update tests

grafana · Dec 30, 2024 · cd0da39 · cd0da39
1 parent 3f019e0
commit cd0da39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/DatasourceWithAsyncBackend.test.ts b/src/DatasourceWithAsyncBackend.test.ts
@@ -105,15 +105,15 @@ describe('DatasourceWithAsyncBackend', () => {
     expect(ds.doSingle).toHaveBeenCalledWith(defaultQuery2, defaultRequest);
   });
 
-  it('uses the datasource id for the request id', () => {
+  it('uses the datasource uid for the request uid', () => {
     const ds = setupDatasourceWithAsyncBackend();
     expect(getRequestLooperMock).not.toHaveBeenCalled();
     ds.doSingle(defaultQuery, defaultRequest);
     expect(getRequestLooperMock).toHaveBeenCalledTimes(1);
     const expectedRequest = {
       ...defaultRequest,
       targets: [defaultQuery],
-      requestId: '12_100',
+      requestId: 'test_100',
     };
     expect(getRequestLooperMock).toHaveBeenCalledWith(expectedRequest, expect.anything());
   });

diff --git a/src/DatasourceWithAsyncBackend.ts b/src/DatasourceWithAsyncBackend.ts
@@ -18,8 +18,6 @@ import { catchError, map } from 'rxjs/operators';
 import { gte } from 'semver';
 import { getRequestLooper } from './requestLooper';
 
-const requestSupportsSkipQueryCache = gte(config.buildInfo.version, '10.2.3');
-
 export interface CustomMeta {
   queryID: string;
   status: string;
@@ -133,6 +131,7 @@ export class DatasourceWithAsyncBackend<
           // The caching service handles bypassing the query cache automatically when it is enabled.
           const cachingDisabled = !config.featureToggles.awsAsyncQueryCaching;
           if (cachingDisabled && isRunning(status)) {
+            const requestSupportsSkipQueryCache = gte(config.buildInfo.version, '10.2.3');
             if (!requestSupportsSkipQueryCache) {
               return getBackendSrv()
                 .fetch<BackendDataSourceResponse>({