Merge pull request #50 from RapidAPI/staging

ci-publish-package

Author: khaledrapidapi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rapidapi/testing-worker",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "A RapidAPI Testing worker CLI",
   "private": false,
   "license": "MIT",

src/models/TestExecutable.js

@@ -63,6 +63,7 @@ class TestExecutable {
     let _apiCalls = [];
     let _actionReports = [];
     let timeoutId;
+    let currentActionIndex = 0;
 
     // TIMING
     const { performance } = require("perf_hooks");
@@ -90,7 +91,7 @@ class TestExecutable {
         let result = { contextWrites: [], apiCalls: [], actionReports: [] };
         //2. evaluate action
         try {
-          result = Object.assign(result, await action.eval(context, stepTimeoutSeconds));
+          result = Object.assign(result, await action.eval(context, timeoutSeconds, stepTimeoutSeconds));
         } catch (e) {
           result.actionReports = [
             {
@@ -116,24 +117,40 @@ class TestExecutable {
         // this does need to bubble to the top for child tests to be correctly scoped
         // into a parent.
         totalContextWrites.push(...result.contextWrites);
+        currentActionIndex += 1;
       }
       // Clear the timeout or else the lambda will hang around until it finishes which is not
       // ideal for default workers without a frequency value.
       clearTimeout(timeoutId);
       return FINISHED_EXECUTION;
     })();
     let result = await Promise.race([timeoutTimer, testExecution]);
-    //TIMING
+    // TIMING
     const t1 = performance.now();
     const elapsedTime = t1 - t0;
 
-    //OVERALL SUCCESS
+    // OVERALL SUCCESS
     let success = _actionReports.filter((a) => a.success == false).length == 0 && result === FINISHED_EXECUTION;
+    let _finalReport = _actionReports;
+
+    if (result === TIMEOUT) {
+      const finishedStepsTotalTime = _finalReport.reduce((a, c) => a + c.time, 0);
+
+      // Add a failed step for the test timeout limit and inform the user that subsequent steps
+      // have been skipped
+      _finalReport.push({
+        action: actions[currentActionIndex].action,
+        success: false,
+        shortSummary: `Test exceeded timeout limit of ${timeoutSeconds}s. Subsequent steps skipped.`,
+        longSummary: null,
+        time: elapsedTime - finishedStepsTotalTime, // time delta is where the step terminated due to timeout
+      });
+    }
 
     return {
       contextWrites: totalContextWrites, // optional
       apiCalls: _apiCalls,
-      actionReports: _actionReports,
+      actionReports: _finalReport,
       elapsedTime,
       success,
       timedOut: result === TIMEOUT,

src/models/actions/Http.js

@@ -38,7 +38,8 @@ class Http extends BaseAction {
     return requestObj;
   }
 
-  async eval(context, stepTimeoutSeconds = 15) {
+  // eslint-disable-next-line no-unused-vars
+  async eval(context, timeoutSeconds = 300, stepTimeoutSeconds = 15) {
     // fetch axios instance from context or create one if does not exist
     // this "shared" axios instance is used to ensure that cookies are properly passed between requests
     let transport;