Merge branch 'develop' into issue-5941-plugins-file-options

Author: chrisbreiding

.eslintignore

@@ -27,8 +27,6 @@ packages/server/lib/scaffold/support/index.js
 packages/server/lib/scaffold/support/commands.js
 packages/server/test/support/fixtures/projects/e2e/cypress/integration/stdout_exit_early_failing_spec.js
 
-packages/launcher/lib/**/*.js
-
 **/package-lock.json
 **/tsconfig.json
 **/.vscode

.eslintrc.json

@@ -7,5 +7,10 @@
   ],
   "rules": {
     "prefer-spread": "off"
+  },
+  "settings": {
+    "react": {
+      "version": "16.8"
+    }
   }
 }

.vscode/settings.json

@@ -1,32 +1,6 @@
 {
   "eslint.alwaysShowStatus": true,
-  "eslint.autoFixOnSave": true,
-  "eslint.validate": [
-    {
-      "language": "javascript",
-      "autoFix": true
-    },
-    {
-      "language": "javascriptreact",
-      "autoFix": true
-    },
-    {
-      "language": "typescript",
-      "autoFix": true
-    },
-    {
-      "language": "typescriptreact",
-      "autoFix": true
-    },
-    {
-      "language": "json",
-      "autoFix": true
-    },
-    {
-      "language": "coffeescript",
-      "autoFix": false
-    },
-  ],
+  "eslint.validate": ["json", "coffeescript"],
   "eslint.enable": true,
   // this project does not use Prettier
   // thus set all settings to disable accidentally running Prettier

.vscode/terminals.json

@@ -24,12 +24,12 @@
       "command": "yarn test-watch [file]"
     },
     {
-      "name": "packages/server test-e2e",
+      "name": "packages/server test",
       "focus": true,
       "onlySingle": true,
       "execute": false,
       "cwd": "[cwd]/packages/server",
-      "command": "yarn test-e2e --spec [fileBasename]"
+      "command": "yarn test [file]"
     },
     {
       "name": "packages/runner watch",

circle.yml

@@ -59,7 +59,8 @@ executors:
   # https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
   mac:
     macos:
-      xcode: "10.1.0"
+      ## Node 12.10.0 (yarn 1.17.3)
+      xcode: "11.0.0"
     environment:
       PLATFORM: mac
 
@@ -97,7 +98,7 @@ commands:
       - attach_workspace:
           at: ~/
       - run:
-          command: yarn lerna exec --scope @packages/server "yarn test-e2e --chunk << parameters.chunk >> --browser << parameters.browser >>"
+          command: yarn lerna exec --scope @packages/server "yarn test ./test/e2e/<< parameters.chunk >>*spec* --browser << parameters.browser >>"
       - verify-mocha-results
       - store_test_results:
           path: /tmp/cypress
@@ -235,7 +236,7 @@ jobs:
       - run: ls $(yarn global bin)/../lib/node_modules
 
       # try several times, because flaky NPM installs ...
-      - run: yarn --ignore-engines || yarn --ignore-engines
+      - run: yarn || yarn
       - run:
           name: Top level packages
           command: yarn list --depth=0 || true
@@ -297,7 +298,7 @@ jobs:
       # make sure our snapshots are compared correctly
       - run: yarn test-mocha-snapshot
       # make sure packages with TypeScript can be transpiled to JS
-      - run: yarn lerna run build-js --stream
+      - run: yarn lerna run build-prod --stream
       # run unit tests from each individual package
       - run: yarn test
       - verify-mocha-results:
@@ -585,7 +586,7 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          command: yarn lerna run start --scope @packages/driver
+          command: yarn workspace @packages/driver start
           background: true
       - run:
           command: $(yarn bin)/wait-on http://localhost:3500
@@ -606,7 +607,7 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          command: yarn lerna exec --scope @packages/desktop-gui "yarn build-prod"
+          command: yarn workspace @packages/desktop-gui build-prod
       - run:
           command: |
             CYPRESS_KONFIG_ENV=production \
@@ -624,7 +625,7 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          command: yarn lerna exec  --scope @packages/reporter "yarn build-prod"
+          command:  yarn workspace @packages/reporter build-for-tests
       - run:
           command: |
             CYPRESS_KONFIG_ENV=production \
@@ -642,7 +643,7 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          command: yarn lerna run build --scope @packages/ui-components
+          command: yarn workspace @packages/ui-components build-for-tests
       - run:
           command: |
             CYPRESS_KONFIG_ENV=production \
@@ -938,6 +939,40 @@ jobs:
           command: $(yarn bin)/cypress info
       - store-npm-logs
 
+  test-npm-module-on-minimum-node-version:
+    <<: *defaults
+    docker:
+      - image: cypress/base:8.0.0
+    steps:
+      - attach_workspace:
+          at: ~/
+      # make sure we have cypress.zip received
+      - run: ls -l
+      - run: ls -l cypress.zip cypress.tgz
+      - run: mkdir test-binary
+      - run: node --version
+      - run: npm --version
+      - run:
+          name: Create new NPM package
+          working_directory: test-binary
+          command: npm init -y
+      - run:
+          name: Install Cypress
+          working_directory: test-binary
+          command: CYPRESS_INSTALL_BINARY=/root/cypress/cypress.zip npm install /root/cypress/cypress.tgz
+      - run:
+          name: Verify Cypress binary
+          working_directory: test-binary
+          command: $(npm bin)/cypress verify
+      - run:
+          name: Print Cypress version
+          working_directory: test-binary
+          command: $(npm bin)/cypress version
+      - run:
+          name: Cypress info
+          working_directory: test-binary
+          command: $(npm bin)/cypress info
+
   # install NPM + binary zip and run against staging API
   "test-binary-against-staging":
     <<: *defaults
@@ -1247,6 +1282,10 @@ linux-workflow: &linux-workflow
               - develop
         requires:
           - build-binary
+    - test-npm-module-on-minimum-node-version:
+        requires:
+          - build-binary
+          - build-npm-package
     - post-pre-release-install-comment:
         context: test-runner:commit-status-checks
         filters:

cli/package.json

@@ -8,7 +8,6 @@
     "build": "node ./scripts/build.js",
     "dtslint": "dtslint types",
     "postinstall": "node ./scripts/post-install.js",
-    "lint": "eslint --fix *.js scripts/*.js bin/* lib/*.js lib/**/*.js test/*.js test/**/*.js",
     "prerelease": "yarn build",
     "release": "cd build && releaser --no-node --no-changelog",
     "size": "t=\"cypress-v0.0.0.tgz\"; yarn pack --filename \"${t}\"; wc -c \"${t}\"; tar tvf \"${t}\"; rm \"${t}\";",
@@ -27,13 +26,13 @@
     "arch": "2.1.1",
     "bluebird": "3.7.2",
     "cachedir": "2.3.0",
-    "chalk": "3.0.0",
+    "chalk": "2.4.2",
     "check-more-types": "2.24.0",
     "commander": "4.1.0",
     "common-tags": "1.8.0",
     "debug": "4.1.1",
     "eventemitter2": "4.1.2",
-    "execa": "2.0.0",
+    "execa": "1.0.0",
     "executable": "4.1.1",
     "extract-zip": "1.6.7",
     "fs-extra": "8.1.0",
@@ -78,7 +77,6 @@
     "cross-env": "6.0.3",
     "dependency-check": "3.4.1",
     "dtslint": "0.9.0",
-    "eslint": "6.8.0",
     "execa-wrap": "1.4.0",
     "hasha": "5.0.0",
     "mocha": "6.2.2",

package.json

@@ -38,7 +38,7 @@
     "ensure-deps": "./scripts/ensure-dependencies.sh",
     "postinstall": "patch-package && yarn build",
     "jscodeshift": "jscodeshift -t ./node_modules/js-codemod/transforms/arrow-function-arguments.js",
-    "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json,.eslintrc .",
+    "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json .",
     "lint-all": "yarn lint-coffee && yarn lint",
     "lint-changed": "lint-changed",
     "lint-changed-fix": "yarn lint-changed --fix",
@@ -77,7 +77,7 @@
   },
   "devDependencies": {
     "@cypress/bumpercar": "2.0.12",
-    "@cypress/commit-message-install": "3.1.0",
+    "@cypress/commit-message-install": "3.1.1",
     "@cypress/env-or-json-file": "2.0.0",
     "@cypress/eslint-plugin-dev": "5.0.0",
     "@cypress/github-commit-status-check": "1.5.0",
@@ -122,10 +122,10 @@
     "del": "3.0.0",
     "electron-builder": "20.39.0",
     "eslint": "6.8.0",
-    "eslint-plugin-cypress": "2.10.1",
+    "eslint-plugin-cypress": "2.10.3",
     "eslint-plugin-json-format": "2.0.0",
     "eslint-plugin-mocha": "6.1.0",
-    "eslint-plugin-react": "7.14.2",
+    "eslint-plugin-react": "7.18.3",
     "execa": "1.0.0",
     "execa-wrap": "1.4.0",
     "filesize": "4.1.2",
@@ -218,9 +218,6 @@
     "packages": [
       "cli",
       "packages/*"
-    ],
-    "nohoist": [
-      "@packages/driver/*"
     ]
   },
   "lint-staged": {

packages/desktop-gui/.eslintrc.json

@@ -5,10 +5,5 @@
   "extends": [
     "plugin:@cypress/dev/tests",
     "plugin:@cypress/dev/react"
-  ],
-  "settings": {
-    "react": {
-      "version": "16.8"
-    }
-  }
+  ]
 }

packages/desktop-gui/cypress/integration/project_spec.js

@@ -14,12 +14,12 @@ describe('Project', function () {
       cy.stub(this.ipc, 'getSpecs').yields(null, this.specs)
       cy.stub(this.ipc, 'closeProject').resolves()
       cy.stub(this.ipc, 'onConfigChanged')
+      cy.stub(this.ipc, 'onProjectWarning')
 
       this.getProjectStatus = this.util.deferred()
       cy.stub(this.ipc, 'getProjectStatus').returns(this.getProjectStatus.promise)
 
       this.updaterCheck = this.util.deferred()
-
       cy.stub(this.ipc, 'updaterCheck').resolves(this.updaterCheck.promise)
     })
   })

packages/desktop-gui/cypress/integration/specs_list_spec.js

@@ -279,6 +279,87 @@ describe('Specs List', function () {
       })
     })
 
+    context('expand/collapse root specs', function () {
+      describe('with folders', function () {
+        beforeEach(function () {
+          this.ipc.getSpecs.yields(null, this.specs)
+
+          this.openProject.resolve(this.config)
+        })
+
+        it('collapsing root spec will keep root itself expanded', function () {
+          cy.get('.level-0 .folder-name').find('a:first').click({ multiple: true })
+          cy.get('.folder.folder-collapsed').should('have.length', 3)
+          cy.get('.folder.folder-expanded').should('have.length', 2)
+        })
+
+        it('collapses all children folders', function () {
+          cy.get('.level-0 .folder-name').find('a:first').click({ multiple: true })
+
+          const lastCollapsedFolderSelector = '.folder-collapsed:last .folder-name'
+          const rootSpecCollapsedFoldersSelector = '.folder-collapsed'
+
+          cy.get(lastCollapsedFolderSelector).click()
+          cy.get(rootSpecCollapsedFoldersSelector).should('have.length', 3)
+
+          cy.get(lastCollapsedFolderSelector).click()
+          cy.get(rootSpecCollapsedFoldersSelector).should('have.length', 3)
+
+          cy.get(lastCollapsedFolderSelector).click()
+          cy.get(rootSpecCollapsedFoldersSelector).should('have.length', 3)
+
+          cy.get(lastCollapsedFolderSelector).click()
+          cy.get(rootSpecCollapsedFoldersSelector).should('have.length', 3)
+
+          cy.get(lastCollapsedFolderSelector).click()
+          cy.get(rootSpecCollapsedFoldersSelector).should('have.length', 2)
+
+          cy.get(lastCollapsedFolderSelector).click()
+          cy.get(rootSpecCollapsedFoldersSelector).should('have.length', 2)
+
+          cy.get(lastCollapsedFolderSelector).click()
+          cy.get(rootSpecCollapsedFoldersSelector).should('have.length', 1)
+
+          cy.get(lastCollapsedFolderSelector).click()
+          cy.get(rootSpecCollapsedFoldersSelector).should('have.length', 0)
+        })
+
+        it('expand all expands all sub folders', function () {
+          cy.get('.level-0 .folder-name').find('a:first').click({ multiple: true })
+          cy.get('.folder-expanded').should('have.length', 2)
+          cy.get('.folder-collapsed').should('have.length', 3)
+
+          cy.get('.level-0 .folder-name').find('a:last').click({ multiple: true })
+          cy.get('.folder-expanded').should('have.length', 10)
+          cy.get('.folder-collapsed').should('have.length', 0)
+        })
+      })
+
+      describe('without folders', function () {
+        beforeEach(function () {
+          this.ipc.getSpecs.yields(null, {
+            integration: [
+              {
+                name: 'app_spec.coffee',
+                relative: 'app_spec.coffee',
+              },
+              {
+                name: 'account_new_spec.coffee',
+                relative: 'account_new_spec.coffee',
+              },
+            ],
+            unit: [],
+          })
+
+          this.openProject.resolve(this.config)
+        })
+
+        it('hides expand/collapse buttons when there are no folders', function () {
+          cy.get('.level-0 .folder-name a').should('not.exist')
+        })
+      })
+    })
+
     context('filtering specs', function () {
       it('scrolls the specs and not the filter', function () {
         this.ipc.getSpecs.yields(null, this.specs)