[MBL-1197] Show unavailable rewards last

Kickstarter-iOS/Features/RewardsCollection/Controller/RewardsCollectionViewControllerTests.swift

@@ -24,50 +24,47 @@ final class RewardsCollectionViewControllerTests: TestCase {
     let project = Project.cosmicSurgery
       |> Project.lens.state .~ .live
 
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.phone5_8inch, Device.pad]).forEach {
-      language, device in
-      withEnvironment(language: language, locale: .init(identifier: language.rawValue)) {
-        let vc = RewardsCollectionViewController.instantiate(
-          with: project,
-          refTag: nil,
-          context: .createPledge
-        )
-        let (parent, _) = traitControllers(device: device, orientation: .portrait, child: vc)
-
-        assertSnapshot(
-          matching: parent.view,
-          as: .image(perceptualPrecision: 0.98),
-          named: "lang_\(language)_device_\(device)"
-        )
-      }
+    let language = Language.en, device = Device.phone4_7inch
+    withEnvironment(language: language, locale: .init(identifier: language.rawValue)) {
+      let vc = RewardsCollectionViewController.instantiate(
+        with: project,
+        refTag: nil,
+        context: .createPledge
+      )
+      let (parent, _) = traitControllers(device: device, orientation: .portrait, child: vc)
+
+      assertSnapshot(
+        matching: parent.view,
+        as: .image(perceptualPrecision: 0.98),
+        named: "lang_\(language)_device_\(device)"
+      )
     }
   }
 
   func testRewards_NonBacker_LiveProject_Landscape() {
     let project = Project.cosmicSurgery
       |> Project.lens.state .~ .live
+      |> Project.lens.rewardData.rewards %~ { Array($0[1...3]) }
+
+    let language = Language.de, device = Device.pad
+    withEnvironment(language: language, locale: .init(identifier: language.rawValue)) {
+      let vc = RewardsCollectionViewController.instantiate(
+        with: project,
+        refTag: nil,
+        context: .createPledge
+      )
+      let (parent, _) = traitControllers(device: device, orientation: .landscape, child: vc)
 
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.phone5_8inch, Device.pad]).forEach {
-      language, device in
-      withEnvironment(language: language, locale: .init(identifier: language.rawValue)) {
-        let vc = RewardsCollectionViewController.instantiate(
-          with: project,
-          refTag: nil,
-          context: .createPledge
-        )
-        let (parent, _) = traitControllers(device: device, orientation: .landscape, child: vc)
-
-        assertSnapshot(
-          matching: parent.view,
-          as: .image(perceptualPrecision: 0.98),
-          named: "lang_\(language)_device_\(device)"
-        )
-      }
+      assertSnapshot(
+        matching: parent.view,
+        as: .image(perceptualPrecision: 0.98),
+        named: "lang_\(language)_device_\(device)"
+      )
     }
   }
 
   func testRewards_Backer_LiveProject_Landscape() {
-    let reward = Project.cosmicSurgery.rewards[1]
+    let reward = Project.cosmicSurgery.rewards[3]
     let project = Project.cosmicSurgery
       |> Project.lens.state .~ .live
       |> Project.lens.personalization.isBacking .~ true
@@ -77,24 +74,23 @@ final class RewardsCollectionViewControllerTests: TestCase {
           |> Backing.lens.rewardId .~ reward.id
           |> Backing.lens.shippingAmount .~ 10
           |> Backing.lens.amount .~ 700.0
+          |> Backing.lens.addOns .~ []
+      )
+
+    let language = Language.es, device = Device.phone5_8inch
+    withEnvironment(language: language, locale: .init(identifier: language.rawValue)) {
+      let vc = RewardsCollectionViewController.instantiate(
+        with: project,
+        refTag: nil,
+        context: .createPledge
       )
+      let (parent, _) = traitControllers(device: device, orientation: .landscape, child: vc)
 
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.phone5_8inch, Device.pad]).forEach {
-      language, device in
-      withEnvironment(language: language, locale: .init(identifier: language.rawValue)) {
-        let vc = RewardsCollectionViewController.instantiate(
-          with: project,
-          refTag: nil,
-          context: .createPledge
-        )
-        let (parent, _) = traitControllers(device: device, orientation: .landscape, child: vc)
-
-        assertSnapshot(
-          matching: parent.view,
-          as: .image(perceptualPrecision: 0.98),
-          named: "lang_\(language)_device_\(device)"
-        )
-      }
+      assertSnapshot(
+        matching: parent.view,
+        as: .image(perceptualPrecision: 0.98),
+        named: "lang_\(language)_device_\(device)"
+      )
     }
   }
 
@@ -107,21 +103,19 @@ final class RewardsCollectionViewControllerTests: TestCase {
       |> Project.lens.state .~ .live
       |> Project.lens.rewardData.rewards .~ [reward]
 
-    combos(Language.allLanguages, [Device.pad]).forEach {
-      language, device in
-      withEnvironment(
-        language: language,
-        locale: .init(identifier: language.rawValue)
-      ) {
-        let vc = RewardsCollectionViewController.instantiate(
-          with: project,
-          refTag: nil,
-          context: .createPledge
-        )
-        let (parent, _) = traitControllers(device: device, orientation: .landscape, child: vc)
-
-        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
-      }
+    let language = Language.fr, device = Device.pad
+    withEnvironment(
+      language: language,
+      locale: .init(identifier: language.rawValue)
+    ) {
+      let vc = RewardsCollectionViewController.instantiate(
+        with: project,
+        refTag: nil,
+        context: .createPledge
+      )
+      let (parent, _) = traitControllers(device: device, orientation: .landscape, child: vc)
+
+      assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
     }
   }
 
@@ -134,21 +128,19 @@ final class RewardsCollectionViewControllerTests: TestCase {
       |> Project.lens.state .~ .live
       |> Project.lens.rewardData.rewards .~ [reward]
 
-    combos(Language.allLanguages, [Device.phone5_8inch]).forEach {
-      language, device in
-      withEnvironment(
-        language: language,
-        locale: .init(identifier: language.rawValue)
-      ) {
-        let vc = RewardsCollectionViewController.instantiate(
-          with: project,
-          refTag: nil,
-          context: .createPledge
-        )
-        let (parent, _) = traitControllers(device: device, orientation: .portrait, child: vc)
-
-        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
-      }
+    let language = Language.ja, device = Device.phone5_8inch
+    withEnvironment(
+      language: language,
+      locale: .init(identifier: language.rawValue)
+    ) {
+      let vc = RewardsCollectionViewController.instantiate(
+        with: project,
+        refTag: nil,
+        context: .createPledge
+      )
+      let (parent, _) = traitControllers(device: device, orientation: .portrait, child: vc)
+
+      assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
     }
   }
 
@@ -161,21 +153,19 @@ final class RewardsCollectionViewControllerTests: TestCase {
       |> Project.lens.state .~ .live
       |> Project.lens.rewardData.rewards .~ [.noReward, reward]
 
-    combos(Language.allLanguages, [Device.phone5_8inch]).forEach {
-      language, device in
-      withEnvironment(
-        language: language,
-        locale: .init(identifier: language.rawValue)
-      ) {
-        let vc = RewardsCollectionViewController.instantiate(
-          with: project,
-          refTag: nil,
-          context: .createPledge
-        )
-        let (parent, _) = traitControllers(device: device, orientation: .portrait, child: vc)
-
-        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
-      }
+    let language = Language.en, device = Device.phone5_8inch
+    withEnvironment(
+      language: language,
+      locale: .init(identifier: language.rawValue)
+    ) {
+      let vc = RewardsCollectionViewController.instantiate(
+        with: project,
+        refTag: nil,
+        context: .createPledge
+      )
+      let (parent, _) = traitControllers(device: device, orientation: .portrait, child: vc)
+
+      assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
     }
   }
 
@@ -193,21 +183,19 @@ final class RewardsCollectionViewControllerTests: TestCase {
       )
       |> Project.lens.rewardData.rewards .~ [reward]
 
-    combos(Language.allLanguages, [Device.phone5_8inch]).forEach {
-      language, device in
-      withEnvironment(
-        language: language,
-        locale: .init(identifier: language.rawValue)
-      ) {
-        let vc = RewardsCollectionViewController.instantiate(
-          with: project,
-          refTag: nil,
-          context: .createPledge
-        )
-        let (parent, _) = traitControllers(device: device, orientation: .portrait, child: vc)
-
-        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
-      }
+    let language = Language.de, device = Device.phone5_8inch
+    withEnvironment(
+      language: language,
+      locale: .init(identifier: language.rawValue)
+    ) {
+      let vc = RewardsCollectionViewController.instantiate(
+        with: project,
+        refTag: nil,
+        context: .createPledge
+      )
+      let (parent, _) = traitControllers(device: device, orientation: .portrait, child: vc)
+
+      assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
     }
   }
 }

Library/ViewModels/RewardsCollectionViewModel.swift

@@ -53,7 +53,7 @@ public final class RewardsCollectionViewModel: RewardsCollectionViewModelType,
       .map(first)
 
     let rewards = project
-      .map(allowableProjectRewards)
+      .map(allowableSortedProjectRewards)
 
     self.title = configData
       .map { project, _, context in (context, project) }
@@ -384,6 +384,8 @@ private func backingAndShippingTotal(for project: Project, and reward: Reward) -
   return (backing, shippingTotal)
 }
 
-private func allowableProjectRewards(from project: Project) -> [Reward] {
-  project.rewards
+private func allowableSortedProjectRewards(from project: Project) -> [Reward] {
+  let availableRewards = project.rewards.filter { rewardIsAvailable(project: project, reward: $0) }
+  let unAvailableRewards = project.rewards.filter { !rewardIsAvailable(project: project, reward: $0) }
+  return availableRewards + unAvailableRewards
 }

Library/ViewModels/RewardsCollectionViewModelTests.swift

@@ -78,7 +78,7 @@ final class RewardsCollectionViewModelTests: TestCase {
 
       let displayableRewards = self.reloadDataWithValues.lastValue?.compactMap { $0.reward }
 
-      XCTAssertEqual(displayableRewards, project.rewards)
+      XCTAssertEqual(displayableRewards?.sorted(), project.rewards.sorted())
     }
   }
 
@@ -116,7 +116,7 @@ final class RewardsCollectionViewModelTests: TestCase {
 
       let displayableRewards = self.reloadDataWithValues.lastValue?.compactMap { $0.reward }
 
-      XCTAssertEqual(displayableRewards, allNonLocalPickupRewards)
+      XCTAssertEqual(displayableRewards?.sorted(), allNonLocalPickupRewards.sorted())
     }
   }