Merge pull request #604 from hmrc/jackheslop96-patch-1

Sequential navigation when currentPage is None.
hmrc · Feb 13, 2024 · 361dce4 · 361dce4
2 parents 3476828 + 3254ca5
commit 361dce4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/app/navigation/UserAnswersNavigator.scala b/app/navigation/UserAnswersNavigator.scala
@@ -80,7 +80,7 @@ object UserAnswersNavigator extends Logging {
           t.routeIfCompleted(_, mode, _)
         }
       case Left(ReaderError(unansweredPage, answeredPages, _)) =>
-        rec(answeredPages.toList, exit = false) {
+        rec(answeredPages.toList, exit = currentPage.isEmpty) {
           (userAnswers, _) => unansweredPage.route(userAnswers, mode)
         }
     }

diff --git a/test/navigation/UserAnswersNavigatorSpec.scala b/test/navigation/UserAnswersNavigatorSpec.scala
@@ -61,16 +61,20 @@ class UserAnswersNavigatorSpec extends SpecBase {
       "when in normal mode" - {
         val mode = NormalMode
 
-        "and no pages answered" in {
-          val currentPage             = None
-          val answeredPages           = Nil
-          val userAnswersReaderResult = Left(ReaderError(FooPage, answeredPages))
+        "and currentPage is None" - {
+          "and userAnswersReaderResult is a Left" - {
+            "must redirect to first answered page" in {
+              val currentPage             = None
+              val answeredPages           = Seq(FooPage, BarPage)
+              val userAnswersReaderResult = Left(ReaderError(BazPage, answeredPages))
 
-          val result = UserAnswersNavigator
-            .nextPage(currentPage, userAnswersReaderResult, mode)
-            .apply(userAnswers, stage)
+              val result = UserAnswersNavigator
+                .nextPage(currentPage, userAnswersReaderResult, mode)
+                .apply(userAnswers, stage)
 
-          result.value.url mustBe "/foo"
+              result.value.url mustBe "/foo"
+            }
+          }
         }
 
         "and on FooPage" - {
@@ -133,6 +137,22 @@ class UserAnswersNavigatorSpec extends SpecBase {
       "when in check mode" - {
         val mode = CheckMode
 
+        "and currentPage is None" - {
+          "and userAnswersReaderResult is a Left" - {
+            "must redirect to first answered page" in {
+              val currentPage             = None
+              val answeredPages           = Seq(FooPage, BarPage)
+              val userAnswersReaderResult = Left(ReaderError(BazPage, answeredPages))
+
+              val result = UserAnswersNavigator
+                .nextPage(currentPage, userAnswersReaderResult, mode)
+                .apply(userAnswers, stage)
+
+              result.value.url mustBe "/foo"
+            }
+          }
+        }
+
         "and on FooPage" - {
           val currentPage = Some(FooPage)