Merge branch 'develop' into tgriesser/chore/perf-spike

packages/server/lib/project-base.ts

@@ -276,20 +276,25 @@ export class ProjectBase<TServer extends ServerE2E | ServerCt> extends EE {
       this.saveState(stateToSave),
     ])
 
-    // start watching specs
-    // whenever a spec file is added or removed, we notify the
-    // <SpecList>
-    // This is only used for CT right now, but it will be
-    // used for E2E eventually. Until then, do not watch
-    // the specs.
-    startSpecWatcher()
-
     await Promise.all([
       checkSupportFile({ configFile: cfg.configFile, supportFile: cfg.supportFile }),
       this.watchPluginsFile(cfg, this.options),
     ])
 
-    if (cfg.isTextTerminal || !cfg.experimentalInteractiveRunEvents) return
+    if (cfg.isTextTerminal) {
+      return
+    }
+
+    // start watching specs
+    // whenever a spec file is added or removed, we notify the
+    // <SpecList>
+    // This is only used for CT right now by general users.
+    // It is is used with E2E if the CypressInternal_UseInlineSpecList flag is true.
+    startSpecWatcher()
+
+    if (!cfg.experimentalInteractiveRunEvents) {
+      return
+    }
 
     const sys = await system.info()
     const beforeRunDetails = {

packages/server/test/unit/project_spec.js

@@ -406,6 +406,36 @@ This option will not have an effect in Some-other-name. Tests that rely on web s
       })
     })
 
+    it('does not call startSpecWatcher if not in interactive mode', function () {
+      const startSpecWatcherStub = sinon.stub()
+
+      sinon.stub(ProjectBase.prototype, 'initializeSpecStore').resolves({
+        startSpecWatcher: startSpecWatcherStub,
+      })
+
+      this.config.isTextTerminal = true
+
+      return this.project.open()
+      .then(() => {
+        expect(startSpecWatcherStub).not.to.be.called
+      })
+    })
+
+    it('calls startSpecWatcher if in interactive mode', function () {
+      const startSpecWatcherStub = sinon.stub()
+
+      sinon.stub(ProjectBase.prototype, 'initializeSpecStore').resolves({
+        startSpecWatcher: startSpecWatcherStub,
+      })
+
+      this.config.isTextTerminal = false
+
+      return this.project.open()
+      .then(() => {
+        expect(startSpecWatcherStub).to.be.called
+      })
+    })
+
     it('does not get system info or execute before:run if experimental flag is not enabled', function () {
       sinon.stub(system, 'info')
       this.config.experimentalInteractiveRunEvents = false