Merge branch 'develop' into issue-3633-5132-add-chrome-flags

Author: jennifer-shehane

packages/driver/test/cypress/integration/commands/actions/click_spec.js

@@ -1487,7 +1487,10 @@ describe('src/cy/commands/actions/click', () => {
 
         cy.get('input:first')
         .then(($el) => {
-          $el[0].ownerDocument.addEventListener('scroll', () => {
+          // This represents an asynchronous re-render
+          // since we fire the 'scrolled' event during actionability
+          // if we use el.on('scroll'), headless electron is flaky
+          cy.on('scrolled', () => {
             $el.remove()
           })
         })

packages/driver/test/cypress/integration/e2e/domSnapshots.spec.js

@@ -22,8 +22,10 @@ describe('rect highlight', () => {
 const getAndPin = (sel) => {
   cy.get(sel)
 
-  cy.wait(0)
-  .then(() => {
+  // arbitrary wait to allow clicking and pinning command
+  // if reduced, test is flakey
+  cy.wait(10)
+  .should(() => {
     withMutableReporterState(() => {
 
       const commandLogEl = getCommandLogWithText(sel)
@@ -33,6 +35,9 @@ const getAndPin = (sel) => {
       reactCommandInstance.props.appState.isRunning = false
 
       $(commandLogEl).find('.command-wrapper').click()
+
+      // make sure command was pinned, otherwise throw a better error message
+      expect(cy.$$('.command-pin:visible', top.document).length, 'command should be pinned').ok
     })
   })
 }

packages/server/package.json

@@ -161,7 +161,7 @@
     "express-session": "1.16.1",
     "express-useragent": "1.0.12",
     "http-mitm-proxy": "0.7.0",
-    "https-proxy-agent": "TooTallNate/node-https-proxy-agent#6c804a2c919b53d29030340da8b02fd8225fd258",
+    "https-proxy-agent": "3.0.0",
     "istanbul": "0.4.5",
     "mocked-env": "1.2.4",
     "mockery": "2.1.0",