Fix regression in 3.5.0 where a cy.visit that changes superdoma…

packages/driver/src/cy/commands/xhr.coffee

@@ -253,7 +253,7 @@ module.exports = (Commands, Cypress, cy, state, config) ->
 
   Cypress.on "test:before:run:async", ->
     ## reset any state on the backend
-    Cypress.backend('reset:xhr:server')
+    Cypress.backend('reset:server:state')
 
   Cypress.on "test:before:run", ->
     ## reset the existing server

packages/server/__snapshots__/2_cookies_spec.coffee.js

@@ -31,27 +31,35 @@ exports['e2e cookies with baseurl'] = `
       ✓ issue: #2724 does not fail on invalid cookies
       ✓ can set and clear cookie
       in a cy.visit
-        ✓ can set cookies on way too many redirects with HTTP intermediary
-        ✓ can set cookies on way too many redirects with HTTPS intermediary
         with Domain = superdomain
           ✓ is set properly with no redirects
           ✓ is set properly with redirects
+        when redirected to a HTTP URL
+          ✓ can set cookies on lots of redirects, ending with different domain
+          ✓ can set cookies on lots of redirects, ending with same domain
+        when redirected to a HTTPS URL
+          ✓ can set cookies on lots of redirects, ending with different domain
+          ✓ can set cookies on lots of redirects, ending with same domain
       in a cy.request
-        ✓ can set cookies on way too many redirects with HTTP intermediary
-        ✓ can set cookies on way too many redirects with HTTPS intermediary
         with Domain = superdomain
           ✓ is set properly with no redirects
           ✓ is set properly with redirects
+        when redirected to a HTTP URL
+          ✓ can set cookies on lots of redirects, ending with different domain
+          ✓ can set cookies on lots of redirects, ending with same domain
+        when redirected to a HTTPS URL
+          ✓ can set cookies on lots of redirects, ending with different domain
+          ✓ can set cookies on lots of redirects, ending with same domain
 
 
-  18 passing
+  22 passing
 
 
   (Results)
 
   ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
-  │ Tests:        18                                                                               │
-  │ Passing:      18                                                                               │
+  │ Tests:        22                                                                               │
+  │ Passing:      22                                                                               │
   │ Failing:      0                                                                                │
   │ Pending:      0                                                                                │
   │ Skipped:      0                                                                                │
@@ -75,9 +83,9 @@ exports['e2e cookies with baseurl'] = `
 
        Spec                                              Tests  Passing  Failing  Pending  Skipped  
   ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
-  │ ✔  cookies_spec_baseurl.coffee              XX:XX       18       18        -        -        - │
+  │ ✔  cookies_spec_baseurl.coffee              XX:XX       22       22        -        -        - │
   └────────────────────────────────────────────────────────────────────────────────────────────────┘
-    ✔  All specs passed!                        XX:XX       18       18        -        -        -  
+    ✔  All specs passed!                        XX:XX       22       22        -        -        -  
 
 
 `

packages/server/__snapshots__/4_request_spec.coffee.js

@@ -19,7 +19,7 @@ exports['e2e requests / passes'] = `
 
   redirects + requests
     ✓ gets and sets cookies from cy.request
-    ✓ visits idempotant
+    ✓ visits to a different superdomain will be resolved twice
     ✓ automatically follows redirects
     ✓ can turn off following redirects that set a cookie
     ✓ can turn off automatically following redirects

packages/server/lib/server.coffee

@@ -326,6 +326,10 @@ class Server
       options
     })
 
+    ## always clear buffers - reduces the possibility of a random HTTP request
+    ## accidentally retrieving buffered content at the wrong time
+    buffers.reset()
+
     startTime = new Date()
 
     ## if we have an existing url resolver
@@ -361,26 +365,6 @@ class Server
         _.invoke(reqStream, "abort")
         _.invoke(currentPromisePhase, "cancel")
 
-      ## if we have a buffer for this url
-      ## then just respond with its details
-      ## so we are idempotant and do not make
-      ## another request
-      if obj = buffers.getByOriginalUrl(urlStr)
-        debug("got previous request buffer for url:", urlStr)
-
-        ## reset the cookies from the buffer on the browser
-        return runPhase ->
-          resolve(
-            Promise.map obj.details.cookies, (cookie) ->
-              ## prevent prepending a . to the cookie domain if top-level
-              ## navigation occurs as a result of a cy.visit
-              if _.isUndefined(cookie.hostOnly) && !cookie.domain?.startsWith('.')
-                cookie.hostOnly = true
-
-              automationRequest('set:cookie', cookie)
-            .return(obj.details)
-          )
-
       redirects = []
       newUrl = null
 
@@ -708,7 +692,10 @@ class Server
     options.onResolveUrl = @_onResolveUrl.bind(@)
     options.onRequest    = @_onRequest.bind(@)
     options.onIncomingXhr = @_xhrServer.onIncomingXhr
-    options.onResetXhrServer = @_xhrServer.reset
+
+    options.onResetServerState = =>
+      @_xhrServer.reset()
+      buffers.reset()
 
     @_socket = Socket(config)
     @_socket.startListening(@_server, automation, config, options)

packages/server/lib/socket.coffee

@@ -133,7 +133,7 @@ class Socket
     _.defaults options,
       socketId: null
       onIncomingXhr: ->
-      onResetXhrServer: ->
+      onResetServerState: ->
       onSetRunnables: ->
       onMocha: ->
       onConnect: ->
@@ -300,8 +300,8 @@ class Socket
               options.onResolveUrl(url, headers, automationRequest, resolveOpts)
             when "http:request"
               options.onRequest(headers, automationRequest, args[0])
-            when "reset:xhr:server"
-              options.onResetXhrServer()
+            when "reset:server:state"
+              options.onResetServerState()
             when "incoming:xhr"
               options.onIncomingXhr(args[0], args[1])
             when "get:fixture"

packages/server/lib/util/buffers.js

@@ -2,7 +2,7 @@ const _ = require('lodash')
 const debug = require('debug')('cypress:server:buffers')
 const uri = require('./uri')
 
-let buffers = []
+let buffer = null
 
 const stripPort = (url) => {
   try {
@@ -13,53 +13,46 @@ const stripPort = (url) => {
 }
 
 module.exports = {
-  all () {
-    return buffers
-  },
-
-  keys () {
-    return _.map(buffers, 'url')
+  getAny () {
+    return buffer
   },
 
   reset () {
     debug('resetting buffers')
 
-    buffers = []
+    buffer = null
   },
 
   set (obj = {}) {
+    obj = _.cloneDeep(obj)
     obj.url = stripPort(obj.url)
     obj.originalUrl = stripPort(obj.originalUrl)
 
-    debug('setting buffer %o', _.pick(obj, 'url'))
-
-    return buffers.push(_.pick(obj, 'url', 'originalUrl', 'jar', 'stream', 'response', 'details'))
-  },
-
-  getByOriginalUrl (str) {
-    const b = _.find(buffers, { originalUrl: stripPort(str) })
-
-    if (b) {
-      debug('found request buffer by original url %o', { str, buffer: _.pick(b, 'url', 'originalUrl', 'details'), bufferCount: buffers.length })
+    if (buffer) {
+      debug('warning: overwriting existing buffer...', { buffer: _.pick(buffer, 'url') })
     }
 
-    return b
+    debug('setting buffer %o', _.pick(obj, 'url'))
+
+    buffer = obj
   },
 
   get (str) {
-    return _.find(buffers, { url: stripPort(str) })
+    if (buffer && buffer.url === stripPort(str)) {
+      return buffer
+    }
   },
 
   take (str) {
-    const buffer = this.get(str)
+    const foundBuffer = this.get(str)
 
-    if (buffer) {
-      buffers = _.without(buffers, buffer)
+    if (foundBuffer) {
+      buffer = null
 
-      debug('found request buffer %o', { buffer: _.pick(buffer, 'url', 'originalUrl'), bufferCount: buffers.length })
-    }
+      debug('found request buffer %o', { buffer: _.pick(foundBuffer, 'url') })
 
-    return buffer
+      return foundBuffer
+    }
   },
 
 }

packages/server/test/e2e/2_cookies_spec.coffee

@@ -77,6 +77,7 @@ onServer = (app) ->
 
     res.header("Set-Cookie", [
       "namefoo#{n}=valfoo#{n}"
+      "namebar#{n}=valbar#{n}"
     ])
 
     console.log('to', a, 'from', b)

packages/server/test/integration/server_spec.coffee

@@ -170,7 +170,7 @@ describe "Server", ->
             cookies: []
           })
 
-          expect(buffers.keys()).to.deep.eq(["http://localhost:2000/index.html"])
+          expect(buffers.getAny()).to.include({ url: "http://localhost:2000/index.html" })
         .then =>
           @server._onResolveUrl("/index.html", {}, @automationRequest)
           .then (obj = {}) =>
@@ -187,15 +187,15 @@ describe "Server", ->
               cookies: []
             })
 
-            expect(@server._request.sendStream).to.be.calledOnce
+            expect(@server._request.sendStream).to.be.calledTwice
         .then =>
           @rp("http://localhost:2000/index.html")
           .then (res) =>
             expect(res.statusCode).to.eq(200)
             expect(res.body).to.include("document.domain")
             expect(res.body).to.include("localhost")
             expect(res.body).to.include("Cypress")
-            expect(buffers.keys()).to.deep.eq([])
+            expect(buffers.getAny()).to.be.null
 
       it "can follow static file redirects", ->
         @server._onResolveUrl("/sub", {}, @automationRequest)
@@ -266,13 +266,13 @@ describe "Server", ->
             cookies: []
           })
 
-          expect(buffers.keys()).to.deep.eq(["http://localhost:2000/index.html"])
+          expect(buffers.getAny()).to.include({ url: "http://localhost:2000/index.html" })
         .then =>
           @rp("http://localhost:2000/index.html")
           .then (res) ->
             expect(res.statusCode).to.eq(200)
 
-            expect(buffers.keys()).to.deep.eq([])
+            expect(buffers.getAny()).to.be.null
 
     describe "http", ->
       beforeEach ->
@@ -496,16 +496,19 @@ describe "Server", ->
 
         nock("http://espn.com")
         .get("/")
+        .times(2)
         .reply 301, undefined, {
           "Location": "/foo"
         }
         .get("/foo")
+        .times(2)
         .reply 302, undefined, {
           "Location": "http://espn.go.com/"
         }
 
         nock("http://espn.go.com")
         .get("/")
+        .times(2)
         .reply 200, "<html><head></head><body>espn</body></html>", {
           "Content-Type": "text/html"
         }
@@ -527,7 +530,7 @@ describe "Server", ->
             ]
           })
 
-          expect(buffers.keys()).to.deep.eq(["http://espn.go.com/"])
+          expect(buffers.getAny()).to.include({ url: "http://espn.go.com/" })
         .then =>
           @server._onResolveUrl("http://espn.com/", {}, @automationRequest)
           .then (obj = {}) =>
@@ -546,15 +549,15 @@ describe "Server", ->
               ]
             })
 
-            expect(@server._request.sendStream).to.be.calledOnce
+            expect(@server._request.sendStream).to.be.calledTwice
         .then =>
           @rp("http://espn.go.com/")
           .then (res) =>
             expect(res.statusCode).to.eq(200)
             expect(res.body).to.include("document.domain")
             expect(res.body).to.include("go.com")
             expect(res.body).to.include("Cypress.action('app:window:before:load', window); </script></head><body>espn</body></html>")
-            expect(buffers.keys()).to.deep.eq([])
+            expect(buffers.getAny()).to.be.null
 
       it "does not buffer 'bad' responses", ->
         sinon.spy(@server._request, "sendStream")
@@ -665,13 +668,13 @@ describe "Server", ->
             cookies: []
           })
 
-          expect(buffers.keys()).to.deep.eq(["http://getbootstrap.com/"])
+          expect(buffers.getAny()).to.include({ url: "http://getbootstrap.com/" })
         .then =>
           @rp("http://getbootstrap.com/")
           .then (res) ->
             expect(res.statusCode).to.eq(200)
 
-            expect(buffers.keys()).to.deep.eq([])
+            expect(buffers.getAny()).to.be.null
 
       it "can serve non 2xx status code requests when option set", ->
         nock("http://google.com")