From 605043da48d0e9de09e2f5636eb556929b6013a9 Mon Sep 17 00:00:00 2001 From: sanke1 <22073083+sankerust@users.noreply.github.com> Date: Fri, 1 Feb 2019 14:21:23 +0300 Subject: [PATCH] Travis CI build failing #152 (#153) --- __mocks__/grafana/app/core/core.ts | 1 + tests/analytic_controller.jest.ts | 6 +++--- tests/setup_tests.ts | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 __mocks__/grafana/app/core/core.ts diff --git a/__mocks__/grafana/app/core/core.ts b/__mocks__/grafana/app/core/core.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/__mocks__/grafana/app/core/core.ts @@ -0,0 +1 @@ +export {}; diff --git a/tests/analytic_controller.jest.ts b/tests/analytic_controller.jest.ts index fc8afbd..07b7d64 100644 --- a/tests/analytic_controller.jest.ts +++ b/tests/analytic_controller.jest.ts @@ -10,7 +10,7 @@ describe('AnalyticController', function () { for (let color of ANALYTIC_UNIT_COLORS) { analyticController.createNew(); expect(analyticController.newAnalyticUnit.color).toBe(color); - await analyticController.saveNew({} as MetricExpanded, {} as DatasourceRequest, 1); + await analyticController.saveNew({} as MetricExpanded, {} as DatasourceRequest, ''); } }); @@ -28,7 +28,7 @@ describe('AnalyticController', function () { it('should set different color to newly created Analytic Unit, afer NOT last AU was deleted', async function() { let auArray = analyticController.analyticUnits; analyticController.createNew(); - await analyticController.saveNew({} as MetricExpanded, {} as DatasourceRequest, 1); + await analyticController.saveNew({} as MetricExpanded, {} as DatasourceRequest, ''); expect(auArray[auArray.length - 2].panelObject.color).not.toBe(auArray[auArray.length - 1].panelObject.color); }); @@ -36,7 +36,7 @@ describe('AnalyticController', function () { let auArray = analyticController.analyticUnits; auArray.splice(-1, 1); analyticController.createNew(); - await analyticController.saveNew({} as MetricExpanded, {} as DatasourceRequest, 1); + await analyticController.saveNew({} as MetricExpanded, {} as DatasourceRequest, ''); expect(auArray[auArray.length - 2].panelObject.color).not.toBe(auArray[auArray.length - 1].panelObject.color); }); diff --git a/tests/setup_tests.ts b/tests/setup_tests.ts index 6c335c1..02fb8fc 100644 --- a/tests/setup_tests.ts +++ b/tests/setup_tests.ts @@ -4,8 +4,6 @@ import { AnalyticService } from '../src/services/analytic_service'; import { MetricExpanded } from '../src/models/metric'; import { DatasourceRequest } from '../src/models/datasource'; -import { BackendSrv } from 'grafana/app/core/services/backend_srv'; -import { AlertSrv } from 'grafana/app/core/services/alert_srv'; import { Emitter } from 'grafana/app/core/utils/emitter'; @@ -14,10 +12,12 @@ import { Emitter } from 'grafana/app/core/utils/emitter'; var id = 0; -const analyticService = new AnalyticService('', {} , new BackendSrv({}, {}, {}, {}, {}), new AlertSrv()); -analyticService.postNewItem = async function ( - metric: MetricExpanded, datasourceRequest: DatasourceRequest, - newItem: AnalyticUnit, panelId: number +function $http() { + return { data: { pattern: [], thresholds: [] } }; +} + +const analyticService = new AnalyticService('', $http); +analyticService.postNewItem = async function (newItem: AnalyticUnit, metric: MetricExpanded, datasource: DatasourceRequest, panelUrl: string ): Promise { id++; return Promise.resolve(id.toString());