From 24616817fc6331b59a00b2f3c77adbbf0243cdc6 Mon Sep 17 00:00:00 2001 From: Brian Mann Date: Mon, 30 Oct 2017 00:40:09 -0400 Subject: [PATCH 01/17] release 1.0.3 [skip ci] From d83f9e8cf5a02a290cc343c1fac591ae4f6678ce Mon Sep 17 00:00:00 2001 From: Brian Mann Date: Fri, 16 Feb 2018 01:22:30 -0500 Subject: [PATCH 02/17] release 2.0.0 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 822c17b1fe05..06368adf83fc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cypress", "productName": "Cypress", - "version": "1.4.2", + "version": "2.0.0", "description": "Cypress.io end to end testing tool", "private": true, "engines": { From 2e68ab8d7e234f96910c36b8609b33a3fa049004 Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Mon, 5 Mar 2018 12:21:02 -0500 Subject: [PATCH 03/17] Add a comment to Issue Template directing questions to be asked in chat. [skip ci] --- ISSUE_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 6c3e83f50db5..78b52342a41a 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -6,6 +6,7 @@ ### Is this a Feature or Bug? + ### Current behavior: From d48d842c49b94e111b56fead03c0774b22bb3163 Mon Sep 17 00:00:00 2001 From: Brian Mann Date: Mon, 13 Aug 2018 20:19:54 -0400 Subject: [PATCH 04/17] release 3.1.0 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ca517e699bb..9a07a26c5668 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cypress", "productName": "Cypress", - "version": "3.0.3", + "version": "3.1.0", "description": "Cypress.io end to end testing tool", "private": true, "engines": { From 0759ed9dc5eaf4d21bdd2128458a2ef1058bb3c3 Mon Sep 17 00:00:00 2001 From: Zoltan Date: Wed, 31 Oct 2018 21:28:13 +0000 Subject: [PATCH 05/17] add fix for windows + node11 --- cli/lib/util.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cli/lib/util.js b/cli/lib/util.js index d342c2091760..309825950d39 100644 --- a/cli/lib/util.js +++ b/cli/lib/util.js @@ -48,6 +48,14 @@ function printNodeOptions (log = debug) { } } +function getNode11WindowsFix(){ + if (process.version>'v11' && process.platform==='win32') { + return { + windowsHide: false + } + } +} + const util = { normalizeModuleOptions, @@ -62,6 +70,7 @@ const util = { .chain({}) .extend(util.getEnvColors()) .extend(util.getForceTty()) + .extend(util.getNode11WindowsFix()) .omitBy(_.isUndefined) // remove undefined values .mapValues((value) => { // stringify to 1 or 0 return value ? '1' : '0' From 8bf7b377bd72e9f147631e453351af5d08c85616 Mon Sep 17 00:00:00 2001 From: Zoltan Date: Wed, 31 Oct 2018 23:30:20 +0000 Subject: [PATCH 06/17] add getNode11WindowsFix to the utils --- cli/lib/util.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/lib/util.js b/cli/lib/util.js index 309825950d39..7c39896b9c34 100644 --- a/cli/lib/util.js +++ b/cli/lib/util.js @@ -48,14 +48,6 @@ function printNodeOptions (log = debug) { } } -function getNode11WindowsFix(){ - if (process.version>'v11' && process.platform==='win32') { - return { - windowsHide: false - } - } -} - const util = { normalizeModuleOptions, @@ -86,6 +78,14 @@ const util = { } }, + getNode11WindowsFix () { + if (process.version>'v11' && process.platform==='win32') { + return { + windowsHide: false + } + } + }, + getEnvColors () { const sc = util.supportsColor() From 9ecd31ba8e89a488b65ead383855655d4e0b7935 Mon Sep 17 00:00:00 2001 From: Zoltan Date: Thu, 1 Nov 2018 16:18:34 +0000 Subject: [PATCH 07/17] formatting --- packages/launcher/lib/detect.ts | 2 +- packages/launcher/package.json | 53 +++++++++++++++++---------------- packages/launcher/tsconfig.json | 15 +++++++++- 3 files changed, 42 insertions(+), 28 deletions(-) diff --git a/packages/launcher/lib/detect.ts b/packages/launcher/lib/detect.ts index 11eba1c630bd..7f10f6c585d5 100644 --- a/packages/launcher/lib/detect.ts +++ b/packages/launcher/lib/detect.ts @@ -79,7 +79,7 @@ function detectBrowsers(): Bluebird { const removeDuplicates = uniqBy(prop('version')) return Bluebird.mapSeries(browsers, checkOneBrowser) .then(_.compact) - .then(removeDuplicates) as Bluebird + .then(removeDuplicates) } export default detectBrowsers diff --git a/packages/launcher/package.json b/packages/launcher/package.json index 7e739dc3b74b..f4a3ff5c2fab 100644 --- a/packages/launcher/package.json +++ b/packages/launcher/package.json @@ -7,7 +7,7 @@ "scripts": { "pretest": "npm run check-deps-pre && npm run lint", "test": "npm run unit", - "unit": "bin-up mocha --reporter mocha-multi-reporters --reporter-options configFile=../../mocha-reporter-config.json", + "unit": "bin-up mocha --reporter mocha-multi-reporters --reporter-options configFile=../../mocha-reporter-config.json --opts ./test/support/mocha.opts test/**/*.ts", "check-deps": "node ../../scripts/check-deps.js --verbose", "check-deps-pre": "npm run check-deps -- --prescript", "clean-deps": "rm -rf node_modules", @@ -25,34 +25,35 @@ "lib" ], "devDependencies": { - "@cypress/releaser": "0.1.12", - "@types/bluebird": "3.5.21", - "@types/chai": "^3.5.2", - "@types/debug": "0.0.29", - "@types/execa": "^0.7.0", - "@types/fs-extra": "3.0.0", - "@types/lodash": "^4.14.64", - "@types/mocha": "^2.2.41", - "@types/node": "^7.0.18", + "@cypress/releaser": "0.2.2", + "@types/bluebird": "3.5.24", + "@types/chai": "^4.1.7", + "@types/debug": "0.0.31", + "@types/execa": "^0.9.0", + "@types/fs-extra": "5.0.4", + "@types/lodash": "^4.14.117", + "@types/mocha": "^5.2.5", + "@types/node": "^10.12.1", + "@types/ramda": "0.25.40", "bin-up": "^1.1.0", - "chai": "^3.5.0", - "prettier": "^1.7.0", - "shelljs": "^0.7.8", - "sinon": "^1.17.3", - "sinon-chai": "^2.8.0", - "tslint": "5.8.0", - "tslint-config-standard": "7.0.0", - "typescript": "2.6.2", - "@types/ramda": "0.24.14" + "chai": "^4.2.0", + "prettier": "^1.14.3", + "shelljs": "^0.8.2", + "sinon": "^7.1.1", + "sinon-chai": "^3.2.0", + "tslint": "5.11.0", + "tslint-config-standard": "8.0.1", + "typescript": "3.1.5" }, "dependencies": { - "bluebird": "^3.5.0", - "debug": "^2.6.6", - "execa": "^0.6.3", - "fs-extra": "^3.0.0", - "lodash": "^4.11.1", - "plist": "^2.1.0", + "@types/jest": "^23.3.9", + "bluebird": "^3.5.2", + "debug": "^4.1.0", + "execa": "^1.0.0", + "fs-extra": "^7.0.0", + "lodash": "^4.17.11", + "plist": "^3.0.1", "pluralize": "^7.0.0", - "ramda": "^0.24.1" + "ramda": "^0.25.0" } } diff --git a/packages/launcher/tsconfig.json b/packages/launcher/tsconfig.json index ffda540c3654..127877485fd8 100644 --- a/packages/launcher/tsconfig.json +++ b/packages/launcher/tsconfig.json @@ -6,5 +6,18 @@ ], "files": [ "./../ts/index.d.ts" - ] + ], + "c": { + // types option has been previously configured + "types": [ + // add node as an option + "node", + "jest" + ], + // typeRoots option has been previously configured + "typeRoots": [ + // add path to @types + "node_modules/@types" + ] +} } From 171e22feea019eb7a1857d0fc0fbbca17b0dab24 Mon Sep 17 00:00:00 2001 From: Zoltan Date: Thu, 1 Nov 2018 16:31:36 +0000 Subject: [PATCH 08/17] do not convert to the windowsHide to string --- cli/lib/util.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/lib/util.js b/cli/lib/util.js index 7c39896b9c34..359eca348e18 100644 --- a/cli/lib/util.js +++ b/cli/lib/util.js @@ -62,11 +62,11 @@ const util = { .chain({}) .extend(util.getEnvColors()) .extend(util.getForceTty()) - .extend(util.getNode11WindowsFix()) .omitBy(_.isUndefined) // remove undefined values .mapValues((value) => { // stringify to 1 or 0 return value ? '1' : '0' }) + .extend(util.getNode11WindowsFix()) // the value has to be falsy, '0' as a string not good enoughs .value() }, @@ -79,7 +79,7 @@ const util = { }, getNode11WindowsFix () { - if (process.version>'v11' && process.platform==='win32') { + if (process.version >= 'v11'&& process.platform === 'win32') { return { windowsHide: false } From fd150f2b3d52575bcb529dcac720c42781166e4e Mon Sep 17 00:00:00 2001 From: Zoltan Date: Thu, 1 Nov 2018 16:56:05 +0000 Subject: [PATCH 09/17] add unit tests --- cli/lib/util.js | 12 ++++++++++-- cli/test/lib/util_spec.js | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/cli/lib/util.js b/cli/lib/util.js index 359eca348e18..38de20c859d5 100644 --- a/cli/lib/util.js +++ b/cli/lib/util.js @@ -79,9 +79,9 @@ const util = { }, getNode11WindowsFix () { - if (process.version >= 'v11'&& process.platform === 'win32') { + if (util.getNodeVersion() >= 'v11' && util.getPlatform() === 'win32') { return { - windowsHide: false + windowsHide: false, } } }, @@ -96,6 +96,14 @@ const util = { } }, + getPlatform () { + return process.platform + }, + + getNodeVersion () { + return process.version + }, + isTty (fd) { return tty.isatty(fd) }, diff --git a/cli/test/lib/util_spec.js b/cli/test/lib/util_spec.js index 1cd58ee38ce2..687ffc76126f 100644 --- a/cli/test/lib/util_spec.js +++ b/cli/test/lib/util_spec.js @@ -180,6 +180,24 @@ describe('util', () => { DEBUG_COLORS: '0', }) }) + + it('returns windowsHide: false on windows environment with node 11', () => { + + sinon.stub(util, 'getPlatform').returns('win32') + sinon.stub(util, 'getNodeVersion').returns('v11.0.0') + + expect(util.getEnvOverrides().windowsHide).to.be.false; + + util.getPlatform.returns('win32') + util.getNodeVersion.returns('v10.0.0') + + expect('windowsHide' in util.getEnvOverrides()).to.be.false; + + util.getPlatform.returns('darvin') + util.getNodeVersion.returns('v11.0.0') + + expect('windowsHide' in util.getEnvOverrides()).to.be.false; + }) }) context('.getForceTty', () => { From 680ee5cd5017326f7173df35e524bbf2d27ede74 Mon Sep 17 00:00:00 2001 From: Zoltan Date: Thu, 1 Nov 2018 16:56:14 +0000 Subject: [PATCH 10/17] add unit tests --- cli/test/lib/util_spec.js | 6 +++--- packages/desktop-gui/src/projects/projects-store.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/test/lib/util_spec.js b/cli/test/lib/util_spec.js index 687ffc76126f..e2415ecbab2f 100644 --- a/cli/test/lib/util_spec.js +++ b/cli/test/lib/util_spec.js @@ -186,17 +186,17 @@ describe('util', () => { sinon.stub(util, 'getPlatform').returns('win32') sinon.stub(util, 'getNodeVersion').returns('v11.0.0') - expect(util.getEnvOverrides().windowsHide).to.be.false; + expect(util.getEnvOverrides().windowsHide).to.be.false util.getPlatform.returns('win32') util.getNodeVersion.returns('v10.0.0') - expect('windowsHide' in util.getEnvOverrides()).to.be.false; + expect('windowsHide' in util.getEnvOverrides()).to.be.false util.getPlatform.returns('darvin') util.getNodeVersion.returns('v11.0.0') - expect('windowsHide' in util.getEnvOverrides()).to.be.false; + expect('windowsHide' in util.getEnvOverrides()).to.be.false }) }) diff --git a/packages/desktop-gui/src/projects/projects-store.js b/packages/desktop-gui/src/projects/projects-store.js index e211f9c9f6a8..1c4189147302 100644 --- a/packages/desktop-gui/src/projects/projects-store.js +++ b/packages/desktop-gui/src/projects/projects-store.js @@ -50,7 +50,7 @@ class ProjectsStore { } @action setProjects (projects) { - this.projects = _.map(projects, (project) => new Project(project)) + this.projects = _.map(projects, (project) => new Project(project)) } @action updateProjectsWithStatuses (projectsWithStatuses = []) { From 63f0d4fd2dd714de9f5d295623f53704eced566a Mon Sep 17 00:00:00 2001 From: Zoltan Date: Thu, 1 Nov 2018 17:05:14 +0000 Subject: [PATCH 11/17] add unit tests --- cli/test/lib/util_spec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/test/lib/util_spec.js b/cli/test/lib/util_spec.js index 687ffc76126f..e2415ecbab2f 100644 --- a/cli/test/lib/util_spec.js +++ b/cli/test/lib/util_spec.js @@ -186,17 +186,17 @@ describe('util', () => { sinon.stub(util, 'getPlatform').returns('win32') sinon.stub(util, 'getNodeVersion').returns('v11.0.0') - expect(util.getEnvOverrides().windowsHide).to.be.false; + expect(util.getEnvOverrides().windowsHide).to.be.false util.getPlatform.returns('win32') util.getNodeVersion.returns('v10.0.0') - expect('windowsHide' in util.getEnvOverrides()).to.be.false; + expect('windowsHide' in util.getEnvOverrides()).to.be.false util.getPlatform.returns('darvin') util.getNodeVersion.returns('v11.0.0') - expect('windowsHide' in util.getEnvOverrides()).to.be.false; + expect('windowsHide' in util.getEnvOverrides()).to.be.false }) }) From 9392767953532e54fbbdaab804ee519d239571f2 Mon Sep 17 00:00:00 2001 From: Zoltan Date: Thu, 1 Nov 2018 17:27:42 +0000 Subject: [PATCH 12/17] Revert "formatting" This reverts commit 9ecd31ba8e89a488b65ead383855655d4e0b7935. --- packages/launcher/lib/detect.ts | 2 +- packages/launcher/package.json | 53 ++++++++++++++++----------------- packages/launcher/tsconfig.json | 15 +--------- 3 files changed, 28 insertions(+), 42 deletions(-) diff --git a/packages/launcher/lib/detect.ts b/packages/launcher/lib/detect.ts index 7f10f6c585d5..11eba1c630bd 100644 --- a/packages/launcher/lib/detect.ts +++ b/packages/launcher/lib/detect.ts @@ -79,7 +79,7 @@ function detectBrowsers(): Bluebird { const removeDuplicates = uniqBy(prop('version')) return Bluebird.mapSeries(browsers, checkOneBrowser) .then(_.compact) - .then(removeDuplicates) + .then(removeDuplicates) as Bluebird } export default detectBrowsers diff --git a/packages/launcher/package.json b/packages/launcher/package.json index f4a3ff5c2fab..7e739dc3b74b 100644 --- a/packages/launcher/package.json +++ b/packages/launcher/package.json @@ -7,7 +7,7 @@ "scripts": { "pretest": "npm run check-deps-pre && npm run lint", "test": "npm run unit", - "unit": "bin-up mocha --reporter mocha-multi-reporters --reporter-options configFile=../../mocha-reporter-config.json --opts ./test/support/mocha.opts test/**/*.ts", + "unit": "bin-up mocha --reporter mocha-multi-reporters --reporter-options configFile=../../mocha-reporter-config.json", "check-deps": "node ../../scripts/check-deps.js --verbose", "check-deps-pre": "npm run check-deps -- --prescript", "clean-deps": "rm -rf node_modules", @@ -25,35 +25,34 @@ "lib" ], "devDependencies": { - "@cypress/releaser": "0.2.2", - "@types/bluebird": "3.5.24", - "@types/chai": "^4.1.7", - "@types/debug": "0.0.31", - "@types/execa": "^0.9.0", - "@types/fs-extra": "5.0.4", - "@types/lodash": "^4.14.117", - "@types/mocha": "^5.2.5", - "@types/node": "^10.12.1", - "@types/ramda": "0.25.40", + "@cypress/releaser": "0.1.12", + "@types/bluebird": "3.5.21", + "@types/chai": "^3.5.2", + "@types/debug": "0.0.29", + "@types/execa": "^0.7.0", + "@types/fs-extra": "3.0.0", + "@types/lodash": "^4.14.64", + "@types/mocha": "^2.2.41", + "@types/node": "^7.0.18", "bin-up": "^1.1.0", - "chai": "^4.2.0", - "prettier": "^1.14.3", - "shelljs": "^0.8.2", - "sinon": "^7.1.1", - "sinon-chai": "^3.2.0", - "tslint": "5.11.0", - "tslint-config-standard": "8.0.1", - "typescript": "3.1.5" + "chai": "^3.5.0", + "prettier": "^1.7.0", + "shelljs": "^0.7.8", + "sinon": "^1.17.3", + "sinon-chai": "^2.8.0", + "tslint": "5.8.0", + "tslint-config-standard": "7.0.0", + "typescript": "2.6.2", + "@types/ramda": "0.24.14" }, "dependencies": { - "@types/jest": "^23.3.9", - "bluebird": "^3.5.2", - "debug": "^4.1.0", - "execa": "^1.0.0", - "fs-extra": "^7.0.0", - "lodash": "^4.17.11", - "plist": "^3.0.1", + "bluebird": "^3.5.0", + "debug": "^2.6.6", + "execa": "^0.6.3", + "fs-extra": "^3.0.0", + "lodash": "^4.11.1", + "plist": "^2.1.0", "pluralize": "^7.0.0", - "ramda": "^0.25.0" + "ramda": "^0.24.1" } } diff --git a/packages/launcher/tsconfig.json b/packages/launcher/tsconfig.json index 127877485fd8..ffda540c3654 100644 --- a/packages/launcher/tsconfig.json +++ b/packages/launcher/tsconfig.json @@ -6,18 +6,5 @@ ], "files": [ "./../ts/index.d.ts" - ], - "c": { - // types option has been previously configured - "types": [ - // add node as an option - "node", - "jest" - ], - // typeRoots option has been previously configured - "typeRoots": [ - // add path to @types - "node_modules/@types" - ] -} + ] } From 5544fa89cf59800cd7ca03dbe90325ce652bbe63 Mon Sep 17 00:00:00 2001 From: Brian Mann Date: Fri, 2 Nov 2018 19:05:43 -0400 Subject: [PATCH 13/17] don't ask to commit package.json version --- scripts/binary/index.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/binary/index.coffee b/scripts/binary/index.coffee index 2a4ad471679e..15195cd2a419 100644 --- a/scripts/binary/index.coffee +++ b/scripts/binary/index.coffee @@ -132,7 +132,7 @@ deploy = { fail("Release Failed") throw err - askMissingOptions(['version', 'commit', 'nextVersion'])(options) + askMissingOptions(['version', 'nextVersion'])(options) .then(release) build: (options) -> From f404395dd4157889d6529f2702f5fe7b098d11a6 Mon Sep 17 00:00:00 2001 From: Brian Mann Date: Fri, 2 Nov 2018 19:05:55 -0400 Subject: [PATCH 14/17] release 3.1.1 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 16081e36ee35..d203c0d30cba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cypress", "productName": "Cypress", - "version": "3.1.0", + "version": "3.1.1", "description": "Cypress.io end to end testing tool", "private": true, "engines": { From 58e119749dbf6d2a034f88b0ea07b0dac724cbea Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Tue, 13 Nov 2018 10:26:21 -0500 Subject: [PATCH 15/17] move isPlatform into cli/util --- cli/lib/exec/spawn.js | 9 ++------- cli/lib/util.js | 4 ++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cli/lib/exec/spawn.js b/cli/lib/exec/spawn.js index e49f0059cd1e..85a912b2f59f 100644 --- a/cli/lib/exec/spawn.js +++ b/cli/lib/exec/spawn.js @@ -1,5 +1,4 @@ const _ = require('lodash') -const os = require('os') const cp = require('child_process') const path = require('path') const Promise = require('bluebird') @@ -13,16 +12,12 @@ const { throwFormErrorText, errors } = require('../errors') const isXlibOrLibudevRe = /^(?:Xlib|libudev)/ const isHighSierraWarningRe = /\*\*\* WARNING/ -function isPlatform (platform) { - return os.platform() === platform -} - function needsStderrPiped (needsXvfb) { - return isPlatform('darwin') || (needsXvfb && isPlatform('linux')) + return util.isPlatform('darwin') || (needsXvfb && util.isPlatform('linux')) } function needsEverythingPipedDirectly () { - return isPlatform('win32') + return util.isPlatform('win32') } function getStdio (needsXvfb) { diff --git a/cli/lib/util.js b/cli/lib/util.js index aed8a5b7fadc..be5ba0e89a6e 100644 --- a/cli/lib/util.js +++ b/cli/lib/util.js @@ -105,6 +105,10 @@ const util = { return process.version }, + isPlatform (platform) { + return os.platform() === platform + }, + isTty (fd) { return tty.isatty(fd) }, From e9e8e37995f9f28e81eb54f04736dd8200e5ee5f Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Tue, 13 Nov 2018 10:43:46 -0500 Subject: [PATCH 16/17] fix version comparison --- cli/lib/util.js | 7 ++----- cli/package.json | 1 + cli/test/lib/util_spec.js | 36 ++++++++++++++++++++++++------------ 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/cli/lib/util.js b/cli/lib/util.js index be5ba0e89a6e..524ef7737cc0 100644 --- a/cli/lib/util.js +++ b/cli/lib/util.js @@ -15,6 +15,7 @@ const isInstalledGlobally = require('is-installed-globally') const pkg = require(path.join(__dirname, '..', 'package.json')) const logger = require('./logger') const debug = require('debug')('cypress:cli') +const compareVersions = require('compare-versions') const getosAsync = Promise.promisify(getos) @@ -80,7 +81,7 @@ const util = { }, getNode11WindowsFix () { - if (util.getNodeVersion() >= 'v11' && util.getPlatform() === 'win32') { + if (compareVersions(util.getNodeVersion(), 'v11') >= 0 && util.isPlatform('win32')) { return { windowsHide: false, } @@ -97,10 +98,6 @@ const util = { } }, - getPlatform () { - return process.platform - }, - getNodeVersion () { return process.version }, diff --git a/cli/package.json b/cli/package.json index a9d5013e3c90..f696f5669b4e 100644 --- a/cli/package.json +++ b/cli/package.json @@ -56,6 +56,7 @@ "check-more-types": "2.24.0", "commander": "2.11.0", "common-tags": "1.4.0", + "compare-versions": "3.4.0", "debug": "3.1.0", "execa": "0.10.0", "executable": "4.1.1", diff --git a/cli/test/lib/util_spec.js b/cli/test/lib/util_spec.js index d30c91bc9fd9..dfc71681b9a6 100644 --- a/cli/test/lib/util_spec.js +++ b/cli/test/lib/util_spec.js @@ -192,22 +192,34 @@ describe('util', () => { }) }) - it('returns windowsHide: false on windows environment with node 11', () => { - - sinon.stub(util, 'getPlatform').returns('win32') - sinon.stub(util, 'getNodeVersion').returns('v11.0.0') - - expect(util.getEnvOverrides().windowsHide).to.be.false + context('.windowsHide', () => { + it('is false on windows with node 11', () => { + os.platform.returns('win32') + sinon.stub(process, 'version').value('v11.0.0') + expect(util.getEnvOverrides().windowsHide).to.be.false + }) - util.getPlatform.returns('win32') - util.getNodeVersion.returns('v10.0.0') + it('is false on windows with node > 11', () => { + os.platform.returns('win32') + sinon.stub(process, 'version').value('v12.0.0') + expect(util.getEnvOverrides().windowsHide).to.be.false + }) - expect('windowsHide' in util.getEnvOverrides()).to.be.false + it('is undefined on windows with node < 11', () => { + os.platform.returns('win32') + sinon.stub(process, 'version').value('v8.0.0') + expect(util.getEnvOverrides().windowsHide).to.be.undefined - util.getPlatform.returns('darvin') - util.getNodeVersion.returns('v11.0.0') + os.platform.returns('win32') + sinon.stub(process, 'version').value('v10.0.0') + expect(util.getEnvOverrides().windowsHide).to.be.undefined + }) - expect('windowsHide' in util.getEnvOverrides()).to.be.false + it('is undefined on non-windows with node 11', () => { + os.platform.returns('darwin') + sinon.stub(process, 'version').value('v11.0.0') + expect(util.getEnvOverrides().windowsHide).to.be.undefined + }) }) }) From fec755cfccabcfa40d9f241b3c2a61a11a6da0e4 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Tue, 13 Nov 2018 12:24:20 -0500 Subject: [PATCH 17/17] revert accidental merge from master --- package.json | 2 +- scripts/binary/index.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d203c0d30cba..16081e36ee35 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cypress", "productName": "Cypress", - "version": "3.1.1", + "version": "3.1.0", "description": "Cypress.io end to end testing tool", "private": true, "engines": { diff --git a/scripts/binary/index.coffee b/scripts/binary/index.coffee index 15195cd2a419..2a4ad471679e 100644 --- a/scripts/binary/index.coffee +++ b/scripts/binary/index.coffee @@ -132,7 +132,7 @@ deploy = { fail("Release Failed") throw err - askMissingOptions(['version', 'nextVersion'])(options) + askMissingOptions(['version', 'commit', 'nextVersion'])(options) .then(release) build: (options) ->