From 59ab85b5be846939d69b00759946838a360bf9a3 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Tue, 21 May 2019 10:34:37 -0400 Subject: [PATCH] fix issues with merging mocha upgrade --- cli/__snapshots__/cli_spec.js | 38 +++++++++---------- .../integration/cypress/cypress_spec.coffee | 2 - .../4_return_value_spec.coffee.js | 2 +- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/cli/__snapshots__/cli_spec.js b/cli/__snapshots__/cli_spec.js index 010f3fdd84d5..2674080d5c1a 100644 --- a/cli/__snapshots__/cli_spec.js +++ b/cli/__snapshots__/cli_spec.js @@ -51,9 +51,9 @@ exports['cli help command shows help 1'] = ` ------- stderr: ------- - + ------- - + ` exports['cli help command shows help for --help 1'] = ` @@ -84,9 +84,9 @@ exports['cli help command shows help for --help 1'] = ` ------- stderr: ------- - + ------- - + ` exports['cli help command shows help for -h 1'] = ` @@ -117,9 +117,9 @@ exports['cli help command shows help for -h 1'] = ` ------- stderr: ------- - + ------- - + ` exports['cli unknown command shows usage and exits 1'] = ` @@ -146,14 +146,14 @@ exports['cli unknown command shows usage and exits 1'] = ` run [options] Runs Cypress tests from the CLI without the GUI open [options] Opens Cypress in the interactive GUI. install [options] Installs the Cypress executable matching this package's version - verify Verifies that Cypress is installed correctly and executable + verify [options] Verifies that Cypress is installed correctly and executable cache [options] Manages the Cypress binary cache ------- stderr: ------- - + ------- - + ` exports['cli unknown option shows help for cache command - no sub-command 1'] = ` @@ -179,9 +179,9 @@ exports['cli unknown option shows help for cache command - no sub-command 1'] = ------- stderr: ------- - + ------- - + ` exports['cli unknown option shows help for cache command - unknown option --foo 1'] = ` @@ -209,9 +209,9 @@ exports['cli unknown option shows help for cache command - unknown option --foo ------- stderr: ------- - + ------- - + ` exports['cli unknown option shows help for cache command - unknown sub-command foo 1'] = ` @@ -239,9 +239,9 @@ exports['cli unknown option shows help for cache command - unknown sub-command f ------- stderr: ------- - + ------- - + ` exports['cli version and binary version 1'] = ` @@ -289,9 +289,9 @@ exports['shows help for open --foo 1'] = ` ------- stderr: ------- - + ------- - + ` exports['shows help for run --foo 1'] = ` @@ -332,7 +332,7 @@ exports['shows help for run --foo 1'] = ` ------- stderr: ------- - + ------- - + ` diff --git a/packages/driver/test/cypress/integration/cypress/cypress_spec.coffee b/packages/driver/test/cypress/integration/cypress/cypress_spec.coffee index 0ea7e34f4980..e4ed80b4ff55 100644 --- a/packages/driver/test/cypress/integration/cypress/cypress_spec.coffee +++ b/packages/driver/test/cypress/integration/cypress/cypress_spec.coffee @@ -45,8 +45,6 @@ describe "driver/src/cypress/index", -> expect(err.backend).to.be.true expect(err.stack).not.to.include("From previous event") - done() - context ".isCy", -> it "returns true on cy, cy chainable", -> expect(Cypress.isCy(cy)).to.be.true diff --git a/packages/server/__snapshots__/4_return_value_spec.coffee.js b/packages/server/__snapshots__/4_return_value_spec.coffee.js index aeb6fa32c8d8..845bded7fca1 100644 --- a/packages/server/__snapshots__/4_return_value_spec.coffee.js +++ b/packages/server/__snapshots__/4_return_value_spec.coffee.js @@ -124,7 +124,7 @@ Error: Resolution method is overspecified. Specify a callback *or* return a Prom - /foo/bar/.projects/e2e/cypress/screenshots/return_value_spec.coffee/errors when invoking commands and return a different value (failed).png (1280x720) - /foo/bar/.projects/e2e/cypress/screenshots/return_value_spec.coffee/errors when invoking commands in custom command and returning different value (failed).png (1280x720) - - /foo/bar/.projects/e2e/cypress/screenshots/return_value_spec.coffee/errors when not invoking commands invoking done callback and returning a promise (failed).png (1280x720) + - /foo/bar/.projects/e2e/cypress/screenshots/return_value_spec.coffee/errors when not invoking commands, invoking done callback, and returning a promise (failed).png (1280x720) (Video)