Merge remote-tracking branch 'origin/develop' into system-tests-refinement

Author: flotwig

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,7 +8,10 @@
 - Closes <!-- link to the issue here, if there is one -->
 
 ### User facing changelog
-<!-- Explain the change(s) for every user to read in our changelog. Examples: https://on.cypress.io/changelog -->
+<!-- 
+Explain the change(s) for every user to read in our changelog. Examples: https://on.cypress.io/changelog
+If the change is not user-facing, write "n/a".
+-->
 
 ### Additional details
 <!-- Examples:
@@ -22,11 +25,14 @@
 Screenshots or GIFs are preferred. -->
 
 ### PR Tasks
-<!-- These tasks must be completed before a PR is merged.
-Delete tasks if they are not applicable. -->
+<!-- 
+These tasks must be completed before a PR is merged.
+If a task does not apply, write [na] instead of checking the box.
+DO NOT DELETE the PR checklist.
+-->
 
 - [ ] Have tests been added/updated?
-- [ ] Has the original issue or this PR been tagged with a release in ZenHub? <!-- (internal team only)-->
+- [ ] Has the original issue (or this PR, if no issue exists) been tagged with a release in ZenHub? (user-facing changes only)
 - [ ] Has a PR for user-facing changes been opened in [`cypress-documentation`](https://github.com/cypress-io/cypress-documentation)? <!-- Link to PR here -->
 - [ ] Have API changes been updated in the [`type definitions`](https://github.com/cypress-io/cypress/blob/develop/cli/types/cypress.d.ts)?
 - [ ] Have new configuration options been added to the [`cypress.schema.json`](https://github.com/cypress-io/cypress/blob/develop/cli/schema/cypress.schema.json)?

__snapshots__/packages-spec.js

@@ -15,18 +15,19 @@ exports['packages can copy files from package.json 1'] = {
   "tmp": {
     "packages": {
       "coffee": {
-        "package.json": "{\"main\":\"src/main.js\", \"name\": \"foo\", \"files\": [\"lib\"]}",
+        "lib": {
+          "foo.js": "{}"
+        },
         "src": {
           "main.js": "console.log()"
         },
-        "lib": {
-          "foo.js": "{}"
-        }
+        "package.json": "{\n  \"main\": \"src/main.js\",\n  \"name\": \"foo\",\n  \"files\": [\n    \"lib\"\n  ]\n}\n"
       }
     }
   }
 }
 
+
 exports['transformRequires can find and replace symlink requires 1'] = {
   "[cwd]": {
     "build": {

appveyor.yml

@@ -2,6 +2,7 @@ branches:
   only:
     - master
     - develop
+    - windows-code-signing
     - 9.0-release
     - /win*/
 

browser-versions.json

@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "96.0.4664.35",
-  "chrome:stable": "95.0.4638.69"
+  "chrome:beta": "96.0.4664.45",
+  "chrome:stable": "96.0.4664.45"
 }

circle.yml

@@ -8,7 +8,6 @@ macBuildFilters: &macBuildFilters
     branches:
       only:
         - develop
-        - 9.0-release
 
 defaults: &defaults
   parallelism: 1
@@ -42,7 +41,6 @@ onlyMainBranches: &onlyMainBranches
     branches:
       only:
         - develop
-        - 9.0-release
   requires:
     - create-build-artifacts
 
@@ -1564,7 +1562,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "9.0-release" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "tgriesser/build/root-yarn-install" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -1937,17 +1935,6 @@ jobs:
           repo: cypress-example-todomvc
           browser: firefox
 
-  "test-binary-against-documentation-firefox":
-    <<: *defaults
-    resource_class: medium
-    steps:
-      - test-binary-against-repo:
-          repo: cypress-documentation
-          browser: firefox
-          command: "yarn cypress run"
-          wait-on: http://localhost:3000
-          server-start-command: yarn serve:dist
-
   "test-binary-against-conduit-chrome":
     <<: *defaults
     resource_class: medium
@@ -2209,7 +2196,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - build
     - test-kitchensink:
@@ -2221,7 +2207,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - build
     - create-build-artifacts:
@@ -2271,15 +2256,13 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
     - test-npm-module-and-verify-binary:
         filters:
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
     - test-binary-against-staging:
@@ -2288,22 +2271,21 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
 
     - test-binary-against-kitchensink-chrome:
         <<: *onlyMainBranches
-    - test-binary-against-conduit-chrome:
-        <<: *onlyMainBranches
+    # Re-enable when the cypress-example-conduit-app project is fixed.
+    # https://github.com/cypress-io/cypress-example-conduit-app/issues/346
+    # - test-binary-against-conduit-chrome:
+    #     <<: *onlyMainBranches
     - test-binary-against-recipes-firefox:
         <<: *onlyMainBranches
     - test-binary-against-kitchensink-firefox:
         <<: *onlyMainBranches
     - test-binary-against-todomvc-firefox:
         <<: *onlyMainBranches
-    - test-binary-against-documentation-firefox:
-        <<: *onlyMainBranches
     - test-binary-against-api-testing-firefox:
         <<: *onlyMainBranches
     - test-binary-against-piechopper-firefox:
@@ -2313,7 +2295,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
 
@@ -2385,7 +2366,6 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - darwin-create-build-artifacts
 
@@ -2397,7 +2377,6 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - darwin-create-build-artifacts
 

cli/lib/tasks/install.js

@@ -38,6 +38,10 @@ const getNpmArgv = () => {
 const getVersionSpecifier = (startDir = path.resolve(__dirname, '../..')) => {
   const argv = getNpmArgv()
 
+  if ((process.env.npm_package_resolved || '').endsWith('cypress.tgz')) {
+    return process.env.npm_package_resolved
+  }
+
   if (argv) {
     const tgz = _.find(argv, (t) => t.endsWith('cypress.tgz'))
 
@@ -81,7 +85,7 @@ const getVersionSpecifier = (startDir = path.resolve(__dirname, '../..')) => {
   })
 }
 
-const betaNpmUrlRe = /^\/beta\/npm\/(?<version>[0-9.]+)\/(?<artifactSlug>[^/]+)\/cypress\.tgz$/
+const betaNpmUrlRe = /^\/beta\/npm\/(?<version>[0-9.]+)\/(?<artifactSlug>.+?)\/cypress\.tgz$/
 
 // convert a prerelease NPM package .tgz URL to the corresponding binary .zip URL
 const getBinaryUrlFromPrereleaseNpmUrl = (npmUrl) => {

cli/package.json

@@ -4,6 +4,7 @@
   "private": true,
   "main": "index.js",
   "scripts": {
+    "clean": "node ./scripts/clean.js",
     "prebuild": "yarn postinstall && node ./scripts/start-build.js",
     "build": "node ./scripts/build.js",
     "dtslint": "dtslint types",
@@ -27,7 +28,7 @@
     "@types/sizzle": "^2.3.2",
     "arch": "^2.2.0",
     "blob-util": "^2.0.2",
-    "bluebird": "^3.7.2",
+    "bluebird": "3.7.2",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.0",
     "check-more-types": "^2.24.0",

cli/scripts/clean.js

@@ -0,0 +1,8 @@
+const shelljs = require('shelljs')
+const { includeTypes } = require('./utils')
+
+shelljs.rm('-rf', 'build')
+
+includeTypes.map((m) => {
+  shelljs.rm('-rf', `types/${m}`)
+})

cli/scripts/post-install.js

@@ -89,7 +89,9 @@ filesToUncomment.forEach((file) => {
   const filePath = join(__dirname, '../types', file)
   const str = fs.readFileSync(filePath).toString()
 
-  const result = str.split('\n').map((line) => line.substring(3)).join('\n')
+  const result = str.split('\n').map((line) => {
+    return line.startsWith('// ') ? line.substring(3) : line
+  }).join('\n')
 
   fs.writeFileSync(filePath, result)
 })

cli/test/lib/tasks/install_spec.js

@@ -472,6 +472,9 @@ describe('/lib/tasks/install', function () {
 
       expect(install._getBinaryUrlFromPrereleaseNpmUrl('https://cdn.cypress.io/beta/npm/5.1.1/circle-develop-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.tgz'))
       .to.eq('https://cdn.cypress.io/beta/binary/5.1.1/linux-x64/circle-develop-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.zip')
+
+      expect(install._getBinaryUrlFromPrereleaseNpmUrl('https://cdn.cypress.io/beta/npm/5.1.1/circle-develop/some/branch-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.tgz'))
+      .to.eq('https://cdn.cypress.io/beta/binary/5.1.1/linux-x64/circle-develop/some/branch-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.zip')
     })
 
     it('returns nothing for an invalid url', function () {
@@ -502,6 +505,14 @@ describe('/lib/tasks/install', function () {
       expect(await install._getVersionSpecifier('/foo/bar/baz')).to.eq('https://foo.com/cypress.tgz')
     })
 
+    it('resolves with cypress.tgz URL if specified in npm env npm_package_resolved', async function () {
+      restoreEnv = mockedEnv({
+        npm_package_resolved: 'https://foo.com/cypress.tgz',
+      })
+
+      expect(await install._getVersionSpecifier('/foo/bar/baz')).to.eq('https://foo.com/cypress.tgz')
+    })
+
     it('resolves with versionSpecifier from parent pkg.json', async function () {
       fs.readJSON.withArgs('/foo/bar/baz/package.json').resolves({
         dependencies: {