diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4cb01b5..545fb86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ concurrency: jobs: macos: runs-on: macos-14 - timeout-minutes: 30 + timeout-minutes: 10 steps: - uses: actions/checkout@v4 - name: Select Xcode @@ -27,7 +27,7 @@ jobs: linux: runs-on: ubuntu-latest - timeout-minutes: 30 + timeout-minutes: 5 steps: - uses: actions/checkout@v4 - name: Test diff --git a/Makefile b/Makefile index 5759335..eb61e28 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ build: done; test-swift: - swift test --parallel -c debug - swift test --parallel -c release + swift test -c debug + swift test -c release .PHONY: build-all build test-swift diff --git a/Tests/OneWayTests/EffectTests.swift b/Tests/OneWayTests/EffectTests.swift index cc6d1bc..d892189 100644 --- a/Tests/OneWayTests/EffectTests.swift +++ b/Tests/OneWayTests/EffectTests.swift @@ -61,7 +61,7 @@ final class EffectTests: XCTestCase { }.values var result: [Action] = [] - await clock.advance(by: .seconds(100)) + Task { await clock.advance(by: .seconds(100 + 1)) } for await value in values { result.append(value) } @@ -138,7 +138,7 @@ final class EffectTests: XCTestCase { ]).values var result: [Action] = [] - await clock.advance(by: .seconds(100 + 200 + 300)) + Task { await clock.advance(by: .seconds(100 + 200 + 300 + 1)) } for await value in values { result.append(value) } @@ -187,7 +187,7 @@ final class EffectTests: XCTestCase { ]).values var result: [Action] = [] - await clock.advance(by: .seconds(500 + 400 + 100)) + Task { await clock.advance(by: .seconds(500 + 400 + 100 + 1)) } for await value in values { result.append(value) } @@ -237,7 +237,7 @@ final class EffectTests: XCTestCase { ]).values var result: [Action] = [] - await clock.advance(by: .seconds(500)) + Task { await clock.advance(by: .seconds(500 + 1)) } for await value in values { result.append(value) } @@ -285,7 +285,7 @@ final class EffectTests: XCTestCase { ]).values var result: [Action] = [] - await clock.advance(by: .seconds(700)) + Task { await clock.advance(by: .seconds(700 + 1)) } for await value in values { result.append(value) } @@ -351,7 +351,7 @@ final class EffectTests: XCTestCase { }.values var result: [Action] = [] - await clock.advance(by: .seconds(300)) + Task { await clock.advance(by: .seconds(300 + 1)) } for await value in values { result.append(value) } diff --git a/Tests/OneWayTests/StoreTests.swift b/Tests/OneWayTests/StoreTests.swift index a1a3189..b5d5adb 100644 --- a/Tests/OneWayTests/StoreTests.swift +++ b/Tests/OneWayTests/StoreTests.swift @@ -141,11 +141,14 @@ final class StoreTests: XCTestCase { func test_cancel() async { do { + let before = await sut.state.text + XCTAssertEqual(before, "") + await sut.send(.longTimeTask) - await clock.advance(by: .seconds(200)) + await clock.advance(by: .seconds(200 + 1)) - let text = await sut.state.text - XCTAssertEqual(text, "Success") + let after = await sut.state.text + XCTAssertEqual(after, "Success") } await sut.send(.response(""))