diff --git a/circle.yml b/circle.yml index bd56932af9f2..02bf785edd1b 100644 --- a/circle.yml +++ b/circle.yml @@ -398,7 +398,8 @@ jobs: - run: name: Upload CLI snapshots for diffing command: | - PERCY_TOKEN=$PERCY_TOKEN_CLI \ + PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_ID \ + PERCY_PARALLEL_TOTAL=-1 \ yarn percy snapshot ./cli/visual-snapshots unit-tests: @@ -457,7 +458,7 @@ jobs: # test binary build code - run: yarn test-scripts - "server-unit-tests": + server-unit-tests: <<: *defaults parallelism: 2 steps: @@ -470,7 +471,7 @@ jobs: path: /tmp/cypress - store-npm-logs - "server-integration-tests": + server-integration-tests: <<: *defaults parallelism: 2 steps: @@ -483,7 +484,7 @@ jobs: path: /tmp/cypress - store-npm-logs - "server-performance-tests": + server-performance-tests: <<: *defaults steps: - attach_workspace: @@ -498,216 +499,216 @@ jobs: path: /tmp/artifacts - store-npm-logs - "server-e2e-tests-chrome-1": + server-e2e-tests-chrome-1: <<: *defaults steps: - run-e2e-tests: browser: chrome chunk: "1" - "server-e2e-tests-chrome-2": + server-e2e-tests-chrome-2: <<: *defaults steps: - run-e2e-tests: browser: chrome chunk: "2" - "server-e2e-tests-chrome-3": + server-e2e-tests-chrome-3: <<: *defaults steps: - run-e2e-tests: browser: chrome chunk: "3" - "server-e2e-tests-chrome-4": + server-e2e-tests-chrome-4: <<: *defaults steps: - run-e2e-tests: browser: chrome chunk: "4" - "server-e2e-tests-chrome-5": + server-e2e-tests-chrome-5: <<: *defaults steps: - run-e2e-tests: browser: chrome chunk: "5" - "server-e2e-tests-chrome-6": + server-e2e-tests-chrome-6: <<: *defaults steps: - run-e2e-tests: browser: chrome chunk: "6" - "server-e2e-tests-chrome-7": + server-e2e-tests-chrome-7: <<: *defaults steps: - run-e2e-tests: browser: chrome chunk: "7" - "server-e2e-tests-chrome-8": + server-e2e-tests-chrome-8: <<: *defaults steps: - run-e2e-tests: browser: chrome chunk: "8" - "server-e2e-tests-electron-1": + server-e2e-tests-electron-1: <<: *defaults steps: - run-e2e-tests: browser: electron chunk: "1" - "server-e2e-tests-electron-2": + server-e2e-tests-electron-2: <<: *defaults steps: - run-e2e-tests: browser: electron chunk: "2" - "server-e2e-tests-electron-3": + server-e2e-tests-electron-3: <<: *defaults steps: - run-e2e-tests: browser: electron chunk: "3" - "server-e2e-tests-electron-4": + server-e2e-tests-electron-4: <<: *defaults steps: - run-e2e-tests: browser: electron chunk: "4" - "server-e2e-tests-electron-5": + server-e2e-tests-electron-5: <<: *defaults steps: - run-e2e-tests: browser: electron chunk: "5" - "server-e2e-tests-electron-6": + server-e2e-tests-electron-6: <<: *defaults steps: - run-e2e-tests: browser: electron chunk: "6" - "server-e2e-tests-electron-7": + server-e2e-tests-electron-7: <<: *defaults steps: - run-e2e-tests: browser: electron chunk: "7" - "server-e2e-tests-electron-8": + server-e2e-tests-electron-8: <<: *defaults steps: - run-e2e-tests: browser: electron chunk: "8" - "server-e2e-tests-non-root": + server-e2e-tests-non-root: <<: *defaults steps: - run-e2e-tests: chunk: non_root - "server-e2e-tests-firefox-1": + server-e2e-tests-firefox-1: <<: *defaults steps: - run-e2e-tests: browser: firefox chunk: "1" - "server-e2e-tests-firefox-2": + server-e2e-tests-firefox-2: <<: *defaults steps: - run-e2e-tests: browser: firefox chunk: "2" - "server-e2e-tests-firefox-3": + server-e2e-tests-firefox-3: <<: *defaults steps: - run-e2e-tests: browser: firefox chunk: "3" - "server-e2e-tests-firefox-4": + server-e2e-tests-firefox-4: <<: *defaults steps: - run-e2e-tests: browser: firefox chunk: "4" - "server-e2e-tests-firefox-5": + server-e2e-tests-firefox-5: <<: *defaults steps: - run-e2e-tests: browser: firefox chunk: "5" - "server-e2e-tests-firefox-6": + server-e2e-tests-firefox-6: <<: *defaults steps: - run-e2e-tests: browser: firefox chunk: "6" - "server-e2e-tests-firefox-7": + server-e2e-tests-firefox-7: <<: *defaults steps: - run-e2e-tests: browser: firefox chunk: "7" - "server-e2e-tests-firefox-8": + server-e2e-tests-firefox-8: <<: *defaults steps: - run-e2e-tests: browser: firefox chunk: "8" - "runner-integration-tests-chrome": + runner-integration-tests-chrome: <<: *defaults parallelism: 2 steps: - run-runner-integration-tests: browser: chrome - "runner-integration-tests-firefox": + runner-integration-tests-firefox: <<: *defaults parallelism: 2 steps: - run-runner-integration-tests: browser: firefox - "driver-integration-tests-chrome": + driver-integration-tests-chrome: <<: *defaults parallelism: 5 steps: - run-driver-integration-tests: browser: chrome - # "driver-integration-tests-electron": + # driver-integration-tests-electron: # <<: *defaults # parallelism: 5 # steps: # - run-driver-integration-tests: # browser: electron - "driver-integration-tests-firefox": + driver-integration-tests-firefox: <<: *defaults parallelism: 5 steps: - run-driver-integration-tests: browser: firefox - "desktop-gui-integration-tests-2x": + desktop-gui-integration-tests-2x: <<: *defaults parallelism: 2 steps: @@ -725,6 +726,9 @@ jobs: command: | CYPRESS_KONFIG_ENV=production \ CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \ + PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_ID \ + PERCY_PARALLEL_TOTAL=-1 \ + yarn percy exec -- \ yarn cypress:run --record --parallel --group 2x-desktop-gui working_directory: packages/desktop-gui - verify-mocha-results @@ -734,38 +738,6 @@ jobs: path: /tmp/artifacts - store-npm-logs - desktop-gui-visual-tests: - <<: *defaults - parallelism: 1 - steps: - - attach_workspace: - at: ~/ - - run: - command: yarn build-prod - working_directory: packages/desktop-gui - - run: - name: Desktop GUI server - command: yarn start - working_directory: packages/desktop-gui - background: true - - run: - # will use PERCY_TOKEN environment variable if available - # to tie Percy builds together, use environment variables - # https://docs.percy.io/docs/parallel-test-suites - # we can use workflow id and list number of jobs with Percy screenshots - # if we allow Percy snapshots in more jobs, use the same - # PERCY_* variables in all of them - command: | - CYPRESS_KONFIG_ENV=production \ - PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_ID \ - PERCY_PARALLEL_TOTAL=1 \ - yarn percy exec -- \ - yarn cypress:run --spec cypress/integration/settings_spec.js,cypress/integration/specs_list_spec.js - working_directory: packages/desktop-gui - - verify-mocha-results - # we don't really need any artifacts - we are only interested in visual screenshots - - store-npm-logs - desktop-gui-component-tests: <<: *defaults parallelism: 1 @@ -792,7 +764,7 @@ jobs: command: | CYPRESS_KONFIG_ENV=production \ PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_ID \ - PERCY_PARALLEL_TOTAL=1 \ + PERCY_PARALLEL_TOTAL=-1 \ yarn percy exec -- \ yarn cypress:run --spec 'src/**/*_spec.jsx' working_directory: packages/desktop-gui @@ -800,7 +772,7 @@ jobs: # we don't really need any artifacts - we are only interested in visual screenshots - store-npm-logs - "reporter-integration-tests": + reporter-integration-tests: <<: *defaults steps: - attach_workspace: @@ -821,7 +793,7 @@ jobs: path: /tmp/artifacts - store-npm-logs - "ui-components-integration-tests": + ui-components-integration-tests: <<: *defaults steps: - attach_workspace: @@ -842,7 +814,7 @@ jobs: path: /tmp/artifacts - store-npm-logs - "run-launcher": + run-launcher: <<: *defaults steps: - attach_workspace: @@ -851,6 +823,13 @@ jobs: command: node index.js working_directory: packages/launcher + percy-finalize: + <<: *defaults + steps: + - run: + name: "finalizes percy builds" + command: npx percy finalize --all + build-binary: <<: *defaults shell: /bin/bash --login @@ -1134,7 +1113,7 @@ jobs: test-npm-module-on-minimum-node-version: <<: *defaults docker: - - image: cypress/base:8.0.0 + - image: cypress/base:10.0.0 steps: - attach_workspace: at: ~/ @@ -1577,9 +1556,6 @@ linux-workflow: &linux-workflow - desktop-gui-integration-tests-2x: requires: - build - - desktop-gui-visual-tests: - requires: - - build - desktop-gui-component-tests: requires: - build @@ -1592,6 +1568,13 @@ linux-workflow: &linux-workflow - run-launcher: requires: - build + + - percy-finalize: + requires: + - desktop-gui-integration-tests-2x + - desktop-gui-component-tests + - cli-visual-tests + # various testing scenarios, like building full binary # and testing it on a real project - test-against-staging: diff --git a/cli/package.json b/cli/package.json index bfff011e8b86..52fc50f53f3a 100644 --- a/cli/package.json +++ b/cli/package.json @@ -28,24 +28,24 @@ "arch": "2.1.2", "bluebird": "3.7.2", "cachedir": "2.3.0", - "chalk": "2.4.2", + "chalk": "4.1.0", "check-more-types": "2.24.0", - "cli-table3": "0.5.1", + "cli-table3": "0.6.0", "commander": "4.1.1", "common-tags": "1.8.0", "debug": "4.1.1", "eventemitter2": "6.4.2", - "execa": "1.0.0", + "execa": "4.0.2", "executable": "4.1.1", "extract-zip": "1.7.0", - "fs-extra": "8.1.0", + "fs-extra": "9.0.1", "getos": "3.2.1", "is-ci": "2.0.0", "is-installed-globally": "0.3.2", "lazy-ass": "1.6.0", "listr": "0.14.3", "lodash": "4.17.15", - "log-symbols": "3.0.0", + "log-symbols": "4.0.0", "minimist": "1.2.5", "moment": "2.26.0", "ospath": "1.2.2", @@ -53,7 +53,7 @@ "ramda": "0.26.1", "request-progress": "3.0.0", "supports-color": "7.1.0", - "tmp": "0.1.0", + "tmp": "0.2.1", "untildify": "4.0.0", "url": "0.11.0", "yauzl": "2.10.0" @@ -82,7 +82,7 @@ "execa-wrap": "1.4.0", "hasha": "5.0.0", "mocha": "6.2.2", - "mock-fs": "4.9.0", + "mock-fs": "4.12.0", "mocked-env": "1.2.4", "nock": "12.0.2", "postinstall-postinstall": "2.0.0", @@ -104,7 +104,7 @@ "cypress": "bin/cypress" }, "engines": { - "node": ">=8.0.0" + "node": ">=10.0.0" }, "types": "types" } diff --git a/packages/driver/cypress/integration/e2e/uncaught_errors_spec.js b/packages/driver/cypress/integration/e2e/uncaught_errors_spec.js index 6651e0aad5ca..bd3b3af01ddf 100644 --- a/packages/driver/cypress/integration/e2e/uncaught_errors_spec.js +++ b/packages/driver/cypress/integration/e2e/uncaught_errors_spec.js @@ -117,7 +117,18 @@ describe('uncaught errors', () => { expect(uncaught).to.be.true expect(err.message).to.include('foo is not defined') expect(click.get('name')).to.eq('click') - expect(click.get('error')).to.eq(err) + + // TODO: when there's an uncaught exception event + // we should log this to the command log so then + // we could update this test to always reference + // that command log + // + // FIXME: in firefox this test sometimes fails + // because the cy.click() command resolves before + // the page navigation event occurs and therefore + // the state('current') command is null'd out and + // firefox does not highlight the click command in read + // expect(click.get('error')).to.eq(err) done() }) @@ -127,7 +138,10 @@ describe('uncaught errors', () => { .window().then((win) => { return win.$('visit') .appendTo(win.document.body) - }).contains('visit').click() + }) + .contains('visit').click() + + cy.url().should('include', 'visit_error.html') }) // https://github.com/cypress-io/cypress/issues/987 diff --git a/packages/server/package.json b/packages/server/package.json index b866fc160486..2e0ff8c23c17 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -170,7 +170,7 @@ "mochawesome-1.5.2": "npm:mochawesome@1.5.2", "mochawesome-2.3.1": "npm:mochawesome@2.3.1", "mochawesome-3.0.1": "npm:mochawesome@3.0.1", - "mock-fs": "4.10.4", + "mock-fs": "4.12.0", "mocked-env": "1.2.4", "mockery": "2.1.0", "multiparty": "4.2.1", diff --git a/yarn.lock b/yarn.lock index af886e8ca276..de18f201eb44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8023,6 +8023,14 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3. escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" @@ -8332,6 +8340,16 @@ cli-table3@0.5.1: optionalDependencies: colors "^1.1.2" +cli-table3@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee" + integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ== + dependencies: + object-assign "^4.1.0" + string-width "^4.2.0" + optionalDependencies: + colors "^1.1.2" + cli-truncate@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574" @@ -12489,6 +12507,16 @@ fs-extra@9.0.0, fs-extra@^9.0.0: jsonfile "^6.0.1" universalify "^1.0.0" +fs-extra@9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" + integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^1.0.0" + fs-extra@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" @@ -16895,6 +16923,13 @@ log-symbols@3.0.0, log-symbols@^3.0.0: dependencies: chalk "^2.4.2" +log-symbols@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" + integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== + dependencies: + chalk "^4.0.0" + log-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" @@ -17954,10 +17989,10 @@ mochawesome-report-generator@^3.0.1: validator "^9.1.2" yargs "^10.0.3" -mock-fs@4.10.4: - version "4.10.4" - resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.10.4.tgz#4eaa3d6f7da2f44e1f3dd6b462cbbcb7b082e3d4" - integrity sha512-gDfZDLaPIvtOusbusLinfx6YSe2YpQsDT8qdP41P47dQ/NQggtkHukz7hwqgt8QvMBmAv+Z6DGmXPyb5BWX2nQ== +mock-fs@4.12.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.12.0.tgz#a5d50b12d2d75e5bec9dac3b67ffe3c41d31ade4" + integrity sha512-/P/HtrlvBxY4o/PzXY9cCNBrdylDNxg7gnrv2sMNxj+UJ2m8jSpl0/A6fuJeNAWr99ZvGWH8XCbE0vmnM5KupQ== mock-fs@4.9.0: version "4.9.0" @@ -24294,6 +24329,13 @@ tmp@0.1.0, tmp@^0.1.0: dependencies: rimraf "^2.6.3" +tmp@0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" + tmpl@1.0.x: version "1.0.4" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"