ashfurrow · dchohfi · Mar 31, 2023 · Mar 31, 2023 · Mar 31, 2023 · Mar 31, 2023
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ build
 .swiftpm
 
 .DS_Store
+.build/
diff --git a/Bootstrap/Bootstrap.xcodeproj/project.pbxproj b/Bootstrap/Bootstrap.xcodeproj/project.pbxproj
@@ -19,6 +19,7 @@
 		5EFDC7711F8699AA001453EC /* DynamicSizeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EFDC76E1F8699AA001453EC /* DynamicSizeTests.swift */; };
 		5EFDC7721F8699AA001453EC /* DynamicTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EFDC76F1F8699AA001453EC /* DynamicTypeTests.swift */; };
 		69BE287EA35A14E2787AC4AF /* Pods_Bootstrap_BootstrapTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CF2E7C50C1B84B73173ED6F7 /* Pods_Bootstrap_BootstrapTests.framework */; };
+		C31D2DD929D73AFE002BD84C /* BootstrapCustomFolderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EFDC7761F8699F9001453EC /* BootstrapCustomFolderTests.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -358,6 +359,7 @@
 			files = (
 				5EFDC7701F8699AA001453EC /* WithoutQuickTests.swift in Sources */,
 				5EFDC7711F8699AA001453EC /* DynamicSizeTests.swift in Sources */,
+				C31D2DD929D73AFE002BD84C /* BootstrapCustomFolderTests.swift in Sources */,
 				5EFDC7611F8698B4001453EC /* BootstrapTests.swift in Sources */,
 				5EFDC7721F8699AA001453EC /* DynamicTypeTests.swift in Sources */,
 			);

diff --git a/Bootstrap/Bootstrap/DynamicTypeView.swift b/Bootstrap/Bootstrap/DynamicTypeView.swift
@@ -8,7 +8,13 @@ public final class DynamicTypeView: UIView {
         label = UILabel()
         super.init(frame: frame)
 
-        backgroundColor = .white
+        backgroundColor = UIColor { traits -> UIColor in
+            if traits.userInterfaceStyle == .dark {
+                return .lightGray
+            } else {
+                return .white
+            }
+        }
         translatesAutoresizingMaskIntoConstraints = false
 
         label.font = .preferredFont(forTextStyle: .body)

diff --git a/Bootstrap/BootstrapTests/ACustomFolder/BootstrapCustomFolderTests.swift b/Bootstrap/BootstrapTests/ACustomFolder/BootstrapCustomFolderTests.swift
@@ -12,19 +12,31 @@ final class BootstrapCustomFormatTests: QuickSpec {
             beforeEach {
                 setNimbleTestFolder("CustomFolder")
                 view = UIView(frame: CGRect(origin: .zero, size: CGSize(width: 44, height: 44)))
-                view.backgroundColor = .blue
+                view.backgroundColor = UIColor { traits -> UIColor in
+                    if traits.userInterfaceStyle == .dark {
+                        return .brown
+                    } else {
+                        return .blue
+                    }
+                }
             }
 
             it("fails to find the snapshots due to the custom folder") {
                 expect(view).notTo(haveValidSnapshot(named: "something custom"))
+                expect(view).notTo(haveValidSnapshot(named: "something custom"))
             }
 
             it("finds the snapshots using a custom images directory") {
-                expect(view).to(haveValidSnapshot())
+                expect(view).to(recordSnapshot())
             }
 
             it("finds device agnostic snapshots with custom images directory") {
-                expect(view).to(haveValidDeviceAgnosticSnapshot())
+                expect(view).to(recordDeviceAgnosticSnapshot())
+            }
+
+            it("find the snapshot using a custom image directory for light and dark mode") {
+                expect(view).to(recordSnapshot(userInterfaceStyle: .light))
+                expect(view).to(recordSnapshot(userInterfaceStyle: .dark))
             }
         }
     }

diff --git a/Bootstrap/BootstrapTests/BootstrapTests.swift b/Bootstrap/BootstrapTests/BootstrapTests.swift
@@ -16,11 +16,18 @@ final class BootstrapTests: QuickSpec {
                 setNimbleTolerance(0.1)
                 setNimbleTestFolder("tests")
                 view = UIView(frame: CGRect(origin: .zero, size: CGSize(width: 44, height: 44)))
-                view.backgroundColor = .blue
+                view.backgroundColor = UIColor { traits -> UIColor in
+                    if traits.userInterfaceStyle == .dark {
+                        return .brown
+                    } else {
+                        return .blue
+                    }
+                }
             }
 
             it("has a valid snapshot") {
-                expect(view).to(haveValidSnapshot())
+                expect(view).to(haveValidSnapshot(userInterfaceStyle: .light))
+                expect(view).to(haveValidSnapshot(userInterfaceStyle: .dark))
                 expect(view).to(haveValidSnapshot(named: "something custom"))
             }
 

diff --git a/Bootstrap/BootstrapTests/DynamicSizeTests.swift b/Bootstrap/BootstrapTests/DynamicSizeTests.swift
@@ -27,14 +27,28 @@ final class DynamicSizeTests: QuickSpec {
 
                 beforeEach {
                     view = UIView(frame: CGRect(x: 0, y: 0, width: 500, height: 500))
-                    view.backgroundColor = .blue
+                    view.backgroundColor = UIColor { traits -> UIColor in
+                        if traits.userInterfaceStyle == .dark {
+                            return .brown
+                        } else {
+                            return .blue
+                        }
+                    }
                 }
 
                 it("has a valid snapshot to all sizes") {
                     expect(view).to(haveValidDynamicSizeSnapshot(sizes: sizes))
 //                    expect(view).to(recordDynamicSizeSnapshot(sizes: sizes))
                 }
 
+                it("has a valid snapshot to all sizes in light and dark mode") {
+                    expect(view).to(haveValidDynamicSizeSnapshot(sizes: sizes, userInterfaceStyle: .light))
+                    expect(view).to(haveValidDynamicSizeSnapshot(sizes: sizes, userInterfaceStyle: .dark))
+//                    expect(view).to(recordDynamicSizeSnapshot(sizes: sizes, userInterfaceStyle: .light))
+//                    expect(view).to(recordDynamicSizeSnapshot(sizes: sizes, userInterfaceStyle: .dark))
+                }
+
+
                 it("has a valid snapshot to all sizes with identifier") {
                     // expect(view).to(recordDynamicSizeSnapshot(identifier: "bootstrap", sizes: sizes))
                     expect(view).to(haveValidDynamicSizeSnapshot(identifier: "bootstrap", sizes: sizes))

diff --git a/Bootstrap/BootstrapTests/DynamicTypeTests.swift b/Bootstrap/BootstrapTests/DynamicTypeTests.swift
@@ -81,6 +81,26 @@ final class DynamicTypeTests: QuickSpec {
                                                              identifier: "bootstrap"))
             }
 
+            it("has a valid snapshot with identifier in light and dark mode") {
+                // expect(view).to(recordDynamicTypeSnapshot(identifier: "bootstrap", userInterfaceStyle: .light))
+                // expect(view).to(recordDynamicTypeSnapshot(identifier: "bootstrap", userInterfaceStyle: .dark))
+                expect(view).to(haveValidDynamicTypeSnapshot(identifier: "bootstrap", userInterfaceStyle: .light))
+                expect(view).to(haveValidDynamicTypeSnapshot(identifier: "bootstrap", userInterfaceStyle: .dark))
+
+//                 expect(view).to(recordDynamicTypeSnapshot(named: "something custom with model and OS",
+//                                                          identifier: "bootstrap",
+//                                                           userInterfaceStyle: .light))
+//                expect(view).to(recordDynamicTypeSnapshot(named: "something custom with model and OS",
+//                                                          identifier: "bootstrap",
+//                                                          userInterfaceStyle: .dark))
+                expect(view).to(haveValidDynamicTypeSnapshot(named: "something custom with model and OS",
+                                                             identifier: "bootstrap",
+                                                             userInterfaceStyle: .light))
+                expect(view).to(haveValidDynamicTypeSnapshot(named: "something custom with model and OS",
+                                                             identifier: "bootstrap",
+                                                             userInterfaceStyle: .dark))
+            }
+
             it("works with adjustsFontForContentSizeCategory") {
                 let label = UILabel(frame: CGRect(x: 0, y: 0, width: 300, height: 100))
                 label.text = "Example"

diff --git a/...ferenceImages/BootstrapTests/in_some_context__has_a_valid_snapshot__dark@2x.png b/...ferenceImages/BootstrapTests/in_some_context__has_a_valid_snapshot__dark@2x.png
diff --git a/...erenceImages/BootstrapTests/in_some_context__has_a_valid_snapshot__light@2x.png b/...erenceImages/BootstrapTests/in_some_context__has_a_valid_snapshot__light@2x.png
diff --git a/Bootstrap/BootstrapTests/ReferenceImages/CustomFolder/.gitkeep b/Bootstrap/BootstrapTests/ReferenceImages/CustomFolder/.gitkeep
diff --git a/...has_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__LargeSize_dark@2x.png b/...has_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__LargeSize_dark@2x.png
diff --git a/...as_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__LargeSize_light@2x.png b/...as_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__LargeSize_light@2x.png
diff --git a/...as_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__MediumSize_dark@2x.png b/...as_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__MediumSize_dark@2x.png
diff --git a/...s_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__MediumSize_light@2x.png b/...s_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__MediumSize_light@2x.png
diff --git a/...has_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__SmallSize_dark@2x.png b/...has_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__SmallSize_dark@2x.png
diff --git a/...as_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__SmallSize_light@2x.png b/...as_a_valid_snapshot_to_all_sizes_in_light_and_dark_mode__SmallSize_light@2x.png
diff --git a/...th_identifier_in_light_and_dark_mode__AccessibilityL_dark_dark_bootstrap@2x.png b/...th_identifier_in_light_and_dark_mode__AccessibilityL_dark_dark_bootstrap@2x.png
diff --git a/..._identifier_in_light_and_dark_mode__AccessibilityL_light_light_bootstrap@2x.png b/..._identifier_in_light_and_dark_mode__AccessibilityL_light_light_bootstrap@2x.png
diff --git a/...th_identifier_in_light_and_dark_mode__AccessibilityM_dark_dark_bootstrap@2x.png b/...th_identifier_in_light_and_dark_mode__AccessibilityM_dark_dark_bootstrap@2x.png
diff --git a/..._identifier_in_light_and_dark_mode__AccessibilityM_light_light_bootstrap@2x.png b/..._identifier_in_light_and_dark_mode__AccessibilityM_light_light_bootstrap@2x.png
diff --git a/...h_identifier_in_light_and_dark_mode__AccessibilityXL_dark_dark_bootstrap@2x.png b/...h_identifier_in_light_and_dark_mode__AccessibilityXL_dark_dark_bootstrap@2x.png
diff --git a/...identifier_in_light_and_dark_mode__AccessibilityXL_light_light_bootstrap@2x.png b/...identifier_in_light_and_dark_mode__AccessibilityXL_light_light_bootstrap@2x.png
diff --git a/..._identifier_in_light_and_dark_mode__AccessibilityXXL_dark_dark_bootstrap@2x.png b/..._identifier_in_light_and_dark_mode__AccessibilityXXL_dark_dark_bootstrap@2x.png
diff --git a/...dentifier_in_light_and_dark_mode__AccessibilityXXL_light_light_bootstrap@2x.png b/...dentifier_in_light_and_dark_mode__AccessibilityXXL_light_light_bootstrap@2x.png
diff --git a/...identifier_in_light_and_dark_mode__AccessibilityXXXL_dark_dark_bootstrap@2x.png b/...identifier_in_light_and_dark_mode__AccessibilityXXXL_dark_dark_bootstrap@2x.png
diff --git a/...entifier_in_light_and_dark_mode__AccessibilityXXXL_light_light_bootstrap@2x.png b/...entifier_in_light_and_dark_mode__AccessibilityXXXL_light_light_bootstrap@2x.png
diff --git a/...d_snapshot_with_identifier_in_light_and_dark_mode__L_dark_dark_bootstrap@2x.png b/...d_snapshot_with_identifier_in_light_and_dark_mode__L_dark_dark_bootstrap@2x.png
diff --git a/...snapshot_with_identifier_in_light_and_dark_mode__L_light_light_bootstrap@2x.png b/...snapshot_with_identifier_in_light_and_dark_mode__L_light_light_bootstrap@2x.png
diff --git a/...d_snapshot_with_identifier_in_light_and_dark_mode__M_dark_dark_bootstrap@2x.png b/...d_snapshot_with_identifier_in_light_and_dark_mode__M_dark_dark_bootstrap@2x.png
diff --git a/...snapshot_with_identifier_in_light_and_dark_mode__M_light_light_bootstrap@2x.png b/...snapshot_with_identifier_in_light_and_dark_mode__M_light_light_bootstrap@2x.png
diff --git a/...d_snapshot_with_identifier_in_light_and_dark_mode__S_dark_dark_bootstrap@2x.png b/...d_snapshot_with_identifier_in_light_and_dark_mode__S_dark_dark_bootstrap@2x.png
diff --git a/...snapshot_with_identifier_in_light_and_dark_mode__S_light_light_bootstrap@2x.png b/...snapshot_with_identifier_in_light_and_dark_mode__S_light_light_bootstrap@2x.png
diff --git a/..._snapshot_with_identifier_in_light_and_dark_mode__XL_dark_dark_bootstrap@2x.png b/..._snapshot_with_identifier_in_light_and_dark_mode__XL_dark_dark_bootstrap@2x.png
diff --git a/...napshot_with_identifier_in_light_and_dark_mode__XL_light_light_bootstrap@2x.png b/...napshot_with_identifier_in_light_and_dark_mode__XL_light_light_bootstrap@2x.png
diff --git a/..._snapshot_with_identifier_in_light_and_dark_mode__XS_dark_dark_bootstrap@2x.png b/..._snapshot_with_identifier_in_light_and_dark_mode__XS_dark_dark_bootstrap@2x.png
diff --git a/...napshot_with_identifier_in_light_and_dark_mode__XS_light_light_bootstrap@2x.png b/...napshot_with_identifier_in_light_and_dark_mode__XS_light_light_bootstrap@2x.png
diff --git a/...snapshot_with_identifier_in_light_and_dark_mode__XXL_dark_dark_bootstrap@2x.png b/...snapshot_with_identifier_in_light_and_dark_mode__XXL_dark_dark_bootstrap@2x.png
diff --git a/...apshot_with_identifier_in_light_and_dark_mode__XXL_light_light_bootstrap@2x.png b/...apshot_with_identifier_in_light_and_dark_mode__XXL_light_light_bootstrap@2x.png
diff --git a/...napshot_with_identifier_in_light_and_dark_mode__XXXL_dark_dark_bootstrap@2x.png b/...napshot_with_identifier_in_light_and_dark_mode__XXXL_dark_dark_bootstrap@2x.png
diff --git a/...pshot_with_identifier_in_light_and_dark_mode__XXXL_light_light_bootstrap@2x.png b/...pshot_with_identifier_in_light_and_dark_mode__XXXL_light_light_bootstrap@2x.png
diff --git a/...ts/something_custom_with_model_and_OS_AccessibilityL_dark_dark_bootstrap@2x.png b/...ts/something_custom_with_model_and_OS_AccessibilityL_dark_dark_bootstrap@2x.png
diff --git a/.../something_custom_with_model_and_OS_AccessibilityL_light_light_bootstrap@2x.png b/.../something_custom_with_model_and_OS_AccessibilityL_light_light_bootstrap@2x.png
diff --git a/...ts/something_custom_with_model_and_OS_AccessibilityM_dark_dark_bootstrap@2x.png b/...ts/something_custom_with_model_and_OS_AccessibilityM_dark_dark_bootstrap@2x.png
diff --git a/.../something_custom_with_model_and_OS_AccessibilityM_light_light_bootstrap@2x.png b/.../something_custom_with_model_and_OS_AccessibilityM_light_light_bootstrap@2x.png
diff --git a/...s/something_custom_with_model_and_OS_AccessibilityXL_dark_dark_bootstrap@2x.png b/...s/something_custom_with_model_and_OS_AccessibilityXL_dark_dark_bootstrap@2x.png
diff --git a/...something_custom_with_model_and_OS_AccessibilityXL_light_light_bootstrap@2x.png b/...something_custom_with_model_and_OS_AccessibilityXL_light_light_bootstrap@2x.png
diff --git a/.../something_custom_with_model_and_OS_AccessibilityXXL_dark_dark_bootstrap@2x.png b/.../something_custom_with_model_and_OS_AccessibilityXXL_dark_dark_bootstrap@2x.png
diff --git a/...omething_custom_with_model_and_OS_AccessibilityXXL_light_light_bootstrap@2x.png b/...omething_custom_with_model_and_OS_AccessibilityXXL_light_light_bootstrap@2x.png
diff --git a/...something_custom_with_model_and_OS_AccessibilityXXXL_dark_dark_bootstrap@2x.png b/...something_custom_with_model_and_OS_AccessibilityXXXL_dark_dark_bootstrap@2x.png
diff --git a/...mething_custom_with_model_and_OS_AccessibilityXXXL_light_light_bootstrap@2x.png b/...mething_custom_with_model_and_OS_AccessibilityXXXL_light_light_bootstrap@2x.png
diff --git a/...ynamicTypeTests/something_custom_with_model_and_OS_L_dark_dark_bootstrap@2x.png b/...ynamicTypeTests/something_custom_with_model_and_OS_L_dark_dark_bootstrap@2x.png
diff --git a/...amicTypeTests/something_custom_with_model_and_OS_L_light_light_bootstrap@2x.png b/...amicTypeTests/something_custom_with_model_and_OS_L_light_light_bootstrap@2x.png
diff --git a/...ynamicTypeTests/something_custom_with_model_and_OS_M_dark_dark_bootstrap@2x.png b/...ynamicTypeTests/something_custom_with_model_and_OS_M_dark_dark_bootstrap@2x.png
diff --git a/...amicTypeTests/something_custom_with_model_and_OS_M_light_light_bootstrap@2x.png b/...amicTypeTests/something_custom_with_model_and_OS_M_light_light_bootstrap@2x.png
diff --git a/...ynamicTypeTests/something_custom_with_model_and_OS_S_dark_dark_bootstrap@2x.png b/...ynamicTypeTests/something_custom_with_model_and_OS_S_dark_dark_bootstrap@2x.png
diff --git a/...amicTypeTests/something_custom_with_model_and_OS_S_light_light_bootstrap@2x.png b/...amicTypeTests/something_custom_with_model_and_OS_S_light_light_bootstrap@2x.png
diff --git a/...namicTypeTests/something_custom_with_model_and_OS_XL_dark_dark_bootstrap@2x.png b/...namicTypeTests/something_custom_with_model_and_OS_XL_dark_dark_bootstrap@2x.png
diff --git a/...micTypeTests/something_custom_with_model_and_OS_XL_light_light_bootstrap@2x.png b/...micTypeTests/something_custom_with_model_and_OS_XL_light_light_bootstrap@2x.png
diff --git a/...namicTypeTests/something_custom_with_model_and_OS_XS_dark_dark_bootstrap@2x.png b/...namicTypeTests/something_custom_with_model_and_OS_XS_dark_dark_bootstrap@2x.png
diff --git a/...micTypeTests/something_custom_with_model_and_OS_XS_light_light_bootstrap@2x.png b/...micTypeTests/something_custom_with_model_and_OS_XS_light_light_bootstrap@2x.png
diff --git a/...amicTypeTests/something_custom_with_model_and_OS_XXL_dark_dark_bootstrap@2x.png b/...amicTypeTests/something_custom_with_model_and_OS_XXL_dark_dark_bootstrap@2x.png
diff --git a/...icTypeTests/something_custom_with_model_and_OS_XXL_light_light_bootstrap@2x.png b/...icTypeTests/something_custom_with_model_and_OS_XXL_light_light_bootstrap@2x.png
diff --git a/...micTypeTests/something_custom_with_model_and_OS_XXXL_dark_dark_bootstrap@2x.png b/...micTypeTests/something_custom_with_model_and_OS_XXXL_dark_dark_bootstrap@2x.png
diff --git a/...cTypeTests/something_custom_with_model_and_OS_XXXL_light_light_bootstrap@2x.png b/...cTypeTests/something_custom_with_model_and_OS_XXXL_light_light_bootstrap@2x.png
diff --git a/Bootstrap/Podfile.lock b/Bootstrap/Podfile.lock
@@ -8,9 +8,9 @@ PODS:
   - iOSSnapshotTestCase/SwiftSupport (8.0.0):
     - iOSSnapshotTestCase/Core
   - Nimble (11.0.0)
-  - Nimble-Snapshots (9.4.0):
-    - Nimble-Snapshots/Core (= 9.4.0)
-  - Nimble-Snapshots/Core (9.4.0):
+  - Nimble-Snapshots (9.6.0):
+    - Nimble-Snapshots/Core (= 9.6.0)
+  - Nimble-Snapshots/Core (9.6.0):
     - iOSSnapshotTestCase (~> 8.0)
     - Nimble (~> 11.0)
   - Quick (6.0.0)
@@ -35,7 +35,7 @@ SPEC CHECKSUMS:
   Forgeries: 64ced144ea8341d89a7eec9d1d7986f0f1366250
   iOSSnapshotTestCase: a670511f9ee3829c2b9c23e6e68f315fd7b6790f
   Nimble: a854c12888a21d9e25a0413bb743ad76c37ef50c
-  Nimble-Snapshots: 9f29ff080d7aeceedd1c9b929cdb690e0a86439a
+  Nimble-Snapshots: 685ec7707c6055bce156341aa9d398a9d3e02f6f
   Quick: 4d5ab9e81f0a632cbf9bc4f3069b55e5eeb175df
 
 PODFILE CHECKSUM: cd5b709b72116303d001ccd6a46fecaf6ce2c21b

diff --git a/Bootstrap/Pods/Local Podspecs/Nimble-Snapshots.podspec.json b/Bootstrap/Pods/Local Podspecs/Nimble-Snapshots.podspec.json
diff --git a/Bootstrap/Pods/Manifest.lock b/Bootstrap/Pods/Manifest.lock
diff --git a/Bootstrap/Pods/Pods.xcodeproj/project.pbxproj b/Bootstrap/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Bootstrap/Pods/Target Support Files/Nimble-Snapshots/Nimble-Snapshots-Info.plist b/Bootstrap/Pods/Target Support Files/Nimble-Snapshots/Nimble-Snapshots-Info.plist
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 - Nothing yet!
 
+## 9.6.0
+
+- Add abitlity to test in light and dark mode
+
 ## 9.5.1
 
 - Fixes SPM definition. See #255 - @diogot