use spec_helper in StreamActivityMonitor_spec due to global sinon clo…

…ck changes
cypress-io · Mar 25, 2024 · 4e839a4 · 4e839a4
1 parent a03d13b
commit 4e839a4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/packages/server/test/spec_helper.js b/packages/server/test/spec_helper.js
@@ -79,10 +79,6 @@ sinon.restore = function (...args) {
   return restore.apply(sinon, args)
 }
 
-mockery.enable({
-  warnOnUnregistered: false,
-})
-
 // stub out the entire electron object for our stub
 // we must use an absolute path here because of the way mockery internally loads this
 // module - meaning the first time electron is required it'll use this path string
@@ -96,11 +92,19 @@ mockery.registerSubstitute(
 mockery.registerMock('original-fs', {})
 
 before(function () {
+  mockery.enable({
+    warnOnUnregistered: false,
+  })
+
   if (hasOnly) {
     this.test.parent._onlyTests = [true]
   }
 })
 
+after((() => {
+  mockery.disable()
+}))
+
 // appData.ensure()
 
 const { setCtx, getCtx, clearCtx, makeDataContext } = require('../lib/makeDataContext')

diff --git a/packages/server/test/unit/cloud/upload/StreamActivityMonitor_spec.ts b/packages/server/test/unit/cloud/upload/StreamActivityMonitor_spec.ts
@@ -1,10 +1,6 @@
-import sinon from 'sinon'
-import chai, { expect } from 'chai'
-import chaiAsPromised from 'chai-as-promised'
+require('../../../spec_helper')
 import { StreamActivityMonitor, StreamStalledError, StreamStartTimedOutError } from '../../../../lib/cloud/upload/StreamActivityMonitor'
 
-chai.use(chaiAsPromised)
-
 describe('StreamTimeoutController', () => {
   const maxStartDwellTime = 1000
   const maxActivityDwellTime = 500