From e341f7c45fa11654c7511665b923addd0baeebca Mon Sep 17 00:00:00 2001 From: Adam Simpson Date: Tue, 18 Jul 2023 13:48:23 -0400 Subject: [PATCH] fix tests --- .../__mocks__/resourcePickerRows.ts | 4 --- .../MetricsQueryEditor.test.tsx | 2 -- .../resourcePicker/resourcePickerData.test.ts | 34 +------------------ .../resourcePicker/resourcePickerData.ts | 7 ---- 4 files changed, 1 insertion(+), 46 deletions(-) diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/resourcePickerRows.ts b/public/app/plugins/datasource/azuremonitor/__mocks__/resourcePickerRows.ts index 3de04fd222d..a9ad12a83a7 100644 --- a/public/app/plugins/datasource/azuremonitor/__mocks__/resourcePickerRows.ts +++ b/public/app/plugins/datasource/azuremonitor/__mocks__/resourcePickerRows.ts @@ -1,5 +1,4 @@ import { ResourceRowGroup, ResourceRowType } from '../components/ResourcePicker/types'; -import { AzureMonitorLocations } from '../types'; export const createMockSubscriptions = (): ResourceRowGroup => [ { @@ -133,6 +132,3 @@ export const mockSearchResults = (): ResourceRowGroup => [ location: 'northeurope', }, ]; - -export const mockGetValidLocations = (): Map => - new Map([['northeurope', { displayName: 'North Europe', name: 'northeurope', supportsLogs: true }]]); diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx index d59a147e4e6..03c0d4dddf2 100644 --- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx @@ -10,7 +10,6 @@ import createMockQuery from '../../__mocks__/query'; import { createMockResourceGroupsBySubscription, createMockSubscriptions, - mockGetValidLocations, mockResourcesByResourceGroup, } from '../../__mocks__/resourcePickerRows'; import { selectors } from '../../e2e/selectors'; @@ -46,7 +45,6 @@ export function createMockResourcePickerData() { mockResourcePicker.getResourcesForResourceGroup = jest.fn().mockResolvedValue(mockResourcesByResourceGroup()); mockResourcePicker.getResourceURIFromWorkspace = jest.fn().mockReturnValue(''); mockResourcePicker.getResourceURIDisplayProperties = jest.fn().mockResolvedValue({}); - mockResourcePicker.getLocations = jest.fn().mockResolvedValue(mockGetValidLocations()); return mockResourcePicker; } diff --git a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts index 298dd0b80d8..de358322d43 100644 --- a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts +++ b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts @@ -5,7 +5,6 @@ import { } from '../__mocks__/argResourcePickerResponse'; import createMockDatasource from '../__mocks__/datasource'; import { createMockInstanceSetttings } from '../__mocks__/instanceSettings'; -import { mockGetValidLocations } from '../__mocks__/resourcePickerRows'; import { ResourceRowType } from '../components/ResourcePicker/types'; import { AzureGraphResponse } from '../types'; @@ -32,9 +31,7 @@ const createResourcePickerData = (responses: AzureGraphResponse[]) => { postResource.mockResolvedValueOnce(res); }); resourcePickerData.postResource = postResource; - const locationsMap = mockGetValidLocations(); - const getLocations = jest.spyOn(resourcePickerData, 'getLocations').mockResolvedValue(locationsMap); - return { resourcePickerData, postResource, mockDatasource, getValidLocations: getLocations }; + return { resourcePickerData, postResource, mockDatasource }; }; describe('AzureMonitor resourcePickerData', () => { @@ -390,35 +387,6 @@ describe('AzureMonitor resourcePickerData', () => { }); }); - describe('getValidLocations', () => { - it('returns a locations map', async () => { - const { resourcePickerData, getValidLocations } = createResourcePickerData([createMockARGSubscriptionResponse()]); - getValidLocations.mockRestore(); - const subscriptions = await resourcePickerData.getSubscriptions(); - const locations = await resourcePickerData.getLocations(subscriptions); - - expect(locations.size).toBe(1); - expect(locations.has('northeurope')).toBe(true); - expect(locations.get('northeurope')?.name).toBe('northeurope'); - expect(locations.get('northeurope')?.displayName).toBe('North Europe'); - }); - - it('returns the raw locations map if provider is undefined', async () => { - const { resourcePickerData, mockDatasource, getValidLocations } = createResourcePickerData([ - createMockARGSubscriptionResponse(), - ]); - getValidLocations.mockRestore(); - mockDatasource.azureMonitorDatasource.getProvider = jest.fn().mockResolvedValue(undefined); - const subscriptions = await resourcePickerData.getSubscriptions(); - const locations = await resourcePickerData.getLocations(subscriptions); - - expect(locations.size).toBe(1); - expect(locations.has('northeurope')).toBe(true); - expect(locations.get('northeurope')?.name).toBe('northeurope'); - expect(locations.get('northeurope')?.displayName).toBe('North Europe'); - }); - }); - describe('fetchInitialRows', () => { it('returns a list of subscriptions', async () => { const { resourcePickerData } = createResourcePickerData([createMockARGSubscriptionResponse()]); diff --git a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts index 961c86c09e9..9ee8c3fec8f 100644 --- a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts +++ b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts @@ -18,7 +18,6 @@ import { AzureDataSourceJsonData, AzureGraphResponse, AzureMonitorResource, - AzureMonitorLocations, AzureMonitorQuery, AzureResourceGraphOptions, AzureResourceSummaryItem, @@ -382,12 +381,6 @@ export default class ResourcePickerData extends DataSourceWithBackend> { - const subscriptionIds = subscriptions.map((sub) => sub.id); - const locations = await this.azureMonitorDatasource.getLocations(subscriptionIds); - return locations; - } - parseRows(resources: Array): ResourceRow[] { const resourceObjs = parseMultipleResourceDetails(resources); const newSelectedRows: ResourceRow[] = [];