Ensure fetch works in node 8

- Remove the use of finally. https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/finally#Browser_compatibility - Increase timeouts because test became flakely otherwise
Airtable · Jun 18, 2020 · d7d6235 · d7d6235
1 parent 0c90b8f
commit d7d6235
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/run_action.js b/lib/run_action.js
@@ -68,9 +68,9 @@ function runAction(base, method, path, queryParams, bodyData, callback, numAttem
                     .catch(callback);
             }
         })
-        .catch(callback)
-        .finally(function() {
+        .catch(function(error) {
             clearTimeout(timeout);
+            callback(error);
         });
 }
 

diff --git a/test/find.test.js b/test/find.test.js
@@ -7,15 +7,15 @@ describe('record retrival', function() {
     var testExpressApp;
     var teardownAsync;
 
-    beforeAll(function() {
+    beforeEach(function() {
         return testHelpers.getMockEnvironmentAsync().then(function(env) {
             airtable = env.airtable;
             testExpressApp = env.testExpressApp;
             teardownAsync = env.teardownAsync;
         });
     });
 
-    afterAll(function() {
+    afterEach(function() {
         delete global.window;
         return teardownAsync();
     });

diff --git a/test/test_helpers.js b/test/test_helpers.js
@@ -143,7 +143,7 @@ function getMockEnvironmentAsync(options) {
                         airtable: new Airtable({
                             apiKey: 'key123',
                             endpointUrl: 'http://localhost:' + testServerPort,
-                            requestTimeout: 100,
+                            requestTimeout: 1000,
                         }),
                         teardownAsync: util.promisify(testServer.close.bind(testServer)),
                         testExpressApp: app,