Disable animations in test cases that weren’t previously disabling an…

…imations
willowtreeapps · May 7, 2024 · 40c30f6 · 40c30f6
1 parent 74b2a30
commit 40c30f6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Vocable/Common/CarouselGridCollectionViewController.swift b/Vocable/Common/CarouselGridCollectionViewController.swift
@@ -111,6 +111,9 @@ class CarouselGridCollectionView: UICollectionView {
         if let offset = layout.scrollOffsetForPageWithOffsetFromCurrentPage(offset: 1) {
             let shouldAnimate = UIView.areAnimationsEnabled
             scrollRectToVisible(CGRect(origin: offset, size: bounds.size), animated: shouldAnimate)
+            if (!shouldAnimate) {
+                layout.updatePagingProgress()
+            }
         }
     }
 
@@ -122,6 +125,9 @@ class CarouselGridCollectionView: UICollectionView {
         if let offset = layout.scrollOffsetForPageWithOffsetFromCurrentPage(offset: -1) {
             let shouldAnimate = UIView.areAnimationsEnabled
             scrollRectToVisible(CGRect(origin: offset, size: bounds.size), animated: shouldAnimate)
+            if (!shouldAnimate) {
+                layout.updatePagingProgress()
+            }
         }
     }
 

diff --git a/Vocable/Common/CarouselGridLayout.swift b/Vocable/Common/CarouselGridLayout.swift
@@ -406,7 +406,7 @@ final class CarouselGridLayout: UICollectionViewLayout {
         return targetScrollOffsetForItem(at: indexPath)
     }
 
-    private func updatePagingProgress() {
+    func updatePagingProgress() {
         guard pagesPerSection > 0 else {
             progress = .zero
             return

diff --git a/VocableUITests/Tests/PaginationBaseTest.swift b/VocableUITests/Tests/PaginationBaseTest.swift
@@ -24,7 +24,7 @@ class PaginationBaseTest: XCTestCase {
     override func setUp() {
         let app = XCUIApplication()
         app.configure {
-            Arguments(.resetAppDataOnLaunch, .enableListeningMode)
+            Arguments(.resetAppDataOnLaunch, .enableListeningMode, .disableAnimations)
             Environment(.overridePresets) {
                 Presets {
                     eightPhrasesCategory

diff --git a/VocableUITests/Tests/PresetsOverrideTestCase.swift b/VocableUITests/Tests/PresetsOverrideTestCase.swift
@@ -15,7 +15,7 @@ class PresetsOverrideTestCase: XCTestCase {
 
         let app = XCUIApplication()
         app.configure {
-            Arguments(.resetAppDataOnLaunch, .enableListeningMode)
+            Arguments(.resetAppDataOnLaunch, .enableListeningMode, .disableAnimations)
             Environment(.overridePresets) {
                 Presets {
                     Category("Custom Basic Needs") {