Redesign legacy errors (closes #685) (#693)

* Redesign legacy errors * Try fix unstable iframe test in IE * Remove iframe fix
DevExpress · Jul 28, 2016 · f3949f3 · f3949f3
1 parent da687e0
commit f3949f3
Show file tree

Hide file tree

Showing 41 changed files with 230 additions and 339 deletions.
diff --git a/src/legacy/test-run-error/formattable-adapter.js b/src/legacy/test-run-error/formattable-adapter.js
@@ -19,6 +19,9 @@ export default class LegacyTestRunErrorFormattableAdapter extends TestRunErrorFo
     }
 
     getCallsiteMarkup () {
+        if (!this.callsite)
+            return null;
+
         var code     = highlight(this.callsite, renderer);
         var lines    = code.split(NEWLINE);
         var lastLine = lines.pop();

diff --git a/src/legacy/test-run-error/templates.js b/src/legacy/test-run-error/templates.js
diff --git a/src/reporter/plugin-host.js b/src/reporter/plugin-host.js
@@ -41,7 +41,6 @@ export default class ReporterPluginHost {
     // Error decorator
     createErrorDecorator () {
         return {
-            'span step-name':  str => `"${str}"`,
             'span user-agent': str => this.chalk.grey(str),
 
             'span subtitle': str => `- ${this.chalk.bold.red(str)} -`,
@@ -50,8 +49,7 @@ export default class ReporterPluginHost {
             'div screenshot-info': identity,
             'a screenshot-path':   str => this.chalk.grey.underline(str),
 
-            'code':     str => this.chalk.yellow(str),
-            'code api': str => this.chalk.yellow(str),
+            'code': identity,
 
             'span syntax-string':     str => this.chalk.green(str),
             'span syntax-punctuator': str => this.chalk.grey(str),

diff --git a/test/functional/legacy-fixtures/api/click/test.js b/test/functional/legacy-fixtures/api/click/test.js
@@ -7,15 +7,13 @@ describe('[Legacy API] act.click()', function () {
             .catch(function (errs) {
                 var expectedError = [
                     'Error at step "1.Click on invisible element":',
-                    '',
-                    'act.click($input);',
-                    '',
                     'A target element \<input id="input"\> of the click action is not visible.',
                     'If this element should appear when you are hovering over another',
                     'element, make sure that you properly recorded the hover action.'
                 ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
+                expect(errs[0]).contains('act.click($input);');
             });
     });
 
@@ -24,15 +22,13 @@ describe('[Legacy API] act.click()', function () {
             .catch(function (errs) {
                 var expectedError = [
                     'Error at step "1.Click on invisible element":',
-                    '',
-                    'act.click($input);',
-                    '',
                     'A target element \<input id="input"\> of the click action is not visible.',
                     'If this element should appear when you are hovering over another',
                     'element, make sure that you properly recorded the hover action.'
                 ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
+                expect(errs[0]).contains('act.click($input);');
             });
     });
 

diff --git a/test/functional/legacy-fixtures/before-unload-handling/test.js b/test/functional/legacy-fixtures/before-unload-handling/test.js
@@ -14,7 +14,7 @@ describe('Before unload handling', function () {
                     ' The expected system beforeUnload dialog did not appear.'
                 ].join('');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 
@@ -26,7 +26,7 @@ describe('Before unload handling', function () {
                     ' Unexpected system beforeUnload dialog message appeared.'
                 ].join('');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 
@@ -42,7 +42,7 @@ describe('Before unload handling', function () {
                     ' The expected system beforeUnload dialog did not appear.'
                 ].join('');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 
@@ -54,7 +54,7 @@ describe('Before unload handling', function () {
                     ' Unexpected system beforeUnload dialog message appeared.'
                 ].join('');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 });
diff --git a/test/functional/legacy-fixtures/native-dialogs-handling/test.js b/test/functional/legacy-fixtures/native-dialogs-handling/test.js
@@ -18,7 +18,7 @@ describe('Native dialogs handling', function () {
                     'Unexpected system alert dialog Alert dialog appeared.'
                 ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 
@@ -30,7 +30,7 @@ describe('Native dialogs handling', function () {
                     'Unexpected system confirm dialog Confirm dialog appeared.'
                 ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 
@@ -42,7 +42,7 @@ describe('Native dialogs handling', function () {
                     'Unexpected system confirm dialog Confirm dialog appeared.'
                 ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 
@@ -54,7 +54,7 @@ describe('Native dialogs handling', function () {
                     'Unexpected system prompt dialog Prompt dialog appeared.'
                 ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 
@@ -66,7 +66,7 @@ describe('Native dialogs handling', function () {
                     'Unexpected system alert dialog Alert dialog appeared.'
                 ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 
@@ -78,7 +78,7 @@ describe('Native dialogs handling', function () {
                     'The expected system confirm dialog did not appear.'
                 ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 
@@ -90,7 +90,7 @@ describe('Native dialogs handling', function () {
                     'The expected system prompt dialog did not appear.'
                 ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 
@@ -102,7 +102,7 @@ describe('Native dialogs handling', function () {
                     'The expected system alert dialog did not appear.'
                 ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
             });
     });
 
@@ -119,7 +119,7 @@ describe('Native dialogs handling', function () {
                         'Unexpected system confirm dialog Confirm dialog appeared.'
                     ].join(' ');
 
-                    expect(errs[0]).eql(expectedError);
+                    expect(errs[0]).contains(expectedError);
                 });
         });
 
@@ -131,7 +131,7 @@ describe('Native dialogs handling', function () {
                         'The expected system confirm dialog did not appear.'
                     ].join(' ');
 
-                    expect(errs[0]).eql(expectedError);
+                    expect(errs[0]).contains(expectedError);
                 });
         });
     });
@@ -149,7 +149,7 @@ describe('Native dialogs handling', function () {
                         'Unexpected system confirm dialog Confirm dialog appeared.'
                     ].join(' ');
 
-                    expect(errs[0]).eql(expectedError);
+                    expect(errs[0]).contains(expectedError);
                 });
         });
 
@@ -161,7 +161,7 @@ describe('Native dialogs handling', function () {
                         'The expected system confirm dialog did not appear.'
                     ].join(' ');
 
-                    expect(errs[0]).eql(expectedError);
+                    expect(errs[0]).contains(expectedError);
                 });
         });
 
@@ -177,7 +177,7 @@ describe('Native dialogs handling', function () {
                         'Unexpected system confirm dialog Confirm dialog appeared.'
                     ].join(' ');
 
-                    expect(errs[0]).eql(expectedError);
+                    expect(errs[0]).contains(expectedError);
                 });
         });
 
@@ -189,7 +189,7 @@ describe('Native dialogs handling', function () {
                         'The expected system confirm dialog did not appear.'
                     ].join(' ');
 
-                    expect(errs[0]).eql(expectedError);
+                    expect(errs[0]).contains(expectedError);
                 });
         });
     });

diff --git a/test/functional/legacy-fixtures/regression/gh-414/test.js b/test/functional/legacy-fixtures/regression/gh-414/test.js
@@ -12,13 +12,14 @@ describe("[Regression](GH-414) Should restart a test step if redirect occurs whi
             .catch(function (errs) {
                 var expectedError = [
                     'Error at step "2.Click div "The second div"":',
-                    " act.click('#div2'); ",
                     'A target element of the click action has not been found in the DOM tree.',
                     'If this element should be created after animation or a time-consuming',
                     'operation is finished, use the waitFor action (available for use in code)',
-                    'to pause test execution until this element appears.'].join(' ');
+                    'to pause test execution until this element appears.'
+                ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
+                expect(errs[0]).contains("act.click('#div2');");
             });
     });
 

diff --git a/test/functional/legacy-fixtures/regression/t200501/test.js b/test/functional/legacy-fixtures/regression/t200501/test.js
@@ -6,10 +6,10 @@ it('[Regression](T200501) Wait parameters are not verified', function () {
         .catch(function (errs) {
             var expectedError = [
                 'Error at step "1.Wait with mixed up parameters":',
-                ' act.wait(function () { return false; }, 500); ',
                 'wait action\'s "milliseconds" parameter should be a positive number.'
             ].join(' ');
 
-            expect(errs[0]).eql(expectedError);
+            expect(errs[0]).contains(expectedError);
+            expect(errs[0]).contains('act.wait(function () { return false; }, 500);');
         });
 });
diff --git a/test/functional/legacy-fixtures/selector-timeout/test.js b/test/functional/legacy-fixtures/selector-timeout/test.js
@@ -7,15 +7,13 @@ describe('Selector timeout', function () {
             .catch(function (errs) {
                 var expectedError = [
                     'Error at step "2.Click on button":',
-                    '',
-                    "act.click('#button');",
-                    '',
                     'A target element \<button id="button"\> of the click action is not visible.',
                     'If this element should appear when you are hovering over another',
                     'element, make sure that you properly recorded the hover action.'
                 ].join(' ');
 
-                expect(errs[0]).eql(expectedError);
+                expect(errs[0]).contains(expectedError);
+                expect(errs[0]).contains("act.click('#button');");
             });
     });
 });
diff --git a/test/server/data/expected-legacy-test-run-errors/empty-first-argument b/test/server/data/expected-legacy-test-run-errors/empty-first-argument
@@ -1,11 +1,11 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 Error at step "Step with <tag>":
-
-code and <tag>
-
 A target element of the testAction action has not been found in the DOM tree.
 If this element should be created after animation or a time-consuming
 operation is finished, use the waitFor action (available for use in code) to
 pause test execution until this element appears.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
+
+Code:
+code and <tag>
diff --git a/test/server/data/expected-legacy-test-run-errors/empty-iframe-argument b/test/server/data/expected-legacy-test-run-errors/empty-iframe-argument
@@ -1,5 +1,5 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 Error at step "Step with <tag>":
 The selector within the inIFrame function returns an empty value.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
diff --git a/test/server/data/expected-legacy-test-run-errors/empty-type-action-argument b/test/server/data/expected-legacy-test-run-errors/empty-type-action-argument
@@ -1,8 +1,8 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 Error at step "Step with <tag>":
-
-code and <tag>
-
 The type action's parameter text is empty.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
+
+Code:
+code and <tag>
diff --git a/test/server/data/expected-legacy-test-run-errors/eq-assertion b/test/server/data/expected-legacy-test-run-errors/eq-assertion
@@ -1,12 +1,13 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 "<tagged> message" assertion failed at step "Step with <tag>":
 
-eq({"<tag>": "<some-tag>"}, {"<tag>": "<another-tag>"})
-
 Objects differ at the <tag> field:
 
 Expected: "<another-tag>"
 Actual:   "<some-tag>"
             ^
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
+
+Code:
+eq({"<tag>": "<some-tag>"}, {"<tag>": "<another-tag>"})
diff --git a/test/server/data/expected-legacy-test-run-errors/expected-dialog-doesnt-appear b/test/server/data/expected-legacy-test-run-errors/expected-dialog-doesnt-appear
@@ -1,5 +1,5 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 Error at step "Step with <tag>":
 The expected system test-dialog dialog did not appear.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
diff --git a/test/server/data/expected-legacy-test-run-errors/global-wait-for-action-timeout-exceed b/test/server/data/expected-legacy-test-run-errors/global-wait-for-action-timeout-exceed
@@ -1,6 +1,5 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 Error at step "Step with <tag>":
-
 __waitFor action's timeout exceeded.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
diff --git a/test/server/data/expected-legacy-test-run-errors/iframe-argument-is-not-iframe b/test/server/data/expected-legacy-test-run-errors/iframe-argument-is-not-iframe
@@ -1,5 +1,5 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 Error at step "Step with <tag>":
 The selector within the inIFrame function doesn’t return an iframe element.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
diff --git a/test/server/data/expected-legacy-test-run-errors/iframe-loading-timeout b/test/server/data/expected-legacy-test-run-errors/iframe-loading-timeout
@@ -1,4 +1,4 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 IFrame loading timed out.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
diff --git a/test/server/data/expected-legacy-test-run-errors/in-iframe-target-loading-timeout b/test/server/data/expected-legacy-test-run-errors/in-iframe-target-loading-timeout
@@ -1,5 +1,5 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 Error at step "Step with <tag>":
 IFrame target loading timed out.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
diff --git a/test/server/data/expected-legacy-test-run-errors/incorrect-dragging-second-argument b/test/server/data/expected-legacy-test-run-errors/incorrect-dragging-second-argument
@@ -1,8 +1,8 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 Error at step "Step with <tag>":
-
-code and <tag>
-
 drag action drop target is incorrect.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
+
+Code:
+code and <tag>
diff --git a/...rver/data/expected-legacy-test-run-errors/incorrect-global-wait-for-action-event-argument b/...rver/data/expected-legacy-test-run-errors/incorrect-global-wait-for-action-event-argument
@@ -1,6 +1,5 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 Error at step "Step with <tag>":
-
 __waitFor action's first parameter should be a function.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
diff --git a/...er/data/expected-legacy-test-run-errors/incorrect-global-wait-for-action-timeout-argument b/...er/data/expected-legacy-test-run-errors/incorrect-global-wait-for-action-timeout-argument
@@ -1,6 +1,5 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 Error at step "Step with <tag>":
-
 __waitFor action's "timeout" parameter should be a positive number.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>
diff --git a/test/server/data/expected-legacy-test-run-errors/incorrect-iframe-argument b/test/server/data/expected-legacy-test-run-errors/incorrect-iframe-argument
@@ -1,5 +1,5 @@
-Chrome 15.0.874 / Mac OS X 10.8.1
 Error at step "Step with <tag>":
 The inIFrame function contains an invalid argument.
 
+Browser: Chrome 15.0.874 / Mac OS X 10.8.1
 Screenshot: /unix/path/with/<tag>