Enable screenshot functionality (closes DevExpress#104)

AlexanderMoskovkin · Nov 10, 2015 · 621d4df · 621d4df
1 parent a964d48
commit 621d4df
Show file tree

Hide file tree

Showing 30 changed files with 568 additions and 570 deletions.
diff --git a/package.json b/package.json
@@ -28,7 +28,8 @@
     "testcafe-browser-natives": "^0.10.0",
     "testcafe-hammerhead": "^0.2.1",
     "uglify-js": "1.2.6",
-    "useragent": "^2.1.7"
+    "useragent": "^2.1.7",
+    "uuid": "^2.0.1"
   },
   "devDependencies": {
     "babel": "^5.8.23",

diff --git a/src/client/core/transport.js b/src/client/core/transport.js
@@ -1,7 +1,10 @@
 import hammerhead from './deps/hammerhead';
 import COMMAND from '../../runner/test-run/command';
 
-var transport = hammerhead.transport;
+var transport          = hammerhead.transport;
+var beforeUnloadRaised = false;
+
+hammerhead.on(hammerhead.EVENTS.beforeUnload, () => beforeUnloadRaised = true);
 
 
 //Exports
@@ -14,25 +17,19 @@ export var queuedAsyncServiceMsg           = transport.queuedAsyncServiceMsg.bin
 
 export function fail (err, callback) {
     var testFailMsg = {
-        cmd: COMMAND.fatalError,
-        err: err
+        cmd:      COMMAND.fatalError,
+        err:      err,
+        deferred: beforeUnloadRaised
     };
 
-    transport.asyncServiceMsg(testFailMsg, function () {
-        callback();
-    });
-
-    //HACK: this helps stop current JS context execution
-    window.onerror = function () {
-    };
-    throw 'STOP';
+    transport.asyncServiceMsg(testFailMsg, callback);
 }
 
-export function assertionFailed (err) {
+export function assertionFailed (err, callback) {
     var assertionFailedMsg = {
         cmd: COMMAND.assertionFailed,
         err: err
     };
 
-    transport.asyncServiceMsg(assertionFailedMsg);
+    transport.asyncServiceMsg(assertionFailedMsg, callback);
 }
diff --git a/src/client/runner/api/actions.js b/src/client/runner/api/actions.js
@@ -698,11 +698,11 @@ export function upload (what, path) {
     );
 }
 
-export function screenshot () {
+export function screenshot (filePath) {
     stepIterator.asyncAction(function (iteratorCallback) {
         stepIterator.takeScreenshot(function () {
             iteratorCallback();
-        }, false);
+        }, filePath);
     });
 }
 

diff --git a/src/client/runner/iframe-runner.js b/src/client/runner/iframe-runner.js
@@ -78,8 +78,6 @@ IFrameRunner.prototype._onAssertionFailed = function (e) {
         err: e
     };
 
-    this.stepIterator.state.needScreeshot = true;
-
     messageSandbox.sendServiceMsg(msg, window.top);
 
     if (SETTINGS.get().PLAYBACK)
@@ -116,7 +114,8 @@ IFrameRunner.prototype._onGetStepsSharedData = function (e) {
 IFrameRunner.prototype._onTakeScreenshot = function (e) {
     var msg = {
         cmd:          RunnerBase.IFRAME_TAKE_SCREENSHOT_REQUEST_CMD,
-        isFailedStep: e.isFailedStep
+        stepName:     e.stepName,
+        filePath:     e.filePath
     };
 
     messageSandbox.sendServiceMsg(msg, window.top);

diff --git a/src/client/runner/runner-base.js b/src/client/runner/runner-base.js
@@ -85,7 +85,8 @@ var RunnerBase = function () {
                 type:      ERROR_TYPE.uncaughtJSError,
                 scriptErr: err.msg,
                 pageError: true,
-                pageUrl:   err.pageUrl
+                pageUrl:   err.pageUrl,
+                stepName:  runner.stepIterator.getCurrentStep()
             });
         }
     });
@@ -105,6 +106,9 @@ var RunnerBase = function () {
         //NOTE: start test execution only when all content is loaded or if loading
         //timeout is reached (whichever comes first).
         runner._prepareStepsExecuting(function () {
+            if (runner.stopped)
+                return;
+
             delete runner.act._onJSError;
             delete runner.act._start;
 
@@ -211,7 +215,7 @@ RunnerBase.prototype._initIFrameBehavior = function () {
                     runner.executingStepInIFrameWindow = null;
 
                 message.err.stepNum = runner.stepIterator.state.step - 1;
-                runner._onAssertionFailed(message.err, true);
+                runner._onAssertionFailed(message.err);
                 break;
 
             case RunnerBase.IFRAME_GET_SHARED_DATA_REQUEST_CMD:
@@ -256,8 +260,9 @@ RunnerBase.prototype._initIFrameBehavior = function () {
 
             case RunnerBase.IFRAME_TAKE_SCREENSHOT_REQUEST_CMD:
                 runner._onTakeScreenshot({
-                    isFailedStep: message.isFailedStep,
-                    callback:     function () {
+                    stepName: message.stepName,
+                    filePath: message.filePath,
+                    callback: function () {
                         msg = {
                             cmd: RunnerBase.IFRAME_TAKE_SCREENSHOT_RESPONSE_CMD
                         };
@@ -376,8 +381,8 @@ RunnerBase.prototype._runInIFrame = function (iframe, stepName, step, stepNum) {
     pingIFrame(iframe, function (err) {
         if (err) {
             runner._onError({
-                type:     ERROR_TYPE.inIFrameTargetLoadingTimeout,
-                stepName: SETTINGS.get().CURRENT_TEST_STEP_NAME
+                code:     ERROR_TYPE.inIFrameTargetLoadingTimeout,
+                stepName: runner.stepIterator.getCurrentStep()
             });
         }
         else {
@@ -390,8 +395,8 @@ RunnerBase.prototype._runInIFrame = function (iframe, stepName, step, stepNum) {
 RunnerBase.prototype._ensureIFrame = function (arg) {
     if (!arg) {
         this._onError({
-            type:     ERROR_TYPE.emptyIFrameArgument,
-            stepName: SETTINGS.get().CURRENT_TEST_STEP_NAME
+            code:     ERROR_TYPE.emptyIFrameArgument,
+            stepName: this.stepIterator.getCurrentStep()
         });
         return null;
     }
@@ -401,8 +406,8 @@ RunnerBase.prototype._ensureIFrame = function (arg) {
             return arg;
         else {
             this._onError({
-                type:     ERROR_TYPE.iframeArgumentIsNotIFrame,
-                stepName: SETTINGS.get().CURRENT_TEST_STEP_NAME
+                code:     ERROR_TYPE.iframeArgumentIsNotIFrame,
+                stepName: this.stepIterator.getCurrentStep()
             });
             return null;
         }
@@ -414,15 +419,15 @@ RunnerBase.prototype._ensureIFrame = function (arg) {
     if (serviceUtils.isJQueryObj(arg)) {
         if (arg.length === 0) {
             this._onError({
-                type:     ERROR_TYPE.emptyIFrameArgument,
-                stepName: SETTINGS.get().CURRENT_TEST_STEP_NAME
+                code:     ERROR_TYPE.emptyIFrameArgument,
+                stepName: this.stepIterator.getCurrentStep()
             });
             return null;
         }
         else if (arg.length > 1) {
             this._onError({
-                type:     ERROR_TYPE.multipleIFrameArgument,
-                stepName: SETTINGS.get().CURRENT_TEST_STEP_NAME
+                code:     ERROR_TYPE.multipleIFrameArgument,
+                stepName: this.stepIterator.getCurrentStep()
             });
             return null;
         }
@@ -434,9 +439,10 @@ RunnerBase.prototype._ensureIFrame = function (arg) {
         return this._ensureIFrame(arg());
 
     this._onError({
-        type:     ERROR_TYPE.incorrectIFrameArgument,
-        stepName: SETTINGS.get().CURRENT_TEST_STEP_NAME
+        code:     ERROR_TYPE.incorrectIFrameArgument,
+        stepName: this.stepIterator.getCurrentStep()
     });
+
     return null;
 };
 
@@ -468,7 +474,7 @@ RunnerBase.prototype._initApi = function () {
                 iFrame  = runner._ensureIFrame(iFrameGetter());
 
             if (iFrame)
-                runner._runInIFrame(iFrame, SETTINGS.get().CURRENT_TEST_STEP_NAME, step, stepNum);
+                runner._runInIFrame(iFrame, runner.stepIterator.getCurrentStep(), step, stepNum);
         };
     };
 };