linter clean up & set os

aws-amplify · Aug 9, 2024 · ef65a56 · ef65a56
1 parent 66e2068
commit ef65a56
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/flutter_ios.yaml b/.github/workflows/flutter_ios.yaml
@@ -19,7 +19,7 @@ on:
 jobs:
   flutter-ios-build-and-test:
     # TODO(equartey): Change to `macos-latest` after github migrates their runners - https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
     timeout-minutes: 30
     strategy:
       # Allows other matrix items to run if one fails
@@ -60,11 +60,12 @@ jobs:
         if: inputs.has-native-tests
         run: |
           set -o pipefail
-          XCODEBUILD_DESTINATION="platform=iOS Simulator,name=iPhone 15 Pro Max,OS=latest"
-          xcodebuild clean test \
+          XCODEBUILD_DESTINATION="platform=iOS Simulator,name=iPhone 15 Pro Max,OS=17.5"
+          xcodebuild test \
               -workspace Runner.xcworkspace \
               -scheme Runner \
-              -destination "$XCODEBUILD_DESTINATION" | xcpretty
+              -destination "$XCODEBUILD_DESTINATION" \
+              -configuration Debug | xcpretty
 
         working-directory: ${{ inputs.example-directory }}/ios
 

diff --git a/packages/amplify_datastore/example/ios/Runner.xcodeproj/project.pbxproj b/packages/amplify_datastore/example/ios/Runner.xcodeproj/project.pbxproj
diff --git a/packages/amplify_datastore/example/ios/unit_tests/ModelSchemaEquatableExtensions.swift b/packages/amplify_datastore/example/ios/unit_tests/ModelSchemaEquatableExtensions.swift
@@ -8,7 +8,7 @@ extension ModelSchema: Equatable {
     public static func == (lhs: ModelSchema, rhs: ModelSchema) -> Bool {
         return
             lhs.name == rhs.name &&
-            lhs.pluralName == rhs.pluralName &&
+            lhs.syncPluralName == rhs.syncPluralName &&
             lhs.authRules == rhs.authRules &&
             lhs.fields == rhs.fields && lhs.attributes == rhs.attributes
     }

diff --git a/packages/amplify_datastore/example/ios/unit_tests/PublisherExtensionTests.swift b/packages/amplify_datastore/example/ios/unit_tests/PublisherExtensionTests.swift
@@ -7,10 +7,13 @@ import Combine
 @testable import amplify_datastore
 
 class PublisherExtensionTests: XCTestCase {
+    var cancellables = AtomicDictionary<AnyCancellable, Void>()
+
     func testToAmplifyAsyncThrowingSequence_createAsyncSequenceCorrect() async throws {
         let subject = PassthroughSubject<Int, TestError>()
         let (sequence, cancellable) = subject.eraseToAnyPublisher().toAmplifyAsyncThrowingSequence()
-
+        cancellables.set(value: (), forKey: cancellable)
+
         let expectation1 = expectation(description: "element 1 received")
         let expectation2 = expectation(description: "element 2 received")
         let expectation3 = expectation(description: "element 3 received")
@@ -38,7 +41,8 @@ class PublisherExtensionTests: XCTestCase {
     func testToAmplifyAsyncThrowingSequence_withThrowingError_createAsyncSequenceCorrect() async throws {
         let subject = PassthroughSubject<Int, TestError>()
         let (sequence, cancellable) = subject.eraseToAnyPublisher().toAmplifyAsyncThrowingSequence()
-
+        cancellables.set(value: (), forKey: cancellable)
+
         let expectation1 = expectation(description: "element 1 received")
         let expectation2 = expectation(description: "element 2 received")
         let expectation3 = expectation(description: "element 3 received")