[NTV-648] Agnostic Snapshot Testing Between M1 and Intel (#1794)

* trial new snapshots on m1 snapshot testing framework with 0.98 perceptualPrecision * intel failed comparing against m1 recordings of this test. Trying a subview recording. * replaced FBSnapshotVerifyView with assertSnapshot everywhere in Kickstarter-Framework-iOSTests * re-recorded all snapshots with snapshot-testing framework. This is a huge commit. But only because it's a lot of files. The idea being it replaces everything in the `_64` folder which had our old tests that were references in the `FBSnapshotTestCase` dependency. These new screenshots are not going to be in one folder. They will be local to the view they represent, similar to the organization of the `Kickstarter-Framework-iOS` target file structure. It's more ordered than having one giant reference folder because if you need to check the snapshots, it's easier find any given views' subfolder in XCode. Opening that views subfolder in XCode will give you access to the screenshots in that folder, but through Finder. The image files themselves are not included in the XCode project, so it doesn't bloat our project either. * updating a missed set of tests * updated tests not to overwrite each other when using the same assert. * some tests running on Intel did require approximate comparisons, so added perceptual precision to only those classes. Tests now recorded on M1 pass 100% on Intel. * added test for facebook reset password view controller recorded on M1, should pass on CI and locally on Intel. * removed _64 directory, where old screenshots were, remove ios-snapshot-test-case as dependency, updated TestCase class, removed project schema variables. * still using old trait controllers, combos, devices, languages and other features. Mainly because we still cannot enforce a simulator to fail a record if its' not iPhone 8. It'll just have to be common knowledge that iPhone is our recording simulator. Will update the readme. It's already kind of a guarantee because if we record with another simulator, we'd have failing tests one existing tests when the whole suite is run. * updated snapshots on FacebookResetPasswordViewController * Added preferred simulator check, so no tests pass if simulator for scheme is not iPhone 8 iOS 14.5. Same for recording.
kickstarter · Feb 22, 2023 · 29008cd · 29008cd
1 parent 40d368f
commit 29008cd
Show file tree

Hide file tree

Showing 4,127 changed files with 867 additions and 331 deletions.
diff --git a/Kickstarter-iOS/Features/Activities/Controller/ActivitiesViewControllerTests.swift b/Kickstarter-iOS/Features/Activities/Controller/ActivitiesViewControllerTests.swift
@@ -2,6 +2,7 @@
 @testable import KsApi
 @testable import Library
 import Prelude
+import SnapshotTesting
 import XCTest
 
 private let creator = User.template |> \.avatar.small .~ ""
@@ -139,7 +140,7 @@ internal final class ActivitiesViewControllerTests: TestCase {
 
         self.scheduler.run()
 
-        FBSnapshotVerifyView(vc.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }
@@ -176,7 +177,7 @@ internal final class ActivitiesViewControllerTests: TestCase {
 
         self.scheduler.run()
 
-        FBSnapshotVerifyView(vc.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }
@@ -211,7 +212,7 @@ internal final class ActivitiesViewControllerTests: TestCase {
 
         self.scheduler.run()
 
-        FBSnapshotVerifyView(vc.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }
@@ -243,7 +244,7 @@ internal final class ActivitiesViewControllerTests: TestCase {
 
         self.scheduler.run()
 
-        FBSnapshotVerifyView(vc.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }

diff --git a/...tActivities_All_lang_de_device_pad@2x.png → ...testActivities_All.lang_de_device_pad.png b/...tActivities_All_lang_de_device_pad@2x.png → ...testActivities_All.lang_de_device_pad.png
diff --git a/...es_All_lang_de_device_phone4_7inch@2x.png → ...ities_All.lang_de_device_phone4_7inch.png b/...es_All_lang_de_device_phone4_7inch@2x.png → ...ities_All.lang_de_device_phone4_7inch.png
diff --git a/...es_All_lang_de_device_phone5_8inch@2x.png → ...ities_All.lang_de_device_phone5_8inch.png b/...es_All_lang_de_device_phone5_8inch@2x.png → ...ities_All.lang_de_device_phone5_8inch.png
diff --git a/...tActivities_All_lang_en_device_pad@2x.png → ...testActivities_All.lang_en_device_pad.png b/...tActivities_All_lang_en_device_pad@2x.png → ...testActivities_All.lang_en_device_pad.png
diff --git a/...es_All_lang_en_device_phone4_7inch@2x.png → ...ities_All.lang_en_device_phone4_7inch.png b/...es_All_lang_en_device_phone4_7inch@2x.png → ...ities_All.lang_en_device_phone4_7inch.png
diff --git a/...es_All_lang_en_device_phone5_8inch@2x.png → ...ities_All.lang_en_device_phone5_8inch.png b/...es_All_lang_en_device_phone5_8inch@2x.png → ...ities_All.lang_en_device_phone5_8inch.png
diff --git a/...tActivities_All_lang_es_device_pad@2x.png → ...testActivities_All.lang_es_device_pad.png b/...tActivities_All_lang_es_device_pad@2x.png → ...testActivities_All.lang_es_device_pad.png
diff --git a/...es_All_lang_es_device_phone4_7inch@2x.png → ...ities_All.lang_es_device_phone4_7inch.png b/...es_All_lang_es_device_phone4_7inch@2x.png → ...ities_All.lang_es_device_phone4_7inch.png
diff --git a/...es_All_lang_es_device_phone5_8inch@2x.png → ...ities_All.lang_es_device_phone5_8inch.png b/...es_All_lang_es_device_phone5_8inch@2x.png → ...ities_All.lang_es_device_phone5_8inch.png
diff --git a/...tActivities_All_lang_fr_device_pad@2x.png → ...testActivities_All.lang_fr_device_pad.png b/...tActivities_All_lang_fr_device_pad@2x.png → ...testActivities_All.lang_fr_device_pad.png
diff --git a/...es_All_lang_fr_device_phone4_7inch@2x.png → ...ities_All.lang_fr_device_phone4_7inch.png b/...es_All_lang_fr_device_phone4_7inch@2x.png → ...ities_All.lang_fr_device_phone4_7inch.png
diff --git a/...es_All_lang_fr_device_phone5_8inch@2x.png → ...ities_All.lang_fr_device_phone5_8inch.png b/...es_All_lang_fr_device_phone5_8inch@2x.png → ...ities_All.lang_fr_device_phone5_8inch.png
diff --git a/...tActivities_All_lang_ja_device_pad@2x.png → ...testActivities_All.lang_ja_device_pad.png b/...tActivities_All_lang_ja_device_pad@2x.png → ...testActivities_All.lang_ja_device_pad.png
diff --git a/...es_All_lang_ja_device_phone4_7inch@2x.png → ...ities_All.lang_ja_device_phone4_7inch.png b/...es_All_lang_ja_device_phone4_7inch@2x.png → ...ities_All.lang_ja_device_phone4_7inch.png
diff --git a/...es_All_lang_ja_device_phone5_8inch@2x.png → ...ities_All.lang_ja_device_phone5_8inch.png b/...es_All_lang_ja_device_phone5_8inch@2x.png → ...ities_All.lang_ja_device_phone5_8inch.png
diff --git a/...ckings_lang_de_device_phone4_7inch@2x.png → ...dBackings.lang_de_device_phone4_7inch.png b/...ckings_lang_de_device_phone4_7inch@2x.png → ...dBackings.lang_de_device_phone4_7inch.png
diff --git a/...ckings_lang_en_device_phone4_7inch@2x.png → ...dBackings.lang_en_device_phone4_7inch.png b/...ckings_lang_en_device_phone4_7inch@2x.png → ...dBackings.lang_en_device_phone4_7inch.png
diff --git a/...ckings_lang_es_device_phone4_7inch@2x.png → ...dBackings.lang_es_device_phone4_7inch.png b/...ckings_lang_es_device_phone4_7inch@2x.png → ...dBackings.lang_es_device_phone4_7inch.png
diff --git a/...ckings_lang_fr_device_phone4_7inch@2x.png → ...dBackings.lang_fr_device_phone4_7inch.png b/...ckings_lang_fr_device_phone4_7inch@2x.png → ...dBackings.lang_fr_device_phone4_7inch.png
diff --git a/...ckings_lang_ja_device_phone4_7inch@2x.png → ...dBackings.lang_ja_device_phone4_7inch.png b/...ckings_lang_ja_device_phone4_7inch@2x.png → ...dBackings.lang_ja_device_phone4_7inch.png
diff --git a/...onnect_lang_de_device_phone4_7inch@2x.png → ...Reconnect.lang_de_device_phone4_7inch.png b/...onnect_lang_de_device_phone4_7inch@2x.png → ...Reconnect.lang_de_device_phone4_7inch.png
diff --git a/...onnect_lang_en_device_phone4_7inch@2x.png → ...Reconnect.lang_en_device_phone4_7inch.png b/...onnect_lang_en_device_phone4_7inch@2x.png → ...Reconnect.lang_en_device_phone4_7inch.png
diff --git a/...onnect_lang_es_device_phone4_7inch@2x.png → ...Reconnect.lang_es_device_phone4_7inch.png b/...onnect_lang_es_device_phone4_7inch@2x.png → ...Reconnect.lang_es_device_phone4_7inch.png
diff --git a/...onnect_lang_fr_device_phone4_7inch@2x.png → ...Reconnect.lang_fr_device_phone4_7inch.png b/...onnect_lang_fr_device_phone4_7inch@2x.png → ...Reconnect.lang_fr_device_phone4_7inch.png
diff --git a/...onnect_lang_ja_device_phone4_7inch@2x.png → ...Reconnect.lang_ja_device_phone4_7inch.png b/...onnect_lang_ja_device_phone4_7inch@2x.png → ...Reconnect.lang_ja_device_phone4_7inch.png
diff --git a/...unched_lang_de_device_phone4_7inch@2x.png → ...uLaunched.lang_de_device_phone4_7inch.png b/...unched_lang_de_device_phone4_7inch@2x.png → ...uLaunched.lang_de_device_phone4_7inch.png
diff --git a/...unched_lang_en_device_phone4_7inch@2x.png → ...uLaunched.lang_en_device_phone4_7inch.png b/...unched_lang_en_device_phone4_7inch@2x.png → ...uLaunched.lang_en_device_phone4_7inch.png
diff --git a/...unched_lang_es_device_phone4_7inch@2x.png → ...uLaunched.lang_es_device_phone4_7inch.png b/...unched_lang_es_device_phone4_7inch@2x.png → ...uLaunched.lang_es_device_phone4_7inch.png
diff --git a/...unched_lang_fr_device_phone4_7inch@2x.png → ...uLaunched.lang_fr_device_phone4_7inch.png b/...unched_lang_fr_device_phone4_7inch@2x.png → ...uLaunched.lang_fr_device_phone4_7inch.png
diff --git a/...unched_lang_ja_device_phone4_7inch@2x.png → ...uLaunched.lang_ja_device_phone4_7inch.png b/...unched_lang_ja_device_phone4_7inch@2x.png → ...uLaunched.lang_ja_device_phone4_7inch.png
diff --git a/Kickstarter-iOS/Features/AddNewCard/Controller/AddNewCardViewControllerTests.swift b/Kickstarter-iOS/Features/AddNewCard/Controller/AddNewCardViewControllerTests.swift
@@ -2,6 +2,7 @@
 @testable import KsApi
 @testable import Library
 import Prelude
+import SnapshotTesting
 import UIKit
 
 /** FIXME: There is a problem with testing the payment sheet. Somehow SPM is incorrectly linking the SDK resources explained here:
@@ -23,7 +24,7 @@ final class AddNewCardViewControllerTests: TestCase {
         controller.configure(with: .settings)
         let (parent, _) = traitControllers(device: device, orientation: .portrait, child: controller)
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }
@@ -35,7 +36,7 @@ final class AddNewCardViewControllerTests: TestCase {
         controller.configure(with: .pledge)
         let (parent, _) = traitControllers(device: device, orientation: .portrait, child: controller)
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }
@@ -53,7 +54,7 @@ final class AddNewCardViewControllerTests: TestCase {
         controller.configure(with: .settings)
         let (parent, _) = traitControllers(device: device, orientation: .portrait, child: controller)
 
-        FBSnapshotVerifyView(parent.view, identifier: "locale_\(locale)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(locale)_device_\(device)")
       }
     }
   }

diff --git a/...tures/BackerDashboardProjects/Controller/BackerDashboardProjectsViewControllerTests.swift b/...tures/BackerDashboardProjects/Controller/BackerDashboardProjectsViewControllerTests.swift
@@ -2,6 +2,7 @@
 @testable import KsApi
 @testable import Library
 import Prelude
+import SnapshotTesting
 import XCTest
 
 internal final class BackerDashboardProjectsViewControllerTests: TestCase {
@@ -67,7 +68,7 @@ internal final class BackerDashboardProjectsViewControllerTests: TestCase {
         )
         self.scheduler.run()
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }
@@ -90,7 +91,7 @@ internal final class BackerDashboardProjectsViewControllerTests: TestCase {
         )
         self.scheduler.run()
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }
@@ -113,7 +114,7 @@ internal final class BackerDashboardProjectsViewControllerTests: TestCase {
         )
         self.scheduler.run()
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }

diff --git a/..._BackedProjects_lang_de_device_pad@2x.png → ...pty_BackedProjects.lang_de_device_pad.png b/..._BackedProjects_lang_de_device_pad@2x.png → ...pty_BackedProjects.lang_de_device_pad.png
diff --git a/...ojects_lang_de_device_phone4_7inch@2x.png → ...dProjects.lang_de_device_phone4_7inch.png b/...ojects_lang_de_device_phone4_7inch@2x.png → ...dProjects.lang_de_device_phone4_7inch.png
diff --git a/...ojects_lang_de_device_phone5_8inch@2x.png → ...dProjects.lang_de_device_phone5_8inch.png b/...ojects_lang_de_device_phone5_8inch@2x.png → ...dProjects.lang_de_device_phone5_8inch.png
diff --git a/..._BackedProjects_lang_en_device_pad@2x.png → ...pty_BackedProjects.lang_en_device_pad.png b/..._BackedProjects_lang_en_device_pad@2x.png → ...pty_BackedProjects.lang_en_device_pad.png
diff --git a/...ojects_lang_en_device_phone4_7inch@2x.png → ...dProjects.lang_en_device_phone4_7inch.png b/...ojects_lang_en_device_phone4_7inch@2x.png → ...dProjects.lang_en_device_phone4_7inch.png
diff --git a/...ojects_lang_en_device_phone5_8inch@2x.png → ...dProjects.lang_en_device_phone5_8inch.png b/...ojects_lang_en_device_phone5_8inch@2x.png → ...dProjects.lang_en_device_phone5_8inch.png
diff --git a/..._BackedProjects_lang_es_device_pad@2x.png → ...pty_BackedProjects.lang_es_device_pad.png b/..._BackedProjects_lang_es_device_pad@2x.png → ...pty_BackedProjects.lang_es_device_pad.png
diff --git a/...ojects_lang_es_device_phone4_7inch@2x.png → ...dProjects.lang_es_device_phone4_7inch.png b/...ojects_lang_es_device_phone4_7inch@2x.png → ...dProjects.lang_es_device_phone4_7inch.png
diff --git a/...ojects_lang_es_device_phone5_8inch@2x.png → ...dProjects.lang_es_device_phone5_8inch.png b/...ojects_lang_es_device_phone5_8inch@2x.png → ...dProjects.lang_es_device_phone5_8inch.png
diff --git a/..._BackedProjects_lang_fr_device_pad@2x.png → ...pty_BackedProjects.lang_fr_device_pad.png b/..._BackedProjects_lang_fr_device_pad@2x.png → ...pty_BackedProjects.lang_fr_device_pad.png
diff --git a/...ojects_lang_fr_device_phone4_7inch@2x.png → ...dProjects.lang_fr_device_phone4_7inch.png b/...ojects_lang_fr_device_phone4_7inch@2x.png → ...dProjects.lang_fr_device_phone4_7inch.png
diff --git a/...ojects_lang_fr_device_phone5_8inch@2x.png → ...dProjects.lang_fr_device_phone5_8inch.png b/...ojects_lang_fr_device_phone5_8inch@2x.png → ...dProjects.lang_fr_device_phone5_8inch.png
diff --git a/..._BackedProjects_lang_ja_device_pad@2x.png → ...pty_BackedProjects.lang_ja_device_pad.png b/..._BackedProjects_lang_ja_device_pad@2x.png → ...pty_BackedProjects.lang_ja_device_pad.png
diff --git a/...ojects_lang_ja_device_phone4_7inch@2x.png → ...dProjects.lang_ja_device_phone4_7inch.png b/...ojects_lang_ja_device_phone4_7inch@2x.png → ...dProjects.lang_ja_device_phone4_7inch.png
diff --git a/...ojects_lang_ja_device_phone5_8inch@2x.png → ...dProjects.lang_ja_device_phone5_8inch.png b/...ojects_lang_ja_device_phone5_8inch@2x.png → ...dProjects.lang_ja_device_phone5_8inch.png
diff --git a/...y_SavedProjects_lang_de_device_pad@2x.png → ...mpty_SavedProjects.lang_de_device_pad.png b/...y_SavedProjects_lang_de_device_pad@2x.png → ...mpty_SavedProjects.lang_de_device_pad.png
diff --git a/...ojects_lang_de_device_phone4_7inch@2x.png → ...dProjects.lang_de_device_phone4_7inch.png b/...ojects_lang_de_device_phone4_7inch@2x.png → ...dProjects.lang_de_device_phone4_7inch.png
diff --git a/...ojects_lang_de_device_phone5_8inch@2x.png → ...dProjects.lang_de_device_phone5_8inch.png b/...ojects_lang_de_device_phone5_8inch@2x.png → ...dProjects.lang_de_device_phone5_8inch.png
diff --git a/...y_SavedProjects_lang_en_device_pad@2x.png → ...mpty_SavedProjects.lang_en_device_pad.png b/...y_SavedProjects_lang_en_device_pad@2x.png → ...mpty_SavedProjects.lang_en_device_pad.png
diff --git a/...ojects_lang_en_device_phone4_7inch@2x.png → ...dProjects.lang_en_device_phone4_7inch.png b/...ojects_lang_en_device_phone4_7inch@2x.png → ...dProjects.lang_en_device_phone4_7inch.png
diff --git a/...ojects_lang_en_device_phone5_8inch@2x.png → ...dProjects.lang_en_device_phone5_8inch.png b/...ojects_lang_en_device_phone5_8inch@2x.png → ...dProjects.lang_en_device_phone5_8inch.png
diff --git a/...y_SavedProjects_lang_es_device_pad@2x.png → ...mpty_SavedProjects.lang_es_device_pad.png b/...y_SavedProjects_lang_es_device_pad@2x.png → ...mpty_SavedProjects.lang_es_device_pad.png
diff --git a/...ojects_lang_es_device_phone4_7inch@2x.png → ...dProjects.lang_es_device_phone4_7inch.png b/...ojects_lang_es_device_phone4_7inch@2x.png → ...dProjects.lang_es_device_phone4_7inch.png
diff --git a/...ojects_lang_es_device_phone5_8inch@2x.png → ...dProjects.lang_es_device_phone5_8inch.png b/...ojects_lang_es_device_phone5_8inch@2x.png → ...dProjects.lang_es_device_phone5_8inch.png
diff --git a/...y_SavedProjects_lang_fr_device_pad@2x.png → ...mpty_SavedProjects.lang_fr_device_pad.png b/...y_SavedProjects_lang_fr_device_pad@2x.png → ...mpty_SavedProjects.lang_fr_device_pad.png
diff --git a/...ojects_lang_fr_device_phone4_7inch@2x.png → ...dProjects.lang_fr_device_phone4_7inch.png b/...ojects_lang_fr_device_phone4_7inch@2x.png → ...dProjects.lang_fr_device_phone4_7inch.png
diff --git a/...ojects_lang_fr_device_phone5_8inch@2x.png → ...dProjects.lang_fr_device_phone5_8inch.png b/...ojects_lang_fr_device_phone5_8inch@2x.png → ...dProjects.lang_fr_device_phone5_8inch.png
diff --git a/...y_SavedProjects_lang_ja_device_pad@2x.png → ...mpty_SavedProjects.lang_ja_device_pad.png b/...y_SavedProjects_lang_ja_device_pad@2x.png → ...mpty_SavedProjects.lang_ja_device_pad.png
diff --git a/...ojects_lang_ja_device_phone4_7inch@2x.png → ...dProjects.lang_ja_device_phone4_7inch.png b/...ojects_lang_ja_device_phone4_7inch@2x.png → ...dProjects.lang_ja_device_phone4_7inch.png
diff --git a/...ojects_lang_ja_device_phone5_8inch@2x.png → ...dProjects.lang_ja_device_phone5_8inch.png b/...ojects_lang_ja_device_phone5_8inch@2x.png → ...dProjects.lang_ja_device_phone5_8inch.png
diff --git a/...ts/testProjects_lang_de_device_pad@2x.png → ...Tests/testProjects.lang_de_device_pad.png b/...ts/testProjects_lang_de_device_pad@2x.png → ...Tests/testProjects.lang_de_device_pad.png
diff --git a/...ojects_lang_de_device_phone4_7inch@2x.png → ...tProjects.lang_de_device_phone4_7inch.png b/...ojects_lang_de_device_phone4_7inch@2x.png → ...tProjects.lang_de_device_phone4_7inch.png
diff --git a/...ojects_lang_de_device_phone5_8inch@2x.png → ...tProjects.lang_de_device_phone5_8inch.png b/...ojects_lang_de_device_phone5_8inch@2x.png → ...tProjects.lang_de_device_phone5_8inch.png
diff --git a/...ts/testProjects_lang_en_device_pad@2x.png → ...Tests/testProjects.lang_en_device_pad.png b/...ts/testProjects_lang_en_device_pad@2x.png → ...Tests/testProjects.lang_en_device_pad.png
diff --git a/...ojects_lang_en_device_phone4_7inch@2x.png → ...tProjects.lang_en_device_phone4_7inch.png b/...ojects_lang_en_device_phone4_7inch@2x.png → ...tProjects.lang_en_device_phone4_7inch.png
diff --git a/...ojects_lang_en_device_phone5_8inch@2x.png → ...tProjects.lang_en_device_phone5_8inch.png b/...ojects_lang_en_device_phone5_8inch@2x.png → ...tProjects.lang_en_device_phone5_8inch.png
diff --git a/...ts/testProjects_lang_es_device_pad@2x.png → ...Tests/testProjects.lang_es_device_pad.png b/...ts/testProjects_lang_es_device_pad@2x.png → ...Tests/testProjects.lang_es_device_pad.png
diff --git a/...ojects_lang_es_device_phone4_7inch@2x.png → ...tProjects.lang_es_device_phone4_7inch.png b/...ojects_lang_es_device_phone4_7inch@2x.png → ...tProjects.lang_es_device_phone4_7inch.png
diff --git a/...ojects_lang_es_device_phone5_8inch@2x.png → ...tProjects.lang_es_device_phone5_8inch.png b/...ojects_lang_es_device_phone5_8inch@2x.png → ...tProjects.lang_es_device_phone5_8inch.png
diff --git a/...ts/testProjects_lang_fr_device_pad@2x.png → ...Tests/testProjects.lang_fr_device_pad.png b/...ts/testProjects_lang_fr_device_pad@2x.png → ...Tests/testProjects.lang_fr_device_pad.png
diff --git a/...ojects_lang_fr_device_phone4_7inch@2x.png → ...tProjects.lang_fr_device_phone4_7inch.png b/...ojects_lang_fr_device_phone4_7inch@2x.png → ...tProjects.lang_fr_device_phone4_7inch.png
diff --git a/...ojects_lang_fr_device_phone5_8inch@2x.png → ...tProjects.lang_fr_device_phone5_8inch.png b/...ojects_lang_fr_device_phone5_8inch@2x.png → ...tProjects.lang_fr_device_phone5_8inch.png
diff --git a/...ts/testProjects_lang_ja_device_pad@2x.png → ...Tests/testProjects.lang_ja_device_pad.png b/...ts/testProjects_lang_ja_device_pad@2x.png → ...Tests/testProjects.lang_ja_device_pad.png
diff --git a/...ojects_lang_ja_device_phone4_7inch@2x.png → ...tProjects.lang_ja_device_phone4_7inch.png b/...ojects_lang_ja_device_phone4_7inch@2x.png → ...tProjects.lang_ja_device_phone4_7inch.png
diff --git a/...ojects_lang_ja_device_phone5_8inch@2x.png → ...tProjects.lang_ja_device_phone5_8inch.png b/...ojects_lang_ja_device_phone5_8inch@2x.png → ...tProjects.lang_ja_device_phone5_8inch.png
diff --git a/Kickstarter-iOS/Features/BetaTools/Controller/BetaToolsViewControllerTests.swift b/Kickstarter-iOS/Features/BetaTools/Controller/BetaToolsViewControllerTests.swift
@@ -2,6 +2,7 @@
 @testable import KsApi
 @testable import Library
 import Prelude
+import SnapshotTesting
 import UIKit
 
 final class BetaToolsViewControllerTests: TestCase {
@@ -26,7 +27,7 @@ final class BetaToolsViewControllerTests: TestCase {
 
       self.scheduler.run()
 
-      FBSnapshotVerifyView(parent.view)
+      assertSnapshot(matching: parent.view, as: .image)
     }
   }
 }
diff --git a/...er/__Snapshots__/BetaToolsViewControllerTests/testBetaToolsViewController.1.png b/...er/__Snapshots__/BetaToolsViewControllerTests/testBetaToolsViewController.1.png
diff --git a/Kickstarter-iOS/Features/CancelPledge/Controller/CancelPledgeViewControllerTests.swift b/Kickstarter-iOS/Features/CancelPledge/Controller/CancelPledgeViewControllerTests.swift
@@ -2,6 +2,7 @@ import Foundation
 @testable import Kickstarter_Framework
 @testable import KsApi
 @testable import Library
+import SnapshotTesting
 import XCTest
 
 final class CancelPledgeViewControllerTests: TestCase {
@@ -35,7 +36,11 @@ final class CancelPledgeViewControllerTests: TestCase {
         controller.configure(with: data)
         let (parent, _) = traitControllers(device: device, orientation: .portrait, child: controller)
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(
+          matching: parent.view,
+          as: .image(perceptualPrecision: 0.98),
+          named: "lang_\(language)_device_\(device)"
+        )
       }
     }
   }

diff --git a/...shots__/CancelPledgeViewControllerTests/testCancelPledge.lang_de_device_pad.png b/...shots__/CancelPledgeViewControllerTests/testCancelPledge.lang_de_device_pad.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_de_device_phone4_7inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_de_device_phone4_7inch.png
diff --git a/.../CancelPledgeViewControllerTests/testCancelPledge.lang_de_device_phone4inch.png b/.../CancelPledgeViewControllerTests/testCancelPledge.lang_de_device_phone4inch.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_de_device_phone5_5inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_de_device_phone5_5inch.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_de_device_phone5_8inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_de_device_phone5_8inch.png
diff --git a/...shots__/CancelPledgeViewControllerTests/testCancelPledge.lang_en_device_pad.png b/...shots__/CancelPledgeViewControllerTests/testCancelPledge.lang_en_device_pad.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_en_device_phone4_7inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_en_device_phone4_7inch.png
diff --git a/.../CancelPledgeViewControllerTests/testCancelPledge.lang_en_device_phone4inch.png b/.../CancelPledgeViewControllerTests/testCancelPledge.lang_en_device_phone4inch.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_en_device_phone5_5inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_en_device_phone5_5inch.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_en_device_phone5_8inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_en_device_phone5_8inch.png
diff --git a/...shots__/CancelPledgeViewControllerTests/testCancelPledge.lang_es_device_pad.png b/...shots__/CancelPledgeViewControllerTests/testCancelPledge.lang_es_device_pad.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_es_device_phone4_7inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_es_device_phone4_7inch.png
diff --git a/.../CancelPledgeViewControllerTests/testCancelPledge.lang_es_device_phone4inch.png b/.../CancelPledgeViewControllerTests/testCancelPledge.lang_es_device_phone4inch.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_es_device_phone5_5inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_es_device_phone5_5inch.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_es_device_phone5_8inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_es_device_phone5_8inch.png
diff --git a/...shots__/CancelPledgeViewControllerTests/testCancelPledge.lang_fr_device_pad.png b/...shots__/CancelPledgeViewControllerTests/testCancelPledge.lang_fr_device_pad.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_fr_device_phone4_7inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_fr_device_phone4_7inch.png
diff --git a/.../CancelPledgeViewControllerTests/testCancelPledge.lang_fr_device_phone4inch.png b/.../CancelPledgeViewControllerTests/testCancelPledge.lang_fr_device_phone4inch.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_fr_device_phone5_5inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_fr_device_phone5_5inch.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_fr_device_phone5_8inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_fr_device_phone5_8inch.png
diff --git a/...shots__/CancelPledgeViewControllerTests/testCancelPledge.lang_ja_device_pad.png b/...shots__/CancelPledgeViewControllerTests/testCancelPledge.lang_ja_device_pad.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_ja_device_phone4_7inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_ja_device_phone4_7inch.png
diff --git a/.../CancelPledgeViewControllerTests/testCancelPledge.lang_ja_device_phone4inch.png b/.../CancelPledgeViewControllerTests/testCancelPledge.lang_ja_device_phone4inch.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_ja_device_phone5_5inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_ja_device_phone5_5inch.png
diff --git a/...ancelPledgeViewControllerTests/testCancelPledge.lang_ja_device_phone5_8inch.png b/...ancelPledgeViewControllerTests/testCancelPledge.lang_ja_device_phone5_8inch.png
diff --git a/...rter-iOS/Features/CategorySelection/Controller/CategorySelectionViewControllerTests.swift b/...rter-iOS/Features/CategorySelection/Controller/CategorySelectionViewControllerTests.swift
@@ -1,6 +1,7 @@
 @testable import Kickstarter_Framework
 @testable import KsApi
 @testable import Library
+import SnapshotTesting
 import XCTest
 
 internal final class CategorySelectionViewControllerTests: TestCase {
@@ -32,7 +33,11 @@ internal final class CategorySelectionViewControllerTests: TestCase {
 
         self.scheduler.run()
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(
+          matching: parent.view,
+          as: .image(perceptualPrecision: 0.98),
+          named: "lang_\(language)_device_\(device)"
+        )
       }
     }
   }

diff --git a/...nViewControllerTests/testCategorySelectionViewController.lang_de_device_pad.png b/...nViewControllerTests/testCategorySelectionViewController.lang_de_device_pad.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_de_device_phone4_7inch.png b/...rollerTests/testCategorySelectionViewController.lang_de_device_phone4_7inch.png
diff --git a/...ntrollerTests/testCategorySelectionViewController.lang_de_device_phone4inch.png b/...ntrollerTests/testCategorySelectionViewController.lang_de_device_phone4inch.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_de_device_phone5_5inch.png b/...rollerTests/testCategorySelectionViewController.lang_de_device_phone5_5inch.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_de_device_phone5_8inch.png b/...rollerTests/testCategorySelectionViewController.lang_de_device_phone5_8inch.png
diff --git a/...nViewControllerTests/testCategorySelectionViewController.lang_en_device_pad.png b/...nViewControllerTests/testCategorySelectionViewController.lang_en_device_pad.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_en_device_phone4_7inch.png b/...rollerTests/testCategorySelectionViewController.lang_en_device_phone4_7inch.png
diff --git a/...ntrollerTests/testCategorySelectionViewController.lang_en_device_phone4inch.png b/...ntrollerTests/testCategorySelectionViewController.lang_en_device_phone4inch.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_en_device_phone5_5inch.png b/...rollerTests/testCategorySelectionViewController.lang_en_device_phone5_5inch.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_en_device_phone5_8inch.png b/...rollerTests/testCategorySelectionViewController.lang_en_device_phone5_8inch.png
diff --git a/...nViewControllerTests/testCategorySelectionViewController.lang_es_device_pad.png b/...nViewControllerTests/testCategorySelectionViewController.lang_es_device_pad.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_es_device_phone4_7inch.png b/...rollerTests/testCategorySelectionViewController.lang_es_device_phone4_7inch.png
diff --git a/...ntrollerTests/testCategorySelectionViewController.lang_es_device_phone4inch.png b/...ntrollerTests/testCategorySelectionViewController.lang_es_device_phone4inch.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_es_device_phone5_5inch.png b/...rollerTests/testCategorySelectionViewController.lang_es_device_phone5_5inch.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_es_device_phone5_8inch.png b/...rollerTests/testCategorySelectionViewController.lang_es_device_phone5_8inch.png
diff --git a/...nViewControllerTests/testCategorySelectionViewController.lang_fr_device_pad.png b/...nViewControllerTests/testCategorySelectionViewController.lang_fr_device_pad.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_fr_device_phone4_7inch.png b/...rollerTests/testCategorySelectionViewController.lang_fr_device_phone4_7inch.png
diff --git a/...ntrollerTests/testCategorySelectionViewController.lang_fr_device_phone4inch.png b/...ntrollerTests/testCategorySelectionViewController.lang_fr_device_phone4inch.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_fr_device_phone5_5inch.png b/...rollerTests/testCategorySelectionViewController.lang_fr_device_phone5_5inch.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_fr_device_phone5_8inch.png b/...rollerTests/testCategorySelectionViewController.lang_fr_device_phone5_8inch.png
diff --git a/...nViewControllerTests/testCategorySelectionViewController.lang_ja_device_pad.png b/...nViewControllerTests/testCategorySelectionViewController.lang_ja_device_pad.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_ja_device_phone4_7inch.png b/...rollerTests/testCategorySelectionViewController.lang_ja_device_phone4_7inch.png
diff --git a/...ntrollerTests/testCategorySelectionViewController.lang_ja_device_phone4inch.png b/...ntrollerTests/testCategorySelectionViewController.lang_ja_device_phone4inch.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_ja_device_phone5_5inch.png b/...rollerTests/testCategorySelectionViewController.lang_ja_device_phone5_5inch.png
diff --git a/...rollerTests/testCategorySelectionViewController.lang_ja_device_phone5_8inch.png b/...rollerTests/testCategorySelectionViewController.lang_ja_device_phone5_8inch.png
diff --git a/Kickstarter-iOS/Features/ChangeEmail/Controller/ChangeEmailViewControllerTests.swift b/Kickstarter-iOS/Features/ChangeEmail/Controller/ChangeEmailViewControllerTests.swift
@@ -2,6 +2,7 @@
 @testable import KsApi
 @testable import Library
 import Prelude
+import SnapshotTesting
 import XCTest
 
 final class ChangeEmailViewControllerTests: TestCase {
@@ -29,7 +30,7 @@ final class ChangeEmailViewControllerTests: TestCase {
 
         scheduler.advance()
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }
@@ -45,7 +46,7 @@ final class ChangeEmailViewControllerTests: TestCase {
 
         scheduler.advance()
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }
@@ -68,7 +69,7 @@ final class ChangeEmailViewControllerTests: TestCase {
 
         scheduler.advance()
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }
@@ -86,7 +87,7 @@ final class ChangeEmailViewControllerTests: TestCase {
 
         scheduler.advance()
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }

diff --git a/...testChangeEmail_lang_de_device_pad@2x.png → ...ts/testChangeEmail.lang_de_device_pad.png b/...testChangeEmail_lang_de_device_pad@2x.png → ...ts/testChangeEmail.lang_de_device_pad.png
diff --git a/...eEmail_lang_de_device_phone4_7inch@2x.png → ...angeEmail.lang_de_device_phone4_7inch.png b/...eEmail_lang_de_device_phone4_7inch@2x.png → ...angeEmail.lang_de_device_phone4_7inch.png
diff --git a/...ngeEmail_lang_de_device_phone4inch@2x.png → ...ChangeEmail.lang_de_device_phone4inch.png b/...ngeEmail_lang_de_device_phone4inch@2x.png → ...ChangeEmail.lang_de_device_phone4inch.png
diff --git a/...eEmail_lang_de_device_phone5_5inch@2x.png → ...angeEmail.lang_de_device_phone5_5inch.png b/...eEmail_lang_de_device_phone5_5inch@2x.png → ...angeEmail.lang_de_device_phone5_5inch.png
diff --git a/...eEmail_lang_de_device_phone5_8inch@2x.png → ...angeEmail.lang_de_device_phone5_8inch.png b/...eEmail_lang_de_device_phone5_8inch@2x.png → ...angeEmail.lang_de_device_phone5_8inch.png
diff --git a/...testChangeEmail_lang_en_device_pad@2x.png → ...ts/testChangeEmail.lang_en_device_pad.png b/...testChangeEmail_lang_en_device_pad@2x.png → ...ts/testChangeEmail.lang_en_device_pad.png
diff --git a/...eEmail_lang_en_device_phone4_7inch@2x.png → ...angeEmail.lang_en_device_phone4_7inch.png b/...eEmail_lang_en_device_phone4_7inch@2x.png → ...angeEmail.lang_en_device_phone4_7inch.png
diff --git a/...ngeEmail_lang_en_device_phone4inch@2x.png → ...ChangeEmail.lang_en_device_phone4inch.png b/...ngeEmail_lang_en_device_phone4inch@2x.png → ...ChangeEmail.lang_en_device_phone4inch.png
diff --git a/...eEmail_lang_en_device_phone5_5inch@2x.png → ...angeEmail.lang_en_device_phone5_5inch.png b/...eEmail_lang_en_device_phone5_5inch@2x.png → ...angeEmail.lang_en_device_phone5_5inch.png
diff --git a/...eEmail_lang_en_device_phone5_8inch@2x.png → ...angeEmail.lang_en_device_phone5_8inch.png b/...eEmail_lang_en_device_phone5_8inch@2x.png → ...angeEmail.lang_en_device_phone5_8inch.png
diff --git a/...testChangeEmail_lang_es_device_pad@2x.png → ...ts/testChangeEmail.lang_es_device_pad.png b/...testChangeEmail_lang_es_device_pad@2x.png → ...ts/testChangeEmail.lang_es_device_pad.png
diff --git a/...eEmail_lang_es_device_phone4_7inch@2x.png → ...angeEmail.lang_es_device_phone4_7inch.png b/...eEmail_lang_es_device_phone4_7inch@2x.png → ...angeEmail.lang_es_device_phone4_7inch.png
diff --git a/...ngeEmail_lang_es_device_phone4inch@2x.png → ...ChangeEmail.lang_es_device_phone4inch.png b/...ngeEmail_lang_es_device_phone4inch@2x.png → ...ChangeEmail.lang_es_device_phone4inch.png
diff --git a/...eEmail_lang_es_device_phone5_5inch@2x.png → ...angeEmail.lang_es_device_phone5_5inch.png b/...eEmail_lang_es_device_phone5_5inch@2x.png → ...angeEmail.lang_es_device_phone5_5inch.png
diff --git a/...eEmail_lang_es_device_phone5_8inch@2x.png → ...angeEmail.lang_es_device_phone5_8inch.png b/...eEmail_lang_es_device_phone5_8inch@2x.png → ...angeEmail.lang_es_device_phone5_8inch.png
diff --git a/...testChangeEmail_lang_fr_device_pad@2x.png → ...ts/testChangeEmail.lang_fr_device_pad.png b/...testChangeEmail_lang_fr_device_pad@2x.png → ...ts/testChangeEmail.lang_fr_device_pad.png
diff --git a/...eEmail_lang_fr_device_phone4_7inch@2x.png → ...angeEmail.lang_fr_device_phone4_7inch.png b/...eEmail_lang_fr_device_phone4_7inch@2x.png → ...angeEmail.lang_fr_device_phone4_7inch.png
diff --git a/...ngeEmail_lang_fr_device_phone4inch@2x.png → ...ChangeEmail.lang_fr_device_phone4inch.png b/...ngeEmail_lang_fr_device_phone4inch@2x.png → ...ChangeEmail.lang_fr_device_phone4inch.png
diff --git a/...eEmail_lang_fr_device_phone5_5inch@2x.png → ...angeEmail.lang_fr_device_phone5_5inch.png b/...eEmail_lang_fr_device_phone5_5inch@2x.png → ...angeEmail.lang_fr_device_phone5_5inch.png
diff --git a/...eEmail_lang_fr_device_phone5_8inch@2x.png → ...angeEmail.lang_fr_device_phone5_8inch.png b/...eEmail_lang_fr_device_phone5_8inch@2x.png → ...angeEmail.lang_fr_device_phone5_8inch.png
diff --git a/...testChangeEmail_lang_ja_device_pad@2x.png → ...ts/testChangeEmail.lang_ja_device_pad.png b/...testChangeEmail_lang_ja_device_pad@2x.png → ...ts/testChangeEmail.lang_ja_device_pad.png
diff --git a/...eEmail_lang_ja_device_phone4_7inch@2x.png → ...angeEmail.lang_ja_device_phone4_7inch.png b/...eEmail_lang_ja_device_phone4_7inch@2x.png → ...angeEmail.lang_ja_device_phone4_7inch.png
diff --git a/...ngeEmail_lang_ja_device_phone4inch@2x.png → ...ChangeEmail.lang_ja_device_phone4inch.png b/...ngeEmail_lang_ja_device_phone4inch@2x.png → ...ChangeEmail.lang_ja_device_phone4inch.png
diff --git a/...eEmail_lang_ja_device_phone5_5inch@2x.png → ...angeEmail.lang_ja_device_phone5_5inch.png b/...eEmail_lang_ja_device_phone5_5inch@2x.png → ...angeEmail.lang_ja_device_phone5_5inch.png
diff --git a/...eEmail_lang_ja_device_phone5_8inch@2x.png → ...angeEmail.lang_ja_device_phone5_8inch.png b/...eEmail_lang_ja_device_phone5_8inch@2x.png → ...angeEmail.lang_ja_device_phone5_8inch.png
diff --git a/...eliverableEmail_lang_de_device_pad@2x.png → ...undeliverableEmail.lang_de_device_pad.png b/...eliverableEmail_lang_de_device_pad@2x.png → ...undeliverableEmail.lang_de_device_pad.png
diff --git a/...eEmail_lang_de_device_phone4_7inch@2x.png → ...ableEmail.lang_de_device_phone4_7inch.png b/...eEmail_lang_de_device_phone4_7inch@2x.png → ...ableEmail.lang_de_device_phone4_7inch.png
diff --git a/...bleEmail_lang_de_device_phone4inch@2x.png → ...erableEmail.lang_de_device_phone4inch.png b/...bleEmail_lang_de_device_phone4inch@2x.png → ...erableEmail.lang_de_device_phone4inch.png
diff --git a/...eEmail_lang_de_device_phone5_5inch@2x.png → ...ableEmail.lang_de_device_phone5_5inch.png b/...eEmail_lang_de_device_phone5_5inch@2x.png → ...ableEmail.lang_de_device_phone5_5inch.png
diff --git a/...eEmail_lang_de_device_phone5_8inch@2x.png → ...ableEmail.lang_de_device_phone5_8inch.png b/...eEmail_lang_de_device_phone5_8inch@2x.png → ...ableEmail.lang_de_device_phone5_8inch.png
diff --git a/...eliverableEmail_lang_en_device_pad@2x.png → ...undeliverableEmail.lang_en_device_pad.png b/...eliverableEmail_lang_en_device_pad@2x.png → ...undeliverableEmail.lang_en_device_pad.png
diff --git a/...eEmail_lang_en_device_phone4_7inch@2x.png → ...ableEmail.lang_en_device_phone4_7inch.png b/...eEmail_lang_en_device_phone4_7inch@2x.png → ...ableEmail.lang_en_device_phone4_7inch.png
diff --git a/...bleEmail_lang_en_device_phone4inch@2x.png → ...erableEmail.lang_en_device_phone4inch.png b/...bleEmail_lang_en_device_phone4inch@2x.png → ...erableEmail.lang_en_device_phone4inch.png
diff --git a/...eEmail_lang_en_device_phone5_5inch@2x.png → ...ableEmail.lang_en_device_phone5_5inch.png b/...eEmail_lang_en_device_phone5_5inch@2x.png → ...ableEmail.lang_en_device_phone5_5inch.png
diff --git a/...eEmail_lang_en_device_phone5_8inch@2x.png → ...ableEmail.lang_en_device_phone5_8inch.png b/...eEmail_lang_en_device_phone5_8inch@2x.png → ...ableEmail.lang_en_device_phone5_8inch.png
diff --git a/...eliverableEmail_lang_es_device_pad@2x.png → ...undeliverableEmail.lang_es_device_pad.png b/...eliverableEmail_lang_es_device_pad@2x.png → ...undeliverableEmail.lang_es_device_pad.png
diff --git a/...eEmail_lang_es_device_phone4_7inch@2x.png → ...ableEmail.lang_es_device_phone4_7inch.png b/...eEmail_lang_es_device_phone4_7inch@2x.png → ...ableEmail.lang_es_device_phone4_7inch.png
diff --git a/...bleEmail_lang_es_device_phone4inch@2x.png → ...erableEmail.lang_es_device_phone4inch.png b/...bleEmail_lang_es_device_phone4inch@2x.png → ...erableEmail.lang_es_device_phone4inch.png
diff --git a/...eEmail_lang_es_device_phone5_5inch@2x.png → ...ableEmail.lang_es_device_phone5_5inch.png b/...eEmail_lang_es_device_phone5_5inch@2x.png → ...ableEmail.lang_es_device_phone5_5inch.png
diff --git a/...eEmail_lang_es_device_phone5_8inch@2x.png → ...ableEmail.lang_es_device_phone5_8inch.png b/...eEmail_lang_es_device_phone5_8inch@2x.png → ...ableEmail.lang_es_device_phone5_8inch.png
diff --git a/...eliverableEmail_lang_fr_device_pad@2x.png → ...undeliverableEmail.lang_fr_device_pad.png b/...eliverableEmail_lang_fr_device_pad@2x.png → ...undeliverableEmail.lang_fr_device_pad.png
diff --git a/...eEmail_lang_fr_device_phone4_7inch@2x.png → ...ableEmail.lang_fr_device_phone4_7inch.png b/...eEmail_lang_fr_device_phone4_7inch@2x.png → ...ableEmail.lang_fr_device_phone4_7inch.png
diff --git a/...bleEmail_lang_fr_device_phone4inch@2x.png → ...erableEmail.lang_fr_device_phone4inch.png b/...bleEmail_lang_fr_device_phone4inch@2x.png → ...erableEmail.lang_fr_device_phone4inch.png
diff --git a/...eEmail_lang_fr_device_phone5_5inch@2x.png → ...ableEmail.lang_fr_device_phone5_5inch.png b/...eEmail_lang_fr_device_phone5_5inch@2x.png → ...ableEmail.lang_fr_device_phone5_5inch.png
diff --git a/...eEmail_lang_fr_device_phone5_8inch@2x.png → ...ableEmail.lang_fr_device_phone5_8inch.png b/...eEmail_lang_fr_device_phone5_8inch@2x.png → ...ableEmail.lang_fr_device_phone5_8inch.png
diff --git a/...eliverableEmail_lang_ja_device_pad@2x.png → ...undeliverableEmail.lang_ja_device_pad.png b/...eliverableEmail_lang_ja_device_pad@2x.png → ...undeliverableEmail.lang_ja_device_pad.png
diff --git a/...eEmail_lang_ja_device_phone4_7inch@2x.png → ...ableEmail.lang_ja_device_phone4_7inch.png b/...eEmail_lang_ja_device_phone4_7inch@2x.png → ...ableEmail.lang_ja_device_phone4_7inch.png
diff --git a/...bleEmail_lang_ja_device_phone4inch@2x.png → ...erableEmail.lang_ja_device_phone4inch.png b/...bleEmail_lang_ja_device_phone4inch@2x.png → ...erableEmail.lang_ja_device_phone4inch.png
diff --git a/...eEmail_lang_ja_device_phone5_5inch@2x.png → ...ableEmail.lang_ja_device_phone5_5inch.png b/...eEmail_lang_ja_device_phone5_5inch@2x.png → ...ableEmail.lang_ja_device_phone5_5inch.png
diff --git a/...eEmail_lang_ja_device_phone5_8inch@2x.png → ...ableEmail.lang_ja_device_phone5_8inch.png b/...eEmail_lang_ja_device_phone5_8inch@2x.png → ...ableEmail.lang_ja_device_phone5_8inch.png
diff --git a/...unverifiedEmail_lang_de_device_pad@2x.png → ...en_unverifiedEmail.lang_de_device_pad.png b/...unverifiedEmail_lang_de_device_pad@2x.png → ...en_unverifiedEmail.lang_de_device_pad.png
diff --git a/...dEmail_lang_de_device_phone4_7inch@2x.png → ...fiedEmail.lang_de_device_phone4_7inch.png b/...dEmail_lang_de_device_phone4_7inch@2x.png → ...fiedEmail.lang_de_device_phone4_7inch.png
diff --git a/...iedEmail_lang_de_device_phone4inch@2x.png → ...rifiedEmail.lang_de_device_phone4inch.png b/...iedEmail_lang_de_device_phone4inch@2x.png → ...rifiedEmail.lang_de_device_phone4inch.png
diff --git a/...dEmail_lang_de_device_phone5_5inch@2x.png → ...fiedEmail.lang_de_device_phone5_5inch.png b/...dEmail_lang_de_device_phone5_5inch@2x.png → ...fiedEmail.lang_de_device_phone5_5inch.png
diff --git a/...dEmail_lang_de_device_phone5_8inch@2x.png → ...fiedEmail.lang_de_device_phone5_8inch.png b/...dEmail_lang_de_device_phone5_8inch@2x.png → ...fiedEmail.lang_de_device_phone5_8inch.png
diff --git a/...unverifiedEmail_lang_en_device_pad@2x.png → ...en_unverifiedEmail.lang_en_device_pad.png b/...unverifiedEmail_lang_en_device_pad@2x.png → ...en_unverifiedEmail.lang_en_device_pad.png
diff --git a/...dEmail_lang_en_device_phone4_7inch@2x.png → ...fiedEmail.lang_en_device_phone4_7inch.png b/...dEmail_lang_en_device_phone4_7inch@2x.png → ...fiedEmail.lang_en_device_phone4_7inch.png
diff --git a/...iedEmail_lang_en_device_phone4inch@2x.png → ...rifiedEmail.lang_en_device_phone4inch.png b/...iedEmail_lang_en_device_phone4inch@2x.png → ...rifiedEmail.lang_en_device_phone4inch.png
diff --git a/...dEmail_lang_en_device_phone5_5inch@2x.png → ...fiedEmail.lang_en_device_phone5_5inch.png b/...dEmail_lang_en_device_phone5_5inch@2x.png → ...fiedEmail.lang_en_device_phone5_5inch.png
diff --git a/...dEmail_lang_en_device_phone5_8inch@2x.png → ...fiedEmail.lang_en_device_phone5_8inch.png b/...dEmail_lang_en_device_phone5_8inch@2x.png → ...fiedEmail.lang_en_device_phone5_8inch.png
diff --git a/...unverifiedEmail_lang_es_device_pad@2x.png → ...en_unverifiedEmail.lang_es_device_pad.png b/...unverifiedEmail_lang_es_device_pad@2x.png → ...en_unverifiedEmail.lang_es_device_pad.png
diff --git a/...dEmail_lang_es_device_phone4_7inch@2x.png → ...fiedEmail.lang_es_device_phone4_7inch.png b/...dEmail_lang_es_device_phone4_7inch@2x.png → ...fiedEmail.lang_es_device_phone4_7inch.png
diff --git a/...iedEmail_lang_es_device_phone4inch@2x.png → ...rifiedEmail.lang_es_device_phone4inch.png b/...iedEmail_lang_es_device_phone4inch@2x.png → ...rifiedEmail.lang_es_device_phone4inch.png
diff --git a/...dEmail_lang_es_device_phone5_5inch@2x.png → ...fiedEmail.lang_es_device_phone5_5inch.png b/...dEmail_lang_es_device_phone5_5inch@2x.png → ...fiedEmail.lang_es_device_phone5_5inch.png
diff --git a/...dEmail_lang_es_device_phone5_8inch@2x.png → ...fiedEmail.lang_es_device_phone5_8inch.png b/...dEmail_lang_es_device_phone5_8inch@2x.png → ...fiedEmail.lang_es_device_phone5_8inch.png
diff --git a/...unverifiedEmail_lang_fr_device_pad@2x.png → ...en_unverifiedEmail.lang_fr_device_pad.png b/...unverifiedEmail_lang_fr_device_pad@2x.png → ...en_unverifiedEmail.lang_fr_device_pad.png
diff --git a/...dEmail_lang_fr_device_phone4_7inch@2x.png → ...fiedEmail.lang_fr_device_phone4_7inch.png b/...dEmail_lang_fr_device_phone4_7inch@2x.png → ...fiedEmail.lang_fr_device_phone4_7inch.png
diff --git a/...iedEmail_lang_fr_device_phone4inch@2x.png → ...rifiedEmail.lang_fr_device_phone4inch.png b/...iedEmail_lang_fr_device_phone4inch@2x.png → ...rifiedEmail.lang_fr_device_phone4inch.png
diff --git a/...dEmail_lang_fr_device_phone5_5inch@2x.png → ...fiedEmail.lang_fr_device_phone5_5inch.png b/...dEmail_lang_fr_device_phone5_5inch@2x.png → ...fiedEmail.lang_fr_device_phone5_5inch.png
diff --git a/...dEmail_lang_fr_device_phone5_8inch@2x.png → ...fiedEmail.lang_fr_device_phone5_8inch.png b/...dEmail_lang_fr_device_phone5_8inch@2x.png → ...fiedEmail.lang_fr_device_phone5_8inch.png
diff --git a/...unverifiedEmail_lang_ja_device_pad@2x.png → ...en_unverifiedEmail.lang_ja_device_pad.png b/...unverifiedEmail_lang_ja_device_pad@2x.png → ...en_unverifiedEmail.lang_ja_device_pad.png
diff --git a/...dEmail_lang_ja_device_phone4_7inch@2x.png → ...fiedEmail.lang_ja_device_phone4_7inch.png b/...dEmail_lang_ja_device_phone4_7inch@2x.png → ...fiedEmail.lang_ja_device_phone4_7inch.png
diff --git a/...iedEmail_lang_ja_device_phone4inch@2x.png → ...rifiedEmail.lang_ja_device_phone4inch.png b/...iedEmail_lang_ja_device_phone4inch@2x.png → ...rifiedEmail.lang_ja_device_phone4inch.png
diff --git a/...dEmail_lang_ja_device_phone5_5inch@2x.png → ...fiedEmail.lang_ja_device_phone5_5inch.png b/...dEmail_lang_ja_device_phone5_5inch@2x.png → ...fiedEmail.lang_ja_device_phone5_5inch.png
diff --git a/...dEmail_lang_ja_device_phone5_8inch@2x.png → ...fiedEmail.lang_ja_device_phone5_8inch.png b/...dEmail_lang_ja_device_phone5_8inch@2x.png → ...fiedEmail.lang_ja_device_phone5_8inch.png
diff --git a/...Email_isCreator_lang_de_device_pad@2x.png → ...iedEmail_isCreator.lang_de_device_pad.png b/...Email_isCreator_lang_de_device_pad@2x.png → ...iedEmail_isCreator.lang_de_device_pad.png
diff --git a/...reator_lang_de_device_phone4_7inch@2x.png → ...isCreator.lang_de_device_phone4_7inch.png b/...reator_lang_de_device_phone4_7inch@2x.png → ...isCreator.lang_de_device_phone4_7inch.png
diff --git a/...sCreator_lang_de_device_phone4inch@2x.png → ...l_isCreator.lang_de_device_phone4inch.png b/...sCreator_lang_de_device_phone4inch@2x.png → ...l_isCreator.lang_de_device_phone4inch.png
diff --git a/...reator_lang_de_device_phone5_5inch@2x.png → ...isCreator.lang_de_device_phone5_5inch.png b/...reator_lang_de_device_phone5_5inch@2x.png → ...isCreator.lang_de_device_phone5_5inch.png
diff --git a/...reator_lang_de_device_phone5_8inch@2x.png → ...isCreator.lang_de_device_phone5_8inch.png b/...reator_lang_de_device_phone5_8inch@2x.png → ...isCreator.lang_de_device_phone5_8inch.png
diff --git a/...Email_isCreator_lang_en_device_pad@2x.png → ...iedEmail_isCreator.lang_en_device_pad.png b/...Email_isCreator_lang_en_device_pad@2x.png → ...iedEmail_isCreator.lang_en_device_pad.png
diff --git a/...reator_lang_en_device_phone4_7inch@2x.png → ...isCreator.lang_en_device_phone4_7inch.png b/...reator_lang_en_device_phone4_7inch@2x.png → ...isCreator.lang_en_device_phone4_7inch.png
diff --git a/...sCreator_lang_en_device_phone4inch@2x.png → ...l_isCreator.lang_en_device_phone4inch.png b/...sCreator_lang_en_device_phone4inch@2x.png → ...l_isCreator.lang_en_device_phone4inch.png
diff --git a/...reator_lang_en_device_phone5_5inch@2x.png → ...isCreator.lang_en_device_phone5_5inch.png b/...reator_lang_en_device_phone5_5inch@2x.png → ...isCreator.lang_en_device_phone5_5inch.png
diff --git a/...reator_lang_en_device_phone5_8inch@2x.png → ...isCreator.lang_en_device_phone5_8inch.png b/...reator_lang_en_device_phone5_8inch@2x.png → ...isCreator.lang_en_device_phone5_8inch.png
diff --git a/...Email_isCreator_lang_es_device_pad@2x.png → ...iedEmail_isCreator.lang_es_device_pad.png b/...Email_isCreator_lang_es_device_pad@2x.png → ...iedEmail_isCreator.lang_es_device_pad.png
diff --git a/...reator_lang_es_device_phone4_7inch@2x.png → ...isCreator.lang_es_device_phone4_7inch.png b/...reator_lang_es_device_phone4_7inch@2x.png → ...isCreator.lang_es_device_phone4_7inch.png
diff --git a/...sCreator_lang_es_device_phone4inch@2x.png → ...l_isCreator.lang_es_device_phone4inch.png b/...sCreator_lang_es_device_phone4inch@2x.png → ...l_isCreator.lang_es_device_phone4inch.png
diff --git a/...reator_lang_es_device_phone5_5inch@2x.png → ...isCreator.lang_es_device_phone5_5inch.png b/...reator_lang_es_device_phone5_5inch@2x.png → ...isCreator.lang_es_device_phone5_5inch.png
diff --git a/...reator_lang_es_device_phone5_8inch@2x.png → ...isCreator.lang_es_device_phone5_8inch.png b/...reator_lang_es_device_phone5_8inch@2x.png → ...isCreator.lang_es_device_phone5_8inch.png
diff --git a/...Email_isCreator_lang_fr_device_pad@2x.png → ...iedEmail_isCreator.lang_fr_device_pad.png b/...Email_isCreator_lang_fr_device_pad@2x.png → ...iedEmail_isCreator.lang_fr_device_pad.png
diff --git a/...reator_lang_fr_device_phone4_7inch@2x.png → ...isCreator.lang_fr_device_phone4_7inch.png b/...reator_lang_fr_device_phone4_7inch@2x.png → ...isCreator.lang_fr_device_phone4_7inch.png
diff --git a/...sCreator_lang_fr_device_phone4inch@2x.png → ...l_isCreator.lang_fr_device_phone4inch.png b/...sCreator_lang_fr_device_phone4inch@2x.png → ...l_isCreator.lang_fr_device_phone4inch.png
diff --git a/...reator_lang_fr_device_phone5_5inch@2x.png → ...isCreator.lang_fr_device_phone5_5inch.png b/...reator_lang_fr_device_phone5_5inch@2x.png → ...isCreator.lang_fr_device_phone5_5inch.png
diff --git a/...reator_lang_fr_device_phone5_8inch@2x.png → ...isCreator.lang_fr_device_phone5_8inch.png b/...reator_lang_fr_device_phone5_8inch@2x.png → ...isCreator.lang_fr_device_phone5_8inch.png
diff --git a/...Email_isCreator_lang_ja_device_pad@2x.png → ...iedEmail_isCreator.lang_ja_device_pad.png b/...Email_isCreator_lang_ja_device_pad@2x.png → ...iedEmail_isCreator.lang_ja_device_pad.png
diff --git a/...reator_lang_ja_device_phone4_7inch@2x.png → ...isCreator.lang_ja_device_phone4_7inch.png b/...reator_lang_ja_device_phone4_7inch@2x.png → ...isCreator.lang_ja_device_phone4_7inch.png
diff --git a/...sCreator_lang_ja_device_phone4inch@2x.png → ...l_isCreator.lang_ja_device_phone4inch.png b/...sCreator_lang_ja_device_phone4inch@2x.png → ...l_isCreator.lang_ja_device_phone4inch.png
diff --git a/...reator_lang_ja_device_phone5_5inch@2x.png → ...isCreator.lang_ja_device_phone5_5inch.png b/...reator_lang_ja_device_phone5_5inch@2x.png → ...isCreator.lang_ja_device_phone5_5inch.png
diff --git a/...reator_lang_ja_device_phone5_8inch@2x.png → ...isCreator.lang_ja_device_phone5_8inch.png b/...reator_lang_ja_device_phone5_8inch@2x.png → ...isCreator.lang_ja_device_phone5_8inch.png
diff --git a/Kickstarter-iOS/Features/ChangePassword/Controller/ChangePasswordViewControllerTests.swift b/Kickstarter-iOS/Features/ChangePassword/Controller/ChangePasswordViewControllerTests.swift
@@ -2,6 +2,7 @@
 @testable import KsApi
 @testable import Library
 import Prelude
+import SnapshotTesting
 import XCTest
 
 final class ChangePasswordViewControllerTests: TestCase {
@@ -23,7 +24,7 @@ final class ChangePasswordViewControllerTests: TestCase {
         let controller = ChangePasswordViewController.instantiate()
         let (parent, _) = traitControllers(device: device, orientation: .portrait, child: controller)
 
-        FBSnapshotVerifyView(parent.view, identifier: "lang_\(language)_device_\(device)")
+        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
       }
     }
   }

diff --git a/...tChangePassword_lang_de_device_pad@2x.png → ...testChangePassword.lang_de_device_pad.png b/...tChangePassword_lang_de_device_pad@2x.png → ...testChangePassword.lang_de_device_pad.png
diff --git a/...ssword_lang_de_device_phone4_7inch@2x.png → ...ePassword.lang_de_device_phone4_7inch.png b/...ssword_lang_de_device_phone4_7inch@2x.png → ...ePassword.lang_de_device_phone4_7inch.png
diff --git a/...Password_lang_de_device_phone4inch@2x.png → ...ngePassword.lang_de_device_phone4inch.png b/...Password_lang_de_device_phone4inch@2x.png → ...ngePassword.lang_de_device_phone4inch.png
diff --git a/...ssword_lang_de_device_phone5_5inch@2x.png → ...ePassword.lang_de_device_phone5_5inch.png b/...ssword_lang_de_device_phone5_5inch@2x.png → ...ePassword.lang_de_device_phone5_5inch.png
diff --git a/...ssword_lang_de_device_phone5_8inch@2x.png → ...ePassword.lang_de_device_phone5_8inch.png b/...ssword_lang_de_device_phone5_8inch@2x.png → ...ePassword.lang_de_device_phone5_8inch.png
diff --git a/...tChangePassword_lang_en_device_pad@2x.png → ...testChangePassword.lang_en_device_pad.png b/...tChangePassword_lang_en_device_pad@2x.png → ...testChangePassword.lang_en_device_pad.png
diff --git a/...ssword_lang_en_device_phone4_7inch@2x.png → ...ePassword.lang_en_device_phone4_7inch.png b/...ssword_lang_en_device_phone4_7inch@2x.png → ...ePassword.lang_en_device_phone4_7inch.png
diff --git a/...Password_lang_en_device_phone4inch@2x.png → ...ngePassword.lang_en_device_phone4inch.png b/...Password_lang_en_device_phone4inch@2x.png → ...ngePassword.lang_en_device_phone4inch.png
diff --git a/...ssword_lang_en_device_phone5_5inch@2x.png → ...ePassword.lang_en_device_phone5_5inch.png b/...ssword_lang_en_device_phone5_5inch@2x.png → ...ePassword.lang_en_device_phone5_5inch.png
diff --git a/...ssword_lang_en_device_phone5_8inch@2x.png → ...ePassword.lang_en_device_phone5_8inch.png b/...ssword_lang_en_device_phone5_8inch@2x.png → ...ePassword.lang_en_device_phone5_8inch.png
diff --git a/...tChangePassword_lang_es_device_pad@2x.png → ...testChangePassword.lang_es_device_pad.png b/...tChangePassword_lang_es_device_pad@2x.png → ...testChangePassword.lang_es_device_pad.png
diff --git a/...ssword_lang_es_device_phone4_7inch@2x.png → ...ePassword.lang_es_device_phone4_7inch.png b/...ssword_lang_es_device_phone4_7inch@2x.png → ...ePassword.lang_es_device_phone4_7inch.png
diff --git a/...Password_lang_es_device_phone4inch@2x.png → ...ngePassword.lang_es_device_phone4inch.png b/...Password_lang_es_device_phone4inch@2x.png → ...ngePassword.lang_es_device_phone4inch.png
diff --git a/...ssword_lang_es_device_phone5_5inch@2x.png → ...ePassword.lang_es_device_phone5_5inch.png b/...ssword_lang_es_device_phone5_5inch@2x.png → ...ePassword.lang_es_device_phone5_5inch.png
diff --git a/...ssword_lang_es_device_phone5_8inch@2x.png → ...ePassword.lang_es_device_phone5_8inch.png b/...ssword_lang_es_device_phone5_8inch@2x.png → ...ePassword.lang_es_device_phone5_8inch.png
diff --git a/...tChangePassword_lang_fr_device_pad@2x.png → ...testChangePassword.lang_fr_device_pad.png b/...tChangePassword_lang_fr_device_pad@2x.png → ...testChangePassword.lang_fr_device_pad.png
diff --git a/...ssword_lang_fr_device_phone4_7inch@2x.png → ...ePassword.lang_fr_device_phone4_7inch.png b/...ssword_lang_fr_device_phone4_7inch@2x.png → ...ePassword.lang_fr_device_phone4_7inch.png
diff --git a/...Password_lang_fr_device_phone4inch@2x.png → ...ngePassword.lang_fr_device_phone4inch.png b/...Password_lang_fr_device_phone4inch@2x.png → ...ngePassword.lang_fr_device_phone4inch.png
diff --git a/...ssword_lang_fr_device_phone5_5inch@2x.png → ...ePassword.lang_fr_device_phone5_5inch.png b/...ssword_lang_fr_device_phone5_5inch@2x.png → ...ePassword.lang_fr_device_phone5_5inch.png
diff --git a/...ssword_lang_fr_device_phone5_8inch@2x.png → ...ePassword.lang_fr_device_phone5_8inch.png b/...ssword_lang_fr_device_phone5_8inch@2x.png → ...ePassword.lang_fr_device_phone5_8inch.png
diff --git a/...tChangePassword_lang_ja_device_pad@2x.png → ...testChangePassword.lang_ja_device_pad.png b/...tChangePassword_lang_ja_device_pad@2x.png → ...testChangePassword.lang_ja_device_pad.png
diff --git a/...ssword_lang_ja_device_phone4_7inch@2x.png → ...ePassword.lang_ja_device_phone4_7inch.png b/...ssword_lang_ja_device_phone4_7inch@2x.png → ...ePassword.lang_ja_device_phone4_7inch.png
diff --git a/...Password_lang_ja_device_phone4inch@2x.png → ...ngePassword.lang_ja_device_phone4inch.png b/...Password_lang_ja_device_phone4inch@2x.png → ...ngePassword.lang_ja_device_phone4inch.png
diff --git a/...ssword_lang_ja_device_phone5_5inch@2x.png → ...ePassword.lang_ja_device_phone5_5inch.png b/...ssword_lang_ja_device_phone5_5inch@2x.png → ...ePassword.lang_ja_device_phone5_5inch.png
diff --git a/...ssword_lang_ja_device_phone5_8inch@2x.png → ...ePassword.lang_ja_device_phone5_8inch.png b/...ssword_lang_ja_device_phone5_8inch@2x.png → ...ePassword.lang_ja_device_phone5_8inch.png
diff --git a/Kickstarter-iOS/Features/Comments/Controllers/CommentRepliesViewControllerTests.swift b/Kickstarter-iOS/Features/Comments/Controllers/CommentRepliesViewControllerTests.swift
@@ -2,6 +2,7 @@
 @testable import KsApi
 import Library
 import Prelude
+import SnapshotTesting
 import XCTest
 
 final class CommentRepliesViewControllerTests: TestCase {
@@ -40,7 +41,11 @@ final class CommentRepliesViewControllerTests: TestCase {
 
         self.scheduler.run()
 
-        FBSnapshotVerifyView(parent.view, identifier: "CommentReplies - lang_\(language)_device_\(device)")
+        assertSnapshot(
+          matching: parent.view,
+          as: .image,
+          named: "CommentReplies - lang_\(language)_device_\(device)"
+        )
       }
     }
   }
@@ -70,7 +75,11 @@ final class CommentRepliesViewControllerTests: TestCase {
         parent.view.frame.size.height = 1_100
 
         self.scheduler.run()
-        FBSnapshotVerifyView(parent.view, identifier: "CommentReplies - lang_\(language)_device_\(device)")
+        assertSnapshot(
+          matching: parent.view,
+          as: .image,
+          named: "CommentReplies - lang_\(language)_device_\(device)"
+        )
       }
     }
   }
@@ -100,7 +109,11 @@ final class CommentRepliesViewControllerTests: TestCase {
         parent.view.frame.size.height = 1_100
 
         self.scheduler.run()
-        FBSnapshotVerifyView(parent.view, identifier: "CommentReplies - lang_\(language)_device_\(device)")
+        assertSnapshot(
+          matching: parent.view,
+          as: .image,
+          named: "CommentReplies - lang_\(language)_device_\(device)"
+        )
       }
     }
   }
@@ -132,7 +145,11 @@ final class CommentRepliesViewControllerTests: TestCase {
 
         self.scheduler.run()
 
-        FBSnapshotVerifyView(parent.view, identifier: "CommentReplies - lang_\(language)_device_\(device)")
+        assertSnapshot(
+          matching: parent.view,
+          as: .image,
+          named: "CommentReplies - lang_\(language)_device_\(device)"
+        )
       }
     }
   }
@@ -166,7 +183,11 @@ final class CommentRepliesViewControllerTests: TestCase {
 
           self.scheduler.advance()
 
-          FBSnapshotVerifyView(parent.view, identifier: "CommentReplies - lang_\(language)_device_\(device)")
+          assertSnapshot(
+            matching: parent.view,
+            as: .image,
+            named: "CommentReplies - lang_\(language)_device_\(device)"
+          )
         }
       }
     }
@@ -196,7 +217,11 @@ final class CommentRepliesViewControllerTests: TestCase {
 
         self.scheduler.advance()
 
-        FBSnapshotVerifyView(parent.view, identifier: "CommentReplies - lang_\(language)_device_\(device)")
+        assertSnapshot(
+          matching: parent.view,
+          as: .image,
+          named: "CommentReplies - lang_\(language)_device_\(device)"
+        )
       }
     }
   }