cypress-io · AtofStryker · Mar 15, 2023 · Mar 13, 2023 · Mar 13, 2023 · Mar 14, 2023
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -15,6 +15,7 @@ _Released 03/14/2023 (PENDING)_
 - Fixed an issue where using `Cypress.require()` would throw the error `Cannot find module 'typescript'`. Fixes [#25885](https://github.com/cypress-io/cypress/issues/25885).
 - The [`before:spec`](https://docs.cypress.io/api/plugins/before-spec-api) API was updated to correctly support async event handlers in `run` mode. Fixes [#24403](https://github.com/cypress-io/cypress/issues/24403).
 - Updated the Component Testing community framework definition detection logic to take into account monorepo structures that hoist dependencies. Fixes [#25993](https://github.com/cypress-io/cypress/issues/25993)
+- Fixed an issue where the reporter auto-scroll configuration inside user preferences was being set implicitly. User's must now explicitly enable/disable auto-scroll under user preferences, which is enabled by default. Fixes [#24171](https://github.com/cypress-io/cypress/issues/24171) and [#25084](https://github.com/cypress-io/cypress/issues/25084)
 
 **Misc:**
 

diff --git a/packages/reporter/cypress/e2e/unit/events.cy.ts b/packages/reporter/cypress/e2e/unit/events.cy.ts
@@ -350,7 +350,7 @@ describe('events', () => {
     })
 
     it('emits save:state on save:state', () => {
-      appState.autoScrollingEnabled = false
+      appState.autoScrollingEnabledUnderUserPreferences = false
       appState.isSpecsListOpen = true
       events.emit('save:state')
       expect(runner.emit).to.have.been.calledWith('save:state', {

diff --git a/packages/reporter/src/lib/app-state.ts b/packages/reporter/src/lib/app-state.ts
@@ -22,6 +22,7 @@ const defaults: DefaultAppState = {
 }
 
 class AppState {
+  @observable autoScrollingEnabledUnderUserPreferences = true
   @observable autoScrollingEnabled = true
   @observable isSpecsListOpen = false
   @observable isPaused = defaults.isPaused
@@ -69,6 +70,14 @@ class AppState {
     this.setAutoScrolling(!this.autoScrollingEnabled)
   }
 
+  /**
+   * Toggles the auto-scrolling user preference to true|false. This method should only be called from the
+   * preferences menu itself.
+   */
+  toggleAutoScrollingUnderUserPreferences () {
+    this.setAutoScrollingEnabledUnderUserPreferences(!this.autoScrollingEnabledUnderUserPreferences)
+  }
+
   toggleSpecList () {
     this.isSpecsListOpen = !this.isSpecsListOpen
   }
@@ -88,6 +97,19 @@ class AppState {
     }
   }
 
+  /**
+   * Sets the auto scroll user preference to true|false.
+   * When this preference is set, it overrides any temporary auto scrolling behaviors that may be in effect.
+   * @param {boolean | null | undefined} isEnabled - whether or not auto scroll should be enabled or disabled.
+   * If not a boolean, this method is a no-op.
+   */
+  setAutoScrollingEnabledUnderUserPreferences (isEnabled?: boolean | null) {
+    if (isEnabled != null) {
+      this.autoScrollingEnabledUnderUserPreferences = isEnabled
+      this.setAutoScrolling(isEnabled)
+    }
+  }
+
   setStudioActive (studioActive: boolean) {
     this.studioActive = studioActive
   }

diff --git a/packages/reporter/src/lib/events.ts b/packages/reporter/src/lib/events.ts
@@ -194,7 +194,8 @@ const events: Events = {
 
     localBus.on('save:state', () => {
       runner.emit('save:state', {
-        autoScrollingEnabled: appState.autoScrollingEnabled,
+        // the "autoScrollingEnabled" key refers to the preference value itself, not the "autoScrollingEnabled" variable stored in application state
+        autoScrollingEnabled: appState.autoScrollingEnabledUnderUserPreferences,
         isSpecsListOpen: appState.isSpecsListOpen,
       })
     })

diff --git a/packages/reporter/src/lib/shortcuts.ts b/packages/reporter/src/lib/shortcuts.ts
@@ -37,7 +37,7 @@ class Shortcuts {
       case 'n': events.emit('next')
         break
       case 'a': action('set:scrolling', () => {
-        appState.setAutoScrolling(!appState.autoScrollingEnabled)
+        appState.toggleAutoScrollingUnderUserPreferences()
         events.emit('save:state')
       })()
 

diff --git a/packages/reporter/src/main.tsx b/packages/reporter/src/main.tsx
@@ -114,7 +114,8 @@ class Reporter extends Component<SingleReporterProps> {
     }
 
     action('set:scrolling', () => {
-      appState.setAutoScrolling(autoScrollingEnabled)
+      // set the initial enablement of auto scroll configured inside the user preferences when the app is loaded
+      appState.setAutoScrollingEnabledUnderUserPreferences(autoScrollingEnabled)
     })()
 
     action('set:specs:list', () => {

diff --git a/packages/reporter/src/preferences/testing-preferences.tsx b/packages/reporter/src/preferences/testing-preferences.tsx
@@ -15,8 +15,8 @@ const TestingPreferences = observer(({
   events = defaultEvents,
   appState,
 }: Props) => {
-  const toggleAutoScrolling = () => {
-    appState.toggleAutoScrolling()
+  const toggleAutoScrollingUnderUserPreferences = () => {
+    appState.toggleAutoScrollingUnderUserPreferences()
     events.emit('save:state')
   }
 
@@ -31,8 +31,8 @@ const TestingPreferences = observer(({
           Auto-scrolling
           <Switch
             data-cy="auto-scroll-switch"
-            value={appState.autoScrollingEnabled}
-            onUpdate={action('toggle:auto:scrolling', toggleAutoScrolling)}
+            value={appState.autoScrollingEnabledUnderUserPreferences}
+            onUpdate={action('toggle:auto:scrolling', toggleAutoScrollingUnderUserPreferences)}
           />
         </div>
         <div>