From 2345e48b0739c568fffa4f0da239d02c622ebf53 Mon Sep 17 00:00:00 2001
From: Jonas Boberg <jonas.boberg@nomasystems.com>
Date: Tue, 29 Aug 2023 10:38:54 +0900
Subject: [PATCH] fix: Remove fetch test race by awaiting the expectations in
 order

This prevents the fetch and fetch from cache test steps to execute concurrently.
---
 Tests/NMAImageFetchTests/NMAImageFetchTests.swift | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Tests/NMAImageFetchTests/NMAImageFetchTests.swift b/Tests/NMAImageFetchTests/NMAImageFetchTests.swift
index 8f63644..b1e20de 100644
--- a/Tests/NMAImageFetchTests/NMAImageFetchTests.swift
+++ b/Tests/NMAImageFetchTests/NMAImageFetchTests.swift
@@ -25,6 +25,7 @@ final class NMAImageFetchTests: XCTestCase {
                 XCTFail()
             }
         }
+        wait(for: [expectationWithoutCaching], timeout: 5)
         let expectationWithCaching = expectation(description: "Image request finished width caching")
         _ = imageFetch.requestImage(imageFetchRequest) { result in
             expectationWithCaching.fulfill()
@@ -35,7 +36,7 @@ final class NMAImageFetchTests: XCTestCase {
                 XCTFail()
             }
         }
-        waitForExpectations(timeout: 5)
+        wait(for: [expectationWithCaching], timeout: 5)
     }
 
     func testVectorLoading() throws {
@@ -54,6 +55,7 @@ final class NMAImageFetchTests: XCTestCase {
                 XCTFail()
             }
         }
+        wait(for: [expectationWithoutCaching], timeout: 5)
         let expectationWithCaching = expectation(description: "Image request finished with caching")
         _ = imageFetch.requestImage(imageFetchRequest) { result in
             expectationWithCaching.fulfill()
@@ -64,7 +66,7 @@ final class NMAImageFetchTests: XCTestCase {
                 XCTFail()
             }
         }
-        waitForExpectations(timeout: 5)
+        wait(for: [expectationWithCaching], timeout: 5)
     }
 
     func testCancel() {