Use Xcode version Xcode 14.3 in CI unit tests so that we can use asyn… (

#2733) * Use Xcode version Xcode 14.3 in CI unit tests so that we can use async/await in tests without deadlocking (see https://developer.apple.com/documentation/xcode-release-notes/xcode-14_3-release-notes) * Try updating default test device from 16.1 to 16.4 * Only update test device for framework-tests * Update 16.1 -> 16.4 in scripts * Update snapshot tests * Update more snapshot tests
stripe · Jul 18, 2023 · 04bfde4 · 04bfde4
1 parent bd12599
commit 04bfde4
Show file tree

Hide file tree

Showing 110 changed files with 18 additions and 12 deletions.
diff --git a/Stripe/StripeiOSTests/STPAUBECSDebitFormViewSnapshotTests.swift b/Stripe/StripeiOSTests/STPAUBECSDebitFormViewSnapshotTests.swift
@@ -17,7 +17,7 @@ import iOSSnapshotTestCase
 class STPAUBECSDebitFormViewSnapshotTests: FBSnapshotTestCase {
     override func setUp() {
         super.setUp()
-        //        self.recordMode = true
+//                self.recordMode = true
     }
 
     func testDefaultAppearance() {

diff --git a/Stripe/StripeiOSTests/STPAddCardViewControllerLocalizationTests.swift b/Stripe/StripeiOSTests/STPAddCardViewControllerLocalizationTests.swift
@@ -18,7 +18,7 @@ class STPAddCardViewControllerLocalizationTests: FBSnapshotTestCase {
     override func setUp() {
         super.setUp()
 
-        //                self.recordMode = true
+//                        self.recordMode = true
     }
 
     func performSnapshotTest(forLanguage language: String?, delivery: Bool) {
@@ -42,9 +42,9 @@ class STPAddCardViewControllerLocalizationTests: FBSnapshotTestCase {
             addCardVC.addressViewModel.addressFieldTableViewCountryCode = "INVALID"
             STPSnapshotVerifyView(viewToTest, identifier: "delivery")
         } else {
-            /// This method rejects nil or empty country codes to stop strange looking behavior
-            /// when scrolling to the top "unset" position in the picker, so put in
-            /// an invalid country code instead to test seeing the "Country" placeholder
+            // This method rejects nil or empty country codes to stop strange looking behavior
+            // when scrolling to the top "unset" position in the picker, so put in
+            // an invalid country code instead to test seeing the "Country" placeholder
             addCardVC.addressViewModel.addressFieldTableViewCountryCode = "INVALID"
             STPSnapshotVerifyView(viewToTest, identifier: "no_country")
 

diff --git a/Stripe/StripeiOSTests/STPFloatingPlaceholderTextFieldSnapshotTests.swift b/Stripe/StripeiOSTests/STPFloatingPlaceholderTextFieldSnapshotTests.swift
@@ -18,7 +18,7 @@ class STPFloatingPlaceholderTextFieldSnapshotTests: FBSnapshotTestCase {
 
     override func setUp() {
         super.setUp()
-        //        recordMode = true
+//                recordMode = true
     }
 
     // MARK: Not Floating

diff --git a/...peIdentity/StripeIdentityTests/Snapshot/IndividualWelcomeViewControllerSnapshotTest.swift b/...peIdentity/StripeIdentityTests/Snapshot/IndividualWelcomeViewControllerSnapshotTest.swift
@@ -15,7 +15,7 @@ final class IndividualWelcomeViewControllerSnapshotTest: FBSnapshotTestCase {
 
     override func setUp() {
         super.setUp()
-        //        recordMode = true
+//                recordMode = true
     }
 
     func testViewIsConfiguredFromAPI() throws {

diff --git a/StripeIdentity/StripeIdentityTests/Snapshot/NSAttributedString_HTMLSnapshotTest.swift b/StripeIdentity/StripeIdentityTests/Snapshot/NSAttributedString_HTMLSnapshotTest.swift
@@ -54,7 +54,7 @@ final class NSAttributedString_HTMLSnapshotTest: FBSnapshotTestCase {
         // Test that link color matches tint color
         textView.tintColor = .systemPink
 
-        //        recordMode = true
+//                recordMode = true
     }
 
     func testDefaultStyle() throws {

diff --git a/StripeIdentity/StripeIdentityTests/Snapshot/SuccessViewControllerSnapshotTest.swift b/StripeIdentity/StripeIdentityTests/Snapshot/SuccessViewControllerSnapshotTest.swift
@@ -17,7 +17,7 @@ final class SuccessViewControllerSnapshotTest: FBSnapshotTestCase {
     override func setUp() {
         super.setUp()
 
-        //        recordMode = true
+//                recordMode = true
     }
 
     func testViewIsConfiguredFromAPI() {

diff --git a/...entViewControllerSnapshotTest/[email protected] b/...entViewControllerSnapshotTest/[email protected]
diff --git a/...erSnapshotTest/[email protected] b/...erSnapshotTest/[email protected]
diff --git a/...omeViewControllerSnapshotTest/[email protected] b/...omeViewControllerSnapshotTest/[email protected]
diff --git a/...Tests.NSAttributedString_HTMLSnapshotTest/[email protected] b/...Tests.NSAttributedString_HTMLSnapshotTest/[email protected]
diff --git a/...ests.NSAttributedString_HTMLSnapshotTest/[email protected] b/...ests.NSAttributedString_HTMLSnapshotTest/[email protected]
diff --git a/...ntityTests.SuccessViewControllerSnapshotTest/[email protected] b/...ntityTests.SuccessViewControllerSnapshotTest/[email protected]
diff --git a/...uccessViewControllerSnapshotTest/[email protected] b/...uccessViewControllerSnapshotTest/[email protected]
diff --git a/...shotTests/testDefaultAppearance_STPAUBECSDebitFormView_defaultAppearance@3x.png b/...shotTests/testDefaultAppearance_STPAUBECSDebitFormView_defaultAppearance@3x.png
diff --git a/...SBAndEmailAppearance_STPAUBECSDebitFormView_invalidBSBAndEmailAppearance@3x.png b/...SBAndEmailAppearance_STPAUBECSDebitFormView_invalidBSBAndEmailAppearance@3x.png
diff --git a/...mailCustomization_STPAUBECSDebitFormView_invalidBSBAndEmailCustomization@3x.png b/...mailCustomization_STPAUBECSDebitFormView_invalidBSBAndEmailCustomization@3x.png
diff --git a/...Tests/testNoDataCustomization_STPAUBECSDebitFormView_noDataCustomization@3x.png b/...Tests/testNoDataCustomization_STPAUBECSDebitFormView_noDataCustomization@3x.png
diff --git a/...otTests/testWithDataAppearance_STPAUBECSDebitFormView_withDataAppearance@3x.png b/...otTests/testWithDataAppearance_STPAUBECSDebitFormView_withDataAppearance@3x.png
diff --git a/...ests/testWithDataCustomization_STPAUBECSDebitFormView_withDataAppearance@3x.png b/...ests/testWithDataCustomization_STPAUBECSDebitFormView_withDataAppearance@3x.png
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...iOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...iOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...S_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...S_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...4/StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...4/StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...4/StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...4/StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...4/StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...4/StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...4/StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...4/StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...peiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...peiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...iOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...iOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...iOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...iOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...S_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...S_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...eiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...eiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...OS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...OS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/.../StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...eiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...eiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...OS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...OS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...iOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...iOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...S_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...S_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...tripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...tripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...tripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...tripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...tripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...tripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...tripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...tripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...OS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...OS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/..._Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/..._Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...StripeiOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...iOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...iOS_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...S_Tests.STPAddCardViewControllerLocalizationTests/[email protected] b/...S_Tests.STPAddCardViewControllerLocalizationTests/[email protected]
diff --git a/...PFloatingPlaceholderTextFieldSnapshotTests/[email protected] b/...PFloatingPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...holderTextFieldSnapshotTests/[email protected] b/...holderTextFieldSnapshotTests/[email protected]
diff --git a/...PlaceholderTextFieldSnapshotTests/[email protected] b/...PlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...laceholderTextFieldSnapshotTests/[email protected] b/...laceholderTextFieldSnapshotTests/[email protected]
diff --git a/...TPFloatingPlaceholderTextFieldSnapshotTests/[email protected] b/...TPFloatingPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...eholderTextFieldSnapshotTests/[email protected] b/...eholderTextFieldSnapshotTests/[email protected]
diff --git a/...gPlaceholderTextFieldSnapshotTests/[email protected] b/...gPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...PlaceholderTextFieldSnapshotTests/[email protected] b/...PlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...s.STPFloatingPlaceholderTextFieldSnapshotTests/[email protected] b/...s.STPFloatingPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...laceholderTextFieldSnapshotTests/[email protected] b/...laceholderTextFieldSnapshotTests/[email protected]
diff --git a/...tingPlaceholderTextFieldSnapshotTests/[email protected] b/...tingPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...ingPlaceholderTextFieldSnapshotTests/[email protected] b/...ingPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...ingPlaceholderTextFieldSnapshotTests/[email protected] b/...ingPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...TextFieldSnapshotTests/[email protected] b/...TextFieldSnapshotTests/[email protected]
diff --git a/...olderTextFieldSnapshotTests/[email protected] b/...olderTextFieldSnapshotTests/[email protected]
diff --git a/...lderTextFieldSnapshotTests/[email protected] b/...lderTextFieldSnapshotTests/[email protected]
diff --git a/...TPFloatingPlaceholderTextFieldSnapshotTests/[email protected] b/...TPFloatingPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...eholderTextFieldSnapshotTests/[email protected] b/...eholderTextFieldSnapshotTests/[email protected]
diff --git a/...gPlaceholderTextFieldSnapshotTests/[email protected] b/...gPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...PlaceholderTextFieldSnapshotTests/[email protected] b/...PlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...oatingPlaceholderTextFieldSnapshotTests/[email protected] b/...oatingPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...derTextFieldSnapshotTests/[email protected] b/...derTextFieldSnapshotTests/[email protected]
diff --git a/...ceholderTextFieldSnapshotTests/[email protected] b/...ceholderTextFieldSnapshotTests/[email protected]
diff --git a/...eholderTextFieldSnapshotTests/[email protected] b/...eholderTextFieldSnapshotTests/[email protected]
diff --git a/...loatingPlaceholderTextFieldSnapshotTests/[email protected] b/...loatingPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...lderTextFieldSnapshotTests/[email protected] b/...lderTextFieldSnapshotTests/[email protected]
diff --git a/...aceholderTextFieldSnapshotTests/[email protected] b/...aceholderTextFieldSnapshotTests/[email protected]
diff --git a/...ceholderTextFieldSnapshotTests/[email protected] b/...ceholderTextFieldSnapshotTests/[email protected]
diff --git a/...TPFloatingPlaceholderTextFieldSnapshotTests/[email protected] b/...TPFloatingPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...eholderTextFieldSnapshotTests/[email protected] b/...eholderTextFieldSnapshotTests/[email protected]
diff --git a/...gPlaceholderTextFieldSnapshotTests/[email protected] b/...gPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...PlaceholderTextFieldSnapshotTests/[email protected] b/...PlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...PlaceholderTextFieldSnapshotTests/[email protected] b/...PlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...tFieldSnapshotTests/[email protected] b/...tFieldSnapshotTests/[email protected]
diff --git a/...erTextFieldSnapshotTests/[email protected] b/...erTextFieldSnapshotTests/[email protected]
diff --git a/...rTextFieldSnapshotTests/[email protected] b/...rTextFieldSnapshotTests/[email protected]
diff --git a/...loatingPlaceholderTextFieldSnapshotTests/[email protected] b/...loatingPlaceholderTextFieldSnapshotTests/[email protected]
diff --git a/...lderTextFieldSnapshotTests/[email protected] b/...lderTextFieldSnapshotTests/[email protected]
diff --git a/...aceholderTextFieldSnapshotTests/[email protected] b/...aceholderTextFieldSnapshotTests/[email protected]
diff --git a/...ceholderTextFieldSnapshotTests/[email protected] b/...ceholderTextFieldSnapshotTests/[email protected]
diff --git a/bitrise.yml b/bitrise.yml
@@ -331,6 +331,12 @@ workflows:
     before_run:
     - prep_all
     after_run: []
+    meta:
+      bitrise.io:
+        stack: osx-xcode-14.3.x-ventura
+        machine_type_id: g2-m1.8core
+    envs:
+    - DEFAULT_TEST_DEVICE: platform=iOS Simulator,name=iPhone 12 mini,OS=16.4
   test-builds-xcode-143:
     steps:
     - xcode-build-for-test@2:

diff --git a/ci_scripts/screenshot_localization_tester.sh b/ci_scripts/screenshot_localization_tester.sh
@@ -16,7 +16,7 @@ source ci_scripts/localization_vars.sh
 LANGUAGE="ms-MY"
 
   # Generate PaymentSheet screenshots
-  xcodebuild -quiet test -workspace "${script_dir}/../Stripe.xcworkspace" -scheme "PaymentSheetLocalizationScreenshotGenerator" -configuration "Debug" -derivedDataPath build-ci-tests -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 12 mini,OS=16.1" -resultBundlePath "${script_dir}/../build/loc_qa/${LANGUAGE}_payment_sheet" -testLanguage $LANGUAGE -testRegion $LANGUAGE
+  xcodebuild -quiet test -workspace "${script_dir}/../Stripe.xcworkspace" -scheme "PaymentSheetLocalizationScreenshotGenerator" -configuration "Debug" -derivedDataPath build-ci-tests -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 12 mini,OS=16.4" -resultBundlePath "${script_dir}/../build/loc_qa/${LANGUAGE}_payment_sheet" -testLanguage $LANGUAGE -testRegion $LANGUAGE
   retVal=$?
   if [ $retVal -ne 0 ]; then
     exit 1

diff --git a/stripe3ds2-support/ci_scripts/run_tests.sh b/stripe3ds2-support/ci_scripts/run_tests.sh
@@ -10,14 +10,14 @@ function die {
 }
 
 # Execute tests
-info "Executing tests (iPhone 12 mini @ iOS 16.1)..."
+info "Executing tests (iPhone 12 mini @ iOS 16.4)..."
 
 xcodebuild clean test \
   -quiet \
   -project "Stripe3DS2/Stripe3DS2.xcodeproj" \
   -scheme "Stripe3DS2" \
   -sdk "iphonesimulator" \
-  -destination "platform=iOS Simulator,name=iPhone 12 mini,OS=16.1"
+  -destination "platform=iOS Simulator,name=iPhone 12 mini,OS=16.4"
 
 exit_code="${PIPESTATUS[0]}"