IOS-11856 Fix snapshot testing

Makefile

@@ -16,7 +16,7 @@ XCRESULT_FILE_PATH := $(TEST_OUTPUT_PATH)/$(SCHEMA).xcresult
 
 # Export config
 SCHEMA := MisticaCatalog
-TEST_SCHEMA := Mistica
+TEST_SCHEMA := MisticaCatalog
 PROJECT_PATH := MisticaCatalog/MisticaCatalog.xcodeproj
 BUILD_PATH := $(ROOT_DIR)/build
 EXPORTED_OPTIONS_PATH := $(ROOT_DIR)/enterprise.plist
@@ -69,8 +69,8 @@ format:
 
 test: clean setup simulator
 	@echo "Testing with simulator $(SIMULATOR_NAME)"
-	$(XCODEBUILD) build-for-testing -scheme $(TEST_SCHEMA) -destination "$(DESTINATION)" | xcbeautify
-	$(XCODEBUILD) test-without-building -scheme $(TEST_SCHEMA) -resultBundlePath $(XCRESULT_FILE_PATH) -destination "$(DESTINATION)" | xcbeautify
+	$(XCODEBUILD) build-for-testing -project "$(PROJECT_PATH)" -scheme $(TEST_SCHEMA) -destination "$(DESTINATION)" | xcbeautify
+	$(XCODEBUILD) test-without-building -project "$(PROJECT_PATH)" -scheme $(TEST_SCHEMA) -resultBundlePath $(XCRESULT_FILE_PATH) -destination "$(DESTINATION)" | xcbeautify
 
 extract_tests_attachments:
 	@xcparse attachments $(XCRESULT_FILE_PATH) $(SCREENSHOT_DIFFS_OUTPUT_PATH) --uti public.plain-text public.image --test

MisticaCatalog/MisticaCatalog.xcodeproj/xcshareddata/xcschemes/MisticaCatalog.xcscheme

@@ -29,33 +29,36 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "MisticaCommonTests"
-               BuildableName = "MisticaCommonTests"
-               BlueprintName = "MisticaCommonTests"
-               ReferencedContainer = "container:..">
+               BlueprintIdentifier = "5F5A41FE2E866A83003F99E0"
+               BuildableName = "MisticaTests.xctest"
+               BlueprintName = "MisticaTests"
+               ReferencedContainer = "container:MisticaCatalog.xcodeproj">
             </BuildableReference>
          </TestableReference>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "MisticaSwiftUITests"
-               BuildableName = "MisticaSwiftUITests"
-               BlueprintName = "MisticaSwiftUITests"
-               ReferencedContainer = "container:..">
+               BlueprintIdentifier = "5F5A5D1D2E867EE7003F99E0"
+               BuildableName = "MisticaCommonTests.xctest"
+               BlueprintName = "MisticaCommonTests"
+               ReferencedContainer = "container:MisticaCatalog.xcodeproj">
             </BuildableReference>
          </TestableReference>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "MisticaTests"
-               BuildableName = "MisticaTests"
-               BlueprintName = "MisticaTests"
-               ReferencedContainer = "container:..">
+               BlueprintIdentifier = "5F5A5D2A2E867EF8003F99E0"
+               BuildableName = "MisticaSwiftUITests.xctest"
+               BlueprintName = "MisticaSwiftUITests"
+               ReferencedContainer = "container:MisticaCatalog.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>

Tests/MisticaTests/UI/MediaCardTests.swift → MisticaCatalog/MisticaTests/UI/MediaCardTests.swift

@@ -125,7 +125,7 @@ final class MediaCardTests: XCTestCase {
         MisticaConfig.brandStyle = .vivoNew
 
         let configurationWithActions = MediaCardConfiguration(
-            richMedia: AnyValues.richMedia,
+            richMedia: AnyValues.richMedia(),
             headline: "headline",
             title: "Item title",
             pretitle: "Pretitle",
@@ -151,7 +151,7 @@ extension MediaCardTests {
         static let button = CardButton(title: "Button", loadingTitle: "Loading", tapHandler: nil)
         static let link = CardLinkButton(title: "Button Link", tapHandler: nil)
         @MainActor
-        static var richMedia: UIImageView {
+        static func richMedia() -> UIImageView {
             let image = UIImageView(image: UIImage(color: .green))
 
             image.heightAnchor.constraint(equalToConstant: 110).isActive = true
@@ -163,7 +163,7 @@ extension MediaCardTests {
     func makeBasicCard(primaryButton: CardButton? = nil,
                        linkButton: CardLinkButton? = nil) -> MediaCard {
         let configuration = MediaCardConfiguration(
-            richMedia: AnyValues.richMedia,
+            richMedia: AnyValues.richMedia(),
             descriptionTitle: "This is a description",
             button: primaryButton,
             link: linkButton
@@ -179,7 +179,7 @@ extension MediaCardTests {
     }
 
     func makeCardWithFullContentAndButtons(
-        richMedia: UIView = AnyValues.richMedia,
+        richMedia: UIView? = nil,
         headline: String? = "headline",
         title: String? = "Item title",
         pretitle: String? = "Pretitle",
@@ -189,7 +189,7 @@ extension MediaCardTests {
         hasFragment: Bool = true
     ) -> MediaCard {
         let configuration = MediaCardConfiguration(
-            richMedia: richMedia,
+            richMedia: richMedia ?? AnyValues.richMedia(),
             headline: headline,
             title: title,
             pretitle: pretitle,

Tests/MisticaTests/UI/SheetTests.swift → MisticaCatalog/MisticaTests/UI/SheetTests.swift

@@ -238,7 +238,7 @@ final class SheetTests: XCTestCase {
 
 private extension SheetTests {
     var iconPath: String {
-        guard let url = Bundle.module.url(forResource: "circleRed", withExtension: "png") else {
+        guard let url = Bundle(for: type(of: self)).url(forResource: "circleRed", withExtension: "png") else {
             fatalError("Asset named circleRed not found")
         }