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(): fixed broken tests due to angularjs upgrade

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-03-28 20:44:32 +02:00
parent 70b66382eb
commit 82ad5a632d
7 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
View File

@ -21,6 +21,7 @@ describe('CloudWatchDatasource', function() {
ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.ds = $injector.instantiate(CloudWatchDatasource, {instanceSettings: instanceSettings});
$httpBackend.when('GET', /\.html$/).respond('');
}));
describe('When performing CloudWatch query', function() {

2
public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
View File

@ -12,11 +12,13 @@ describe('ElasticDatasource', function() {
beforeEach(angularMocks.module('grafana.core'));
beforeEach(angularMocks.module('grafana.services'));
beforeEach(ctx.providePhase(['templateSrv', 'backendSrv']));
beforeEach(angularMocks.inject(function($q, $rootScope, $httpBackend, $injector) {
ctx.$q = $q;
ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.$injector = $injector;
$httpBackend.when('GET', /\.html$/).respond('');
}));
function createDatasource(instanceSettings) {

1
public/app/plugins/datasource/graphite/specs/datasource_specs.ts
View File

@ -15,6 +15,7 @@ describe('graphiteDatasource', function() {
ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.$injector = $injector;
$httpBackend.when('GET', /\.html$/).respond('');
}));
beforeEach(function() {

3
public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
View File

@ -12,9 +12,10 @@ describe('opentsdb', function() {
beforeEach(angularMocks.inject(function($q, $rootScope, $httpBackend, $injector) {
ctx.$q = $q;
ctx.$httpBackend = $httpBackend;
ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.ds = $injector.instantiate(OpenTsDatasource, {instanceSettings: instanceSettings});
$httpBackend.when('GET', /\.html$/).respond('');
}));
describe('When performing metricFindQuery', function() {

1
public/app/plugins/datasource/prometheus/specs/datasource_specs.ts
View File

@ -14,6 +14,7 @@ describe('PrometheusDatasource', function() {
ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.ds = $injector.instantiate(PrometheusDatasource, {instanceSettings: instanceSettings});
$httpBackend.when('GET', /\.html$/).respond('');
}));
describe('When querying prometheus with one target using query editor target spec', function() {

2
public/app/plugins/datasource/prometheus/specs/metric_find_query_specs.ts
View File

@ -8,6 +8,7 @@ describe('PrometheusMetricFindQuery', function() {
var ctx = new helpers.ServiceTestContext();
var instanceSettings = {url: 'proxied', directUrl: 'direct', user: 'test', password: 'mupp' };
beforeEach(angularMocks.module('grafana.core'));
beforeEach(angularMocks.module('grafana.services'));
beforeEach(angularMocks.inject(function($q, $rootScope, $httpBackend, $injector) {
@ -15,6 +16,7 @@ describe('PrometheusMetricFindQuery', function() {
ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.ds = $injector.instantiate(PrometheusDatasource, {instanceSettings: instanceSettings});
$httpBackend.when('GET', /\.html$/).respond('');
}));
describe('When performing metricFindQuery', function() {

3
public/test/specs/value_select_dropdown_specs.js
View File

@ -11,7 +11,7 @@ function () {
var rootScope;
beforeEach(module('grafana.core'));
beforeEach(inject(function($controller, $rootScope, $q) {
beforeEach(inject(function($controller, $rootScope, $q, $httpBackend) {
rootScope = $rootScope;
scope = $rootScope.$new();
ctrl = $controller('ValueSelectDropdownCtrl', {$scope: scope});
@ -19,6 +19,7 @@ function () {
return $q.when(tagValuesMap[obj.tagKey]);
};
ctrl.onUpdated = sinon.spy();
$httpBackend.when('GET', /\.html$/).respond('');
}));
describe("Given simple variable", function() {