Merge branch '10.0-release' into 99f24863a2-develop-into-10.0-release

scripts/binary/smoke.js

@@ -82,7 +82,7 @@ const runProjectTest = function (buildAppExecutable, e2e) {
 
     const args = [
       `--run-project=${e2e}`,
-      `--spec=${e2e}/cypress/integration/simple_passing_spec.js`,
+      `--spec=${e2e}/cypress/e2e/simple_passing.cy.js`,
     ]
 
     if (verify.needsSandbox()) {
@@ -117,8 +117,8 @@ const runFailingProjectTest = function (buildAppExecutable, e2e) {
   console.log('running failing project test')
 
   const verifyScreenshots = function () {
-    const screenshot1 = path.join(e2e, 'cypress', 'screenshots', 'simple_failing_spec.js', 'simple failing spec -- fails1 (failed).png')
-    const screenshot2 = path.join(e2e, 'cypress', 'screenshots', 'simple_failing_spec.js', 'simple failing spec -- fails2 (failed).png')
+    const screenshot1 = path.join(e2e, 'cypress', 'screenshots', 'simple_failing.cy.js', 'simple failing spec -- fails1 (failed).png')
+    const screenshot2 = path.join(e2e, 'cypress', 'screenshots', 'simple_failing.cy.js', 'simple failing spec -- fails2 (failed).png')
 
     return Promise.all([
       fs.statAsync(screenshot1),
@@ -132,7 +132,7 @@ const runFailingProjectTest = function (buildAppExecutable, e2e) {
 
       const args = [
         `--run-project=${e2e}`,
-        `--spec=${e2e}/cypress/integration/simple_failing_spec.js`,
+        `--spec=${e2e}/cypress/e2e/simple_failing.cy.js`,
       ]
 
       if (verify.needsSandbox()) {

scripts/binary/upload-unique-binary.js

@@ -43,7 +43,6 @@ const getCDN = function ({ version, hash, filename, platform }) {
 }
 
 // returns folder that contains beta (unreleased) binaries for given version
-//
 const getUploadVersionDirName = function (options) {
   la(check.unemptyString(options.version), 'missing version', options)
 

scripts/binary/util/packages.ts

@@ -140,17 +140,21 @@ export const replaceLocalNpmVersions = async function (basePath: string) {
       let shouldWriteFile = false
 
       for (const [depName, version] of Object.entries(dependencies)) {
-        if (!depName.startsWith('@cypress/') || version !== '0.0.0-development') {
+        const matchedPkg = Boolean(depName.startsWith('@cypress/') || depName === 'create-cypress-tests')
+
+        if (!matchedPkg || version !== '0.0.0-development') {
           continue
         }
 
-        const [, localPkg] = depName.split('/')
+        const pkgName = depName.startsWith('@cypress/') ? depName.split('/')[1] : depName
 
-        const localPkgPath = path.join(basePath, 'npm', localPkg)
+        const localPkgPath = path.join(basePath, 'npm', pkgName)
+
+        json.dependencies[depName] = `file:${localPkgPath}`
+        shouldWriteFile = true
 
-        dependencies[`@cypress/${localPkg}`] = `file:${localPkgPath}`
         if (!visited.has(localPkgPath)) {
-          await updatePackageJson(`./npm/${localPkg}`)
+          await updatePackageJson(`./npm/${pkgName}`)
         }
 
         shouldWriteFile = true

scripts/binary/util/testStaticAssets.js

@@ -47,21 +47,6 @@ const testStaticAssets = async (buildResourcePath) => {
         ['-ms-', 20],
       ],
     }),
-
-    testPackageStaticAssets({
-      assetGlob: `${buildResourcePath}/packages/desktop-gui/dist/index.html`,
-      goodStrings: [
-        // make sure webpack is run with NODE_ENV=production
-        `window.env = 'production'`,
-      ],
-    }),
-    testPackageStaticAssets({
-      assetGlob: `${buildResourcePath}/packages/desktop-gui/dist/app.js`,
-      goodStrings: [
-        // make sure webpack is run with NODE_ENV=production
-        'react.production.min.js',
-      ],
-    }),
     testPackageStaticAssets({
       assetGlob: `${buildResourcePath}/packages/socket/node_modules/socket.io-parser/dist/binary.js`,
       badStrings: [
@@ -81,15 +66,6 @@ const testStaticAssets = async (buildResourcePath) => {
         'return callback((data instanceof ArrayBuffer || isArrayBuffer(data)) ? data : data.buffer);',
       ],
     }),
-    testPackageStaticAssets({
-      assetGlob: `${buildResourcePath}/node_modules/winston/lib/winston/common.js`,
-      badStrings: [
-        `if (target.padLevels) {`,
-      ],
-      goodStrings: [
-        `if (target.hasOwnProperty('padLevels') && target.padLevels) {`,
-      ],
-    }),
   ])
 }
 

scripts/binary/zip.js

@@ -72,7 +72,7 @@ const checkZipSize = function (zipPath) {
   const zipSize = filesize(stats.size, { round: 0 })
 
   console.log(`zip file size ${zipSize}`)
-  const MAX_ALLOWED_SIZE_MB = os.platform() === 'win32' ? 265 : 230
+  const MAX_ALLOWED_SIZE_MB = os.platform() === 'win32' ? 295 : 300
   const MAX_ZIP_FILE_SIZE = megaBytes(MAX_ALLOWED_SIZE_MB)
 
   if (stats.size > MAX_ZIP_FILE_SIZE) {