Add test of timeout abort

- Fix sending a signal so that it actually aborts
Airtable · Jun 18, 2020 · 0c90b8f · 0c90b8f
1 parent 554808a
commit 0c90b8f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/lib/run_action.js b/lib/run_action.js
@@ -35,16 +35,17 @@ function runAction(base, method, path, queryParams, bodyData, callback, numAttem
         headers['User-Agent'] = userAgent;
     }
 
+    var controller = new AbortController();
     var options = {
         method: method.toUpperCase(),
         headers: headers,
+        signal: controller.signal,
     };
 
     if (bodyData !== null) {
         options.body = JSON.stringify(bodyData);
     }
 
-    var controller = new AbortController();
     var timeout = setTimeout(function() {
         controller.abort();
     }, base._airtable.requestTimeout);

diff --git a/test/find.test.js b/test/find.test.js
@@ -146,4 +146,28 @@ describe('record retrival', function() {
                 expect(foundRecord.get('Name')).toBe('Rebecca');
             });
     });
+
+    it('can timeout if the servers are slow', function(done) {
+        var recordId = 'record1';
+
+        testExpressApp.set('handler override', function(req) {
+            expect(req.method).toBe('GET');
+            expect(req.url).toBe('/v0/app123/Table/record1?');
+            // Timeout before returning a response
+        });
+
+        return airtable
+            .base('app123')
+            .table('Table')
+            .find(recordId)
+            .then(
+                function() {
+                    throw new Error('Promise unexpectedly fufilled.');
+                },
+                function(err) {
+                    expect(err.message).toMatch(/aborted/);
+                    done();
+                }
+            );
+    });
 });
diff --git a/test/test_helpers.js b/test/test_helpers.js
@@ -143,6 +143,7 @@ function getMockEnvironmentAsync(options) {
                         airtable: new Airtable({
                             apiKey: 'key123',
                             endpointUrl: 'http://localhost:' + testServerPort,
+                            requestTimeout: 100,
                         }),
                         teardownAsync: util.promisify(testServer.close.bind(testServer)),
                         testExpressApp: app,