fix: fixing watchos integration tests

aws-amplify · May 2, 2024 · 8bba829 · 8bba829
1 parent 4a42859
commit 8bba829
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 458 deletions.
diff --git a/.github/workflows/integ_test_push_notifications.yml b/.github/workflows/integ_test_push_notifications.yml
@@ -26,7 +26,7 @@ permissions:
 jobs:
   push-notification-integration-tests:
     name: ${{ matrix.platform }} Tests | PushNotificationHostApp
-    runs-on: macos-13
+    runs-on: macos-latest
     timeout-minutes: 30
     environment: IntegrationTest
     strategy:
@@ -48,7 +48,6 @@ jobs:
         uses: ./.github/composite_actions/get_platform_parameters
         with:
           platform: ${{ matrix.platform }}
-          xcode_version: 'minimum'
 
       - name: Create the test configuration directory
         run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/

diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml
@@ -4,7 +4,7 @@ on:
     inputs:
       os-runner:
         type: string
-        default: 'macos-13'
+        default: 'macos-latest'
       scheme:
         description: 'The scheme to run the tests'
         required: true
@@ -18,7 +18,7 @@ on:
         type: string
       xcode_version:
         description: 'The version of Xcode used to run these tests'
-        default: 'minimum'
+        default: 'latest'
         type: string
       destination:
         default: ''

diff --git a/AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/project.pbxproj
@@ -377,20 +377,11 @@
 		681B35A52A4396F00074F369 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35A42A4396F00074F369 /* Amplify */; };
 		681B35A72A4396F00074F369 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35A62A4396F00074F369 /* AWSAPIPlugin */; };
 		681B35A92A4396F00074F369 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35A82A4396F00074F369 /* AWSCognitoAuthPlugin */; };
-		681B35AB2A4396F90074F369 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35AA2A4396F90074F369 /* Amplify */; };
-		681B35AD2A4396F90074F369 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35AC2A4396F90074F369 /* AWSAPIPlugin */; };
-		681B35AF2A4396F90074F369 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35AE2A4396F90074F369 /* AWSCognitoAuthPlugin */; };
-		681B35B12A4397000074F369 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35B02A4397000074F369 /* Amplify */; };
-		681B35B32A4397000074F369 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35B22A4397000074F369 /* AWSAPIPlugin */; };
-		681B35B52A4397000074F369 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35B42A4397000074F369 /* AWSCognitoAuthPlugin */; };
 		681B35BA2A43970A0074F369 /* RESTWithIAMIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21698BC728899BC8004BD994 /* RESTWithIAMIntegrationTests.swift */; };
 		681B35BB2A43970A0074F369 /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE6F28E7451D0000C36A /* AsyncTesting.swift */; };
 		681B35BC2A43970A0074F369 /* TestConfigHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 395906B828AC4C3A004B96B1 /* TestConfigHelper.swift */; };
 		681B35BD2A43970A0074F369 /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE7128E7451D0000C36A /* XCTestCase+AsyncTesting.swift */; };
 		681B35BE2A43970A0074F369 /* AsyncExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE7028E7451D0000C36A /* AsyncExpectation.swift */; };
-		681B35C92A4397180074F369 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35C82A4397180074F369 /* Amplify */; };
-		681B35CB2A4397180074F369 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35CA2A4397180074F369 /* AWSAPIPlugin */; };
-		681B35CD2A4397180074F369 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35CC2A4397180074F369 /* AWSCognitoAuthPlugin */; };
 		681DFE7228E7451E0000C36A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE6F28E7451D0000C36A /* AsyncTesting.swift */; };
 		681DFE7328E7451E0000C36A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE6F28E7451D0000C36A /* AsyncTesting.swift */; };
 		681DFE7428E7451E0000C36A /* AsyncExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE7028E7451D0000C36A /* AsyncExpectation.swift */; };
@@ -878,29 +869,20 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				681B35AD2A4396F90074F369 /* AWSAPIPlugin in Frameworks */,
-				681B35AB2A4396F90074F369 /* Amplify in Frameworks */,
-				681B35AF2A4396F90074F369 /* AWSCognitoAuthPlugin in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		681B359B2A4396CF0074F369 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				681B35B32A4397000074F369 /* AWSAPIPlugin in Frameworks */,
-				681B35B12A4397000074F369 /* Amplify in Frameworks */,
-				681B35B52A4397000074F369 /* AWSCognitoAuthPlugin in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		681B35BF2A43970A0074F369 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				681B35CB2A4397180074F369 /* AWSAPIPlugin in Frameworks */,
-				681B35C92A4397180074F369 /* Amplify in Frameworks */,
-				681B35CD2A4397180074F369 /* AWSCognitoAuthPlugin in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1745,9 +1727,6 @@
 			);
 			name = AWSAPIPluginFunctionalTestsWatch;
 			packageProductDependencies = (
-				681B35AA2A4396F90074F369 /* Amplify */,
-				681B35AC2A4396F90074F369 /* AWSAPIPlugin */,
-				681B35AE2A4396F90074F369 /* AWSCognitoAuthPlugin */,
 			);
 			productName = AWSAPIPluginFunctionalTests;
 			productReference = 681B35892A43962D0074F369 /* AWSAPIPluginFunctionalTestsWatch.xctest */;
@@ -1769,9 +1748,6 @@
 			);
 			name = AWSAPIPluginGraphQLLambdaAuthTestsWatch;
 			packageProductDependencies = (
-				681B35B02A4397000074F369 /* Amplify */,
-				681B35B22A4397000074F369 /* AWSAPIPlugin */,
-				681B35B42A4397000074F369 /* AWSCognitoAuthPlugin */,
 			);
 			productName = AWSAPIPluginGraphQLLambdaAuthTests;
 			productReference = 681B35A12A4396CF0074F369 /* AWSAPIPluginGraphQLLambdaAuthTestsWatch.xctest */;
@@ -1793,9 +1769,6 @@
 			);
 			name = AWSAPIPluginRESTIAMTestsWatch;
 			packageProductDependencies = (
-				681B35C82A4397180074F369 /* Amplify */,
-				681B35CA2A4397180074F369 /* AWSAPIPlugin */,
-				681B35CC2A4397180074F369 /* AWSCognitoAuthPlugin */,
 			);
 			productName = AWSAPIPluginRESTIAMTests;
 			productReference = 681B35C52A43970A0074F369 /* AWSAPIPluginRESTIAMTestsWatch.xctest */;
@@ -3887,42 +3860,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = AWSCognitoAuthPlugin;
 		};
-		681B35AA2A4396F90074F369 /* Amplify */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Amplify;
-		};
-		681B35AC2A4396F90074F369 /* AWSAPIPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = AWSAPIPlugin;
-		};
-		681B35AE2A4396F90074F369 /* AWSCognitoAuthPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = AWSCognitoAuthPlugin;
-		};
-		681B35B02A4397000074F369 /* Amplify */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Amplify;
-		};
-		681B35B22A4397000074F369 /* AWSAPIPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = AWSAPIPlugin;
-		};
-		681B35B42A4397000074F369 /* AWSCognitoAuthPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = AWSCognitoAuthPlugin;
-		};
-		681B35C82A4397180074F369 /* Amplify */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Amplify;
-		};
-		681B35CA2A4397180074F369 /* AWSAPIPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = AWSAPIPlugin;
-		};
-		681B35CC2A4397180074F369 /* AWSCognitoAuthPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = AWSCognitoAuthPlugin;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 21E73E6328898D7800D7DB7E /* Project object */;

diff --git a/AmplifyPlugins/Analytics/Tests/AnalyticsHostApp/AnalyticsHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/Analytics/Tests/AnalyticsHostApp/AnalyticsHostApp.xcodeproj/project.pbxproj
@@ -29,9 +29,6 @@
 		68DBE9592A3B6EAE002B73E3 /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697229519DEC0074B63A /* XCTestCase+AsyncTesting.swift */; };
 		68DBE95A2A3B6EAE002B73E3 /* AWSPinpointAnalyticsPluginIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6857647828AE95ED000CE2E9 /* AWSPinpointAnalyticsPluginIntegrationTests.swift */; };
 		68DBE95B2A3B6EAE002B73E3 /* TestConfigHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6857648828AE9951000CE2E9 /* TestConfigHelper.swift */; };
-		68DBE9662A3B6F2A002B73E3 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 68DBE9652A3B6F2A002B73E3 /* Amplify */; };
-		68DBE9682A3B6F2A002B73E3 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68DBE9672A3B6F2A002B73E3 /* AWSCognitoAuthPlugin */; };
-		68DBE96A2A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68DBE9692A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin */; };
 		9737697629519E050074B63A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697029519DEC0074B63A /* AsyncTesting.swift */; };
 		9737697729519E050074B63A /* AsyncExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697129519DEC0074B63A /* AsyncExpectation.swift */; };
 		9737697829519E050074B63A /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697229519DEC0074B63A /* XCTestCase+AsyncTesting.swift */; };
@@ -134,9 +131,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				68DBE9662A3B6F2A002B73E3 /* Amplify in Frameworks */,
-				68DBE96A2A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin in Frameworks */,
-				68DBE9682A3B6F2A002B73E3 /* AWSCognitoAuthPlugin in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -332,9 +326,6 @@
 			);
 			name = AWSPinpointAnalyticsPluginIntegrationTestsWatch;
 			packageProductDependencies = (
-				68DBE9652A3B6F2A002B73E3 /* Amplify */,
-				68DBE9672A3B6F2A002B73E3 /* AWSCognitoAuthPlugin */,
-				68DBE9692A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin */,
 			);
 			productName = AWSPinpointAnalyticsPluginIntegrationTests;
 			productReference = 68DBE9622A3B6EAE002B73E3 /* AWSPinpointAnalyticsPluginIntegrationTestsWatch.xctest */;
@@ -1118,18 +1109,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = AWSPinpointAnalyticsPlugin;
 		};
-		68DBE9652A3B6F2A002B73E3 /* Amplify */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Amplify;
-		};
-		68DBE9672A3B6F2A002B73E3 /* AWSCognitoAuthPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = AWSCognitoAuthPlugin;
-		};
-		68DBE9692A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = AWSPinpointAnalyticsPlugin;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 6857645428AE94D9000CE2E9 /* Project object */;

diff --git a/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthHostApp.xcodeproj/project.pbxproj
@@ -100,8 +100,6 @@
 		681B76BB2A3CBBAE004B59D9 /* AuthConfirmResetPasswordTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97829202286E41FA000DE190 /* AuthConfirmResetPasswordTests.swift */; };
 		681B76BC2A3CBBAE004B59D9 /* AuthDeleteUserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4821B2F1286B5F74000EC1D7 /* AuthDeleteUserTests.swift */; };
 		681B76BF2A3CBBAE004B59D9 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 485CB5AE27B61EAA006CCEC7 /* README.md */; };
-		681B76C62A3CBE11004B59D9 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681B76C52A3CBE11004B59D9 /* Amplify */; };
-		681B76C82A3CBE11004B59D9 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B76C72A3CBE11004B59D9 /* AWSCognitoAuthPlugin */; };
 		681DFEAB28E747B80000C36A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEA828E747B80000C36A /* AsyncTesting.swift */; };
 		681DFEAC28E747B80000C36A /* AsyncExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEA928E747B80000C36A /* AsyncExpectation.swift */; };
 		681DFEAD28E747B80000C36A /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEAA28E747B80000C36A /* XCTestCase+AsyncTesting.swift */; };
@@ -257,8 +255,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				681B76C62A3CBE11004B59D9 /* Amplify in Frameworks */,
-				681B76C82A3CBE11004B59D9 /* AWSCognitoAuthPlugin in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -591,8 +587,6 @@
 			);
 			name = AuthIntegrationTestsWatch;
 			packageProductDependencies = (
-				681B76C52A3CBE11004B59D9 /* Amplify */,
-				681B76C72A3CBE11004B59D9 /* AWSCognitoAuthPlugin */,
 			);
 			productName = AuthIntegrationTests;
 			productReference = 681B76C42A3CBBAE004B59D9 /* AuthIntegrationTestsWatch.xctest */;
@@ -1481,14 +1475,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = AWSCognitoAuthPlugin;
 		};
-		681B76C52A3CBE11004B59D9 /* Amplify */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Amplify;
-		};
-		681B76C72A3CBE11004B59D9 /* AWSCognitoAuthPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = AWSCognitoAuthPlugin;
-		};
 		B4B9F45728F47C0A004F346F /* Amplify */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = Amplify;