Merge branch 'develop' into issue-2118-destroy-electron

cypress-io · Nov 7, 2019 · 169b3ed · 169b3ed
2 parents 75aa21c + 1e870c5
commit 169b3ed
Show file tree

Hide file tree

Showing 20 changed files with 3,638 additions and 2,863 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -53,6 +53,7 @@ install:
   - node --version
   - node --print process.arch
   - npm --version
+  - npm run check-next-dev-version
   # prints all public variables relevant to the build
   - print-env Platform
   - npm run check-node-version

diff --git a/circle.yml b/circle.yml
@@ -714,9 +714,10 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/
+      - run: npm run check-next-dev-version
       - run:
           name: bump NPM version
-          command: npm --no-git-tag-version version ${NEXT_DEV_VERSION:-0.0.0-development}
+          command: npm --no-git-tag-version --allow-same-version version ${NEXT_DEV_VERSION:-0.0.0-development}
       - run:
           name: build NPM package
           working_directory: cli
@@ -1121,7 +1122,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-        
+
     - lint:
         name: Mac lint
         executor: mac

diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "bump": "node ./scripts/binary.js bump",
     "check-deps": "node ./scripts/check-deps.js --verbose",
     "check-deps-pre": "node ./scripts/check-deps.js --verbose --prescript",
+    "check-next-dev-version": "node scripts/check-next-dev-version.js",
     "check-node-version": "node scripts/check-node-version.js",
     "check-terminal": "node scripts/check-terminal.js",
     "clean-deps": "npm run all clean-deps && rm -rf node_modules",

diff --git a/packages/driver/src/cy/chai.coffee b/packages/driver/src/cy/chai.coffee