Merge remote-tracking branch 'origin/develop' into issue-19403-perf-reporter-changes

BlueWinds · BlueWinds · commit b8f1b4fc8ec9 · 2022-02-08T09:12:20.000-08:00
diff --git a/cli/package.json b/cli/package.json
@@ -93,7 +93,7 @@
     "postinstall-postinstall": "2.1.0",
     "proxyquire": "2.1.3",
     "resolve-pkg": "2.0.0",
-    "shelljs": "0.8.4",
+    "shelljs": "0.8.5",
     "sinon": "7.2.2",
     "snap-shot-it": "7.9.6",
     "spawn-mock": "1.0.0",
diff --git a/npm/eslint-plugin-dev/package.json b/npm/eslint-plugin-dev/package.json
@@ -14,7 +14,7 @@
     "chalk": "^2.4.2",
     "eslint-rule-composer": "^0.3.0",
     "lodash": "^4.17.15",
-    "shelljs": "^0.8.3"
+    "shelljs": "0.8.5"
   },
   "devDependencies": {
     "eslint": "^7.22.0",
diff --git a/package.json b/package.json
@@ -175,7 +175,7 @@
     "semantic-release": "17.2.3",
     "semantic-release-monorepo": "7.0.3",
     "semver": "7.3.2",
-    "shelljs": "0.8.3",
+    "shelljs": "0.8.5",
     "shx": "0.3.3",
     "sinon": "7.3.2",
     "snap-shot-it": "7.9.3",
diff --git a/packages/example/package.json b/packages/example/package.json
@@ -35,6 +35,6 @@
     "gulp-rev-all": "2.0.2",
     "mocha": "2.5.3",
     "resolve-pkg": "2.0.0",
-    "shelljs": "0.8.4"
+    "shelljs": "0.8.5"
   }
 }
diff --git a/packages/launcher/package.json b/packages/launcher/package.json
@@ -26,7 +26,7 @@
     "chai-as-promised": "7.1.1",
     "cross-env": "6.0.3",
     "mocha": "3.5.3",
-    "shelljs": "0.8.3",
+    "shelljs": "0.8.5",
     "sinon": "^10.0.0",
     "sinon-chai": "3.4.0",
     "typescript": "^4.2.3"
diff --git a/packages/server/.gitignore b/packages/server/.gitignore
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -163,7 +163,6 @@
     "eventsource": "1.0.7",
     "express-session": "1.16.1",
     "express-useragent": "1.0.15",
-    "http-mitm-proxy": "0.7.0",
     "https-proxy-agent": "3.0.1",
     "istanbul": "0.4.5",
     "mocha": "7.1.0",
diff --git a/system-tests/package.json b/system-tests/package.json
@@ -50,7 +50,6 @@
     "fluent-ffmpeg": "2.1.2",
     "fs-extra": "8.1.0",
     "glob": "7.2.0",
-    "http-mitm-proxy": "0.7.0",
     "https-proxy-agent": "3.0.1",
     "human-interval": "1.0.0",
     "image-size": "0.8.3",
diff --git a/system-tests/test/network_error_handling_spec.js b/system-tests/test/network_error_handling_spec.js
@@ -1,7 +1,5 @@
 const _ = require('lodash')
 const express = require('express')
-const http = require('http')
-const https = require('https')
 const path = require('path')
 const debug = require('debug')('cypress:server:network-error-handling-spec')
 const Promise = require('bluebird')
@@ -12,7 +10,6 @@ const chrome = require('@packages/server/lib/browsers/chrome')
 const systemTests = require('../lib/system-tests').default
 const random = require('@packages/server/lib/util/random')
 const Fixtures = require('../lib/fixtures')
-let mitmProxy = require('http-mitm-proxy')
 
 const PORT = 13370
 const PROXY_PORT = 13371
@@ -348,19 +345,19 @@ describe('e2e network error handling', function () {
   })
 
   context('Cypress', () => {
+    let debugProxy
+
     beforeEach(() => {
       delete process.env.HTTP_PROXY
       delete process.env.HTTPS_PROXY
 
-      return delete process.env.NO_PROXY
+      delete process.env.NO_PROXY
     })
 
-    afterEach(function () {
-      if (this.debugProxy) {
-        return this.debugProxy.stop()
-        .then(() => {
-          this.debugProxy = null
-        })
+    afterEach(async function () {
+      if (debugProxy) {
+        await debugProxy.stop()
+        debugProxy = null
       }
     })
 
@@ -415,11 +412,11 @@ describe('e2e network error handling', function () {
         return true
       })
 
-      this.debugProxy = new DebugProxy({
+      debugProxy = new DebugProxy({
         onConnect,
       })
 
-      return this.debugProxy
+      return debugProxy
       .start(PROXY_PORT)
       .then(() => {
         process.env.HTTP_PROXY = `http://localhost:${PROXY_PORT}`
@@ -465,9 +462,9 @@ describe('e2e network error handling', function () {
       })
 
       it('behind a proxy', function () {
-        this.debugProxy = new DebugProxy()
+        debugProxy = new DebugProxy()
 
-        return this.debugProxy
+        return debugProxy
         .start(PROXY_PORT)
         .then(() => {
           process.env.HTTP_PROXY = `http://localhost:${PROXY_PORT}`
@@ -485,27 +482,22 @@ describe('e2e network error handling', function () {
         })
       })
 
-      it('behind a proxy with transfer-encoding: chunked', function () {
-        mitmProxy = mitmProxy()
-
-        mitmProxy.onRequest((ctx, callback) => {
-          return callback()
-        })
-
-        mitmProxy.listen({
-          host: '127.0.0.1',
-          port: PROXY_PORT,
-          keepAlive: true,
-          httpAgent: http.globalAgent,
-          httpsAgent: https.globalAgent,
-          forceSNI: false,
-          forceChunkedRequest: true,
+      it('behind a proxy with transfer-encoding: chunked', async function () {
+        debugProxy = new DebugProxy({
+          onRequest: (reqUrl, req, res) => {
+            expect(req.headers).to.have.property('content-length')
+            // delete content-length to force te: chunked
+            delete req.headers['content-length']
+            debugProxy._onRequest(reqUrl, req, res)
+          },
         })
 
         process.env.HTTP_PROXY = `http://localhost:${PROXY_PORT}`
         process.env.NO_PROXY = ''
 
-        return systemTests.exec(this, {
+        await debugProxy.start(PROXY_PORT)
+
+        await systemTests.exec(this, {
           spec: 'network_error_304_handling_spec.js',
           video: false,
           config: {
diff --git a/yarn.lock b/yarn.lock
@@ -10983,7 +10983,7 @@ async@>=0.2.9, async@^3.2.0:
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
   integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
 
-async@^2.1.4, async@^2.4.1, async@^2.5.0, async@^2.6.2:
+async@^2.1.4, async@^2.4.1, async@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -21991,19 +21991,6 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-http-mitm-proxy@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/http-mitm-proxy/-/http-mitm-proxy-0.7.0.tgz#82933137ae1c06713961afe50f38ca84cf80bb0c"
-  integrity sha512-rRMRfQCVwEO31Q6GFiQHfECdMn3Z0ddWWLNgmeyIUDMf0gr/Ek+lhZ17gWzKL4NXZkMc1h982BYl8blRXv7/og==
-  dependencies:
-    async "^2.5.0"
-    debug "^4.1.0"
-    mkdirp "^0.5.1"
-    node-forge "^0.8.0"
-    optimist "^0.6.1"
-    semaphore "^1.1.0"
-    ws "^3.2.0"
-
 http-parser-js@>=0.5.1:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
@@ -28361,11 +28348,6 @@ node-forge@^0.10.0:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
-node-forge@^0.8.0:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.8.5.tgz#57906f07614dc72762c84cef442f427c0e1b86ee"
-  integrity sha512-vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q==
-
 node-gyp@^5.0.2, node-gyp@^5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
@@ -35188,7 +35170,7 @@ semantic-release@17.4.2:
     signale "^1.2.1"
     yargs "^16.2.0"
 
-semaphore@1.1.0, semaphore@^1.1.0:
+semaphore@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.1.0.tgz#aaad8b86b20fe8e9b32b16dc2ee682a8cd26a8aa"
   integrity sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==
@@ -35577,16 +35559,16 @@ shell-quote@1.7.2, shell-quote@^1.4.2, shell-quote@^1.6.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
-shelljs@0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.3.tgz#a7f3319520ebf09ee81275b2368adb286659b097"
-  integrity sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==
+shelljs@0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
+  integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-shelljs@0.8.4, shelljs@^0.8.3, shelljs@^0.8.4:
+shelljs@^0.8.4:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
   integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
@@ -41508,7 +41490,7 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@3.3.x, ws@^3.2.0:
+ws@3.3.x:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
   integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@`
`35`	`35`	`"gulp-rev-all": "2.0.2",`
`36`	`36`	`"mocha": "2.5.3",`
`37`	`37`	`"resolve-pkg": "2.0.0",`
`38`		`- "shelljs": "0.8.4"`
	`38`	`+ "shelljs": "0.8.5"`
`39`	`39`	`}`
`40`	`40`	`}`