IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

tech(library upgrade): fixed unit test broken by angularjs upgrade, #7274

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-01-16 22:27:35 +01:00
parent 6f87f88690
commit 0683742e83
8 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/templating/specs/variable_srv_init_specs.ts
View File

@ -12,6 +12,9 @@ describe('VariableSrv init', function() {
beforeEach(angularMocks.module('grafana.core'));
beforeEach(angularMocks.module('grafana.controllers'));
beforeEach(angularMocks.module('grafana.services'));
beforeEach(angularMocks.module(function($compileProvider) {
$compileProvider.preAssignBindingsEnabled(true);
}));
beforeEach(ctx.providePhase(['datasourceSrv', 'timeSrv', 'templateSrv', '$location']));
beforeEach(angularMocks.inject(($rootScope, $q, $location, $injector) => {

3
public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
View File

@ -13,6 +13,9 @@ describe('GraphiteQueryCtrl', function() {
beforeEach(angularMocks.module('grafana.core'));
beforeEach(angularMocks.module('grafana.controllers'));
beforeEach(angularMocks.module('grafana.services'));
beforeEach(angularMocks.module(function($compileProvider) {
$compileProvider.preAssignBindingsEnabled(true);
}));
beforeEach(ctx.providePhase());
beforeEach(angularMocks.inject(($rootScope, $controller, $q) => {

3
public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts
View File

@ -10,6 +10,9 @@ describe('InfluxDBQueryCtrl', function() {
beforeEach(angularMocks.module('grafana.core'));
beforeEach(angularMocks.module('grafana.controllers'));
beforeEach(angularMocks.module('grafana.services'));
beforeEach(angularMocks.module(function($compileProvider) {
$compileProvider.preAssignBindingsEnabled(true);
}));
beforeEach(ctx.providePhase());
beforeEach(angularMocks.inject(($rootScope, $controller, $q) => {

4
public/app/plugins/datasource/opentsdb/specs/query-ctrl-specs.ts
View File

@ -7,6 +7,10 @@ describe('OpenTsQueryCtrl', function() {
beforeEach(angularMocks.module('grafana.core'));
beforeEach(angularMocks.module('grafana.services'));
beforeEach(angularMocks.module(function($compileProvider) {
$compileProvider.preAssignBindingsEnabled(true);
}));
beforeEach(ctx.providePhase(['backendSrv','templateSrv']));
beforeEach(ctx.providePhase());

3
public/app/plugins/panel/graph/specs/graph_ctrl_specs.ts
View File

@ -12,6 +12,9 @@ describe('GraphCtrl', function() {
beforeEach(angularMocks.module('grafana.services'));
beforeEach(angularMocks.module('grafana.controllers'));
beforeEach(angularMocks.module(function($compileProvider) {
$compileProvider.preAssignBindingsEnabled(true);
}));
beforeEach(ctx.providePhase());
beforeEach(ctx.createPanelController(GraphCtrl));

3
public/app/plugins/panel/singlestat/specs/singlestat-specs.ts
View File

@ -17,6 +17,9 @@ describe('SingleStatCtrl', function() {
beforeEach(angularMocks.module('grafana.services'));
beforeEach(angularMocks.module('grafana.controllers'));
beforeEach(angularMocks.module(function($compileProvider) {
$compileProvider.preAssignBindingsEnabled(true);
}));
beforeEach(ctx.providePhase());
beforeEach(ctx.createPanelController(SingleStatCtrl));

1
public/test/specs/helpers.js
View File

@ -162,6 +162,7 @@ define([
this.fillVariableValuesForUrl = function() {};
this.updateTemplateData = function() { };
this.variableExists = function() { return false; };
this.variableInitialized = function() { };
this.highlightVariablesAsHtml = function(str) { return str; };
this.setGrafanaVariable = function(name, value) {
this.data[name] = value;

11
public/test/specs/shareModalCtrl-specs.js
View File

@ -16,6 +16,9 @@ define([
beforeEach(module('grafana.controllers'));
beforeEach(module('grafana.services'));
beforeEach(module(function($compileProvider) {
$compileProvider.preAssignBindingsEnabled(true);
}));
beforeEach(ctx.providePhase());
@ -28,7 +31,7 @@ define([
ctx.scope.panel = { id: 22 };
ctx.scope.init();
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000&panelId=22&fullscreen');
expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&panelId=22&fullscreen');
});
it('should generate render url', function() {
@ -48,7 +51,7 @@ define([
ctx.scope.panel = null;
ctx.scope.init();
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000');
expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000');
});
it('should add theme when specified', function() {
@ -57,7 +60,7 @@ define([
ctx.scope.panel = null;
ctx.scope.init();
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000&theme=light');
expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&theme=light');
});
it('should include template variables in url', function() {
@ -70,7 +73,7 @@ define([
};
ctx.scope.buildUrl();
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000&var-app=mupp&var-server=srv-01');
expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&var-app=mupp&var-server=srv-01');
});
});