diff --git a/public/app/plugins/datasource/elasticsearch/specs/datasource.jest.ts b/public/app/plugins/datasource/elasticsearch/specs/datasource.jest.ts index e9f7a61a572..36e7a63a005 100644 --- a/public/app/plugins/datasource/elasticsearch/specs/datasource.jest.ts +++ b/public/app/plugins/datasource/elasticsearch/specs/datasource.jest.ts @@ -22,7 +22,7 @@ describe('ElasticDatasource', function() { let timeSrv = { time: { from: 'now-1h', to: 'now' }, - timeRange: jest.fn(parse => { + timeRange: jest.fn(() => { return { from: dateMath.parse(this.time.from, false), to: dateMath.parse(this.time.to, true), diff --git a/public/test/specs/helpers.ts b/public/test/specs/helpers.ts index d98e79ff06b..677419f3f75 100644 --- a/public/test/specs/helpers.ts +++ b/public/test/specs/helpers.ts @@ -195,43 +195,6 @@ export function TemplateSrvStub() { }; } -export function jestTemplateSrvStub() { - this.variables = []; - this.templateSettings = { interpolate: /\[\[([\s\S]+?)\]\]/g }; - this.data = {}; - this.replace = jest.fn(text => _.template(text, this.templateSettings)(this.data)); - this.init = jest.fn(); - this.getAdhocFilters = jest.fn(() => []); - this.fillVariableValuesForUrl = jest.fn(); - this.updateTemplateData = jest.fn(); - this.variableExists = jest.fn(() => false); - this.variableInitialized = jest.fn(); - this.highlightVariablesAsHtml = jest.fn(str => str); - this.setGrafanaVariable = jest.fn((name, value) => { - this.data[name] = value; - }); -} - -export function jestTimeSrvStub() { - this.init = jest.fn(); - this.time = { from: 'now-1h', to: 'now' }; - this.timeRange = jest.fn(parse => { - if (parse === false) { - return this.time; - } - return { - from: dateMath.parse(this.time.from, false), - to: dateMath.parse(this.time.to, true), - }; - }); - - this.replace = jest.fn(target => target); - - this.setTime = jest.fn(time => { - this.time = time; - }); -} - var allDeps = { ContextSrvStub, TemplateSrvStub, @@ -239,8 +202,6 @@ var allDeps = { ControllerTestContext, ServiceTestContext, DashboardViewStateStub, - jestTimeSrvStub, - jestTemplateSrvStub, }; // for legacy