[MOB-10402] Fix Tests

.github/workflows/build-and-test.yml

@@ -4,7 +4,7 @@ on: pull_request
 
 jobs:
   run-tests-job:
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -18,10 +18,13 @@ jobs:
           gem install erb
           gem install xcpretty
 
+      - name: Print available simulators
+        run: xcrun simctl list devices | cat
+
       - name: Build and test
         run: |
-          xcodebuild test -project swift-sdk.xcodeproj -scheme swift-sdk -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro' -enableCodeCoverage YES CODE_SIGNING_REQUIRED=NO | xcpretty && exit ${PIPESTATUS[0]}
-
+          xcodebuild test -project swift-sdk.xcodeproj -scheme swift-sdk -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro,OS=18.2' -enableCodeCoverage YES -resultBundlePath TestResults.xcresult CODE_SIGNING_REQUIRED=NO | xcpretty && exit ${PIPESTATUS[0]}
+ 
       - name: CocoaPods lint
         run: pod lib lint --allow-warnings
 

.github/workflows/e2e.yml

@@ -4,7 +4,7 @@ on: pull_request
 
 jobs:
   run-e2e-job:
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -23,3 +23,5 @@ jobs:
           in_app_template_id: ${{secrets.E2E_IN_APP_TEMPLATE_ID}}
         run: |
           ./tests/endpoint-tests/scripts/run_test.sh
+
+

swift-sdk.xcodeproj/project.pbxproj

@@ -710,6 +710,8 @@
 		8AAA8C832D074C2000DF8220 /* RequestProcessorUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestProcessorUtil.swift; sourceTree = "<group>"; };
 		8AAA8C842D074C2000DF8220 /* RequestSender.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestSender.swift; sourceTree = "<group>"; };
 		8AB8D7D12D3805A900DECFE5 /* IterableAPIMobileFrameworkDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IterableAPIMobileFrameworkDetector.swift; sourceTree = "<group>"; };
+		8AC534392D760B6C00F84F44 /* swift-sdk.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "swift-sdk.xctestplan"; sourceTree = "<group>"; };
+		8AC5343A2D760BD400F84F44 /* endpoint-tests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "endpoint-tests.xctestplan"; sourceTree = "<group>"; };
 		9FF05EAB2AFEA5FA005311F7 /* MockAuthManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAuthManager.swift; sourceTree = "<group>"; };
 		AC02CAA5234E50B5006617E0 /* RegistrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistrationTests.swift; sourceTree = "<group>"; };
 		AC05644A26387B54001FB810 /* MockPersistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockPersistence.swift; sourceTree = "<group>"; };
@@ -1538,6 +1540,8 @@
 		ACFCA72920EB02DB00BFB277 /* tests */ = {
 			isa = PBXGroup;
 			children = (
+				8AC534392D760B6C00F84F44 /* swift-sdk.xctestplan */,
+				8AC5343A2D760BD400F84F44 /* endpoint-tests.xctestplan */,
 				AC995F932166EC310099A184 /* common */,
 				AC28480824AA44C600C1FC7F /* endpoint-tests */,
 				ACFBEA15262DC68C000935DD /* hosting-apps */,

swift-sdk.xcodeproj/xcshareddata/xcschemes/endpoint-tests.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1420"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -11,6 +11,12 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:tests/endpoint-tests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -51,15 +57,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "ACF560D220E443BF000AAC23"
-            BuildableName = "host-app.app"
-            BlueprintName = "host-app"
-            ReferencedContainer = "container:swift-sdk.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1420"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -110,6 +110,12 @@
             ReferencedContainer = "container:swift-sdk.xcodeproj">
          </BuildableReference>
       </CodeCoverageTargets>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:tests/swift-sdk.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -120,56 +126,6 @@
                BlueprintName = "unit-tests"
                ReferencedContainer = "container:swift-sdk.xcodeproj">
             </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "AuthTests/testAsyncAuthTokenRetrieval()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testAuthTokenChangeWithSameEmail()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testAuthTokenChangeWithSameUserId()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testAuthTokenDeletedOnLogout()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testAuthTokenRetrievalFailureReset()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testEmailWithTokenPersistence()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testLogoutUser()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testNewEmailAndThenChangeToken()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testNewUserIdAndThenChangeToken()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testOnNewAuthTokenCallbackCalled()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testPushRegistrationAfterAuthTokenRetrieval()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testRefreshTimerQueueRejection()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testRetryJwtFailure()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testUpdateEmailAndThenChangeToken()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testUpdateEmailWithTokenParam()">
-               </Test>
-               <Test
-                  Identifier = "AuthTests/testUserIdWithTokenPersistence()">
-               </Test>
-            </SkippedTests>
          </TestableReference>
          <TestableReference
             skipped = "NO">
@@ -210,20 +166,6 @@
                BlueprintName = "offline-events-tests"
                ReferencedContainer = "container:swift-sdk.xcodeproj">
             </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "NetworkConnectivityManagerTests/testConnectivityChange()">
-               </Test>
-               <Test
-                  Identifier = "NetworkConnectivityManagerTests/testPollingNetworkMonitor()">
-               </Test>
-               <Test
-                  Identifier = "RequestHandlerTests/testFeatureFlagTurnOnOfflineMode()">
-               </Test>
-               <Test
-                  Identifier = "TaskRunnerTests/testResumeWhenNetworkIsBackOnline()">
-               </Test>
-            </SkippedTests>
          </TestableReference>
       </Testables>
    </TestAction>

swift-sdk/Internal/AuthManager.swift

@@ -150,19 +150,19 @@ class AuthManager: IterableAuthManagerProtocol {
 
         pendingAuth = false
 
+        // Set the new token first
+        authToken = retrievedAuthToken
+        storeAuthToken()
+
         if retrievedAuthToken != nil {
             let isRefreshQueued = queueAuthTokenExpirationRefresh(retrievedAuthToken, onSuccess: onSuccess)
             if !isRefreshQueued {
-                onSuccess?(authToken)
+                onSuccess?(retrievedAuthToken)  // Use retrievedAuthToken instead of authToken
             }
         } else {
             handleAuthFailure(failedAuthToken: nil, reason: .authTokenNull)
             scheduleAuthTokenRefreshTimer(interval: getNextRetryInterval(), successCallback: onSuccess)
         }
-
-        authToken = retrievedAuthToken
-
-        storeAuthToken()
     }
 
     func handleAuthFailure(failedAuthToken: String?, reason: AuthFailureReason) {
@@ -180,13 +180,13 @@ class AuthManager: IterableAuthManagerProtocol {
             /// schedule a default timer of 10 seconds if we fall into this case
             scheduleAuthTokenRefreshTimer(interval: getNextRetryInterval(), successCallback: onSuccess)
 
-            return true
+            return false  // Return false since we couldn't queue a valid refresh
         }
 
         let timeIntervalToRefresh = TimeInterval(expirationDate) - dateProvider.currentDate.timeIntervalSince1970 - expirationRefreshPeriod
         if timeIntervalToRefresh > 0 {
             scheduleAuthTokenRefreshTimer(interval: timeIntervalToRefresh, isScheduledRefresh: true, successCallback: onSuccess)
-            return true
+            return true  // Only return true when we successfully queue a refresh
         }
         return false
     }

swift-sdk/Resources/IterableDataModel.xcdatamodeld/IterableDataModel.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19G2021" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="23G80" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="IterableTaskManagedObject" representedClassName="IterableTaskManagedObject" syncable="YES">
         <attribute name="attempts" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="blocking" attributeType="Boolean" usesScalarValueType="YES"/>
@@ -23,7 +23,4 @@
             <fetchIndexElement property="scheduledAt" type="Binary" order="ascending"/>
         </fetchIndex>
     </entity>
-    <elements>
-        <element name="IterableTaskManagedObject" positionX="-63" positionY="-18" width="128" height="268"/>
-    </elements>
 </model>

tests/endpoint-tests.xctestplan

@@ -0,0 +1,29 @@
+{
+  "configurations" : [
+    {
+      "id" : "D4401795-4D16-4709-9480-E9D329384AB3",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : false,
+    "targetForVariableExpansion" : {
+      "containerPath" : "container:swift-sdk.xcodeproj",
+      "identifier" : "ACF560D220E443BF000AAC23",
+      "name" : "host-app"
+    }
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:swift-sdk.xcodeproj",
+        "identifier" : "AC28480624AA44C600C1FC7F",
+        "name" : "endpoint-tests"
+      }
+    }
+  ],
+  "version" : 1
+}

tests/endpoint-tests/scripts/run_test.sh

@@ -24,4 +24,5 @@ xcodebuild -project swift-sdk.xcodeproj \
            -scheme endpoint-tests \
            -sdk iphonesimulator \
            -destination 'platform=iOS Simulator,OS=18.1,name=iPhone 16 Pro' \
+           -resultBundlePath TestResults.xcresult \
            test | xcpretty