chore: refactor log function to class (#20382)

cypress-io · Mar 9, 2022 · 7d87da9 · 7d87da9 · cypress-bot · Mar 9, 2022
1 parent 047aefc
commit 7d87da9
Show file tree

Hide file tree

Showing 5 changed files with 389 additions and 385 deletions.
diff --git a/packages/driver/cypress/integration/cypress/log_spec.js b/packages/driver/cypress/integration/cypress/log_spec.js
@@ -1,4 +1,4 @@
-const $Log = require('@packages/driver/src/cypress/log').default
+const { create } = require('@packages/driver/src/cypress/log')
 
 describe('src/cypress/log', function () {
   context('#snapshot', function () {
@@ -11,7 +11,7 @@ describe('src/cypress/log', function () {
       this.config = cy.stub()
       this.config.withArgs('isInteractive').returns(true)
       this.config.withArgs('numTestsKeptInMemory').returns(50)
-      this.log = $Log.create(Cypress, this.cy, this.state, this.config)
+      this.log = create(Cypress, this.cy, this.state, this.config)
     })
 
     it('creates a snapshot and returns the log', function () {

diff --git a/packages/driver/src/cy/commands/navigation.ts b/packages/driver/src/cy/commands/navigation.ts
@@ -5,7 +5,7 @@ import Promise from 'bluebird'
 
 import $utils from '../../cypress/utils'
 import $errUtils from '../../cypress/error_utils'
-import $Log from '../../cypress/log'
+import { LogUtils } from '../../cypress/log'
 import { bothUrlsMatchAndOneHasHash } from '../navigation'
 import { $Location } from '../../cypress/location'
 
@@ -1022,7 +1022,7 @@ export default (Commands, Cypress, cy, state, config) => {
           s.passed = Cypress.runner.countByTestState(s.tests, 'passed')
           s.failed = Cypress.runner.countByTestState(s.tests, 'failed')
           s.pending = Cypress.runner.countByTestState(s.tests, 'pending')
-          s.numLogs = $Log.countLogsByTests(s.tests)
+          s.numLogs = LogUtils.countLogsByTests(s.tests)
 
           return Cypress.action('cy:collect:run:state')
           .then((a = []) => {

diff --git a/packages/driver/src/cypress.ts b/packages/driver/src/cypress.ts
@@ -17,7 +17,7 @@ import $dom from './dom'
 import $Downloads from './cypress/downloads'
 import $errorMessages from './cypress/error_messages'
 import $errUtils from './cypress/error_utils'
-import $Log from './cypress/log'
+import { create as createLogFn, LogUtils } from './cypress/log'
 import $LocalStorage from './cypress/local_storage'
 import $Mocha from './cypress/mocha'
 import { create as createMouse } from './cy/mouse'
@@ -115,7 +115,7 @@ class $Cypress {
   errorMessages = $errorMessages
   Keyboard = $Keyboard
   Location = $Location
-  Log = $Log
+  Log = LogUtils
   LocalStorage = $LocalStorage
   Mocha = $Mocha
   resolveWindowReference = resolvers.resolveWindowReference
@@ -323,7 +323,7 @@ class $Cypress {
     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)
+    this.log = createLogFn(this, this.cy, this.state, this.config)
     this.mocha = $Mocha.create(specWindow, this, this.config)
     this.runner = $Runner.create(specWindow, this.mocha, this, this.cy, this.state)
     this.downloads = $Downloads.create(this)