From df75fb0e6da5ca805da3f54454b3c85d2f32774a Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Fri, 30 Nov 2018 09:32:36 +0100 Subject: [PATCH] remove obsolete test --- public/app/features/explore/Explore.tsx | 2 +- public/app/features/plugins/datasource_srv.ts | 6 ----- .../plugins/specs/datasource_srv.test.ts | 26 ------------------- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx index ca578a3f20a..4bc9dd31f12 100644 --- a/public/app/features/explore/Explore.tsx +++ b/public/app/features/explore/Explore.tsx @@ -144,7 +144,7 @@ export class Explore extends React.PureComponent { if (!datasourceSrv) { throw new Error('No datasource service passed as props.'); } - const datasources = datasourceSrv.getExploreSources(); + const datasources = Object['values'](datasourceSrv.getAll()); const exploreDatasources = datasources.map(ds => ({ value: ds.name, label: ds.name, diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts index 0d6aac22714..9a3a5227586 100644 --- a/public/app/features/plugins/datasource_srv.ts +++ b/public/app/features/plugins/datasource_srv.ts @@ -91,12 +91,6 @@ export class DatasourceSrv { return sources; } - getExploreSources() { - const { datasources } = config; - const es = Object.keys(datasources).map(name => datasources[name]); - return _.sortBy(es, ['name']); - } - getMetricSources(options?) { const metricSources: DataSourceSelectItem[] = []; diff --git a/public/app/features/plugins/specs/datasource_srv.test.ts b/public/app/features/plugins/specs/datasource_srv.test.ts index a8d0807c765..b04e9fa10c2 100644 --- a/public/app/features/plugins/specs/datasource_srv.test.ts +++ b/public/app/features/plugins/specs/datasource_srv.test.ts @@ -18,32 +18,6 @@ const templateSrv = { describe('datasource_srv', () => { const _datasourceSrv = new DatasourceSrv({}, {}, {}, templateSrv); - describe('when loading explore sources', () => { - beforeEach(() => { - config.datasources = { - explore1: { - name: 'explore1', - meta: { explore: true, metrics: true }, - }, - explore2: { - name: 'explore2', - meta: { explore: true, metrics: false }, - }, - nonExplore: { - name: 'nonExplore', - meta: { explore: false, metrics: true }, - }, - }; - }); - - it('should return list of explore sources', () => { - const exploreSources = _datasourceSrv.getExploreSources(); - expect(exploreSources.length).toBe(2); - expect(exploreSources[0].name).toBe('explore1'); - expect(exploreSources[1].name).toBe('explore2'); - }); - }); - describe('when loading metric sources', () => { let metricSources; const unsortedDatasources = {