spotify · dflems · Aug 21, 2025 · Aug 21, 2025
diff --git a/MobiusCore/Test/AnonymousDisposableTests.swift b/MobiusCore/Test/AnonymousDisposableTests.swift
@@ -7,7 +7,7 @@ import Quick
 
 class AnonymousDisposableTests: QuickSpec {
     // swiftlint:disable:next function_body_length
-    override func spec() {
+    override class func spec() {
         describe("AnonymousDisposable") {
             var disposable: AnonymousDisposable!
             var invocationCount: Int!

diff --git a/MobiusCore/Test/AnyConnectionTests.swift b/MobiusCore/Test/AnyConnectionTests.swift
@@ -6,7 +6,7 @@ import Nimble
 import Quick
 
 class ConnectionTests: QuickSpec {
-    override func spec() {
+    override class func spec() {
         describe("Connection") {
             context("when initializing with closures") {
                 var connection: Connection<Int>!

diff --git a/MobiusCore/Test/AnyMobiusLoggerTests.swift b/MobiusCore/Test/AnyMobiusLoggerTests.swift
@@ -6,7 +6,7 @@ import Nimble
 import Quick
 
 class AnyMobiusLoggerTests: QuickSpec {
-    override func spec() {
+    override class func spec() {
         describe("AnyMobiusLogger") {
             var delegate: TestMobiusLogger!
             var logger: AnyMobiusLogger<String, String, String>!

diff --git a/MobiusCore/Test/AsyncDispatchQueueConnectableTests.swift b/MobiusCore/Test/AsyncDispatchQueueConnectableTests.swift
@@ -8,16 +8,15 @@ import Nimble
 import Quick
 
 class AsyncDispatchQueueConnectableTests: QuickSpec {
-    private let acceptQueue = DispatchQueue(label: "accept queue")
-
-    override func spec() {
+    override class func spec() {
         describe("AsyncDispatchQueueConnectable") {
             var connectable: AsyncDispatchQueueConnectable<String, String>!
             var underlyingConnectable: RecordingTestConnectable!
+            let acceptQueue = DispatchQueue(label: "accept queue")
 
             beforeEach {
-                underlyingConnectable = RecordingTestConnectable(expectedQueue: self.acceptQueue)
-                connectable = AsyncDispatchQueueConnectable(underlyingConnectable, acceptQueue: self.acceptQueue)
+                underlyingConnectable = RecordingTestConnectable(expectedQueue: acceptQueue)
+                connectable = AsyncDispatchQueueConnectable(underlyingConnectable, acceptQueue: acceptQueue)
             }
 
             context("when connected") {

diff --git a/MobiusCore/Test/CompositeDisposableTests.swift b/MobiusCore/Test/CompositeDisposableTests.swift
@@ -6,7 +6,7 @@ import Nimble
 import Quick
 
 class CompositeDisposableTests: QuickSpec {
-    override func spec() {
+    override class func spec() {
         describe("CompositeDisposable") {
             var one: TestDisposable!
             var two: TestDisposable!

diff --git a/MobiusCore/Test/ConnectablePublisherTests.swift b/MobiusCore/Test/ConnectablePublisherTests.swift
@@ -8,7 +8,7 @@ import Quick
 
 class ConnectablePublisherTests: QuickSpec {
     // swiftlint:disable:next function_body_length
-    override func spec() {
+    override class func spec() {
         describe("ConnectablePublisher") {
             var publisher: ConnectablePublisher<String>!
             var received: [String]!

diff --git a/MobiusCore/Test/EffectHandlers/AnyEffectHandlerTests.swift b/MobiusCore/Test/EffectHandlers/AnyEffectHandlerTests.swift
@@ -10,7 +10,7 @@ private typealias Event = String
 
 class AnyEffectHandlerTests: QuickSpec {
     // swiftlint:disable:next function_body_length
-    override func spec() {
+    override class func spec() {
         describe("AnyEffectHandler") {
             var effectHandler: AnyEffectHandler<Effect, Event>!
             var receivedEvents: [Event]!

diff --git a/MobiusCore/Test/EffectHandlers/CallbackTests.swift b/MobiusCore/Test/EffectHandlers/CallbackTests.swift
@@ -7,7 +7,7 @@ import Quick
 
 class CallbackTests: QuickSpec {
     // swiftlint:disable:next function_body_length
-    override func spec() {
+    override class func spec() {
         describe("Callbacks") {
             context("Ending a Callback") {
                 var onEndCalledTimes: Int!

diff --git a/MobiusCore/Test/EffectHandlers/EffectHandlerTests.swift b/MobiusCore/Test/EffectHandlers/EffectHandlerTests.swift
@@ -17,7 +17,7 @@ private enum Event {
 }
 
 class EffectHandlerTests: QuickSpec {
-    override func spec() {
+    override class func spec() {
         describe("Handling effects with EffectHandler") {
             var effectHandler: AnyEffectHandler<Effect, Event>!
             var executeEffect: ((Effect) -> Void)!

diff --git a/MobiusCore/Test/EffectHandlers/EffectRouterDSLTests.swift b/MobiusCore/Test/EffectHandlers/EffectRouterDSLTests.swift
@@ -17,7 +17,7 @@ private enum Event: Equatable {
 
 class EffectRouterDSLTests: QuickSpec {
     // swiftlint:disable:next function_body_length
-    override func spec() {
+    override class func spec() {
         context("An EffectHandler which always ends as soon as it is called") {
             var wasDisposed: Bool!
             var connection: Connection<Int>!

diff --git a/MobiusCore/Test/EffectHandlers/EffectRouterTests.swift b/MobiusCore/Test/EffectHandlers/EffectRouterTests.swift
@@ -20,7 +20,7 @@ private enum Event {
 
 class EffectRouterTests: QuickSpec {
     // swiftlint:disable:next function_body_length
-    override func spec() {
+    override class func spec() {
         context("Router happy paths") {
             var receivedEvents: [Event]!
             var disposed1: Bool!

diff --git a/MobiusCore/Test/EffectHandlers/EnumRouteTests.swift b/MobiusCore/Test/EffectHandlers/EnumRouteTests.swift
@@ -35,7 +35,7 @@ private func unwrap<Input, Parameters, Output>(
 }
 
 class ParameterExtractionRouteTests: QuickSpec {
-    override func spec() {
+    override class func spec() {
         context("Different types of enums being unwrapped") {
             it("supports routing to an effect with nothing to unwrap") {
                 let route = EffectRouter<Effect, Never>()

diff --git a/MobiusCore/Test/EventRouterDisposalLogicalRaceRegressionTest.swift b/MobiusCore/Test/EventRouterDisposalLogicalRaceRegressionTest.swift
@@ -31,7 +31,7 @@ private enum Effect: Equatable {
 /// We had seen small volumes of this second issue in production. (Spotify internal: IOS-42623)
 class EventRouterDisposalLogicalRaceRegressionTest: QuickSpec {
     // swiftlint:disable:next function_body_length
-    override func spec() {
+    override class func spec() {
         describe("Effect Handler connection") {
             var controller: MobiusController<Model, Event, Effect>!
             var collaborator: EffectCollaborator!

diff --git a/MobiusCore/Test/EventSources/AnyEventSourceTests.swift b/MobiusCore/Test/EventSources/AnyEventSourceTests.swift
@@ -7,7 +7,7 @@ import Nimble
 import Quick
 
 class AnyEventSourceTests: QuickSpec {
-    override func spec() {
+    override class func spec() {
         describe("AnyEventSource") {
             var eventConsumer: TestConsumer!
             var delegateEventSource: TestEventSource<String>!
@@ -18,18 +18,19 @@ class AnyEventSourceTests: QuickSpec {
             }
 
             it("should forward delegate consumer to closure") {
-                let consumerForwarded = self.expectation(description: "consumer forwarded")
+                var forwarded = false
 
                 let source = AnyEventSource<String>({ consumer in
                     let testString = UUID().uuidString
                     consumer(testString)
                     if eventConsumer.received == [testString] {
-                        consumerForwarded.fulfill()
+                        forwarded = true
                     }
                     return TestDisposable()
                 })
 
                 _ = source.subscribe(consumer: eventConsumer.accept)
+                expect(forwarded).toEventually(beTrue())
             }
 
             it("should forward events from delegate event source") {

diff --git a/MobiusCore/Test/EventSources/CompositeEventSourceBuilderTests.swift b/MobiusCore/Test/EventSources/CompositeEventSourceBuilderTests.swift
@@ -7,7 +7,7 @@ import Quick
 
 class CompositeEventSourceBuilderTest: QuickSpec {
     // swiftlint:disable:next function_body_length
-    override func spec() {
+    override class func spec() {
         var eventsReceived: [Int]!
         var compositeEventSource: AnyEventSource<Int>!
         var disposable: Disposable!

diff --git a/MobiusCore/Test/FirstTests.swift b/MobiusCore/Test/FirstTests.swift
@@ -11,7 +11,7 @@ class FirstTests: QuickSpec {
         case refresh
     }
 
-    override func spec() {
+    override class func spec() {
         describe("First") {
             var sut: First<String, Effect>!
 

diff --git a/MobiusCore/Test/InitializationTests.swift b/MobiusCore/Test/InitializationTests.swift
@@ -8,7 +8,7 @@ import Quick
 
 class InitializationTests: QuickSpec {
     // swiftlint:disable:next function_body_length
-    override func spec() {
+    override class func spec() {
         describe("Initialization") {
             var builder: Mobius.Builder<String, String, String>!
             var updateFunction: Update<String, String, String>!

diff --git a/MobiusCore/Test/LoggingInitiateTests.swift b/MobiusCore/Test/LoggingInitiateTests.swift
@@ -6,7 +6,7 @@ import Nimble
 import Quick
 
 class LoggingInitiateTests: QuickSpec {
-    override func spec() {
+    override class func spec() {
         describe("LoggingInitiate") {
             var logger: TestMobiusLogger!
             var loggingInitiate: Initiate<String, String>!

diff --git a/MobiusCore/Test/LoggingUpdateTests.swift b/MobiusCore/Test/LoggingUpdateTests.swift
@@ -6,7 +6,7 @@ import Nimble
 import Quick
 
 class LoggingUpdateTests: QuickSpec {
-    override func spec() {
+    override class func spec() {
         describe("LoggingUpdate") {
             var logger: TestMobiusLogger!
             var loggingUpdate: Update<String, String, String>!

diff --git a/MobiusCore/Test/MobiusControllerTests.swift b/MobiusCore/Test/MobiusControllerTests.swift
@@ -10,11 +10,21 @@ import Quick
 // swiftlint:disable file_length
 // swiftlint:disable:next type_body_length
 class MobiusControllerTests: QuickSpec {
-    let loopQueue = DispatchQueue(label: "loop queue")
-    let viewQueue = DispatchQueue(label: "view queue")
-
     // swiftlint:disable:next function_body_length
-    override func spec() {
+    override class func spec() {
+        let loopQueue = DispatchQueue(label: "loop queue")
+        let viewQueue = DispatchQueue(label: "view queue")
+
+        let makeSureAllEffectsAndEventsHaveBeenProcessed: () -> Void = {
+            loopQueue.sync {
+                // Waiting synchronously for effects to be completed
+            }
+
+            viewQueue.sync {
+                // Waiting synchronously for view observations to be completed
+            }
+        }
+
         describe("MobiusController") {
             var controller: MobiusController<String, String, String>!
             var updateFunction: Update<String, String, String>!
@@ -31,8 +41,7 @@ class MobiusControllerTests: QuickSpec {
             }
 
             beforeEach {
-                view = RecordingTestConnectable(expectedQueue: self.viewQueue)
-                let loopQueue = self.loopQueue
+                view = RecordingTestConnectable(expectedQueue: viewQueue)
 
                 updateFunction = .init { model, event in
                     dispatchPrecondition(condition: .onQueue(loopQueue))
@@ -57,8 +66,8 @@ class MobiusControllerTests: QuickSpec {
                     .makeController(
                         from: "S",
                         initiate: initiate,
-                        loopQueue: self.loopQueue,
-                        viewQueue: self.viewQueue
+                        loopQueue: loopQueue,
+                        viewQueue: viewQueue
                     )
             }
 
@@ -79,7 +88,7 @@ class MobiusControllerTests: QuickSpec {
                         expect(view.recorder.items).toEventually(equal(["S", "S-hey"]))
                     }
                     it("should allow multiple connections") {
-                        let secondaryView = RecordingTestConnectable(expectedQueue: self.viewQueue)
+                        let secondaryView = RecordingTestConnectable(expectedQueue: viewQueue)
 
                         controller.connectView(view)
                         controller.connectView(secondaryView)
@@ -105,13 +114,13 @@ class MobiusControllerTests: QuickSpec {
                             controller.start()
 
                             view.dispatch("restarted")
-                            self.makeSureAllEffectsAndEventsHaveBeenProcessed()
+                            makeSureAllEffectsAndEventsHaveBeenProcessed()
 
                             expect(view.recorder.items).toEventually(equal(["S", "S-restarted"]))
                         }
                         it("should retain updated state") {
                             view.dispatch("hi")
-                            self.makeSureAllEffectsAndEventsHaveBeenProcessed()
+                            makeSureAllEffectsAndEventsHaveBeenProcessed()
 
                             controller.stop()
 
@@ -189,7 +198,7 @@ class MobiusControllerTests: QuickSpec {
                         expect(view.recorder.items).toEventually(equal(["S"]))
                     }
                     it("should allow disconnecting by id") {
-                        let secondaryView = RecordingTestConnectable(expectedQueue: self.viewQueue)
+                        let secondaryView = RecordingTestConnectable(expectedQueue: viewQueue)
 
                         let connectionID = controller.connectView(view)
                         let secondaryConnectionID = controller.connectView(secondaryView)
@@ -198,7 +207,7 @@ class MobiusControllerTests: QuickSpec {
                         controller.disconnectView(id: secondaryConnectionID)
                     }
                     it("should not send events to a disconnected view") {
-                        let disconnectedView = RecordingTestConnectable(expectedQueue: self.viewQueue)
+                        let disconnectedView = RecordingTestConnectable(expectedQueue: viewQueue)
                         controller.connectView(disconnectedView)
                         controller.disconnectView()
 
@@ -230,15 +239,15 @@ class MobiusControllerTests: QuickSpec {
 
                     describe("multiple view connections") {
                         it("should not allow disconnecting without a connection id") {
-                            let secondaryView = RecordingTestConnectable(expectedQueue: self.viewQueue)
+                            let secondaryView = RecordingTestConnectable(expectedQueue: viewQueue)
 
                             controller.connectView(view)
                             controller.connectView(secondaryView)
 
                             expect(controller.disconnectView()).to(raiseError())
                         }
                         it("should not allow disconnecting an invalid connection id") {
-                            let secondaryView = RecordingTestConnectable(expectedQueue: self.viewQueue)
+                            let secondaryView = RecordingTestConnectable(expectedQueue: viewQueue)
 
                             controller.connectView(view)
                             controller.connectView(secondaryView)
@@ -339,7 +348,7 @@ class MobiusControllerTests: QuickSpec {
                         controller.start()
 
                         view.dispatch("the last event")
-                        self.makeSureAllEffectsAndEventsHaveBeenProcessed()
+                        makeSureAllEffectsAndEventsHaveBeenProcessed()
 
                         controller.stop()
 
@@ -393,8 +402,8 @@ class MobiusControllerTests: QuickSpec {
                         .makeController(
                             from: "S",
                             initiate: initiate,
-                            loopQueue: self.loopQueue,
-                            viewQueue: self.viewQueue
+                            loopQueue: loopQueue,
+                            viewQueue: viewQueue
                         )
                     controller.connectView(view)
                     controller.start()
@@ -430,8 +439,8 @@ class MobiusControllerTests: QuickSpec {
                         .makeController(
                             from: "S",
                             initiate: initiate,
-                            loopQueue: self.loopQueue,
-                            viewQueue: self.viewQueue
+                            loopQueue: loopQueue,
+                            viewQueue: viewQueue
                         )
                     controller.connectView(view)
                     controller.start()
@@ -456,13 +465,13 @@ class MobiusControllerTests: QuickSpec {
                     effectObserver = MockConnectable()
                     controller = Mobius
                         .loop(update: Update { model, _ in .next(model) }, effectHandler: effectObserver)
-                        .makeController(from: NSObject(), loopQueue: self.loopQueue, viewQueue: self.viewQueue)
+                        .makeController(from: NSObject(), loopQueue: loopQueue, viewQueue: viewQueue)
                     controller.connectView(modelObserver)
                     controller.start()
                 }
 
                 it("should release any references to the loop") {
-                    self.makeSureAllEffectsAndEventsHaveBeenProcessed()
+                    makeSureAllEffectsAndEventsHaveBeenProcessed()
                     controller.stop()
                     controller.disconnectView()
                     controller = nil
@@ -471,16 +480,6 @@ class MobiusControllerTests: QuickSpec {
             }
         }
     }
-
-    func makeSureAllEffectsAndEventsHaveBeenProcessed() {
-        loopQueue.sync {
-            // Waiting synchronously for effects to be completed
-        }
-
-        viewQueue.sync {
-            // Waiting synchronously for view observations to be completed
-        }
-    }
 }
 
 class MockConnectable: Connectable {

diff --git a/MobiusCore/Test/MobiusHooksTests.swift b/MobiusCore/Test/MobiusHooksTests.swift
@@ -7,7 +7,7 @@ import Nimble
 import Quick
 
 class MobiusHooksTests: QuickSpec {
-    override func spec() {
+    override class func spec() {
         let someString = UUID().uuidString
 
         describe("MobiusHooks") {

diff --git a/MobiusCore/Test/MobiusIntegrationTests.swift b/MobiusCore/Test/MobiusIntegrationTests.swift
@@ -9,7 +9,7 @@ import Quick
 // Should only test public APIs
 class MobiusIntegrationTests: QuickSpec {
     // swiftlint:disable:next function_body_length
-    override func spec() {
+    override class func spec() {
         describe("Mobius integration tests") {
             let update = Update<String, String, String> { _, event in
                 switch event {