public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Adam Simpson
2023-07-21 14:52:15 -04:00
parent f9abb88afa
commit e341f7c45f
4 changed files with 1 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/azuremonitor/__mocks__/resourcePickerRows.ts
-4
View File
@@ -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<string, AzureMonitorLocations> =>
new Map([['northeurope', { displayName: 'North Europe', name: 'northeurope', supportsLogs: true }]]);
public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx
-2
View File
@@ -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;
}
public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts
+1 -33
View File
@@ -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()]);
public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts
-7
View File
@@ -18,7 +18,6 @@ import {
AzureDataSourceJsonData,
AzureGraphResponse,
AzureMonitorResource,
AzureMonitorLocations,
AzureMonitorQuery,
AzureResourceGraphOptions,
AzureResourceSummaryItem,
@@ -382,12 +381,6 @@ export default class ResourcePickerData extends DataSourceWithBackend<AzureMonit
this.supportedMetricNamespaces = uniq(supportedMetricNamespaces).join(',');
}
async getLocations(subscriptions: ResourceRowGroup): Promise<Map<string, AzureMonitorLocations>> {
const subscriptionIds = subscriptions.map((sub) => sub.id);
const locations = await this.azureMonitorDatasource.getLocations(subscriptionIds);
return locations;
}
parseRows(resources: Array<string | AzureMonitorResource>): ResourceRow[] {
const resourceObjs = parseMultipleResourceDetails(resources);
const newSelectedRows: ResourceRow[] = [];