Fix tests in main #4174

aboedo · 2024-08-12T19:54:47Z

Fixes the tests that were failing in main, which you can see in #4172

aboedo · 2024-08-12T19:56:11Z

aboedo · 2024-08-12T20:03:56Z

having any references to ContentUnavailableView simply won't compile in Xcode 14, since that entity was created using a newer iOS SDK. I'll have to update the code to account for that

aboedo · 2024-08-12T20:11:28Z

@RCGitBot please test

aboedo · 2024-08-12T20:25:21Z

@RevenueCat/coresdk I think for the iOS 14 and 15 tests that are currently failing, we need to update snapshots?

aboedo · 2024-08-12T20:26:03Z

.circleci/config.yml

@@ -512,7 +512,7 @@ jobs:
 spm-revenuecat-ui-ios-16:
 executor:
 name: macos-executor
- xcode_version: '14.3.0'
+ xcode_version: '15.4.0'



this one didn't need Xcode 14, and we do intend to move to 15, so I figured it was worth moving it over

aboedo · 2024-08-12T20:26:07Z

.circleci/config.yml

@@ -653,7 +653,7 @@ jobs:
 run-test-ios-16:
 executor:
 name: macos-executor
- xcode_version: '14.3.0'
+ xcode_version: '15.4.0'


aboedo · 2024-08-12T20:26:40Z

RevenueCat.xcodeproj/project.pbxproj

+ 2D2AFE8D2C6A834D00D1B0B4 /* TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 887A5FDA2C1D037000E1A461 /* TestData.swift */; };
+ 2D2AFE8F2C6A9D8700D1B0B4 /* CompatibilityContentUnavailableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D2AFE8E2C6A9D8700D1B0B4 /* CompatibilityContentUnavailableView.swift */; };
+ 2D2AFE912C6A9EF500D1B0B4 /* Binding+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D2AFE902C6A9EF500D1B0B4 /* Binding+Extensions.swift */; };


some of these files were added into the SPM package but not the Xcode project, so they wouldn't show up in the navigator and they'd fail to compile

Nice find. I wish Xcode had the ability to add all sources in a particular path like SPM allows...

aboedo · 2024-08-12T20:27:04Z

RevenueCatUI/CustomerCenter/Views/CompatibilityContentUnavailableView.swift

-@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
+@available(iOS 15.0, *)
 @available(macOS, unavailable)
 @available(tvOS, unavailable)
 @available(watchOS, unavailable)


this availability was redundant and we were marking it first available and then unavailable for the same platforms

aboedo · 2024-08-12T20:28:01Z

RevenueCatUI/CustomerCenter/Views/CompatibilityContentUnavailableView.swift

- description: Text(description)
- )
+ if #available(iOS 17.0, *) {
+ #if swift(>=5.9)


this is an old trick that's useful for these Xcode transitions - you point to the min swift version that's packed with the newest xcode, and it effectively works as "if xcode is greater than 15"

aboedo · 2024-08-12T20:28:26Z

fastlane/README.md

-### ios build_swift_api_tester
+### ios run_api_tests

 ```sh
-[bundle exec] fastlane ios build_swift_api_tester
+[bundle exec] fastlane ios run_api_tests
 ```

-build Swift API tester
-
-### ios build_objc_api_tester
-
-```sh
-[bundle exec] fastlane ios build_objc_api_tester
-```
-
-build ObjC API tester
-
-### ios build_custom_entitlement_computation_api_tester
-
-```sh
-[bundle exec] fastlane ios build_custom_entitlement_computation_api_tester
-```
-
-build CustomEntitlementComputation API tester
-
-### ios build_revenuecatui_api_tester
-
-```sh
-[bundle exec] fastlane ios build_revenuecatui_api_tester
-```
-
-build RevenueCatUI API tester
+run API Tests



just automatic and left over from fastlane lane updates from other PRs

jamesrb1

LGTM!

jamesrb1 · 2024-08-12T20:48:00Z

RevenueCat.xcodeproj/project.pbxproj

+ 2D2AFE8D2C6A834D00D1B0B4 /* TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 887A5FDA2C1D037000E1A461 /* TestData.swift */; };
+ 2D2AFE8F2C6A9D8700D1B0B4 /* CompatibilityContentUnavailableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D2AFE8E2C6A9D8700D1B0B4 /* CompatibilityContentUnavailableView.swift */; };
+ 2D2AFE912C6A9EF500D1B0B4 /* Binding+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D2AFE902C6A9EF500D1B0B4 /* Binding+Extensions.swift */; };


Nice find. I wish Xcode had the ability to add all sources in a particular path like SPM allows...

jamesrb1 · 2024-08-12T20:50:21Z

RevenueCatUI/CustomerCenter/Views/CompatibilityContentUnavailableView.swift

- description: Text(description)
- )
+ if #available(iOS 17.0, *) {
+ #if swift(>=5.9)


vegaro

it all makes sense to me

aboedo · 2024-08-13T18:59:19Z

Note: this fixes most tests but it doesn't fix them all, not sure what's happening with iOS 14 and 16 tests. Maybe need to generate snapshots again?

Merging for the time being since it does leave us in a better place than where we started before the PR

@jamesrb1

**This is an automatic release.** ### New Features * Price rounding logic (#4132) via James Borthwick (@jamesrb1) ### Bugfixes * [Customer Center] Migrate to List style (#4190) via Cody Kerns (@codykerns) * [Paywalls] Improve locale consistency (#4158) via Josh Holtz (@joshdholtz) * Set Paywalls Tester deployment target to iOS 15 (#4196) via James Borthwick (@jamesrb1) * [Customer Center] Hide Contact Support button if URL can't be created (#4192) via Cesar de la Vega (@vegaro) * Fix the setting for SKIP_INSTALL in Xcode project (#4195) via Andy Boedo (@aboedo) * [Customer Center] Improving customer center buttons (#4165) via Cody Kerns (@codykerns) * Revert workaround for iOS 18 beta 5 SwiftUI crash (#4173) via Mark Villacampa (@MarkVillacampa) * [Paywalls] Make iOS version calculation lazy (#4163) via Mark Villacampa (@MarkVillacampa) * [Paywalls] Observe `PurchaseHandler` when owned externally (#4097) via James Borthwick (@jamesrb1) ### Other Changes * [Customer Center] Clean up colors in WrongPlatformView and NoSubscriptionsView (#4204) via Cesar de la Vega (@vegaro) * Fix failing `all-tests` and retry more flaky tests (#4188) via Josh Holtz (@joshdholtz) * Compatibility content unavailable improvements (#4197) via James Borthwick (@jamesrb1) * Create lane to enable customer center (#4191) via Cesar de la Vega (@vegaro) * XCFramework artifacts in CircleCI (#4189) via Andy Boedo (@aboedo) * [Customer Center] CustomerCenterViewModel checks whether the app is the latest version (#4169) via JayShortway (@JayShortway) * export RevenueCatUI xcframework (#4172) via Andy Boedo (@aboedo) * Corrects references from ManageSubscriptionsButtonStyle to ButtonsStyle. (#4186) via JayShortway (@JayShortway) * Speed up carthage installation tests (#4184) via Andy Boedo (@aboedo) * Customer center improvements (#4166) via James Borthwick (@jamesrb1) * replace `color(from colorInformation:)` global with extension (#4183) via Andy Boedo (@aboedo) * Fix tests in main (#4174) via Andy Boedo (@aboedo) * Enable customer center tests (#4171) via James Borthwick (@jamesrb1) * [Customer Center] Initial implementation (#3967) via Cesar de la Vega (@vegaro) --------- Co-authored-by: Josh Holtz <me@joshholtz.com>

aboedo added 4 commits August 12, 2024 16:29

added testData file to the revenuecatUI target

303b352

some small fixes in project files

6c351f2

more project fixes

4354840

reverted customer center flag changes made for testing

d12ad8e

aboedo added the test label Aug 12, 2024

aboedo self-assigned this Aug 12, 2024

aboedo added 2 commits August 12, 2024 17:06

updated xcode version for iOS 16 tests

e287d88

update CompatibilityContentUnavailableView for Xcode 14 compatibility

6af2a3e

aboedo requested a review from a team August 12, 2024 20:25

aboedo commented Aug 12, 2024

View reviewed changes

jamesrb1 approved these changes Aug 12, 2024

View reviewed changes

tonidero approved these changes Aug 13, 2024

View reviewed changes

vegaro reviewed Aug 13, 2024

View reviewed changes

aboedo marked this pull request as ready for review August 13, 2024 18:58

aboedo merged commit d0dbbdc into main Aug 13, 2024
31 of 33 checks passed

aboedo deleted the andy/fix_tests branch August 13, 2024 18:59

vegaro mentioned this pull request Aug 14, 2024

Generating new test snapshots for main - ios-16 #4182

Merged

RCGitBot mentioned this pull request Aug 14, 2024

[AUTOMATIC] Release/5.3.0 #4185

Closed

vegaro mentioned this pull request Aug 14, 2024

[Customer Center] Improving customer center buttons #4165

Merged

RCGitBot mentioned this pull request Aug 21, 2024

[AUTOMATIC] Release/5.3.0 #4205

Merged

vegaro added the pr:other label Sep 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix tests in main #4174

Fix tests in main #4174

aboedo commented Aug 12, 2024

aboedo commented Aug 12, 2024

aboedo commented Aug 12, 2024

aboedo commented Aug 12, 2024

aboedo commented Aug 12, 2024

aboedo Aug 12, 2024

aboedo Aug 12, 2024

aboedo Aug 12, 2024

jamesrb1 Aug 12, 2024

aboedo Aug 12, 2024

aboedo Aug 12, 2024

aboedo Aug 12, 2024

jamesrb1 Aug 12, 2024

aboedo Aug 12, 2024

jamesrb1 left a comment

jamesrb1 Aug 12, 2024

jamesrb1 Aug 12, 2024

vegaro left a comment

aboedo commented Aug 13, 2024

Fix tests in main #4174

Fix tests in main #4174

Conversation

aboedo commented Aug 12, 2024

aboedo commented Aug 12, 2024

aboedo commented Aug 12, 2024

aboedo commented Aug 12, 2024

aboedo commented Aug 12, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jamesrb1 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vegaro left a comment

Choose a reason for hiding this comment

aboedo commented Aug 13, 2024