Type promises (apache#47)

- type rejectAfterTimeout with generics. - fixing an import typo in tests.
graceguo-supercat · Dec 3, 2018 · 990a463 · 990a463
1 parent 96a6487
commit 990a463
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/superset-ui-connection/src/callApi/callApiAndParseWithTimeout.ts b/packages/superset-ui-connection/src/callApi/callApiAndParseWithTimeout.ts
@@ -14,7 +14,7 @@ export default function callApiAndParseWithTimeout({
 
   const racedPromise =
     typeof timeout === 'number' && timeout > 0
-      ? Promise.race([rejectAfterTimeout(timeout), apiPromise])
+      ? Promise.race([rejectAfterTimeout<Response>(timeout), apiPromise])
       : apiPromise;
 
   return parseResponse(racedPromise, parseMethod);

diff --git a/packages/superset-ui-connection/src/callApi/rejectAfterTimeout.ts b/packages/superset-ui-connection/src/callApi/rejectAfterTimeout.ts
@@ -1,5 +1,5 @@
 // returns a Promise that rejects after the specified timeout
-export default function rejectAfterTimeout(timeout: number): Promise<any> {
+export default function rejectAfterTimeout<T>(timeout: number): Promise<T> {
   return new Promise((resolve, reject) => {
     setTimeout(
       () =>

diff --git a/packages/superset-ui-connection/test/callApi/callApiAndParseWithTimeout.test.ts b/packages/superset-ui-connection/test/callApi/callApiAndParseWithTimeout.test.ts
@@ -9,7 +9,7 @@ import * as rejectAfterTimeout from '../../src/callApi/rejectAfterTimeout';
 
 import { LOGIN_GLOB } from '../fixtures/constants';
 import throwIfCalled from '../utils/throwIfCalled';
-import { JsonResponse } from '../../src/types';
+import { Json } from '../../src/types';
 
 describe('callApiAndParseWithTimeout()', () => {
   beforeAll(() => {
@@ -91,7 +91,7 @@ describe('callApiAndParseWithTimeout()', () => {
       jest.useFakeTimers();
 
       return callApiAndParseWithTimeout({ url: mockGetUrl, method: 'GET', timeout: 100 }).then(
-        (response: JsonResponse) => {
+        (response: Json) => {
           expect(response.json).toEqual(expect.objectContaining(mockGetPayload));
 
           return Promise.resolve();