Explorar el Código

fix(): another test fix

Torkel Ödegaard hace 9 años
padre
commit
105a678d64

+ 3 - 1
public/app/plugins/panel/graph/specs/graph_specs.ts

@@ -53,7 +53,9 @@ describe('grafanaGraph', function() {
             },
             renderingCompleted: sinon.spy(),
             hiddenSeries: {},
-            dashboard: {timezone: 'browser'},
+            dashboard: {
+              getTimezone: sinon.stub().returns('browser')
+            },
             range: {
               from: moment([2015, 1, 1, 10]),
               to: moment([2015, 1, 1, 22]),

+ 4 - 0
public/test/specs/dashboardSrv-specs.js

@@ -7,6 +7,10 @@ define([
     var _dashboardSrv;
 
     beforeEach(module('grafana.services'));
+    beforeEach(module(function($provide) {
+      $provide.value('contextSrv', {
+      });
+    }));
 
     beforeEach(inject(function(dashboardSrv) {
       _dashboardSrv = dashboardSrv;

+ 10 - 5
public/test/specs/dynamicDashboardSrv-specs.js

@@ -12,6 +12,11 @@ define([
       ctx.setup = function (setupFunc) {
 
         beforeEach(module('grafana.services'));
+        beforeEach(module(function($provide) {
+          $provide.value('contextSrv', {
+            user: { timezone: 'utc'}
+          });
+        }));
 
         beforeEach(inject(function(dynamicDashboardSrv, dashboardSrv) {
           ctx.dynamicDashboardSrv = dynamicDashboardSrv;
@@ -45,10 +50,10 @@ define([
           value: ['se1', 'se2', 'se3']
         },
         options: [
-          {text: 'se1', value: 'se1', selected: true},
-          {text: 'se2', value: 'se2', selected: true},
-          {text: 'se3', value: 'se3', selected: true},
-          {text: 'se4', value: 'se4', selected: false}
+        {text: 'se1', value: 'se1', selected: true},
+        {text: 'se2', value: 'se2', selected: true},
+        {text: 'se3', value: 'se3', selected: true},
+        {text: 'se4', value: 'se4', selected: false}
         ]
       });
     });
@@ -93,7 +98,7 @@ define([
     describe('After a second iteration and selected values reduced', function() {
       beforeEach(function() {
         ctx.dash.templating.list[0].options[1].selected = false;
-        
+
         ctx.dynamicDashboardSrv.update(ctx.dash);
       });