chore: refactor cy funcs (#19080)

Co-authored-by: Emily Rohrbough <[email protected]>
Co-authored-by: David Munechika <[email protected]>

Author: 3 people

packages/driver/cypress/integration/cypress/command_queue_spec.ts

@@ -1,6 +1,6 @@
 import _ from 'lodash'
 import $Command from '../../../src/cypress/command'
-import $CommandQueue from '../../../src/cypress/command_queue'
+import { CommandQueue } from '../../../src/cypress/command_queue'
 
 const createCommand = (props = {}) => {
   return $Command.create(_.extend({
@@ -23,14 +23,14 @@ const log = (props = {}) => {
 describe('src/cypress/command_queue', () => {
   let queue
   const state = () => {}
-  const timeouts = { timeout () {} }
-  const stability = { whenStable () {} }
+  const timeout = () => {}
+  const whenStable = () => {}
   const cleanup = () => {}
   const fail = () => {}
   const isCy = () => {}
 
   beforeEach(() => {
-    queue = $CommandQueue.create(state, timeouts, stability, cleanup, fail, isCy)
+    queue = new CommandQueue(state, timeout, whenStable, cleanup, fail, isCy)
 
     queue.add(createCommand({
       name: 'get',

packages/driver/cypress/integration/util/queue_spec.ts

@@ -1,14 +1,14 @@
 import Bluebird from 'bluebird'
 
-import $Queue from '../../../src/util/queue'
+import { Queue } from '../../../src/util/queue'
 
 const ids = (queueables) => queueables.map((q) => q.id)
 
 describe('src/util/queue', () => {
   let queue
 
   beforeEach(() => {
-    queue = $Queue.create([
+    queue = new Queue([
       { id: '1' },
       { id: '2' },
       { id: '3' },

packages/driver/src/cypress.ts

@@ -14,7 +14,7 @@ import browserInfo from './cypress/browser'
 import $scriptUtils from './cypress/script_utils'
 
 import $Commands from './cypress/commands'
-import $Cy from './cypress/cy'
+import { $Cy } from './cypress/cy'
 import $dom from './dom'
 import $Downloads from './cypress/downloads'
 import $errorMessages from './cypress/error_messages'
@@ -209,12 +209,8 @@ class $Cypress {
   // or parsed. we have not received any custom commands
   // at this point
   onSpecWindow (specWindow, scripts) {
-    const logFn = (...args) => {
-      return this.log.apply(this, args)
-    }
-
     // create cy and expose globally
-    this.cy = $Cy.create(specWindow, this, this.Cookies, this.state, this.config, logFn)
+    this.cy = new $Cy(specWindow, this, this.Cookies, this.state, this.config)
     window.cy = this.cy
     this.isCy = this.cy.isCy
     this.log = $Log.create(this, this.cy, this.state, this.config)