From a4d27083d094538d4ad9e189498ae12160f8d624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Aug 2016 12:20:16 +0200 Subject: [PATCH] fix(tests): fixed unit test broken in recent dynamic dashboard fix --- public/app/features/dashboard/dynamic_dashboard_srv.ts | 2 +- public/test/specs/dynamicDashboardSrv-specs.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/app/features/dashboard/dynamic_dashboard_srv.ts b/public/app/features/dashboard/dynamic_dashboard_srv.ts index 21f1468f359..b3b13bdc199 100644 --- a/public/app/features/dashboard/dynamic_dashboard_srv.ts +++ b/public/app/features/dashboard/dynamic_dashboard_srv.ts @@ -24,7 +24,7 @@ export class DynamicDashboardSrv { if (dashboard.templating.list.length === 0) { return; } this.dashboard = dashboard; - this.iteration = new Date().getTime(); + this.iteration = (this.iteration || new Date().getTime()) + 1; var cleanUpOnly = options.cleanUpOnly; diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js index a09c3788377..b6d3a6d52fb 100644 --- a/public/test/specs/dynamicDashboardSrv-specs.js +++ b/public/test/specs/dynamicDashboardSrv-specs.js @@ -1,5 +1,5 @@ define([ - 'app/features/dashboard/dynamicDashboardSrv', + 'app/features/dashboard/dynamic_dashboard_srv', 'app/features/dashboard/dashboardSrv' ], function() { 'use strict'; @@ -12,6 +12,7 @@ define([ ctx.setup = function (setupFunc) { beforeEach(module('grafana.services')); + beforeEach(module('grafana.core')); beforeEach(module(function($provide) { $provide.value('contextSrv', { user: { timezone: 'utc'}