From 25c8233523d317a378f628258b86d88686b1a744 Mon Sep 17 00:00:00 2001 From: Tobias Skarhed Date: Wed, 4 Jul 2018 09:22:39 +0200 Subject: [PATCH 1/3] Begin conversion --- ...query_ctrl_specs.ts => query_ctrl.jest.ts} | 89 +++++++++++-------- 1 file changed, 50 insertions(+), 39 deletions(-) rename public/app/plugins/datasource/graphite/specs/{query_ctrl_specs.ts => query_ctrl.jest.ts} (84%) diff --git a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts b/public/app/plugins/datasource/graphite/specs/query_ctrl.jest.ts similarity index 84% rename from public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts rename to public/app/plugins/datasource/graphite/specs/query_ctrl.jest.ts index b4f7718930f..776dec0a1a7 100644 --- a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts +++ b/public/app/plugins/datasource/graphite/specs/query_ctrl.jest.ts @@ -6,48 +6,59 @@ import helpers from 'test/specs/helpers'; import { GraphiteQueryCtrl } from '../query_ctrl'; describe('GraphiteQueryCtrl', function() { - var ctx = new helpers.ControllerTestContext(); + + let datasource = { + metricFindQuery: jest.fn(() => Promise.resolve([])), + getFuncDefs: jest.fn(() => Promise.resolve(gfunc.getFuncDefs('1.0'))), + getFuncDef: gfunc.getFuncDef, + waitForFuncDefsLoaded: jest.fn(() => Promise.resolve(null)), + createFuncInstance: gfunc.createFuncInstance, + + }; + let ctx = { - 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) => { - ctx.$q = $q; - ctx.scope = $rootScope.$new(); - ctx.target = { target: 'aliasByNode(scaleToSeconds(test.prod.*,1),2)' }; - ctx.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([])); - ctx.datasource.getFuncDefs = sinon.stub().returns(ctx.$q.when(gfunc.getFuncDefs('1.0'))); - ctx.datasource.getFuncDef = gfunc.getFuncDef; - ctx.datasource.waitForFuncDefsLoaded = sinon.stub().returns(ctx.$q.when(null)); - ctx.datasource.createFuncInstance = gfunc.createFuncInstance; - ctx.panelCtrl = { panel: {} }; - ctx.panelCtrl = { - panel: { - targets: [ctx.target], - }, - }; - ctx.panelCtrl.refresh = sinon.spy(); + // beforeEach(angularMocks.module('grafana.core')); + // beforeEach(angularMocks.module('grafana.controllers')); + // beforeEach(angularMocks.module('grafana.services')); + // beforeEach( + // angularMocks.module(function($compileProvider) { + // $compileProvider.preAssignBindingsEnabled(true); + // }) + // ); - ctx.ctrl = $controller( - GraphiteQueryCtrl, - { $scope: ctx.scope }, - { - panelCtrl: ctx.panelCtrl, - datasource: ctx.datasource, - target: ctx.target, - } - ); - ctx.scope.$digest(); - }) - ); + //beforeEach(ctx.providePhase()); + // beforeEach( + // angularMocks.inject(($rootScope, $controller, $q) => { + // ctx.$q = $q; + // ctx.scope = $rootScope.$new(); + // ctx.target = { target: 'aliasByNode(scaleToSeconds(test.prod.*,1),2)' }; + // ctx.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([])); + // ctx.datasource.getFuncDefs = sinon.stub().returns(ctx.$q.when(gfunc.getFuncDefs('1.0'))); + // ctx.datasource.getFuncDef = gfunc.getFuncDef; + // ctx.datasource.waitForFuncDefsLoaded = sinon.stub().returns(ctx.$q.when(null)); + // ctx.datasource.createFuncInstance = gfunc.createFuncInstance; + // ctx.panelCtrl = { panel: {} }; + // ctx.panelCtrl = { + // panel: { + // targets: [ctx.target], + // }, + // }; + // ctx.panelCtrl.refresh = sinon.spy(); + + // ctx.ctrl = $controller( + // GraphiteQueryCtrl, + // { $scope: ctx.scope }, + // { + // panelCtrl: ctx.panelCtrl, + // datasource: ctx.datasource, + // target: ctx.target, + // } + // ); + // ctx.scope.$digest(); + // }) + // ); describe('init', function() { it('should validate metric key exists', function() { From b58a7642dc6b3be313a30be95b455fd6141f8da9 Mon Sep 17 00:00:00 2001 From: Tobias Skarhed Date: Tue, 24 Jul 2018 15:39:56 +0200 Subject: [PATCH 2/3] Karma to Jest --- .../graphite/specs/query_ctrl.jest.ts | 271 ++++++++++-------- 1 file changed, 145 insertions(+), 126 deletions(-) diff --git a/public/app/plugins/datasource/graphite/specs/query_ctrl.jest.ts b/public/app/plugins/datasource/graphite/specs/query_ctrl.jest.ts index 776dec0a1a7..58cefeef6f6 100644 --- a/public/app/plugins/datasource/graphite/specs/query_ctrl.jest.ts +++ b/public/app/plugins/datasource/graphite/specs/query_ctrl.jest.ts @@ -1,22 +1,27 @@ -import 'app/core/services/segment_srv'; -import { describe, beforeEach, it, sinon, expect, angularMocks } from 'test/lib/common'; +import { uiSegmentSrv } from 'app/core/services/segment_srv'; +// import { describe, beforeEach, it, sinon, expect, angularMocks } from 'test/lib/common'; import gfunc from '../gfunc'; -import helpers from 'test/specs/helpers'; +// import helpers from 'test/specs/helpers'; import { GraphiteQueryCtrl } from '../query_ctrl'; -describe('GraphiteQueryCtrl', function() { - - let datasource = { - metricFindQuery: jest.fn(() => Promise.resolve([])), - getFuncDefs: jest.fn(() => Promise.resolve(gfunc.getFuncDefs('1.0'))), - getFuncDef: gfunc.getFuncDef, - waitForFuncDefsLoaded: jest.fn(() => Promise.resolve(null)), - createFuncInstance: gfunc.createFuncInstance, - +describe('GraphiteQueryCtrl', () => { + let ctx = { + datasource: { + metricFindQuery: jest.fn(() => Promise.resolve([])), + getFuncDefs: jest.fn(() => Promise.resolve(gfunc.getFuncDefs('1.0'))), + getFuncDef: gfunc.getFuncDef, + waitForFuncDefsLoaded: jest.fn(() => Promise.resolve(null)), + createFuncInstance: gfunc.createFuncInstance, + }, + target: { target: 'aliasByNode(scaleToSeconds(test.prod.*,1),2)' }, + panelCtrl: { + refresh: jest.fn(), + }, }; - let ctx = { + ctx.panelCtrl.panel = { + targets: [ctx.target], }; // beforeEach(angularMocks.module('grafana.core')); @@ -60,156 +65,170 @@ describe('GraphiteQueryCtrl', function() { // }) // ); - describe('init', function() { - it('should validate metric key exists', function() { - expect(ctx.datasource.metricFindQuery.getCall(0).args[0]).to.be('test.prod.*'); + beforeEach(() => { + GraphiteQueryCtrl.prototype.target = ctx.target; + GraphiteQueryCtrl.prototype.datasource = ctx.datasource; + + GraphiteQueryCtrl.prototype.panelCtrl = ctx.panelCtrl; + + ctx.ctrl = new GraphiteQueryCtrl( + {}, + {}, + new uiSegmentSrv({ trustAsHtml: html => html }, { highlightVariablesAsHtml: () => {} }), + {}, + {} + ); + }); + + describe('init', () => { + it('should validate metric key exists', () => { + expect(ctx.datasource.metricFindQuery.mock.calls[0][0]).toBe('test.prod.*'); }); - it('should delete last segment if no metrics are found', function() { - expect(ctx.ctrl.segments[2].value).to.be('select metric'); + it('should delete last segment if no metrics are found', () => { + expect(ctx.ctrl.segments[2].value).toBe('select metric'); }); - it('should parse expression and build function model', function() { - expect(ctx.ctrl.queryModel.functions.length).to.be(2); + it('should parse expression and build function model', () => { + expect(ctx.ctrl.queryModel.functions.length).toBe(2); }); }); - describe('when adding function', function() { - beforeEach(function() { + describe('when adding function', () => { + beforeEach(() => { ctx.ctrl.target.target = 'test.prod.*.count'; - ctx.ctrl.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([{ expandable: false }])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([{ expandable: false }]); ctx.ctrl.parseTarget(); ctx.ctrl.addFunction(gfunc.getFuncDef('aliasByNode')); }); - it('should add function with correct node number', function() { - expect(ctx.ctrl.queryModel.functions[0].params[0]).to.be(2); + it('should add function with correct node number', () => { + expect(ctx.ctrl.queryModel.functions[0].params[0]).toBe(2); }); - it('should update target', function() { - expect(ctx.ctrl.target.target).to.be('aliasByNode(test.prod.*.count, 2)'); + it('should update target', () => { + expect(ctx.ctrl.target.target).toBe('aliasByNode(test.prod.*.count, 2)'); }); - it('should call refresh', function() { - expect(ctx.panelCtrl.refresh.called).to.be(true); + it('should call refresh', () => { + expect(ctx.panelCtrl.refresh).toHaveBeenCalled(); }); }); - describe('when adding function before any metric segment', function() { - beforeEach(function() { + describe('when adding function before any metric segment', () => { + beforeEach(() => { ctx.ctrl.target.target = ''; - ctx.ctrl.datasource.metricFindQuery.returns(ctx.$q.when([{ expandable: true }])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([{ expandable: true }]); ctx.ctrl.parseTarget(); ctx.ctrl.addFunction(gfunc.getFuncDef('asPercent')); }); - it('should add function and remove select metric link', function() { - expect(ctx.ctrl.segments.length).to.be(0); + it('should add function and remove select metric link', () => { + expect(ctx.ctrl.segments.length).toBe(0); }); }); - describe('when initializing target without metric expression and only function', function() { - beforeEach(function() { + describe('when initializing target without metric expression and only function', () => { + beforeEach(() => { ctx.ctrl.target.target = 'asPercent(#A, #B)'; - ctx.ctrl.datasource.metricFindQuery.returns(ctx.$q.when([])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([]); ctx.ctrl.parseTarget(); - ctx.scope.$digest(); }); - it('should not add select metric segment', function() { - expect(ctx.ctrl.segments.length).to.be(1); + it('should not add select metric segment', () => { + expect(ctx.ctrl.segments.length).toBe(1); }); - it('should add second series ref as param', function() { - expect(ctx.ctrl.queryModel.functions[0].params.length).to.be(1); + it('should add second series ref as param', () => { + expect(ctx.ctrl.queryModel.functions[0].params.length).toBe(1); }); }); - describe('when initializing a target with single param func using variable', function() { - beforeEach(function() { + describe('when initializing a target with single param func using variable', () => { + beforeEach(() => { ctx.ctrl.target.target = 'movingAverage(prod.count, $var)'; - ctx.ctrl.datasource.metricFindQuery.returns(ctx.$q.when([])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([]); ctx.ctrl.parseTarget(); }); - it('should add 2 segments', function() { - expect(ctx.ctrl.segments.length).to.be(2); + it('should add 2 segments', () => { + expect(ctx.ctrl.segments.length).toBe(2); }); - it('should add function param', function() { - expect(ctx.ctrl.queryModel.functions[0].params.length).to.be(1); + it('should add function param', () => { + expect(ctx.ctrl.queryModel.functions[0].params.length).toBe(1); }); }); - describe('when initializing target without metric expression and function with series-ref', function() { - beforeEach(function() { + describe('when initializing target without metric expression and function with series-ref', () => { + beforeEach(() => { ctx.ctrl.target.target = 'asPercent(metric.node.count, #A)'; - ctx.ctrl.datasource.metricFindQuery.returns(ctx.$q.when([])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([]); ctx.ctrl.parseTarget(); }); - it('should add segments', function() { - expect(ctx.ctrl.segments.length).to.be(3); + it('should add segments', () => { + expect(ctx.ctrl.segments.length).toBe(3); }); - it('should have correct func params', function() { - expect(ctx.ctrl.queryModel.functions[0].params.length).to.be(1); + it('should have correct func params', () => { + expect(ctx.ctrl.queryModel.functions[0].params.length).toBe(1); }); }); - describe('when getting altSegments and metricFindQuery returns empty array', function() { - beforeEach(function() { + describe('when getting altSegments and metricFindQuery returns empty array', () => { + beforeEach(() => { ctx.ctrl.target.target = 'test.count'; - ctx.ctrl.datasource.metricFindQuery.returns(ctx.$q.when([])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([]); ctx.ctrl.parseTarget(); ctx.ctrl.getAltSegments(1).then(function(results) { ctx.altSegments = results; }); - ctx.scope.$digest(); }); - it('should have no segments', function() { - expect(ctx.altSegments.length).to.be(0); + it('should have no segments', () => { + expect(ctx.altSegments.length).toBe(0); }); }); - describe('targetChanged', function() { - beforeEach(function() { - ctx.ctrl.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([{ expandable: false }])); + describe('targetChanged', () => { + beforeEach(() => { + ctx.ctrl.target.target = 'aliasByNode(scaleToSeconds(test.prod.*, 1), 2)'; + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([{ expandable: false }]); ctx.ctrl.parseTarget(); ctx.ctrl.target.target = ''; ctx.ctrl.targetChanged(); }); - it('should rebuld target after expression model', function() { - expect(ctx.ctrl.target.target).to.be('aliasByNode(scaleToSeconds(test.prod.*, 1), 2)'); + it('should rebuild target after expression model', () => { + expect(ctx.ctrl.target.target).toBe('aliasByNode(scaleToSeconds(test.prod.*, 1), 2)'); }); - it('should call panelCtrl.refresh', function() { - expect(ctx.panelCtrl.refresh.called).to.be(true); + it('should call panelCtrl.refresh', () => { + expect(ctx.panelCtrl.refresh).toHaveBeenCalled(); }); }); - describe('when updating targets with nested query', function() { - beforeEach(function() { + describe('when updating targets with nested query', () => { + beforeEach(() => { ctx.ctrl.target.target = 'scaleToSeconds(#A, 60)'; - ctx.ctrl.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([{ expandable: false }])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([{ expandable: false }]); ctx.ctrl.parseTarget(); }); - it('should add function params', function() { - expect(ctx.ctrl.queryModel.segments.length).to.be(1); - expect(ctx.ctrl.queryModel.segments[0].value).to.be('#A'); + it('should add function params', () => { + expect(ctx.ctrl.queryModel.segments.length).toBe(1); + expect(ctx.ctrl.queryModel.segments[0].value).toBe('#A'); - expect(ctx.ctrl.queryModel.functions[0].params.length).to.be(1); - expect(ctx.ctrl.queryModel.functions[0].params[0]).to.be(60); + expect(ctx.ctrl.queryModel.functions[0].params.length).toBe(1); + expect(ctx.ctrl.queryModel.functions[0].params[0]).toBe(60); }); - it('target should remain the same', function() { - expect(ctx.ctrl.target.target).to.be('scaleToSeconds(#A, 60)'); + it('target should remain the same', () => { + expect(ctx.ctrl.target.target).toBe('scaleToSeconds(#A, 60)'); }); - it('targetFull should include nested queries', function() { + it('targetFull should include nested queries', () => { ctx.ctrl.panelCtrl.panel.targets = [ { target: 'nested.query.count', @@ -219,17 +238,17 @@ describe('GraphiteQueryCtrl', function() { ctx.ctrl.updateModelTarget(); - expect(ctx.ctrl.target.target).to.be('scaleToSeconds(#A, 60)'); + expect(ctx.ctrl.target.target).toBe('scaleToSeconds(#A, 60)'); - expect(ctx.ctrl.target.targetFull).to.be('scaleToSeconds(nested.query.count, 60)'); + expect(ctx.ctrl.target.targetFull).toBe('scaleToSeconds(nested.query.count, 60)'); }); }); - describe('when updating target used in other query', function() { - beforeEach(function() { + describe('when updating target used in other query', () => { + beforeEach(() => { ctx.ctrl.target.target = 'metrics.a.count'; ctx.ctrl.target.refId = 'A'; - ctx.ctrl.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([{ expandable: false }])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([{ expandable: false }]); ctx.ctrl.parseTarget(); ctx.ctrl.panelCtrl.panel.targets = [ctx.ctrl.target, { target: 'sumSeries(#A)', refId: 'B' }]; @@ -237,113 +256,113 @@ describe('GraphiteQueryCtrl', function() { ctx.ctrl.updateModelTarget(); }); - it('targetFull of other query should update', function() { - expect(ctx.ctrl.panel.targets[1].targetFull).to.be('sumSeries(metrics.a.count)'); + it('targetFull of other query should update', () => { + expect(ctx.ctrl.panel.targets[1].targetFull).toBe('sumSeries(metrics.a.count)'); }); }); - describe('when adding seriesByTag function', function() { - beforeEach(function() { + describe('when adding seriesByTag function', () => { + beforeEach(() => { ctx.ctrl.target.target = ''; - ctx.ctrl.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([{ expandable: false }])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([{ expandable: false }]); ctx.ctrl.parseTarget(); ctx.ctrl.addFunction(gfunc.getFuncDef('seriesByTag')); }); - it('should update functions', function() { - expect(ctx.ctrl.queryModel.getSeriesByTagFuncIndex()).to.be(0); + it('should update functions', () => { + expect(ctx.ctrl.queryModel.getSeriesByTagFuncIndex()).toBe(0); }); - it('should update seriesByTagUsed flag', function() { - expect(ctx.ctrl.queryModel.seriesByTagUsed).to.be(true); + it('should update seriesByTagUsed flag', () => { + expect(ctx.ctrl.queryModel.seriesByTagUsed).toBe(true); }); - it('should update target', function() { - expect(ctx.ctrl.target.target).to.be('seriesByTag()'); + it('should update target', () => { + expect(ctx.ctrl.target.target).toBe('seriesByTag()'); }); - it('should call refresh', function() { - expect(ctx.panelCtrl.refresh.called).to.be(true); + it('should call refresh', () => { + expect(ctx.panelCtrl.refresh).toHaveBeenCalled(); }); }); - describe('when parsing seriesByTag function', function() { - beforeEach(function() { + describe('when parsing seriesByTag function', () => { + beforeEach(() => { ctx.ctrl.target.target = "seriesByTag('tag1=value1', 'tag2!=~value2')"; - ctx.ctrl.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([{ expandable: false }])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([{ expandable: false }]); ctx.ctrl.parseTarget(); }); - it('should add tags', function() { + it('should add tags', () => { const expected = [ { key: 'tag1', operator: '=', value: 'value1' }, { key: 'tag2', operator: '!=~', value: 'value2' }, ]; - expect(ctx.ctrl.queryModel.tags).to.eql(expected); + expect(ctx.ctrl.queryModel.tags).toEqual(expected); }); - it('should add plus button', function() { - expect(ctx.ctrl.addTagSegments.length).to.be(1); + it('should add plus button', () => { + expect(ctx.ctrl.addTagSegments.length).toBe(1); }); }); - describe('when tag added', function() { - beforeEach(function() { + describe('when tag added', () => { + beforeEach(() => { ctx.ctrl.target.target = 'seriesByTag()'; - ctx.ctrl.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([{ expandable: false }])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([{ expandable: false }]); ctx.ctrl.parseTarget(); ctx.ctrl.addNewTag({ value: 'tag1' }); }); - it('should update tags with default value', function() { + it('should update tags with default value', () => { const expected = [{ key: 'tag1', operator: '=', value: '' }]; - expect(ctx.ctrl.queryModel.tags).to.eql(expected); + expect(ctx.ctrl.queryModel.tags).toEqual(expected); }); - it('should update target', function() { + it('should update target', () => { const expected = "seriesByTag('tag1=')"; - expect(ctx.ctrl.target.target).to.eql(expected); + expect(ctx.ctrl.target.target).toEqual(expected); }); }); - describe('when tag changed', function() { - beforeEach(function() { + describe('when tag changed', () => { + beforeEach(() => { ctx.ctrl.target.target = "seriesByTag('tag1=value1', 'tag2!=~value2')"; - ctx.ctrl.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([{ expandable: false }])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([{ expandable: false }]); ctx.ctrl.parseTarget(); ctx.ctrl.tagChanged({ key: 'tag1', operator: '=', value: 'new_value' }, 0); }); - it('should update tags', function() { + it('should update tags', () => { const expected = [ { key: 'tag1', operator: '=', value: 'new_value' }, { key: 'tag2', operator: '!=~', value: 'value2' }, ]; - expect(ctx.ctrl.queryModel.tags).to.eql(expected); + expect(ctx.ctrl.queryModel.tags).toEqual(expected); }); - it('should update target', function() { + it('should update target', () => { const expected = "seriesByTag('tag1=new_value', 'tag2!=~value2')"; - expect(ctx.ctrl.target.target).to.eql(expected); + expect(ctx.ctrl.target.target).toEqual(expected); }); }); - describe('when tag removed', function() { - beforeEach(function() { + describe('when tag removed', () => { + beforeEach(() => { ctx.ctrl.target.target = "seriesByTag('tag1=value1', 'tag2!=~value2')"; - ctx.ctrl.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([{ expandable: false }])); + ctx.ctrl.datasource.metricFindQuery = () => Promise.resolve([{ expandable: false }]); ctx.ctrl.parseTarget(); ctx.ctrl.removeTag(0); }); - it('should update tags', function() { + it('should update tags', () => { const expected = [{ key: 'tag2', operator: '!=~', value: 'value2' }]; - expect(ctx.ctrl.queryModel.tags).to.eql(expected); + expect(ctx.ctrl.queryModel.tags).toEqual(expected); }); - it('should update target', function() { + it('should update target', () => { const expected = "seriesByTag('tag2!=~value2')"; - expect(ctx.ctrl.target.target).to.eql(expected); + expect(ctx.ctrl.target.target).toEqual(expected); }); }); }); From ce9b25a5ac66f0f6a8b9a2f1c91b14c184ed9143 Mon Sep 17 00:00:00 2001 From: Tobias Skarhed Date: Tue, 24 Jul 2018 18:30:29 +0200 Subject: [PATCH 3/3] Remove comments --- .../graphite/specs/query_ctrl.jest.ts | 44 ------------------- 1 file changed, 44 deletions(-) diff --git a/public/app/plugins/datasource/graphite/specs/query_ctrl.jest.ts b/public/app/plugins/datasource/graphite/specs/query_ctrl.jest.ts index 58cefeef6f6..b38ad56427b 100644 --- a/public/app/plugins/datasource/graphite/specs/query_ctrl.jest.ts +++ b/public/app/plugins/datasource/graphite/specs/query_ctrl.jest.ts @@ -1,8 +1,5 @@ import { uiSegmentSrv } from 'app/core/services/segment_srv'; -// import { describe, beforeEach, it, sinon, expect, angularMocks } from 'test/lib/common'; - import gfunc from '../gfunc'; -// import helpers from 'test/specs/helpers'; import { GraphiteQueryCtrl } from '../query_ctrl'; describe('GraphiteQueryCtrl', () => { @@ -24,47 +21,6 @@ describe('GraphiteQueryCtrl', () => { targets: [ctx.target], }; - // 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) => { - // ctx.$q = $q; - // ctx.scope = $rootScope.$new(); - // ctx.target = { target: 'aliasByNode(scaleToSeconds(test.prod.*,1),2)' }; - // ctx.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([])); - // ctx.datasource.getFuncDefs = sinon.stub().returns(ctx.$q.when(gfunc.getFuncDefs('1.0'))); - // ctx.datasource.getFuncDef = gfunc.getFuncDef; - // ctx.datasource.waitForFuncDefsLoaded = sinon.stub().returns(ctx.$q.when(null)); - // ctx.datasource.createFuncInstance = gfunc.createFuncInstance; - // ctx.panelCtrl = { panel: {} }; - // ctx.panelCtrl = { - // panel: { - // targets: [ctx.target], - // }, - // }; - // ctx.panelCtrl.refresh = sinon.spy(); - - // ctx.ctrl = $controller( - // GraphiteQueryCtrl, - // { $scope: ctx.scope }, - // { - // panelCtrl: ctx.panelCtrl, - // datasource: ctx.datasource, - // target: ctx.target, - // } - // ); - // ctx.scope.$digest(); - // }) - // ); - beforeEach(() => { GraphiteQueryCtrl.prototype.target = ctx.target; GraphiteQueryCtrl.prototype.datasource = ctx.datasource;