From 3727df85a2ffb730d11dc567c3b3bcce3bee98b8 Mon Sep 17 00:00:00 2001
From: Emily Rohrbough <emilyrohrbough@yahoo.com>
Date: Tue, 16 Aug 2022 13:20:24 -0500
Subject: [PATCH] clean up

---
 .vscode/settings.json                             | 2 +-
 packages/driver/src/cy/commands/sessions/utils.ts | 4 ++--
 packages/driver/src/cypress/cy.ts                 | 1 -
 packages/reporter/src/attempts/attempt-model.ts   | 3 ---
 packages/server/lib/socket-base.ts                | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index f651d34a4f..47436c0f11 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -38,7 +38,7 @@
   // Volar is the main extension that powers Vue's language features.
   // These are commented out because they slow down node development
   // "volar.autoCompleteRefs": false,
-  "volar.takeOverMode.enabled": true,
+  "volar.takeOverMode.enabled": "auto",
 
   "editor.tabSize": 2,
 }
diff --git a/packages/driver/src/cy/commands/sessions/utils.ts b/packages/driver/src/cy/commands/sessions/utils.ts
index 8feeb527c4..b07ef6d120 100644
--- a/packages/driver/src/cy/commands/sessions/utils.ts
+++ b/packages/driver/src/cy/commands/sessions/utils.ts
@@ -131,7 +131,7 @@ const setPostMessageLocalStorage = async (specWindow, originOptions) => {
   .timeout(2000)
   .finally(() => {
     specWindow.removeEventListener('message', onPostMessage)
-    // $iframeContainer.remove()
+    $iframeContainer.remove()
   })
   .catch(() => {
     Cypress.log({
@@ -180,7 +180,7 @@ const getPostMessageLocalStorage = (specWindow, origins): Promise<any[]> => {
   .timeout(2000)
   .finally(() => {
     specWindow.removeEventListener('message', onPostMessage)
-    // $iframeContainer.remove()
+    $iframeContainer.remove()
   })
   .catch((err) => {
     Cypress.log({
diff --git a/packages/driver/src/cypress/cy.ts b/packages/driver/src/cypress/cy.ts
index cff8b969f2..2c35c26c1f 100644
--- a/packages/driver/src/cypress/cy.ts
+++ b/packages/driver/src/cypress/cy.ts
@@ -641,7 +641,6 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
     try {
       const s = this.state()
 
-      console.log('reset', test.title, s.activeSessions)
       const backup = {
         test,
         window: s.window,
diff --git a/packages/reporter/src/attempts/attempt-model.ts b/packages/reporter/src/attempts/attempt-model.ts
index 41c525140e..b703d7bcae 100644
--- a/packages/reporter/src/attempts/attempt-model.ts
+++ b/packages/reporter/src/attempts/attempt-model.ts
@@ -184,9 +184,7 @@ export default class Attempt {
   _addSession (props: CommandProps) {
     const updated = this._updateSession(props)
 
-    console.log('updated?', props.id)
     if (!updated) {
-      console.log('add new session', props)
       const session = new Session({
         state: props.state,
         testCurrentRetry: props.testCurrentRetry || 0,
@@ -205,7 +203,6 @@ export default class Attempt {
     const session = this.sessions[props.id]
 
     if (session) {
-      console.log('update session')
       session.update({
         state: props.state,
         testCurrentRetry: props.testCurrentRetry || 0,
diff --git a/packages/server/lib/socket-base.ts b/packages/server/lib/socket-base.ts
index 3d398c985f..2645596db1 100644
--- a/packages/server/lib/socket-base.ts
+++ b/packages/server/lib/socket-base.ts
@@ -448,7 +448,7 @@ export class SocketBase {
 
             case 'reset:session:state':
               cookieJar.removeAllCookies()
-              session.clearAllSessions()
+              session.clearSpecSessions()
               resetRenderedHTMLOrigins()
 
               return