From dd65a8721a3ec30b69b0485699f1d3d7bcafe18e Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Wed, 20 Jan 2021 13:46:40 +0000
Subject: [PATCH 001/249] Previewing a question now specifies a liquid_template

`liquid_template` is a required part of a `Journey` which was not being
provided whilst previewing a question, leading to the `Journey` not
being persisted and a redirect to the step within the journey being
impossible.

This commit adds a very short stub template to preview journeys.

It also adds a feature spec to ensure that a user attempting to preview
a step does reach the intended view.
---
 app/controllers/preview/entries_controller.rb      |  2 +-
 .../anyone_can_preview_a_journey_step_spec.rb      | 14 ++++++++++++++
 spec/requests/entry_preview_spec.rb                |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb

diff --git a/app/controllers/preview/entries_controller.rb b/app/controllers/preview/entries_controller.rb
index dcd4db657..b2b8d72d6 100644
--- a/app/controllers/preview/entries_controller.rb
+++ b/app/controllers/preview/entries_controller.rb
@@ -1,6 +1,6 @@
 class Preview::EntriesController < ApplicationController
   def show
-    @journey = Journey.create(category: "catering")
+    @journey = Journey.create(category: "catering", liquid_template: "<p>N/A</p>")
     contentful_entry = GetContentfulEntry.new(entry_id: entry_id).call
     @step = CreateJourneyStep.new(
       journey: @journey, contentful_entry: contentful_entry
diff --git a/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb b/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
new file mode 100644
index 000000000..412a9e752
--- /dev/null
+++ b/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
@@ -0,0 +1,14 @@
+feature "Users can preview a journey step" do
+  scenario "the appropriate step is displayed" do
+    stub_get_contentful_entry(
+      entry_id: "contentful-radio-question",
+      fixture_filename: "radio-question-example.json"
+    )
+
+    visit preview_entry_path("contentful-radio-question")
+
+    expect(page).to have_content("Which service do you need?")
+    expect(page).to have_content("Catering")
+    expect(page).to have_content("Cleaning")
+  end
+end
diff --git a/spec/requests/entry_preview_spec.rb b/spec/requests/entry_preview_spec.rb
index 916e3b7cd..c6927ca36 100644
--- a/spec/requests/entry_preview_spec.rb
+++ b/spec/requests/entry_preview_spec.rb
@@ -5,7 +5,7 @@
     entry_id = "123"
     fake_journey = create(:journey)
     expect(Journey).to receive(:create)
-      .with(category: anything)
+      .with(category: anything, liquid_template: anything)
       .and_return(fake_journey)
 
     fake_get_contentful_entry = instance_double(Contentful::Entry)

From 3d9bef71350fe14c15e0ee17c9ca80a68f1a6c7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Jan 2021 11:05:27 +0000
Subject: [PATCH 002/249] Bump bullet from 6.1.2 to 6.1.3

Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.2...6.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 506206498..6ea65482b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
       msgpack (~> 1.0)
     brakeman (4.10.1)
     builder (3.2.4)
-    bullet (6.1.2)
+    bullet (6.1.3)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -94,7 +94,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     connection_pool (2.2.3)
     contentful (2.15.4)
       http (> 0.8, < 5.0)
@@ -332,7 +332,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
-    uniform_notifier (1.13.0)
+    uniform_notifier (1.13.2)
     web-console (4.1.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)

From a3136365d6bdfd2d461bf8d91d4eb3afd4b51257 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Jan 2021 11:02:47 +0000
Subject: [PATCH 003/249] Bump sidekiq from 6.1.2 to 6.1.3

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.1.2...v6.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 506206498..ba1743526 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -290,7 +290,7 @@ GEM
       rubyzip (>= 1.2.2)
     shoulda-matchers (4.5.0)
       activesupport (>= 4.2.0)
-    sidekiq (6.1.2)
+    sidekiq (6.1.3)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)

From 8efff5dae084131b6f260afea0efd1b6a356c656 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Jan 2021 11:03:49 +0000
Subject: [PATCH 004/249] Bump jbuilder from 2.10.1 to 2.11.1

Bumps [jbuilder](https://github.com/rails/jbuilder) from 2.10.1 to 2.11.1.
- [Release notes](https://github.com/rails/jbuilder/releases)
- [Changelog](https://github.com/rails/jbuilder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/jbuilder/compare/v2.10.1...v2.11.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9f4980330..c44df0a95 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem "contentful", "~> 2.15"
 gem "govuk_design_system_formbuilder", "~> 2.1"
 gem "high_voltage"
 gem "htmltoword"
-gem "jbuilder", "~> 2.5"
+gem "jbuilder", "~> 2.11"
 gem "jquery-rails"
 gem "liquid"
 gem "pg"
diff --git a/Gemfile.lock b/Gemfile.lock
index 506206498..fabcc0aaf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -94,7 +94,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     connection_pool (2.2.3)
     contentful (2.15.4)
       http (> 0.8, < 5.0)
@@ -153,7 +153,7 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.10.1)
+    jbuilder (2.11.1)
       activesupport (>= 5.0.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -369,7 +369,7 @@ DEPENDENCIES
   govuk_design_system_formbuilder (~> 2.1)
   high_voltage
   htmltoword
-  jbuilder (~> 2.5)
+  jbuilder (~> 2.11)
   jquery-rails
   launchy
   liquid

From 209d4b5a964f1365998db20f42f5870fe456bbd9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Jan 2021 16:21:27 +0000
Subject: [PATCH 005/249] Bump shoulda-matchers from 4.5.0 to 4.5.1

Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases)
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v4.5.0...v4.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 22405bf4a..6b30d24b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -288,7 +288,7 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    shoulda-matchers (4.5.0)
+    shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
     sidekiq (6.1.3)
       connection_pool (>= 2.2.2)

From 1f73c6a727ddb7237a9577aa41cbc286a509749e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 25 Jan 2021 12:35:40 +0000
Subject: [PATCH 006/249] Introduce a service that will find a category..

..and return a list of entries

* error handling for the case where an entry appears in the cateory entry_list more than once
* raise a more explicit rollbar error message when it's a category that cannot be found (rather than a normal entry)
---
 app/services/get_entries_in_category.rb       | 43 +++++++++++++
 spec/services/get_entries_in_category_spec.rb | 61 +++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 app/services/get_entries_in_category.rb
 create mode 100644 spec/services/get_entries_in_category_spec.rb

diff --git a/app/services/get_entries_in_category.rb b/app/services/get_entries_in_category.rb
new file mode 100644
index 000000000..4642229fd
--- /dev/null
+++ b/app/services/get_entries_in_category.rb
@@ -0,0 +1,43 @@
+class GetEntriesInCategory
+  class RepeatEntryDetected < StandardError; end
+
+  attr_accessor :category_entry_id
+  def initialize(category_entry_id:)
+    self.category_entry_id = category_entry_id
+  end
+
+  def call
+    category_entry = begin
+      GetContentfulEntry.new(entry_id: category_entry_id).call
+    rescue GetContentfulEntry::EntryNotFound
+      send_rollbar_error(message: "A Contentful category entry was not found", entry_id: category_entry_id)
+      raise
+    end
+
+    question_entry_ids = []
+    category_entry.steps.each do |step|
+      if question_entry_ids.include?(step.id)
+        send_rollbar_error(message: "A repeated Contentful entry was found in the same journey", entry_id: step.id)
+        raise RepeatEntryDetected.new(step.id)
+      else
+        question_entry_ids << step.id
+      end
+    end
+
+    question_entry_ids.map { |entry_id|
+      GetContentfulEntry.new(entry_id: entry_id).call
+    }
+  end
+
+  private
+
+  def send_rollbar_error(message:, entry_id:)
+    Rollbar.error(
+      message,
+      contentful_url: ENV["CONTENTFUL_URL"],
+      contentful_space_id: ENV["CONTENTFUL_SPACE"],
+      contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+      contentful_entry_id: entry_id
+    )
+  end
+end
diff --git a/spec/services/get_entries_in_category_spec.rb b/spec/services/get_entries_in_category_spec.rb
new file mode 100644
index 000000000..148704037
--- /dev/null
+++ b/spec/services/get_entries_in_category_spec.rb
@@ -0,0 +1,61 @@
+require "rails_helper"
+
+RSpec.describe GetEntriesInCategory do
+  describe "#call" do
+    it "returns the list of entry objects referenced by the category list" do
+      stub_contentful_category(
+        fixture_filename: "journey-with-multiple-entries.json"
+      )
+
+      result = described_class.new(category_entry_id: "contentful-category-entry").call
+
+      expect(result).to be_kind_of(Array)
+      # INFO: We should test this is a Contentful::Entry however it wasn't
+      # possible to create an instance_double due to an unusual way the object
+      # is constructed within the gem. Creating the object seems overly complex.
+      expect(result.first.id).to eq("contentful-radio-question")
+    end
+
+    context "when the category entry cannot be found" do
+      it "sends a message to rollbar" do
+        contentful_connector = instance_double(ContentfulConnector)
+        expect(ContentfulConnector).to receive(:new)
+          .and_return(contentful_connector)
+
+        allow(contentful_connector).to receive(:get_entry_by_id)
+          .with(anything)
+          .and_return(nil)
+
+        expect(Rollbar).to receive(:error)
+          .with("A Contentful category entry was not found",
+            contentful_url: ENV["CONTENTFUL_URL"],
+            contentful_space_id: ENV["CONTENTFUL_SPACE"],
+            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+            contentful_entry_id: "a-category-id-that-does-not-exist")
+          .and_call_original
+
+        expect {
+          described_class.new(category_entry_id: "a-category-id-that-does-not-exist").call
+        }.to raise_error(GetContentfulEntry::EntryNotFound)
+      end
+    end
+
+    context "when the same entry is found twice" do
+      it "returns an error message" do
+        stub_contentful_category(fixture_filename: "journey-with-repeat-entries.json")
+
+        expect(Rollbar).to receive(:error)
+          .with("A repeated Contentful entry was found in the same journey",
+            contentful_url: ENV["CONTENTFUL_URL"],
+            contentful_space_id: ENV["CONTENTFUL_SPACE"],
+            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+            contentful_entry_id: "contentful-radio-question")
+          .and_call_original
+
+        expect {
+          described_class.new(category_entry_id: "contentful-category-entry").call
+        }.to raise_error(GetEntriesInCategory::RepeatEntryDetected)
+      end
+    end
+  end
+end

From 92bf42de0ed6b33ea6014e921f543e53c67844fa Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 25 Jan 2021 12:05:47 +0000
Subject: [PATCH 007/249] CreateJourney service refactored to get entries from
 a Category service

Co-authored-by: Nick <nick@dxw.com>
Co-authored-by: Lorna <lorna@dxw.com>
---
 app/controllers/journeys_controller.rb        |   2 +-
 app/services/create_journey.rb                |   7 +-
 .../anyone_can_complete_a_journey_spec.rb     | 203 +++++-------------
 .../category-with-liquid-template.json        |  36 ++++
 .../categories/category-with-no-steps.json    |  36 ++++
 .../categories/checkboxes-question.json       |  43 ++++
 .../categories/extended-radio-question.json   |  43 ++++
 .../categories/long-text-question.json        |  43 ++++
 .../categories/missing-entry-id.json          |  43 ++++
 .../contentful/categories/radio-question.json |  43 ++++
 .../fixtures/contentful/categories/radio.json |  43 ++++
 .../categories/short-text-question.json       |  43 ++++
 .../categories/single-date-question.json      |  43 ++++
 .../contentful/categories/static-content.json |  43 ++++
 .../unexpected-contentful-question-type.json  |  43 ++++
 .../unexpected-contentful-type.json           |  43 ++++
 .../contentful/steps/checkboxes-question.json |  41 ++++
 .../steps/contentful-radio-question.json      |  45 ++++
 .../steps/extended-radio-question.json        |  51 +++++
 .../contentful/steps/long-text-question.json  |  44 ++++
 .../contentful/steps/short-text-question.json |  37 ++++
 .../steps/single-date-question.json           |  43 ++++
 .../contentful/steps/static-content.json      |  37 ++++
 .../unexpected-contentful-question-type.json  |  35 +++
 .../steps/unexpected-contentful-type.json     |  35 +++
 spec/services/create_journey_spec.rb          |  13 +-
 spec/support/contentful_helpers.rb            |  39 ++++
 27 files changed, 1013 insertions(+), 164 deletions(-)
 create mode 100644 spec/fixtures/contentful/categories/category-with-liquid-template.json
 create mode 100644 spec/fixtures/contentful/categories/category-with-no-steps.json
 create mode 100644 spec/fixtures/contentful/categories/checkboxes-question.json
 create mode 100644 spec/fixtures/contentful/categories/extended-radio-question.json
 create mode 100644 spec/fixtures/contentful/categories/long-text-question.json
 create mode 100644 spec/fixtures/contentful/categories/missing-entry-id.json
 create mode 100644 spec/fixtures/contentful/categories/radio-question.json
 create mode 100644 spec/fixtures/contentful/categories/radio.json
 create mode 100644 spec/fixtures/contentful/categories/short-text-question.json
 create mode 100644 spec/fixtures/contentful/categories/single-date-question.json
 create mode 100644 spec/fixtures/contentful/categories/static-content.json
 create mode 100644 spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
 create mode 100644 spec/fixtures/contentful/categories/unexpected-contentful-type.json
 create mode 100644 spec/fixtures/contentful/steps/checkboxes-question.json
 create mode 100644 spec/fixtures/contentful/steps/contentful-radio-question.json
 create mode 100644 spec/fixtures/contentful/steps/extended-radio-question.json
 create mode 100644 spec/fixtures/contentful/steps/long-text-question.json
 create mode 100644 spec/fixtures/contentful/steps/short-text-question.json
 create mode 100644 spec/fixtures/contentful/steps/single-date-question.json
 create mode 100644 spec/fixtures/contentful/steps/static-content.json
 create mode 100644 spec/fixtures/contentful/steps/unexpected-contentful-question-type.json
 create mode 100644 spec/fixtures/contentful/steps/unexpected-contentful-type.json

diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index d0ed713e3..6e1b57ca9 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -13,7 +13,7 @@ class JourneysController < ApplicationController
     render "errors/unexpected_contentful_step_type", status: 500
   end
 
-  rescue_from BuildJourneyOrder::MissingEntryDetected do |exception|
+  rescue_from GetContentfulEntry::EntryNotFound do |exception|
     render "errors/contentful_entry_not_found", status: 500
   end
 
diff --git a/app/services/create_journey.rb b/app/services/create_journey.rb
index 3322af4c8..fd86e9903 100644
--- a/app/services/create_journey.rb
+++ b/app/services/create_journey.rb
@@ -11,11 +11,8 @@ def call
       next_entry_id: ENV["CONTENTFUL_PLANNING_START_ENTRY_ID"],
       liquid_template: liquid_template
     )
-    entries = GetAllContentfulEntries.new.call
-    question_entries = BuildJourneyOrder.new(
-      entries: entries.to_a,
-      starting_entry_id: ENV["CONTENTFUL_PLANNING_START_ENTRY_ID"]
-    ).call
+
+    question_entries = GetEntriesInCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
     question_entries.each do |entry|
       CreateJourneyStep.new(
         journey: journey, contentful_entry: entry
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index c175e424a..d0093c5ca 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -3,17 +3,15 @@
 feature "Anyone can start a journey" do
   around do |example|
     ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
+      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-category-entry",
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
     ) do
       example.run
     end
   end
 
   scenario "Start page includes a call to action" do
-    stub_get_contentful_entries(
-      entry_id: "contentful-starting-step",
-      fixture_filename: "closed-path-with-multiple-example.json"
-    )
+    stub_contentful_category(fixture_filename: "radio-question.json")
 
     visit root_path
 
@@ -24,15 +22,26 @@
     expect(page).to have_content("Not started")
   end
 
-  scenario "an answer must be provided" do
-    stub_get_contentful_entries(
-      entry_id: "contentful-starting-step",
-      fixture_filename: "closed-path-with-multiple-example.json"
+  def click_first_link_in_task_list
+    within("ol.app-task-list") do
+      first("a").click
+    end
+  end
+
+  def start_journey_from_category_and_go_to_question(category:)
+    stub_contentful_category(
+      fixture_filename: category
     )
-    journey = CreateJourney.new(category: "catering").call
-    step = journey.steps.find_by(contentful_id: "contentful-radio-question")
 
-    visit journey_step_path(journey, step)
+    visit root_path
+
+    click_on(I18n.t("generic.button.start"))
+
+    click_first_link_in_task_list
+  end
+
+  scenario "an answer must be provided" do
+    start_journey_from_category_and_go_to_question(category: "radio-question.json")
 
     # Omit a choice
 
@@ -43,79 +52,34 @@
 
   context "when the Contentful model is of type question" do
     context "when Contentful entry is of type short_text" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
       scenario "user can answer using free text" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        journey = CreateJourney.new(category: "catering").call
-        step = journey.steps.find_by(contentful_id: "contentful-short-text-question")
-
-        visit journey_step_path(journey, step)
+        start_journey_from_category_and_go_to_question(category: "short-text-question.json")
 
         fill_in "answer[response]", with: "email@example.com"
         click_on(I18n.t("generic.button.next"))
 
-        click_on(step.title)
+        click_first_link_in_task_list
 
         expect(find_field("answer-response-field").value).to eql("email@example.com")
       end
     end
 
     context "when Contentful entry is of type long_text" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
       scenario "user can answer using free text with multiple lines" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        journey = CreateJourney.new(category: "catering").call
-        step = journey.steps.find_by(contentful_id: "contentful-long-text-question")
-
-        visit journey_step_path(journey, step)
+        start_journey_from_category_and_go_to_question(category: "long-text-question.json")
 
         fill_in "answer[response]", with: "We would like a supplier to provide catering from September 2020.\nThey must be able to supply us for 3 years minumum."
         click_on(I18n.t("generic.button.next"))
 
-        click_on(step.title)
+        click_first_link_in_task_list
 
         expect(find_field("answer-response-field").value).to eql("We would like a supplier to provide catering from September 2020.\r\nThey must be able to supply us for 3 years minumum.")
       end
     end
 
     context "when Contentful entry is of type single_date" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
       scenario "user can answer using a date input" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        journey = CreateJourney.new(category: "catering").call
-        step = journey.steps.find_by(contentful_id: "contentful-single-date-question")
-
-        visit journey_step_path(journey, step)
+        start_journey_from_category_and_go_to_question(category: "single-date-question.json")
 
         fill_in "answer[response(3i)]", with: "12"
         fill_in "answer[response(2i)]", with: "8"
@@ -123,7 +87,7 @@
 
         click_on(I18n.t("generic.button.next"))
 
-        click_on(step.title)
+        click_first_link_in_task_list
 
         expect(find_field("answer_response_3i").value).to eql("12")
         expect(find_field("answer_response_2i").value).to eql("8")
@@ -132,30 +96,15 @@
     end
 
     context "when Contentful entry is of type checkboxes" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
       scenario "user can select multiple answers" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        journey = CreateJourney.new(category: "catering").call
-        step = journey.steps.find_by(contentful_id: "contentful-checkboxes-question")
-
-        visit journey_step_path(journey, step)
+        start_journey_from_category_and_go_to_question(category: "checkboxes-question.json")
 
         check "Breakfast"
         check "Lunch"
 
         click_on(I18n.t("generic.button.next"))
 
-        click_on(step.title)
+        click_first_link_in_task_list
 
         expect(page).to have_checked_field("answer-response-breakfast-field")
         expect(page).to have_checked_field("answer-response-lunch-field")
@@ -164,32 +113,15 @@
 
     context "when Contentful entry is of type radios" do
       context "when extra configuration is passed to collect further info" do
-        around do |example|
-          ClimateControl.modify(
-            CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-          ) do
-            example.run
-          end
-        end
-
         scenario "asks the user for further information" do
-          stub_get_contentful_entries(
-            entry_id: "contentful-starting-step",
-            fixture_filename: "closed-path-with-multiple-example.json"
-          )
-          journey = CreateJourney.new(category: "catering").call
-          step = journey.steps.find_by(contentful_id: "contentful-radio-question")
-
-          visit journey_step_path(journey, step)
-
-          click_on(I18n.t("generic.button.start"))
+          start_journey_from_category_and_go_to_question(category: "extended-radio-question.json")
 
           choose("Catering")
           fill_in "answer[further_information]", with: "The school needs the kitchen cleaned once a day"
 
           click_on(I18n.t("generic.button.next"))
 
-          click_on(step.title)
+          click_first_link_in_task_list
 
           expect(page).to have_checked_field("Catering")
           expect(find_field("answer-further-information-field").value)
@@ -201,53 +133,27 @@
 
   context "when the Contentful model is of type staticContent" do
     context "when Contentful entry is of type paragraphs" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
+      scenario "the content is not displayed in the task list" do
+        stub_contentful_category(fixture_filename: "static-content.json")
 
-      scenario "user can read static content and proceed without answering" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        journey = CreateJourney.new(category: "catering").call
-        step = journey.steps.find_by(contentful_id: "contentful-starting-step")
+        visit root_path
 
-        visit journey_step_path(journey, step)
+        click_on(I18n.t("generic.button.start"))
 
-        expect(page).to have_content("When you should start")
+        # We should really remove static content entirely, since it doesn't
+        # appear in the task list pattern.
 
-        within(".static-content") do
-          paragraphs_elements = find_all("p")
-          expect(paragraphs_elements.first.text).to have_content("Procuring a new catering contract can take up to 6 months to consult, create, review and award.")
-          expect(paragraphs_elements.last.text).to have_content("Usually existing contracts start and end in the month of September. We recommend starting this process around March.")
-        end
-
-        click_on(I18n.t("generic.button.next"))
+        # TODO: Talk to design and see if static content is actually included
+        # anywhere in the journey, or if we can ditch support.
 
-        expect(page).to have_content("Catering")
+        expect(page).not_to have_content("When you should start")
       end
     end
   end
 
   context "when Contentful entry model wasn't an expected type" do
-    around do |example|
-      ClimateControl.modify(
-        CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-unexpected-model"
-      ) do
-        example.run
-      end
-    end
-
     scenario "returns an error message" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-unexpected-model",
-        fixture_filename: "path-with-unexpected-model.json"
-      )
+      stub_contentful_category(fixture_filename: "unexpected-contentful-type.json")
 
       visit new_journey_path
 
@@ -256,20 +162,9 @@
     end
   end
 
-  context "when the Contentful Entry wasn't an expected step type" do
-    around do |example|
-      ClimateControl.modify(
-        CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-unexpected-step-type"
-      ) do
-        example.run
-      end
-    end
-
+  context "when the Contentful Entry wasn't an expected question type" do
     scenario "returns an error message" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-unexpected-step-type",
-        fixture_filename: "path-with-unexpected-step-type.json"
-      )
+      stub_contentful_category(fixture_filename: "unexpected-contentful-question-type.json")
 
       visit new_journey_path
 
@@ -288,11 +183,17 @@
     end
 
     scenario "a Contentful entry_id does not exist" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-fake-entry-id",
-        fixture_filename: "closed-path-with-multiple-example.json"
+      contentful_connector = instance_double(ContentfulConnector)
+      stub_contentful_category(
+        fixture_filename: "missing-entry-id.json",
+        stub_steps: false,
+        contentful_connector: contentful_connector
       )
 
+      allow(contentful_connector).to receive(:get_entry_by_id)
+        .with("missing-entry-id")
+        .and_return(nil)
+
       visit new_journey_path
 
       expect(page).to have_content(I18n.t("errors.contentful_entry_not_found.page_title"))
diff --git a/spec/fixtures/contentful/categories/category-with-liquid-template.json b/spec/fixtures/contentful/categories/category-with-liquid-template.json
new file mode 100644
index 000000000..890715a1b
--- /dev/null
+++ b/spec/fixtures/contentful/categories/category-with-liquid-template.json
@@ -0,0 +1,36 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/category-with-no-steps.json b/spec/fixtures/contentful/categories/category-with-no-steps.json
new file mode 100644
index 000000000..890715a1b
--- /dev/null
+++ b/spec/fixtures/contentful/categories/category-with-no-steps.json
@@ -0,0 +1,36 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/checkboxes-question.json b/spec/fixtures/contentful/categories/checkboxes-question.json
new file mode 100644
index 000000000..33eabb88b
--- /dev/null
+++ b/spec/fixtures/contentful/categories/checkboxes-question.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "checkboxes-question"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/extended-radio-question.json b/spec/fixtures/contentful/categories/extended-radio-question.json
new file mode 100644
index 000000000..96ca2de66
--- /dev/null
+++ b/spec/fixtures/contentful/categories/extended-radio-question.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "extended-radio-question"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/long-text-question.json b/spec/fixtures/contentful/categories/long-text-question.json
new file mode 100644
index 000000000..6b844a620
--- /dev/null
+++ b/spec/fixtures/contentful/categories/long-text-question.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "long-text-question"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/missing-entry-id.json b/spec/fixtures/contentful/categories/missing-entry-id.json
new file mode 100644
index 000000000..a933430ae
--- /dev/null
+++ b/spec/fixtures/contentful/categories/missing-entry-id.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "missing-entry-id"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/radio-question.json b/spec/fixtures/contentful/categories/radio-question.json
new file mode 100644
index 000000000..e81486777
--- /dev/null
+++ b/spec/fixtures/contentful/categories/radio-question.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "contentful-radio-question"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/radio.json b/spec/fixtures/contentful/categories/radio.json
new file mode 100644
index 000000000..0a4e97ee3
--- /dev/null
+++ b/spec/fixtures/contentful/categories/radio.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "2xAVAM1lxUie3bPHxUBBqD",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "contentful-radio-question"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/short-text-question.json b/spec/fixtures/contentful/categories/short-text-question.json
new file mode 100644
index 000000000..aa4e5ace3
--- /dev/null
+++ b/spec/fixtures/contentful/categories/short-text-question.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "short-text-question"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/single-date-question.json b/spec/fixtures/contentful/categories/single-date-question.json
new file mode 100644
index 000000000..0edf917b1
--- /dev/null
+++ b/spec/fixtures/contentful/categories/single-date-question.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "single-date-question"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/static-content.json b/spec/fixtures/contentful/categories/static-content.json
new file mode 100644
index 000000000..8dfeb3f45
--- /dev/null
+++ b/spec/fixtures/contentful/categories/static-content.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "static-content"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json b/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
new file mode 100644
index 000000000..617e780bd
--- /dev/null
+++ b/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "unexpected-contentful-question-type"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/unexpected-contentful-type.json b/spec/fixtures/contentful/categories/unexpected-contentful-type.json
new file mode 100644
index 000000000..903c4946a
--- /dev/null
+++ b/spec/fixtures/contentful/categories/unexpected-contentful-type.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "unexpected-contentful-type"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/checkboxes-question.json b/spec/fixtures/contentful/steps/checkboxes-question.json
new file mode 100644
index 000000000..cd8444e72
--- /dev/null
+++ b/spec/fixtures/contentful/steps/checkboxes-question.json
@@ -0,0 +1,41 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "checkboxes-question",
+        "type": "Entry",
+        "createdAt": "2020-12-09T11:53:52.744Z",
+        "updatedAt": "2020-12-09T11:53:52.744Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/everyday-services",
+        "type": "checkboxes",
+        "title": "Everyday services that are required and need to be considered",
+        "extendedOptions": [
+          { "value": "breakfast" },
+          { "value": "lunch" },
+          { "value": "dinner" }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/contentful-radio-question.json b/spec/fixtures/contentful/steps/contentful-radio-question.json
new file mode 100644
index 000000000..ddf2ba23b
--- /dev/null
+++ b/spec/fixtures/contentful/steps/contentful-radio-question.json
@@ -0,0 +1,45 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "jspwts36h1os"
+            }
+        },
+        "id": "contentful-radio-question",
+        "type": "Entry",
+        "createdAt": "2020-09-07T10:56:40.585Z",
+        "updatedAt": "2020-09-14T22:16:54.633Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 7,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/which-service",
+        "title": "Which service do you need?",
+        "helpText": "Tell us which service you need.",
+        "type": "radios",
+        "extendedOptions": [
+          {
+              "value": "Catering"
+          },
+          {
+              "value": "Cleaning"
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/extended-radio-question.json b/spec/fixtures/contentful/steps/extended-radio-question.json
new file mode 100644
index 000000000..d564b8899
--- /dev/null
+++ b/spec/fixtures/contentful/steps/extended-radio-question.json
@@ -0,0 +1,51 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "jspwts36h1os"
+            }
+        },
+        "id": "extended-radio-question",
+        "type": "Entry",
+        "createdAt": "2020-09-07T10:56:40.585Z",
+        "updatedAt": "2020-09-14T22:16:54.633Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 7,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/which-service",
+        "title": "Which service do you need?",
+        "helpText": "Tell us which service you need.",
+        "type": "radios",
+        "extendedOptions": [
+          {
+              "value": "Catering",
+              "help_text": "",
+              "display_further_information": true,
+              "further_information_help_text": "Briefly describe why you need catering"
+          },
+          {
+              "value": "Cleaning",
+              "help_text": "All interior areas of the school only",
+              "display_further_information": false,
+              "further_information_help_text": "Briefly describe why you need cleaning"
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/long-text-question.json b/spec/fixtures/contentful/steps/long-text-question.json
new file mode 100644
index 000000000..525896e99
--- /dev/null
+++ b/spec/fixtures/contentful/steps/long-text-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "long-text-question",
+        "type": "Entry",
+        "createdAt": "2020-11-11T11:26:20.994Z",
+        "updatedAt": "2020-11-11T11:26:20.994Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/describe-what-you-need",
+        "title": "Describe what you need",
+        "helpText": "Briefly describe what you are looking to procure from your supplier.",
+        "type": "long text",
+        "next": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "contentful-single-date-question"
+            }
+          }
+    }
+}
diff --git a/spec/fixtures/contentful/steps/short-text-question.json b/spec/fixtures/contentful/steps/short-text-question.json
new file mode 100644
index 000000000..9c61f32e8
--- /dev/null
+++ b/spec/fixtures/contentful/steps/short-text-question.json
@@ -0,0 +1,37 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "short-text-question",
+        "type": "Entry",
+        "createdAt": "2020-11-05T16:42:58.340Z",
+        "updatedAt": "2020-11-05T16:42:58.340Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/what-email-address-did-you-use",
+        "title": "What email address did you use?",
+        "helpText": "This will help us recover your existing plans",
+        "type": "short text"
+    }
+}
diff --git a/spec/fixtures/contentful/steps/single-date-question.json b/spec/fixtures/contentful/steps/single-date-question.json
new file mode 100644
index 000000000..0a40db1a9
--- /dev/null
+++ b/spec/fixtures/contentful/steps/single-date-question.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "single-date-question",
+        "type": "Entry",
+        "createdAt": "2020-12-08T10:43:19.102Z",
+        "updatedAt": "2020-12-08T10:43:19.102Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/starting-date",
+        "type": "single date",
+        "title": "When will this start?",
+        "next": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "contentful-checkboxes-question"
+            }
+          }
+    }
+}
diff --git a/spec/fixtures/contentful/steps/static-content.json b/spec/fixtures/contentful/steps/static-content.json
new file mode 100644
index 000000000..c9d84162e
--- /dev/null
+++ b/spec/fixtures/contentful/steps/static-content.json
@@ -0,0 +1,37 @@
+{
+  "sys": {
+    "space": {
+      "sys": {
+        "type": "Link",
+        "linkType": "Space",
+        "id": "rwl7tyzv9sys"
+      }
+    },
+    "id": "static-content",
+    "type": "Entry",
+    "createdAt": "2020-12-02T10:48:35.748Z",
+    "updatedAt": "2020-12-02T10:48:35.748Z",
+    "environment": {
+      "sys": {
+        "id": "develop",
+        "type": "Link",
+        "linkType": "Environment"
+      }
+    },
+    "revision": 1,
+    "contentType": {
+      "sys": {
+        "type": "Link",
+        "linkType": "ContentType",
+        "id": "staticContent"
+      }
+    },
+    "locale": "en-US"
+  },
+  "fields": {
+    "slug": "/timelines",
+    "title": "When you should start",
+    "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
+    "type": "paragraphs"
+  }
+}
diff --git a/spec/fixtures/contentful/steps/unexpected-contentful-question-type.json b/spec/fixtures/contentful/steps/unexpected-contentful-question-type.json
new file mode 100644
index 000000000..6309be468
--- /dev/null
+++ b/spec/fixtures/contentful/steps/unexpected-contentful-question-type.json
@@ -0,0 +1,35 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "jspwts36h1os"
+            }
+        },
+        "id": "unexpected-contentful-question-type",
+        "type": "Entry",
+        "createdAt": "2020-09-02T15:56:05.472Z",
+        "updatedAt": "2020-09-02T16:19:00.652Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/check-your-answers",
+        "type": "telepathy"
+    }
+}
diff --git a/spec/fixtures/contentful/steps/unexpected-contentful-type.json b/spec/fixtures/contentful/steps/unexpected-contentful-type.json
new file mode 100644
index 000000000..ab4820420
--- /dev/null
+++ b/spec/fixtures/contentful/steps/unexpected-contentful-type.json
@@ -0,0 +1,35 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "jspwts36h1os"
+            }
+        },
+        "id": "unexpected-contentful-type",
+        "type": "Entry",
+        "createdAt": "2020-09-02T15:56:05.472Z",
+        "updatedAt": "2020-09-02T16:19:00.652Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "telepathy"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/check-your-answers",
+        "type": "telepathy"
+    }
+}
diff --git a/spec/services/create_journey_spec.rb b/spec/services/create_journey_spec.rb
index 7e1259b02..23f6dddf9 100644
--- a/spec/services/create_journey_spec.rb
+++ b/spec/services/create_journey_spec.rb
@@ -3,7 +3,8 @@
 RSpec.describe CreateJourney do
   around do |example|
     ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
+      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step",
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
     ) do
       example.run
     end
@@ -11,9 +12,8 @@
 
   describe "#call" do
     it "creates a new journey" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-starting-step",
-        fixture_filename: "closed-path-with-multiple-example.json"
+      stub_contentful_category(
+        fixture_filename: "category-with-no-steps.json"
       )
       expect { described_class.new(category: "catering").call }
         .to change { Journey.count }.by(1)
@@ -21,9 +21,8 @@
     end
 
     it "stores a copy of the Liquid template" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-starting-step",
-        fixture_filename: "closed-path-with-multiple-example.json"
+      stub_contentful_category(
+        fixture_filename: "category-with-liquid-template.json"
       )
       fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/basic_catering.liquid")
       finder = instance_double(FindLiquidTemplate)
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index d9bb11f38..c06ce62be 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -25,6 +25,32 @@ def stub_get_contentful_entries(
       .and_return(raw_response)
   end
 
+  def stub_contentful_category(
+    fixture_filename:,
+    stub_steps: true,
+    contentful_connector: instance_double(ContentfulConnector)
+  )
+    category = fake_contentful_category(contentful_fixture_filename: fixture_filename)
+
+    expect(ContentfulConnector).to receive(:new)
+      .and_return(contentful_connector).at_least(:once) # This twice is a problem..
+
+    # Mock the GET request for the Category Entry
+    allow(contentful_connector).to receive(:get_entry_by_id)
+      .with(category.id)
+      .and_return(category)
+
+    # For each step in the category mock a GET request
+    if stub_steps
+      category.steps.each do |step|
+        step = fake_contentful_entry(contentful_fixture_filename: "steps/#{step.id}.json")
+        allow(contentful_connector).to receive(:get_entry_by_id)
+          .with(step.id)
+          .and_return(step)
+      end
+    end
+  end
+
   def stub_contentful_connector
     contentful_connector = instance_double(ContentfulConnector)
     expect(ContentfulConnector).to receive(:new)
@@ -40,6 +66,19 @@ def stub_contentful_client
     contentful_client
   end
 
+  def fake_contentful_category(contentful_fixture_filename:)
+    raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/categories/#{contentful_fixture_filename}")
+    hash_response = JSON.parse(raw_response)
+
+    steps = hash_response.dig("fields", "steps").map { |step| double(id: step.dig("sys", "id")) }
+
+    double(
+      Contentful::Entry,
+      id: hash_response.dig("sys", "id"),
+      steps: steps
+    )
+  end
+
   def fake_contentful_entry(contentful_fixture_filename:)
     raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{contentful_fixture_filename}")
     hash_response = JSON.parse(raw_response)

From 49d14c85e1cdbcc3d2c48b119467e1e3bf5ad1e0 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 25 Jan 2021 12:06:29 +0000
Subject: [PATCH 008/249] JourneyMap endpoint refactored to get entries with a
 category

Co-authored-by: Nick <nick@dxw.com>
Co-authored-by: Lorna <lorna@dxw.com>
---
 app/controllers/journey_maps_controller.rb    | 12 ++--
 ..._see_the_map_of_journey_steps_page_spec.rb | 66 ++++++++-----------
 .../journey-with-multiple-entries.json        | 57 ++++++++++++++++
 .../journey-with-repeat-entries.json          | 50 ++++++++++++++
 4 files changed, 140 insertions(+), 45 deletions(-)
 create mode 100644 spec/fixtures/contentful/categories/journey-with-multiple-entries.json
 create mode 100644 spec/fixtures/contentful/categories/journey-with-repeat-entries.json

diff --git a/app/controllers/journey_maps_controller.rb b/app/controllers/journey_maps_controller.rb
index eab7d3d64..6eb1a194b 100644
--- a/app/controllers/journey_maps_controller.rb
+++ b/app/controllers/journey_maps_controller.rb
@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
 class JourneyMapsController < ApplicationController
-  rescue_from BuildJourneyOrder::RepeatEntryDetected do |exception|
+  rescue_from GetEntriesInCategory::RepeatEntryDetected do |exception|
     render "errors/repeat_step_in_the_contentful_journey", status: 500, locals: {error: exception}
   end
 
+  rescue_from GetContentfulEntry::EntryNotFound do |exception|
+    render "errors/contentful_entry_not_found", status: 500
+  end
+
   rescue_from BuildJourneyOrder::TooManyChainedEntriesDetected do |exception|
     render "errors/too_many_steps_in_the_contentful_journey", status: 500, locals: {error: exception}
   end
 
   def new
-    entries = GetAllContentfulEntries.new.call
-    @journey_map = BuildJourneyOrder.new(
-      entries: entries.to_a,
-      starting_entry_id: ENV["CONTENTFUL_PLANNING_START_ENTRY_ID"]
-    ).call
+    @journey_map = GetEntriesInCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
   end
 end
diff --git a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
index cfde7b168..1d434e0bb 100644
--- a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
@@ -1,16 +1,16 @@
 feature "Users can see all the steps of a journey" do
   around do |example|
     ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
+      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step",
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
     ) do
       example.run
     end
   end
 
   scenario "Multiple journey steps" do
-    stub_get_contentful_entries(
-      entry_id: "contentful-starting-step",
-      fixture_filename: "closed-path-with-multiple-example.json"
+    stub_contentful_category(
+      fixture_filename: "journey-with-multiple-entries.json"
     )
 
     visit new_journey_map_path
@@ -19,11 +19,26 @@
 
     within(".govuk-list") do
       list_items = find_all("li")
-      within(list_items.first) do
-        expect(page).to have_link("When you should start", href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/contentful-starting-step")
+      within(list_items[0]) do
+        expect(page)
+          .to have_link(
+            "Which service do you need?",
+            href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/contentful-radio-question"
+          )
       end
-      within(list_items.last) do
-        expect(page).to have_link("Everyday services that are required and need to be considered", href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/contentful-checkboxes-question")
+      within(list_items[1]) do
+        expect(page)
+          .to have_link(
+            "What email address did you use?",
+            href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/short-text-question"
+          )
+      end
+      within(list_items[2]) do
+        expect(page)
+          .to have_link(
+            "Describe what you need",
+            href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/long-text-question"
+          )
       end
     end
   end
@@ -32,48 +47,21 @@
     context "when the same entry is found twice" do
       around do |example|
         ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
+          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step",
+          CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
         ) do
           example.run
         end
       end
 
       it "returns an error message" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "repeat-entry-example.json"
-        )
+        stub_contentful_category(fixture_filename: "journey-with-repeat-entries.json")
 
         visit new_journey_map_path
 
         expect(page).to have_content(I18n.t("errors.repeat_step_in_the_contentful_journey.page_title"))
         expect(page).to have_content(
-          I18n.t("errors.repeat_step_in_the_contentful_journey.page_body", entry_id: "contentful-starting-step")
-        )
-      end
-    end
-
-    context "when the chain becomes obviously too long" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      it "returns an error message" do
-        stub_const("BuildJourneyOrder::ENTRY_JOURNEY_MAX_LENGTH", 1)
-        stub_get_contentful_entries(
-          entry_id: "contentful-radio-question",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-
-        visit new_journey_map_path
-
-        expect(page).to have_content(I18n.t("errors.too_many_steps_in_the_contentful_journey.page_title"))
-        expect(page).to have_content(
-          I18n.t("errors.too_many_steps_in_the_contentful_journey.page_body", entry_id: "contentful-radio-question", step_count: 1)
+          I18n.t("errors.repeat_step_in_the_contentful_journey.page_body", entry_id: "contentful-radio-question")
         )
       end
     end
diff --git a/spec/fixtures/contentful/categories/journey-with-multiple-entries.json b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
new file mode 100644
index 000000000..297481ead
--- /dev/null
+++ b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
@@ -0,0 +1,57 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "contentful-radio-question"
+            }
+          },
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "short-text-question"
+            }
+          },
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "long-text-question"
+            }
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/categories/journey-with-repeat-entries.json b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
new file mode 100644
index 000000000..ba32a6280
--- /dev/null
+++ b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "contentful-radio-question"
+            }
+          },
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "contentful-radio-question"
+            }
+          }
+        ]
+    }
+}

From dd399b7b171b445154860bb7dceb5fa9410f3c5f Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Mon, 25 Jan 2021 16:14:01 +0000
Subject: [PATCH 009/249] Refactor cache warming to use GetEntriesInCategory

This removes the dependency on BuildJourneyOrder

Co-authored-by: Nick <nick@dxw.com>
Co-authored-by: Tom <tomh@dxw.com>
---
 app/jobs/warm_entry_cache_job.rb       |  8 ++----
 spec/jobs/warm_entry_cache_job_spec.rb | 37 ++++++++++----------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/app/jobs/warm_entry_cache_job.rb b/app/jobs/warm_entry_cache_job.rb
index 3b04dfcbe..1a4192ba3 100644
--- a/app/jobs/warm_entry_cache_job.rb
+++ b/app/jobs/warm_entry_cache_job.rb
@@ -5,16 +5,12 @@ class WarmEntryCacheJob < ApplicationJob
   sidekiq_options retry: 5
 
   def perform
-    entries = BuildJourneyOrder.new(
-      entries: GetAllContentfulEntries.new.call,
-      starting_entry_id: ENV["CONTENTFUL_PLANNING_START_ENTRY_ID"]
-    ).call
+    entries = GetEntriesInCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
 
     entries.each do |entry|
       store_in_cache(cache: cache, key: "contentful:entry:#{entry.id}", entry: entry)
     end
-  rescue BuildJourneyOrder::RepeatEntryDetected,
-    BuildJourneyOrder::TooManyChainedEntriesDetected
+  rescue GetEntriesInCategory::RepeatEntryDetected
     cache.extend_ttl_on_all_entries
   end
 
diff --git a/spec/jobs/warm_entry_cache_job_spec.rb b/spec/jobs/warm_entry_cache_job_spec.rb
index 158dbbeb2..0e4a0b84c 100644
--- a/spec/jobs/warm_entry_cache_job_spec.rb
+++ b/spec/jobs/warm_entry_cache_job_spec.rb
@@ -9,6 +9,7 @@
   around do |example|
     ClimateControl.modify(
       CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step",
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry",
       CONTENTFUL_ENTRY_CACHING: "true"
     ) do
       example.run
@@ -23,34 +24,29 @@
     end
 
     it "asks GetAllContentfulEntries for the Contentful entries" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-starting-step",
-        fixture_filename: "multiple-entries-example.json"
+      stub_contentful_category(
+        fixture_filename: "journey-with-multiple-entries.json"
       )
 
       described_class.perform_later
       perform_enqueued_jobs
 
-      expect(RedisCache.redis.get("contentful:entry:contentful-starting-step"))
+      expect(RedisCache.redis.get("contentful:entry:contentful-radio-question"))
         .to eql(
-          "\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"rwl7tyzv9sys\\\"}},\\\"id\\\":\\\"contentful-starting-step\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-12-02T10:48:35.748Z\\\",\\\"updatedAt\\\":\\\"2020-12-02T10:48:35.748Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"develop\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":1,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"staticContent\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/timelines\\\",\\\"title\\\":\\\"When you should start\\\",\\\"body\\\":\\\"Procuring a new catering contract can take up to 6 months to consult, create, review and award. \\\\n\\\\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.\\\",\\\"type\\\":\\\"paragraphs\\\",\\\"next\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Entry\\\",\\\"id\\\":\\\"hfjJgWRg4xiiiImwVRDtZ\\\"}}}}\""
-        )
-      expect(RedisCache.redis.get("contentful:entry:hfjJgWRg4xiiiImwVRDtZ"))
-        .to eql(
-          "\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"rwl7tyzv9sys\\\"}},\\\"id\\\":\\\"hfjJgWRg4xiiiImwVRDtZ\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-11-04T12:28:30.442Z\\\",\\\"updatedAt\\\":\\\"2020-11-26T16:39:54.188Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"develop\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":6,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/dev-start-which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\""
+          "\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"contentful-radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\""
         )
+      expect(RedisCache.redis.get("contentful:entry:short-text-question"))
+        .not_to be_nil
+
+      expect(RedisCache.redis.get("contentful:entry:long-text-question"))
+        .not_to be_nil
     end
 
     context "when the journey order cannot be built" do
       it "does not add new items to the cache" do
-        allow_any_instance_of(BuildJourneyOrder)
+        allow_any_instance_of(GetEntriesInCategory)
           .to receive(:call)
-          .and_raise(BuildJourneyOrder::RepeatEntryDetected)
-
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "repeat-entry-example.json"
-        )
+          .and_raise(GetEntriesInCategory::RepeatEntryDetected)
 
         described_class.perform_later
         perform_enqueued_jobs
@@ -61,14 +57,9 @@
       it "extends the TTL on all existing items by 24 hours" do
         RedisCache.redis.set("contentful:entry:contentful-starting-step", "\"{\\}\"")
 
-        allow_any_instance_of(BuildJourneyOrder)
+        allow_any_instance_of(GetEntriesInCategory)
           .to receive(:call)
-          .and_raise(BuildJourneyOrder::RepeatEntryDetected)
-
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "repeat-entry-example.json"
-        )
+          .and_raise(GetEntriesInCategory::RepeatEntryDetected)
 
         freeze_time do
           ttl_extension = 60 * 60 * 24

From 12968657c95aa77cdfd75d3925d0c34272c5c336 Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Mon, 25 Jan 2021 16:25:23 +0000
Subject: [PATCH 010/249] Remove BuildJourneyOrder as this is no longer used

Co-authored-by: Nick <nick@dxw.com>
Co-authored-by: Tom <tomh@dxw.com>
---
 app/controllers/journey_maps_controller.rb    |   4 -
 app/services/build_journey_order.rb           |  71 -----------
 ...y_steps_in_the_contentful_journey.html.erb |   6 -
 config/locales/en.yml                         |   3 -
 spec/services/build_journey_order_spec.rb     | 110 ------------------
 5 files changed, 194 deletions(-)
 delete mode 100644 app/services/build_journey_order.rb
 delete mode 100644 app/views/errors/too_many_steps_in_the_contentful_journey.html.erb
 delete mode 100644 spec/services/build_journey_order_spec.rb

diff --git a/app/controllers/journey_maps_controller.rb b/app/controllers/journey_maps_controller.rb
index 6eb1a194b..dca9d8b59 100644
--- a/app/controllers/journey_maps_controller.rb
+++ b/app/controllers/journey_maps_controller.rb
@@ -9,10 +9,6 @@ class JourneyMapsController < ApplicationController
     render "errors/contentful_entry_not_found", status: 500
   end
 
-  rescue_from BuildJourneyOrder::TooManyChainedEntriesDetected do |exception|
-    render "errors/too_many_steps_in_the_contentful_journey", status: 500, locals: {error: exception}
-  end
-
   def new
     @journey_map = GetEntriesInCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
   end
diff --git a/app/services/build_journey_order.rb b/app/services/build_journey_order.rb
deleted file mode 100644
index 4a5293e4b..000000000
--- a/app/services/build_journey_order.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-class BuildJourneyOrder
-  class RepeatEntryDetected < StandardError; end
-
-  class TooManyChainedEntriesDetected < StandardError; end
-
-  class MissingEntryDetected < StandardError; end
-
-  ENTRY_JOURNEY_MAX_LENGTH = 50
-
-  attr_accessor :entries, :starting_entry_id
-
-  def initialize(entries:, starting_entry_id:)
-    self.entries = entries
-    self.starting_entry_id = starting_entry_id
-  end
-
-  def call
-    recursive_path(
-      entry_lookup: entry_lookup_hash,
-      next_entry_id: starting_entry_id,
-      entries: []
-    )
-  end
-
-  private
-
-  def entry_lookup_hash
-    @entry_lookup_hash ||= entries.to_h { |entry| [entry.id, entry] }
-  end
-
-  def recursive_path(entry_lookup:, next_entry_id:, entries:)
-    begin
-      entry = entry_lookup.fetch(next_entry_id)
-    rescue KeyError
-      send_rollbar_error(message: "A specified Contentful entry was not found", entry_id: next_entry_id)
-      raise MissingEntryDetected.new(next_entry_id)
-    end
-
-    if entries.include?(entry)
-      send_rollbar_error(message: "A repeated Contentful entry was found in the same journey", entry_id: entry.id)
-      raise RepeatEntryDetected.new(entry.id)
-    end
-
-    if entries.count >= ENTRY_JOURNEY_MAX_LENGTH
-      send_rollbar_error(message: "More than #{ENTRY_JOURNEY_MAX_LENGTH} steps were found in a journey map", entry_id: entry.id)
-      raise TooManyChainedEntriesDetected.new(entry.id)
-    end
-
-    entries << entry if entry.present?
-
-    if entry.respond_to?(:next)
-      recursive_path(
-        entry_lookup: entry_lookup,
-        next_entry_id: entry.next.id,
-        entries: entries
-      )
-    else
-      entries
-    end
-  end
-
-  def send_rollbar_error(message:, entry_id:)
-    Rollbar.error(
-      message,
-      contentful_url: ENV["CONTENTFUL_URL"],
-      contentful_space_id: ENV["CONTENTFUL_SPACE"],
-      contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-      contentful_entry_id: entry_id
-    )
-  end
-end
diff --git a/app/views/errors/too_many_steps_in_the_contentful_journey.html.erb b/app/views/errors/too_many_steps_in_the_contentful_journey.html.erb
deleted file mode 100644
index f63b298cf..000000000
--- a/app/views/errors/too_many_steps_in_the_contentful_journey.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= content_for :title, I18n.t("errors.too_many_steps_in_the_contentful_journey.page_title") %>
-
-<h1 class="govuk-heading-xl"><%= I18n.t("errors.too_many_steps_in_the_contentful_journey.page_title") %></h1>
-<p class="govuk-body">
-  <%= I18n.t("errors.too_many_steps_in_the_contentful_journey.page_body", entry_id: error.message, step_count: BuildJourneyOrder::ENTRY_JOURNEY_MAX_LENGTH) %>
-</p>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 600ad125b..96c92fa8b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -58,9 +58,6 @@ en:
     repeat_step_in_the_contentful_journey:
       page_title: "An unexpected error occurred"
       page_body: "One or more steps in the Contentful journey would leave the user in an infinite loop. This entry ID was presented more than once to the user: %{entry_id}"
-    too_many_steps_in_the_contentful_journey:
-      page_title: "An unexpected error occurred"
-      page_body: "More than %{step_count} steps were found in the Contentful journey. Is the journey missing an end? The last Entry ID was: %{entry_id}"
     specification_template_invalid:
       page_title: "An unexpected error occurred"
       page_body: "The service has had a problem trying to retrieve a working Specification template. The team have been notified of this problem and you should be able to retry shortly."
diff --git a/spec/services/build_journey_order_spec.rb b/spec/services/build_journey_order_spec.rb
deleted file mode 100644
index e00600fb3..000000000
--- a/spec/services/build_journey_order_spec.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-require "rails_helper"
-
-RSpec.describe BuildJourneyOrder do
-  describe "#call" do
-    around do |example|
-      ClimateControl.modify(
-        CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-      ) do
-        example.run
-      end
-    end
-
-    context "when the journey includes a node which doesn't exist" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "fake-id"
-        ) do
-          example.run
-        end
-      end
-
-      it "raises a rollbar event" do
-        fake_entries = fake_contentful_entry_array(
-          contentful_fixture_filename: "repeat-entry-example.json"
-        )
-
-        expect(Rollbar).to receive(:error)
-          .with("A specified Contentful entry was not found",
-            contentful_url: ENV["CONTENTFUL_URL"],
-            contentful_space_id: ENV["CONTENTFUL_SPACE"],
-            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "fake-id")
-          .and_call_original
-
-        expect {
-          described_class.new(
-            entries: fake_entries,
-            starting_entry_id: "fake-id"
-          ).call
-        }.to raise_error(BuildJourneyOrder::MissingEntryDetected)
-      end
-    end
-
-    context "when the journey visits the same node twice" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      it "raises a rollbar event" do
-        fake_entries = fake_contentful_entry_array(
-          contentful_fixture_filename: "repeat-entry-example.json"
-        )
-
-        expect(Rollbar).to receive(:error)
-          .with("A repeated Contentful entry was found in the same journey",
-            contentful_url: ENV["CONTENTFUL_URL"],
-            contentful_space_id: ENV["CONTENTFUL_SPACE"],
-            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "contentful-starting-step")
-          .and_call_original
-
-        expect {
-          described_class.new(
-            entries: fake_entries,
-            starting_entry_id: "contentful-starting-step"
-          ).call
-        }.to raise_error(BuildJourneyOrder::RepeatEntryDetected)
-      end
-    end
-
-    context "when the journey visits more than the maximum permitted number of entries" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      it "raises a rollbar event with the last entry" do
-        # Creating 50 linked entries in a fixture slows the test suite down
-        # We assume these 50 entries are chained together in a linear sequence.
-        fake_entries = fake_contentful_entry_array(
-          contentful_fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        expect(BuildJourneyOrder::ENTRY_JOURNEY_MAX_LENGTH).to eq(50)
-        stub_const("BuildJourneyOrder::ENTRY_JOURNEY_MAX_LENGTH", 1)
-
-        expect(Rollbar).to receive(:error)
-          .with("More than #{BuildJourneyOrder::ENTRY_JOURNEY_MAX_LENGTH} steps were found in a journey map",
-            contentful_url: ENV["CONTENTFUL_URL"],
-            contentful_space_id: ENV["CONTENTFUL_SPACE"],
-            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "contentful-radio-question")
-          .and_call_original
-
-        expect {
-          described_class.new(
-            entries: fake_entries,
-            starting_entry_id: "contentful-starting-step"
-          ).call
-        }.to raise_error(BuildJourneyOrder::TooManyChainedEntriesDetected)
-      end
-    end
-  end
-end

From 232a0a00c20f3b8d8582341004fd0525135394cc Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Mon, 25 Jan 2021 16:33:22 +0000
Subject: [PATCH 011/249] Remove all references to
 CONTENTFUL_PLANNING_START_ENTRY

This is no longer used; the default category entry ID is now provided in
`CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID`.
---
 .env.example                                             | 2 +-
 .env.test                                                | 2 +-
 app/services/create_journey.rb                           | 1 -
 config/initializers/dotenv.rb                            | 2 +-
 .../visitors/anyone_can_complete_a_journey_spec.rb       | 9 ---------
 .../anyone_can_see_the_map_of_journey_steps_page_spec.rb | 2 --
 spec/jobs/warm_entry_cache_job_spec.rb                   | 1 -
 spec/services/create_journey_spec.rb                     | 1 -
 spec/services/get_contentful_entry_spec.rb               | 8 --------
 9 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/.env.example b/.env.example
index 178000046..3b44aeb4a 100644
--- a/.env.example
+++ b/.env.example
@@ -18,6 +18,6 @@ CONTENTFUL_URL=cdn.contentful.com
 CONTENTFUL_SPACE=
 CONTENTFUL_ENVIRONMENT=master
 CONTENTFUL_ACCESS_TOKEN=
-CONTENTFUL_PLANNING_START_ENTRY_ID=
 CONTENTFUL_PREVIEW_APP=false
 CONTENTFUL_ENTRY_CACHING=false
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID=contentful-category-entry
diff --git a/.env.test b/.env.test
index 3a665ad35..0f92858fd 100644
--- a/.env.test
+++ b/.env.test
@@ -14,6 +14,6 @@ CONTENTFUL_URL=cdn.contentful.com
 CONTENTFUL_SPACE=test
 CONTENTFUL_ENVIRONMENT=master
 CONTENTFUL_ACCESS_TOKEN=123
-CONTENTFUL_PLANNING_START_ENTRY_ID=contentful-starting-step
 CONTENTFUL_PREVIEW_APP=false
 CONTENTFUL_ENTRY_CACHING=false
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID=contentful-category-entry
diff --git a/app/services/create_journey.rb b/app/services/create_journey.rb
index fd86e9903..cf8fac827 100644
--- a/app/services/create_journey.rb
+++ b/app/services/create_journey.rb
@@ -8,7 +8,6 @@ def initialize(category:)
   def call
     journey = Journey.create(
       category: category,
-      next_entry_id: ENV["CONTENTFUL_PLANNING_START_ENTRY_ID"],
       liquid_template: liquid_template
     )
 
diff --git a/config/initializers/dotenv.rb b/config/initializers/dotenv.rb
index 3986747f7..7e353e232 100644
--- a/config/initializers/dotenv.rb
+++ b/config/initializers/dotenv.rb
@@ -6,7 +6,7 @@
     "CONTENTFUL_SPACE",
     "CONTENTFUL_ENVIRONMENT",
     "CONTENTFUL_ACCESS_TOKEN",
-    "CONTENTFUL_PLANNING_START_ENTRY_ID",
+    "CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID",
     "CONTENTFUL_PREVIEW_APP",
     "CONTENTFUL_ENTRY_CACHING"
   )
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index d0093c5ca..158b46e8f 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -3,7 +3,6 @@
 feature "Anyone can start a journey" do
   around do |example|
     ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-category-entry",
       CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
     ) do
       example.run
@@ -174,14 +173,6 @@ def start_journey_from_category_and_go_to_question(category:)
   end
 
   context "when the starting entry id doesn't exist" do
-    around do |example|
-      ClimateControl.modify(
-        CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-fake-entry-id"
-      ) do
-        example.run
-      end
-    end
-
     scenario "a Contentful entry_id does not exist" do
       contentful_connector = instance_double(ContentfulConnector)
       stub_contentful_category(
diff --git a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
index 1d434e0bb..249ff647a 100644
--- a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
@@ -1,7 +1,6 @@
 feature "Users can see all the steps of a journey" do
   around do |example|
     ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step",
       CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
     ) do
       example.run
@@ -47,7 +46,6 @@
     context "when the same entry is found twice" do
       around do |example|
         ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step",
           CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
         ) do
           example.run
diff --git a/spec/jobs/warm_entry_cache_job_spec.rb b/spec/jobs/warm_entry_cache_job_spec.rb
index 0e4a0b84c..2ec22fd18 100644
--- a/spec/jobs/warm_entry_cache_job_spec.rb
+++ b/spec/jobs/warm_entry_cache_job_spec.rb
@@ -8,7 +8,6 @@
 
   around do |example|
     ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step",
       CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry",
       CONTENTFUL_ENTRY_CACHING: "true"
     ) do
diff --git a/spec/services/create_journey_spec.rb b/spec/services/create_journey_spec.rb
index 23f6dddf9..61a451282 100644
--- a/spec/services/create_journey_spec.rb
+++ b/spec/services/create_journey_spec.rb
@@ -3,7 +3,6 @@
 RSpec.describe CreateJourney do
   around do |example|
     ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step",
       CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
     ) do
       example.run
diff --git a/spec/services/get_contentful_entry_spec.rb b/spec/services/get_contentful_entry_spec.rb
index 4aeaa4729..6e534076c 100644
--- a/spec/services/get_contentful_entry_spec.rb
+++ b/spec/services/get_contentful_entry_spec.rb
@@ -3,14 +3,6 @@
 RSpec.describe GetContentfulEntry do
   let(:contentful_journey_start_entry_id) { "1a2b3c4d5" }
 
-  around do |example|
-    ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: contentful_journey_start_entry_id
-    ) do
-      example.run
-    end
-  end
-
   describe "#call" do
     it "requests and returns the required entry from Contentful" do
       contentful_connector = instance_double(ContentfulConnector)

From b27776b3b0e5f27e32d4755a86790c1a1887a523 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Mon, 25 Jan 2021 17:14:18 +0000
Subject: [PATCH 012/249] Remove new_journey_step_path

This code path should no longer be used, as we create all steps at the
point a user begins a journey (instead of incrementally as they
progress).
---
 app/controllers/steps_controller.rb      | 13 ---------
 spec/requests/contentful_caching_spec.rb | 34 +++++++++++-------------
 2 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index 6984327a4..5186477ca 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -1,19 +1,6 @@
 # frozen_string_literal: true
 
 class StepsController < ApplicationController
-  def new
-    @journey = Journey.find(journey_id)
-
-    return redirect_to journey_path(@journey) unless @journey.next_entry_id.present?
-
-    contentful_entry = GetContentfulEntry.new(entry_id: @journey.next_entry_id).call
-    @step = CreateJourneyStep.new(
-      journey: @journey, contentful_entry: contentful_entry
-    ).call
-
-    redirect_to journey_step_path(@journey, @step)
-  end
-
   def show
     @journey = Journey.find(journey_id)
     @step = Step.find(params[:id])
diff --git a/spec/requests/contentful_caching_spec.rb b/spec/requests/contentful_caching_spec.rb
index c96a38676..3e36a1b9e 100644
--- a/spec/requests/contentful_caching_spec.rb
+++ b/spec/requests/contentful_caching_spec.rb
@@ -3,6 +3,7 @@
 RSpec.describe "Contentful Caching", type: :request do
   around do |example|
     ClimateControl.modify(
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry",
       CONTENTFUL_ENTRY_CACHING: "true"
     ) do
       example.run
@@ -10,14 +11,15 @@
   end
 
   it "checks the Redis cache instead of making an external request" do
-    journey = create(:journey, next_entry_id: "contentful-radio-question")
+    raw_category_response = File.read("#{Rails.root}/spec/fixtures/contentful/categories/radio-question.json")
+    RedisCache.redis.set("contentful:entry:contentful-category-entry", JSON.dump(raw_category_response))
 
-    raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/radio-question-example.json")
-    RedisCache.redis.set("contentful:entry:contentful-radio-question", JSON.dump(raw_response))
+    raw_step_response = File.read("#{Rails.root}/spec/fixtures/contentful/steps/contentful-radio-question.json")
+    RedisCache.redis.set("contentful:entry:contentful-radio-question", JSON.dump(raw_step_response))
 
     expect_any_instance_of(Contentful::Client).not_to receive(:entry)
 
-    get new_journey_step_path(journey)
+    get new_journey_path
 
     expect(response).to have_http_status(:found)
 
@@ -25,13 +27,11 @@
   end
 
   it "stores the external contentful response in the cache" do
-    journey = create(:journey, next_entry_id: "contentful-radio-question")
-    stub_get_contentful_entry(
-      entry_id: "contentful-radio-question",
-      fixture_filename: "radio-question-example.json"
+    stub_contentful_category(
+      fixture_filename: "radio-question.json"
     )
 
-    get new_journey_step_path(journey)
+    get new_journey_path
 
     expect(RedisCache.redis.get("contentful:entry:contentful-radio-question"))
       .to eq("\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"contentful-radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\"")
@@ -40,14 +40,12 @@
   end
 
   it "sets a TTL to 72 hours by default" do
-    journey = create(:journey, next_entry_id: "contentful-radio-question")
-    stub_get_contentful_entry(
-      entry_id: "contentful-radio-question",
-      fixture_filename: "radio-question-example.json"
+    stub_contentful_category(
+      fixture_filename: "radio-question.json"
     )
 
     freeze_time do
-      get new_journey_step_path(journey)
+      get new_journey_path
 
       expect(RedisCache.redis.ttl("contentful:entry:contentful-radio-question"))
         .to eq(60 * 60 * 72)
@@ -66,15 +64,13 @@
     end
 
     it "does not interact with the redis cache" do
-      journey = create(:journey, next_entry_id: "contentful-radio-question")
-      stub_get_contentful_entry(
-        entry_id: "contentful-radio-question",
-        fixture_filename: "radio-question-example.json"
+      stub_contentful_category(
+        fixture_filename: "radio-question.json"
       )
 
       expect(RedisCache).not_to receive(:redis)
 
-      get new_journey_step_path(journey)
+      get new_journey_path
     end
   end
 end

From fcdafbd171b7cbc8976d0d17c39363ce5e970643 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Mon, 25 Jan 2021 17:20:33 +0000
Subject: [PATCH 013/249] Remove next_entry_id

This is made redundant by the Category entry providing the entire list.
---
 app/services/create_journey_step.rb           | 11 +--------
 .../20210125171840_remove_next_entry_id.rb    |  5 ++++
 db/schema.rb                                  |  3 +--
 spec/factories/journey.rb                     |  1 -
 spec/models/journey_spec.rb                   |  5 ----
 spec/services/create_journey_step_spec.rb     | 24 -------------------
 6 files changed, 7 insertions(+), 42 deletions(-)
 create mode 100644 db/migrate/20210125171840_remove_next_entry_id.rb

diff --git a/app/services/create_journey_step.rb b/app/services/create_journey_step.rb
index 08c7e0415..c2efb8ce3 100644
--- a/app/services/create_journey_step.rb
+++ b/app/services/create_journey_step.rb
@@ -30,7 +30,7 @@ def call
       raise UnexpectedContentfulStepType
     end
 
-    step = Step.create(
+    Step.create(
       title: title,
       help_text: help_text,
       body: body,
@@ -42,10 +42,6 @@ def call
       raw: raw,
       journey: journey
     )
-
-    journey.update(next_entry_id: next_entry_id)
-
-    step
   end
 
   private
@@ -106,11 +102,6 @@ def raw
     contentful_entry.raw
   end
 
-  def next_entry_id
-    return nil unless contentful_entry.respond_to?(:next)
-    contentful_entry.next.id
-  end
-
   def send_rollbar_warning
     Rollbar.warning(
       "An unexpected Contentful type was found",
diff --git a/db/migrate/20210125171840_remove_next_entry_id.rb b/db/migrate/20210125171840_remove_next_entry_id.rb
new file mode 100644
index 000000000..f0883ad67
--- /dev/null
+++ b/db/migrate/20210125171840_remove_next_entry_id.rb
@@ -0,0 +1,5 @@
+class RemoveNextEntryId < ActiveRecord::Migration[6.1]
+  def change
+    remove_column(:journeys, :next_entry_id)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 17fe498e7..101cc61a3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_01_18_123111) do
+ActiveRecord::Schema.define(version: 2021_01_25_171840) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -29,7 +29,6 @@
     t.string "category", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.string "next_entry_id"
     t.jsonb "liquid_template"
   end
 
diff --git a/spec/factories/journey.rb b/spec/factories/journey.rb
index c24800da3..1fb390acc 100644
--- a/spec/factories/journey.rb
+++ b/spec/factories/journey.rb
@@ -1,7 +1,6 @@
 FactoryBot.define do
   factory :journey do
     category { "catering" }
-    next_entry_id { "47EI2X2T5EDTpJX9WjRR9p" }
     liquid_template { "Your answer was {{ answer_47EI2X2T5EDTpJX9WjRR9p }}" }
 
     trait :catering do
diff --git a/spec/models/journey_spec.rb b/spec/models/journey_spec.rb
index 1d9cb3d78..52a89ed82 100644
--- a/spec/models/journey_spec.rb
+++ b/spec/models/journey_spec.rb
@@ -11,9 +11,4 @@
     journey = build(:journey, :catering)
     expect(journey.category).to eql("catering")
   end
-
-  it "stores an identifier for the next Contentful Entry" do
-    journey = build(:journey, :catering, next_entry_id: "47EI2X2T5EDTpJX9WjRR9p")
-    expect(journey.next_entry_id).to eql("47EI2X2T5EDTpJX9WjRR9p")
-  end
 end
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index f6198446e..8c8b1b97e 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -56,17 +56,6 @@
           }
         )
       end
-
-      it "updates the journey with a new next_entry_id" do
-        journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "has-next-question-example.json"
-        )
-
-        _step = described_class.new(journey: journey, contentful_entry: fake_entry).call
-
-        expect(journey.next_entry_id).to eql("5lYcZs1ootDrOnk09LDLZg")
-      end
     end
 
     context "when the question is of type 'short_text'" do
@@ -93,19 +82,6 @@
       end
     end
 
-    context "when the new step does not have a following step" do
-      it "updates the journey by setting the next_entry_id to nil" do
-        journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "radio-question-example.json"
-        )
-
-        _step = described_class.new(journey: journey, contentful_entry: fake_entry).call
-
-        expect(journey.next_entry_id).to eql(nil)
-      end
-    end
-
     context "when the new entry has a body field" do
       it "updates the step with the body" do
         journey = create(:journey, :catering)

From 7cf7c98030d01cbcf0df9c4e5d8bdbe2a1b2a91c Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 26 Jan 2021 11:01:58 +0000
Subject: [PATCH 014/249] Tests that enable caching tidy up after themselves

This resolves a case where tests running with the order of 52991 failed.
---
 spec/requests/contentful_caching_spec.rb | 72 ++++++++++++++----------
 1 file changed, 41 insertions(+), 31 deletions(-)

diff --git a/spec/requests/contentful_caching_spec.rb b/spec/requests/contentful_caching_spec.rb
index 3e36a1b9e..f81cb537d 100644
--- a/spec/requests/contentful_caching_spec.rb
+++ b/spec/requests/contentful_caching_spec.rb
@@ -3,55 +3,65 @@
 RSpec.describe "Contentful Caching", type: :request do
   around do |example|
     ClimateControl.modify(
-      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry",
-      CONTENTFUL_ENTRY_CACHING: "true"
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
     ) do
       example.run
     end
   end
 
-  it "checks the Redis cache instead of making an external request" do
-    raw_category_response = File.read("#{Rails.root}/spec/fixtures/contentful/categories/radio-question.json")
-    RedisCache.redis.set("contentful:entry:contentful-category-entry", JSON.dump(raw_category_response))
+  context "when caching is enabled" do
+    around do |example|
+      ClimateControl.modify(
+        CONTENTFUL_ENTRY_CACHING: "true"
+      ) do
+        example.run
+      end
+    end
+    after(:each) { RedisCache.redis.flushdb }
 
-    raw_step_response = File.read("#{Rails.root}/spec/fixtures/contentful/steps/contentful-radio-question.json")
-    RedisCache.redis.set("contentful:entry:contentful-radio-question", JSON.dump(raw_step_response))
+    it "checks the Redis cache instead of making an external request" do
+      raw_category_response = File.read("#{Rails.root}/spec/fixtures/contentful/categories/radio-question.json")
+      RedisCache.redis.set("contentful:entry:contentful-category-entry", JSON.dump(raw_category_response))
 
-    expect_any_instance_of(Contentful::Client).not_to receive(:entry)
+      raw_step_response = File.read("#{Rails.root}/spec/fixtures/contentful/steps/contentful-radio-question.json")
+      RedisCache.redis.set("contentful:entry:contentful-radio-question", JSON.dump(raw_step_response))
 
-    get new_journey_path
+      expect_any_instance_of(Contentful::Client).not_to receive(:entry)
 
-    expect(response).to have_http_status(:found)
+      get new_journey_path
 
-    RedisCache.redis.del("contentful:entry:contentful-radio-question")
-  end
+      expect(response).to have_http_status(:found)
 
-  it "stores the external contentful response in the cache" do
-    stub_contentful_category(
-      fixture_filename: "radio-question.json"
-    )
+      RedisCache.redis.del("contentful:entry:contentful-radio-question")
+    end
 
-    get new_journey_path
+    it "stores the external contentful response in the cache" do
+      stub_contentful_category(
+        fixture_filename: "radio-question.json"
+      )
 
-    expect(RedisCache.redis.get("contentful:entry:contentful-radio-question"))
-      .to eq("\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"contentful-radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\"")
+      get new_journey_path
 
-    RedisCache.redis.del("contentful:entry:contentful-radio-question")
-  end
+      expect(RedisCache.redis.get("contentful:entry:contentful-radio-question"))
+        .to eq("\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"contentful-radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\"")
 
-  it "sets a TTL to 72 hours by default" do
-    stub_contentful_category(
-      fixture_filename: "radio-question.json"
-    )
+      RedisCache.redis.del("contentful:entry:contentful-radio-question")
+    end
 
-    freeze_time do
-      get new_journey_path
+    it "sets a TTL to 72 hours by default" do
+      stub_contentful_category(
+        fixture_filename: "radio-question.json"
+      )
 
-      expect(RedisCache.redis.ttl("contentful:entry:contentful-radio-question"))
-        .to eq(60 * 60 * 72)
-    end
+      freeze_time do
+        get new_journey_path
 
-    RedisCache.redis.del("contentful:entry:contentful-radio-question")
+        expect(RedisCache.redis.ttl("contentful:entry:contentful-radio-question"))
+          .to eq(60 * 60 * 72)
+      end
+
+      RedisCache.redis.del("contentful:entry:contentful-radio-question")
+    end
   end
 
   context "when caching has been disabled in ENV" do

From dda0409313149202dbd115e6450b67dccc54ab90 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 26 Jan 2021 11:25:50 +0000
Subject: [PATCH 015/249] Move remaining fixtures into the new subfolder
 pattern

We've moved everthing else into /categories and /steps. This change completes this migration.
---
 .../anyone_can_preview_a_journey_step_spec.rb |  2 +-
 .../contentful/steps/no-primary-button.json   | 37 ++++++++++++++++++
 .../contentful/steps/primary-button.json      | 38 +++++++++++++++++++
 .../steps/unexpected-contentful-type.json     |  2 +-
 spec/services/create_journey_step_spec.rb     | 26 ++++++-------
 5 files changed, 90 insertions(+), 15 deletions(-)
 create mode 100644 spec/fixtures/contentful/steps/no-primary-button.json
 create mode 100644 spec/fixtures/contentful/steps/primary-button.json

diff --git a/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb b/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
index 412a9e752..f256a8866 100644
--- a/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
+++ b/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
@@ -2,7 +2,7 @@
   scenario "the appropriate step is displayed" do
     stub_get_contentful_entry(
       entry_id: "contentful-radio-question",
-      fixture_filename: "radio-question-example.json"
+      fixture_filename: "steps/contentful-radio-question.json"
     )
 
     visit preview_entry_path("contentful-radio-question")
diff --git a/spec/fixtures/contentful/steps/no-primary-button.json b/spec/fixtures/contentful/steps/no-primary-button.json
new file mode 100644
index 000000000..a46ec391f
--- /dev/null
+++ b/spec/fixtures/contentful/steps/no-primary-button.json
@@ -0,0 +1,37 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-starting-step",
+        "type": "Entry",
+        "createdAt": "2020-12-02T10:48:35.748Z",
+        "updatedAt": "2020-12-07T17:04:21.854Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "staticContent"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/timelines",
+        "title": "When you should start",
+        "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
+        "type": "paragraphs"
+    }
+}
diff --git a/spec/fixtures/contentful/steps/primary-button.json b/spec/fixtures/contentful/steps/primary-button.json
new file mode 100644
index 000000000..20c09d601
--- /dev/null
+++ b/spec/fixtures/contentful/steps/primary-button.json
@@ -0,0 +1,38 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-starting-step",
+        "type": "Entry",
+        "createdAt": "2020-12-02T10:48:35.748Z",
+        "updatedAt": "2020-12-07T17:04:21.854Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "staticContent"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/timelines",
+        "title": "When you should start",
+        "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
+        "type": "paragraphs",
+        "primaryCallToAction": "Go onwards!"
+    }
+}
diff --git a/spec/fixtures/contentful/steps/unexpected-contentful-type.json b/spec/fixtures/contentful/steps/unexpected-contentful-type.json
index ab4820420..97e4234a5 100644
--- a/spec/fixtures/contentful/steps/unexpected-contentful-type.json
+++ b/spec/fixtures/contentful/steps/unexpected-contentful-type.json
@@ -30,6 +30,6 @@
     },
     "fields": {
         "slug": "/check-your-answers",
-        "type": "telepathy"
+        "type": "radios"
     }
 }
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index 8c8b1b97e..a2c5fa325 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -6,7 +6,7 @@
       it "creates a local copy of the new step" do
         journey = create(:journey, :catering)
         fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "radio-question-example.json"
+          contentful_fixture_filename: "steps/contentful-radio-question.json"
         )
 
         step = described_class.new(journey: journey, contentful_entry: fake_entry).call
@@ -62,7 +62,7 @@
       it "sets help_text and options to nil" do
         journey = create(:journey, :catering)
         fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "short-text-question-example.json"
+          contentful_fixture_filename: "steps/short-text-question.json"
         )
 
         step = described_class.new(journey: journey, contentful_entry: fake_entry).call
@@ -73,7 +73,7 @@
       it "replaces spaces with underscores" do
         journey = create(:journey, :catering)
         fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "short-text-question-example.json"
+          contentful_fixture_filename: "steps/short-text-question.json"
         )
 
         step = described_class.new(journey: journey, contentful_entry: fake_entry).call
@@ -86,7 +86,7 @@
       it "updates the step with the body" do
         journey = create(:journey, :catering)
         fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "static-content-example.json"
+          contentful_fixture_filename: "steps/static-content.json"
         )
 
         step, _answer = described_class.new(
@@ -104,7 +104,7 @@
       it "updates the step with the body" do
         journey = create(:journey, :catering)
         fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "primary-button-example.json"
+          contentful_fixture_filename: "steps/primary-button.json"
         )
 
         step, _answer = described_class.new(
@@ -119,7 +119,7 @@
       it "default copy is used for the button" do
         journey = create(:journey, :catering)
         fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "no-primary-button-example.json"
+          contentful_fixture_filename: "steps/no-primary-button.json"
         )
 
         step, _answer = described_class.new(
@@ -134,7 +134,7 @@
       it "raises an error" do
         journey = create(:journey, :catering)
         fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "an-unexpected-model-example.json"
+          contentful_fixture_filename: "steps/unexpected-contentful-type.json"
         )
 
         expect { described_class.new(journey: journey, contentful_entry: fake_entry).call }
@@ -145,7 +145,7 @@
         journey = create(:journey, :catering)
 
         fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "an-unexpected-model-example.json"
+          contentful_fixture_filename: "steps/unexpected-contentful-type.json"
         )
 
         expect(Rollbar).to receive(:warning)
@@ -153,8 +153,8 @@
             contentful_url: ENV["CONTENTFUL_URL"],
             contentful_space_id: ENV["CONTENTFUL_SPACE"],
             contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "6EKsv389ETYcQql3htK3Z2",
-            content_model: "unmanagedPage",
+            contentful_entry_id: "unexpected-contentful-type",
+            content_model: "telepathy",
             step_type: "radios",
             allowed_content_models: CreateJourneyStep::ALLOWED_CONTENTFUL_MODELS.join(", "),
             allowed_step_types: CreateJourneyStep::ALLOWED_CONTENTFUL_ENTRY_TYPES.join(", "))
@@ -168,7 +168,7 @@
       it "raises an error" do
         journey = create(:journey, :catering)
         fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "an-unexpected-question-type-example.json"
+          contentful_fixture_filename: "steps/unexpected-contentful-question-type.json"
         )
 
         expect { described_class.new(journey: journey, contentful_entry: fake_entry).call }
@@ -179,7 +179,7 @@
         journey = create(:journey, :catering)
 
         fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "an-unexpected-question-type-example.json"
+          contentful_fixture_filename: "steps/unexpected-contentful-question-type.json"
         )
 
         expect(Rollbar).to receive(:warning)
@@ -187,7 +187,7 @@
             contentful_url: ENV["CONTENTFUL_URL"],
             contentful_space_id: ENV["CONTENTFUL_SPACE"],
             contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "8as7df68uhasdnuasdf",
+            contentful_entry_id: "unexpected-contentful-question-type",
             content_model: "question",
             step_type: "telepathy",
             allowed_content_models: CreateJourneyStep::ALLOWED_CONTENTFUL_MODELS.join(", "),

From 92062cf61aa9f29d9a9fd5ca99902aa8fe9020f1 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 26 Jan 2021 11:25:58 +0000
Subject: [PATCH 016/249] Remove all redundant fixtures

---
 .../an-unexpected-model-example.json          |  35 ---
 .../an-unexpected-question-type-example.json  |  35 ---
 .../fixtures/contentful/categories/radio.json |  43 ---
 .../fixtures/contentful/checkbox-example.json |  41 ---
 .../closed-path-with-multiple-example.json    | 286 ------------------
 .../extended-radio-question-example.json      |  51 ----
 .../contentful/has-next-question-example.json |  52 ----
 .../contentful/multiple-entries-example.json  |  99 ------
 .../contentful/no-next-question-example.json  |  45 ---
 .../contentful/no-primary-button-example.json |  37 ---
 .../path-with-unexpected-model.json           |  45 ---
 .../path-with-unexpected-step-type.json       |  45 ---
 .../contentful/primary-button-example.json    |  38 ---
 .../contentful/radio-question-example.json    |  45 ---
 .../contentful/repeat-entry-example.json      | 150 ---------
 .../short-text-question-example.json          |  37 ---
 .../contentful/static-content-example.json    |  37 ---
 17 files changed, 1121 deletions(-)
 delete mode 100644 spec/fixtures/contentful/an-unexpected-model-example.json
 delete mode 100644 spec/fixtures/contentful/an-unexpected-question-type-example.json
 delete mode 100644 spec/fixtures/contentful/categories/radio.json
 delete mode 100644 spec/fixtures/contentful/checkbox-example.json
 delete mode 100644 spec/fixtures/contentful/closed-path-with-multiple-example.json
 delete mode 100644 spec/fixtures/contentful/extended-radio-question-example.json
 delete mode 100644 spec/fixtures/contentful/has-next-question-example.json
 delete mode 100644 spec/fixtures/contentful/multiple-entries-example.json
 delete mode 100644 spec/fixtures/contentful/no-next-question-example.json
 delete mode 100644 spec/fixtures/contentful/no-primary-button-example.json
 delete mode 100644 spec/fixtures/contentful/path-with-unexpected-model.json
 delete mode 100644 spec/fixtures/contentful/path-with-unexpected-step-type.json
 delete mode 100644 spec/fixtures/contentful/primary-button-example.json
 delete mode 100644 spec/fixtures/contentful/radio-question-example.json
 delete mode 100644 spec/fixtures/contentful/repeat-entry-example.json
 delete mode 100644 spec/fixtures/contentful/short-text-question-example.json
 delete mode 100644 spec/fixtures/contentful/static-content-example.json

diff --git a/spec/fixtures/contentful/an-unexpected-model-example.json b/spec/fixtures/contentful/an-unexpected-model-example.json
deleted file mode 100644
index f213d6483..000000000
--- a/spec/fixtures/contentful/an-unexpected-model-example.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "sys": {
-        "space": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Space",
-                "id": "jspwts36h1os"
-            }
-        },
-        "id": "6EKsv389ETYcQql3htK3Z2",
-        "type": "Entry",
-        "createdAt": "2020-09-02T15:56:05.472Z",
-        "updatedAt": "2020-09-02T16:19:00.652Z",
-        "environment": {
-            "sys": {
-                "id": "master",
-                "type": "Link",
-                "linkType": "Environment"
-            }
-        },
-        "revision": 2,
-        "contentType": {
-            "sys": {
-                "type": "Link",
-                "linkType": "ContentType",
-                "id": "unmanagedPage"
-            }
-        },
-        "locale": "en-US"
-    },
-    "fields": {
-        "slug": "/check-your-answers",
-        "type": "radios"
-    }
-}
diff --git a/spec/fixtures/contentful/an-unexpected-question-type-example.json b/spec/fixtures/contentful/an-unexpected-question-type-example.json
deleted file mode 100644
index 1f02406eb..000000000
--- a/spec/fixtures/contentful/an-unexpected-question-type-example.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "sys": {
-        "space": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Space",
-                "id": "jspwts36h1os"
-            }
-        },
-        "id": "8as7df68uhasdnuasdf",
-        "type": "Entry",
-        "createdAt": "2020-09-02T15:56:05.472Z",
-        "updatedAt": "2020-09-02T16:19:00.652Z",
-        "environment": {
-            "sys": {
-                "id": "master",
-                "type": "Link",
-                "linkType": "Environment"
-            }
-        },
-        "revision": 2,
-        "contentType": {
-            "sys": {
-                "type": "Link",
-                "linkType": "ContentType",
-                "id": "question"
-            }
-        },
-        "locale": "en-US"
-    },
-    "fields": {
-        "slug": "/check-your-answers",
-        "type": "telepathy"
-    }
-}
diff --git a/spec/fixtures/contentful/categories/radio.json b/spec/fixtures/contentful/categories/radio.json
deleted file mode 100644
index 0a4e97ee3..000000000
--- a/spec/fixtures/contentful/categories/radio.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "sys": {
-        "space": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Space",
-                "id": "rwl7tyzv9sys"
-            }
-        },
-        "id": "2xAVAM1lxUie3bPHxUBBqD",
-        "type": "Entry",
-        "createdAt": "2021-01-20T12:19:10.220Z",
-        "updatedAt": "2021-01-20T15:06:12.067Z",
-        "environment": {
-            "sys": {
-                "id": "develop",
-                "type": "Link",
-                "linkType": "Environment"
-            }
-        },
-        "revision": 2,
-        "contentType": {
-            "sys": {
-                "type": "Link",
-                "linkType": "ContentType",
-                "id": "category"
-            }
-        },
-        "locale": "en-US"
-    },
-    "fields": {
-        "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "contentful-radio-question"
-            }
-          }
-        ]
-    }
-}
diff --git a/spec/fixtures/contentful/checkbox-example.json b/spec/fixtures/contentful/checkbox-example.json
deleted file mode 100644
index 71408ac83..000000000
--- a/spec/fixtures/contentful/checkbox-example.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "sys": {
-        "space": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Space",
-                "id": "rwl7tyzv9sys"
-            }
-        },
-        "id": "1DqhwF2XkJJ0Um6NSweWlZ",
-        "type": "Entry",
-        "createdAt": "2020-12-09T11:53:52.744Z",
-        "updatedAt": "2020-12-09T11:53:52.744Z",
-        "environment": {
-            "sys": {
-                "id": "develop",
-                "type": "Link",
-                "linkType": "Environment"
-            }
-        },
-        "revision": 1,
-        "contentType": {
-            "sys": {
-                "type": "Link",
-                "linkType": "ContentType",
-                "id": "question"
-            }
-        },
-        "locale": "en-US"
-    },
-    "fields": {
-        "slug": "/everyday-services",
-        "type": "checkboxes",
-        "title": "Everyday services that are required and need to be considered",
-        "extendedOptions": [
-          { "value": "breakfast" },
-          { "value": "lunch" },
-          { "value": "dinner" }
-        ]
-    }
-}
diff --git a/spec/fixtures/contentful/closed-path-with-multiple-example.json b/spec/fixtures/contentful/closed-path-with-multiple-example.json
deleted file mode 100644
index c2ea024e6..000000000
--- a/spec/fixtures/contentful/closed-path-with-multiple-example.json
+++ /dev/null
@@ -1,286 +0,0 @@
-{
-    "sys": {
-        "type": "Array"
-    },
-    "total": 2,
-    "skip": 0,
-    "limit": 100,
-    "items": [
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-starting-step",
-                "type": "Entry",
-                "createdAt": "2020-12-02T10:48:35.748Z",
-                "updatedAt": "2020-12-02T10:48:35.748Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "staticContent"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/timelines",
-                "title": "When you should start",
-                "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
-                "type": "paragraphs",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-radio-question"
-                    }
-                }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-radio-question",
-                "type": "Entry",
-                "createdAt": "2020-11-04T12:28:30.442Z",
-                "updatedAt": "2020-11-26T16:39:54.188Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 6,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/dev-start-which-service",
-                "title": "Which service do you need?",
-                "helpText": "Tell us which service you need.",
-                "type": "radios",
-                "extendedOptions": [
-                  {
-                      "value": "Catering",
-                      "display_further_information": true,
-                      "further_information_help_text": "Do a thing"
-                  },
-                  {
-                      "value": "Cleaning"
-                  }
-                ],
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-short-text-question"
-                    }
-                  }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-short-text-question",
-                "type": "Entry",
-                "createdAt": "2020-11-05T16:42:58.340Z",
-                "updatedAt": "2020-11-05T16:42:58.340Z",
-                "environment": {
-                    "sys": {
-                        "id": "master",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/what-email-address-did-you-use",
-                "title": "What email address did you use?",
-                "helpText": "This will help us recover your existing plans",
-                "type": "short text",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-long-text-question"
-                    }
-                  }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-long-text-question",
-                "type": "Entry",
-                "createdAt": "2020-11-11T11:26:20.994Z",
-                "updatedAt": "2020-11-11T11:26:20.994Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/describe-what-you-need",
-                "title": "Describe what you need",
-                "helpText": "Briefly describe what you are looking to procure from your supplier.",
-                "type": "long text",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-single-date-question"
-                    }
-                  }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-single-date-question",
-                "type": "Entry",
-                "createdAt": "2020-12-08T10:43:19.102Z",
-                "updatedAt": "2020-12-08T10:43:19.102Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/starting-date",
-                "type": "single date",
-                "title": "When will this start?",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-checkboxes-question"
-                    }
-                  }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-checkboxes-question",
-                "type": "Entry",
-                "createdAt": "2020-12-09T11:53:52.744Z",
-                "updatedAt": "2020-12-09T11:53:52.744Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/everyday-services",
-                "type": "checkboxes",
-                "title": "Everyday services that are required and need to be considered",
-                "extendedOptions": [
-                  {
-                      "value": "breakfast"
-                  },
-                  {
-                      "value": "lunch"
-                  },
-                  {
-                      "value": "dinner"
-                  }
-                ]
-            }
-        }
-    ]
-}
diff --git a/spec/fixtures/contentful/extended-radio-question-example.json b/spec/fixtures/contentful/extended-radio-question-example.json
deleted file mode 100644
index fd02a3b48..000000000
--- a/spec/fixtures/contentful/extended-radio-question-example.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "sys": {
-        "space": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Space",
-                "id": "jspwts36h1os"
-            }
-        },
-        "id": "contentful-starting-step",
-        "type": "Entry",
-        "createdAt": "2020-09-07T10:56:40.585Z",
-        "updatedAt": "2020-09-14T22:16:54.633Z",
-        "environment": {
-            "sys": {
-                "id": "master",
-                "type": "Link",
-                "linkType": "Environment"
-            }
-        },
-        "revision": 7,
-        "contentType": {
-            "sys": {
-                "type": "Link",
-                "linkType": "ContentType",
-                "id": "question"
-            }
-        },
-        "locale": "en-US"
-    },
-    "fields": {
-        "slug": "/which-service",
-        "title": "Which service do you need?",
-        "helpText": "Tell us which service you need.",
-        "type": "radios",
-        "extendedOptions": [
-          {
-              "value": "Catering",
-              "help_text": "",
-              "display_further_information": true,
-              "further_information_help_text": "Briefly describe why you need catering"
-          },
-          {
-              "value": "Cleaning",
-              "help_text": "All interior areas of the school only",
-              "display_further_information": false,
-              "further_information_help_text": "Briefly describe why you need cleaning"
-          }
-        ]
-    }
-}
diff --git a/spec/fixtures/contentful/has-next-question-example.json b/spec/fixtures/contentful/has-next-question-example.json
deleted file mode 100644
index 2e07763ab..000000000
--- a/spec/fixtures/contentful/has-next-question-example.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "sys": {
-        "space": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Space",
-                "id": "jspwts36h1os"
-            }
-        },
-        "id": "47EI2X2T5EDTpJX9WjRR9p",
-        "type": "Entry",
-        "createdAt": "2020-09-14T19:23:05.211Z",
-        "updatedAt": "2020-09-14T19:23:05.211Z",
-        "environment": {
-            "sys": {
-                "id": "master",
-                "type": "Link",
-                "linkType": "Environment"
-            }
-        },
-        "revision": 1,
-        "contentType": {
-            "sys": {
-                "type": "Link",
-                "linkType": "ContentType",
-                "id": "question"
-            }
-        },
-        "locale": "en-US"
-    },
-    "fields": {
-        "slug": "/which-service",
-        "title": "Which service do you need?",
-        "helpText": "Tell us which service you need.",
-        "type": "radios",
-        "extendedOptions": [
-          {
-              "value": "Catering"
-          },
-          {
-              "value": "Cleaning"
-          }
-        ],
-        "next": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "5lYcZs1ootDrOnk09LDLZg"
-            }
-        }
-    }
-}
diff --git a/spec/fixtures/contentful/multiple-entries-example.json b/spec/fixtures/contentful/multiple-entries-example.json
deleted file mode 100644
index 4ad585640..000000000
--- a/spec/fixtures/contentful/multiple-entries-example.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "sys": {
-        "type": "Array"
-    },
-    "total": 2,
-    "skip": 0,
-    "limit": 100,
-    "items": [
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-starting-step",
-                "type": "Entry",
-                "createdAt": "2020-12-02T10:48:35.748Z",
-                "updatedAt": "2020-12-02T10:48:35.748Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "staticContent"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/timelines",
-                "title": "When you should start",
-                "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
-                "type": "paragraphs",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "hfjJgWRg4xiiiImwVRDtZ"
-                    }
-                }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "hfjJgWRg4xiiiImwVRDtZ",
-                "type": "Entry",
-                "createdAt": "2020-11-04T12:28:30.442Z",
-                "updatedAt": "2020-11-26T16:39:54.188Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 6,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/dev-start-which-service",
-                "title": "Which service do you need?",
-                "helpText": "Tell us which service you need.",
-                "type": "radios",
-                "extendedOptions": [
-                  {
-                      "value": "Catering"
-                  },
-                  {
-                      "value": "Cleaning"
-                  }
-                ]
-            }
-        }
-    ]
-}
diff --git a/spec/fixtures/contentful/no-next-question-example.json b/spec/fixtures/contentful/no-next-question-example.json
deleted file mode 100644
index 677a48d26..000000000
--- a/spec/fixtures/contentful/no-next-question-example.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "sys": {
-        "space": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Space",
-                "id": "jspwts36h1os"
-            }
-        },
-        "id": "5lYcZs1ootDrOnk09LDLZg",
-        "type": "Entry",
-        "createdAt": "2020-09-14T19:23:05.211Z",
-        "updatedAt": "2020-09-14T19:23:05.211Z",
-        "environment": {
-            "sys": {
-                "id": "master",
-                "type": "Link",
-                "linkType": "Environment"
-            }
-        },
-        "revision": 1,
-        "contentType": {
-            "sys": {
-                "type": "Link",
-                "linkType": "ContentType",
-                "id": "question"
-            }
-        },
-        "locale": "en-US"
-    },
-    "fields": {
-        "slug": "/which-goods",
-        "title": "Which goods do you need?",
-        "helpText": "Tell us which goods you need.",
-        "type": "radios",
-        "extendedOptions": [
-          {
-              "value": "Stationary"
-          },
-          {
-              "value": "IT supplies"
-          }
-        ]
-    }
-}
diff --git a/spec/fixtures/contentful/no-primary-button-example.json b/spec/fixtures/contentful/no-primary-button-example.json
deleted file mode 100644
index a46ec391f..000000000
--- a/spec/fixtures/contentful/no-primary-button-example.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "sys": {
-        "space": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Space",
-                "id": "rwl7tyzv9sys"
-            }
-        },
-        "id": "contentful-starting-step",
-        "type": "Entry",
-        "createdAt": "2020-12-02T10:48:35.748Z",
-        "updatedAt": "2020-12-07T17:04:21.854Z",
-        "environment": {
-            "sys": {
-                "id": "develop",
-                "type": "Link",
-                "linkType": "Environment"
-            }
-        },
-        "revision": 2,
-        "contentType": {
-            "sys": {
-                "type": "Link",
-                "linkType": "ContentType",
-                "id": "staticContent"
-            }
-        },
-        "locale": "en-US"
-    },
-    "fields": {
-        "slug": "/timelines",
-        "title": "When you should start",
-        "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
-        "type": "paragraphs"
-    }
-}
diff --git a/spec/fixtures/contentful/path-with-unexpected-model.json b/spec/fixtures/contentful/path-with-unexpected-model.json
deleted file mode 100644
index 4701e030f..000000000
--- a/spec/fixtures/contentful/path-with-unexpected-model.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "sys": {
-        "type": "Array"
-    },
-    "total": 2,
-    "skip": 0,
-    "limit": 100,
-    "items": [
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "jspwts36h1os"
-                    }
-                },
-                "id": "contentful-unexpected-model",
-                "type": "Entry",
-                "createdAt": "2020-09-02T15:56:05.472Z",
-                "updatedAt": "2020-09-02T16:19:00.652Z",
-                "environment": {
-                    "sys": {
-                        "id": "master",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 2,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "unmanagedPage"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/check-your-answers",
-                "type": "radios"
-            }
-        }
-    ]
-}
diff --git a/spec/fixtures/contentful/path-with-unexpected-step-type.json b/spec/fixtures/contentful/path-with-unexpected-step-type.json
deleted file mode 100644
index d1f353021..000000000
--- a/spec/fixtures/contentful/path-with-unexpected-step-type.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "sys": {
-        "type": "Array"
-    },
-    "total": 2,
-    "skip": 0,
-    "limit": 100,
-    "items": [
-      {
-          "sys": {
-              "space": {
-                  "sys": {
-                      "type": "Link",
-                      "linkType": "Space",
-                      "id": "jspwts36h1os"
-                  }
-              },
-              "id": "contentful-unexpected-step-type",
-              "type": "Entry",
-              "createdAt": "2020-09-02T15:56:05.472Z",
-              "updatedAt": "2020-09-02T16:19:00.652Z",
-              "environment": {
-                  "sys": {
-                      "id": "master",
-                      "type": "Link",
-                      "linkType": "Environment"
-                  }
-              },
-              "revision": 2,
-              "contentType": {
-                  "sys": {
-                      "type": "Link",
-                      "linkType": "ContentType",
-                      "id": "question"
-                  }
-              },
-              "locale": "en-US"
-          },
-          "fields": {
-              "slug": "/check-your-answers",
-              "type": "telepathy"
-          }
-      }
-    ]
-}
diff --git a/spec/fixtures/contentful/primary-button-example.json b/spec/fixtures/contentful/primary-button-example.json
deleted file mode 100644
index 20c09d601..000000000
--- a/spec/fixtures/contentful/primary-button-example.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "sys": {
-        "space": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Space",
-                "id": "rwl7tyzv9sys"
-            }
-        },
-        "id": "contentful-starting-step",
-        "type": "Entry",
-        "createdAt": "2020-12-02T10:48:35.748Z",
-        "updatedAt": "2020-12-07T17:04:21.854Z",
-        "environment": {
-            "sys": {
-                "id": "develop",
-                "type": "Link",
-                "linkType": "Environment"
-            }
-        },
-        "revision": 2,
-        "contentType": {
-            "sys": {
-                "type": "Link",
-                "linkType": "ContentType",
-                "id": "staticContent"
-            }
-        },
-        "locale": "en-US"
-    },
-    "fields": {
-        "slug": "/timelines",
-        "title": "When you should start",
-        "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
-        "type": "paragraphs",
-        "primaryCallToAction": "Go onwards!"
-    }
-}
diff --git a/spec/fixtures/contentful/radio-question-example.json b/spec/fixtures/contentful/radio-question-example.json
deleted file mode 100644
index ddf2ba23b..000000000
--- a/spec/fixtures/contentful/radio-question-example.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "sys": {
-        "space": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Space",
-                "id": "jspwts36h1os"
-            }
-        },
-        "id": "contentful-radio-question",
-        "type": "Entry",
-        "createdAt": "2020-09-07T10:56:40.585Z",
-        "updatedAt": "2020-09-14T22:16:54.633Z",
-        "environment": {
-            "sys": {
-                "id": "master",
-                "type": "Link",
-                "linkType": "Environment"
-            }
-        },
-        "revision": 7,
-        "contentType": {
-            "sys": {
-                "type": "Link",
-                "linkType": "ContentType",
-                "id": "question"
-            }
-        },
-        "locale": "en-US"
-    },
-    "fields": {
-        "slug": "/which-service",
-        "title": "Which service do you need?",
-        "helpText": "Tell us which service you need.",
-        "type": "radios",
-        "extendedOptions": [
-          {
-              "value": "Catering"
-          },
-          {
-              "value": "Cleaning"
-          }
-        ]
-    }
-}
diff --git a/spec/fixtures/contentful/repeat-entry-example.json b/spec/fixtures/contentful/repeat-entry-example.json
deleted file mode 100644
index 00bdd448f..000000000
--- a/spec/fixtures/contentful/repeat-entry-example.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "sys": {
-        "type": "Array"
-    },
-    "total": 4,
-    "skip": 0,
-    "limit": 100,
-    "items": [
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-starting-step",
-                "type": "Entry",
-                "createdAt": "2020-12-02T10:48:35.748Z",
-                "updatedAt": "2020-12-02T10:48:35.748Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "staticContent"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/timelines",
-                "title": "When you should start",
-                "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
-                "type": "paragraphs",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "hfjJgWRg4xiiiImwVRDtZ"
-                    }
-                }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "hfjJgWRg4xiiiImwVRDtZ",
-                "type": "Entry",
-                "createdAt": "2020-11-04T12:28:30.442Z",
-                "updatedAt": "2020-11-26T16:39:54.188Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 6,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/dev-start-which-service",
-                "title": "Which service do you need?",
-                "helpText": "Tell us which service you need.",
-                "type": "radios",
-                "extendedOptions": [
-                  {
-                      "value": "Catering"
-                  },
-                  {
-                      "value": "Cleaning"
-                  }
-                ],
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-starting-step"
-                    }
-                }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-starting-step",
-                "type": "Entry",
-                "createdAt": "2020-12-02T10:48:35.748Z",
-                "updatedAt": "2020-12-02T10:48:35.748Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "staticContent"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/timelines",
-                "title": "When you should start",
-                "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
-                "type": "paragraphs",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "hfjJgWRg4xiiiImwVRDtZ"
-                    }
-                }
-            }
-        }
-    ]
-}
diff --git a/spec/fixtures/contentful/short-text-question-example.json b/spec/fixtures/contentful/short-text-question-example.json
deleted file mode 100644
index 4c945fa53..000000000
--- a/spec/fixtures/contentful/short-text-question-example.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "sys": {
-        "space": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Space",
-                "id": "rwl7tyzv9sys"
-            }
-        },
-        "id": "hfjJgWRg4xiiiImwVRDtZ",
-        "type": "Entry",
-        "createdAt": "2020-11-05T16:42:58.340Z",
-        "updatedAt": "2020-11-05T16:42:58.340Z",
-        "environment": {
-            "sys": {
-                "id": "master",
-                "type": "Link",
-                "linkType": "Environment"
-            }
-        },
-        "revision": 1,
-        "contentType": {
-            "sys": {
-                "type": "Link",
-                "linkType": "ContentType",
-                "id": "question"
-            }
-        },
-        "locale": "en-US"
-    },
-    "fields": {
-        "slug": "/what-email-address-did-you-use",
-        "title": "What email address did you use?",
-        "helpText": "This will help us recover your existing plans",
-        "type": "short text"
-    }
-}
diff --git a/spec/fixtures/contentful/static-content-example.json b/spec/fixtures/contentful/static-content-example.json
deleted file mode 100644
index a09b1e972..000000000
--- a/spec/fixtures/contentful/static-content-example.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "sys": {
-    "space": {
-      "sys": {
-        "type": "Link",
-        "linkType": "Space",
-        "id": "rwl7tyzv9sys"
-      }
-    },
-    "id": "contentful-starting-step",
-    "type": "Entry",
-    "createdAt": "2020-12-02T10:48:35.748Z",
-    "updatedAt": "2020-12-02T10:48:35.748Z",
-    "environment": {
-      "sys": {
-        "id": "develop",
-        "type": "Link",
-        "linkType": "Environment"
-      }
-    },
-    "revision": 1,
-    "contentType": {
-      "sys": {
-        "type": "Link",
-        "linkType": "ContentType",
-        "id": "staticContent"
-      }
-    },
-    "locale": "en-US"
-  },
-  "fields": {
-    "slug": "/timelines",
-    "title": "When you should start",
-    "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
-    "type": "paragraphs"
-  }
-}

From 11623946229b1e8dd34d5d2d955d3ede335d9d9b Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Tue, 26 Jan 2021 11:52:35 +0000
Subject: [PATCH 017/249] Rename contentful-radio-question for consistency

---
 .../anyone_can_preview_a_journey_step_spec.rb    |  6 +++---
 ...can_see_the_map_of_journey_steps_page_spec.rb |  4 ++--
 .../journey-with-multiple-entries.json           |  2 +-
 .../categories/journey-with-repeat-entries.json  |  4 ++--
 .../contentful/categories/radio-question.json    |  2 +-
 ...l-radio-question.json => radio-question.json} |  2 +-
 spec/jobs/warm_entry_cache_job_spec.rb           |  4 ++--
 spec/requests/contentful_caching_spec.rb         | 16 ++++++++--------
 spec/services/create_journey_step_spec.rb        |  6 +++---
 spec/services/get_entries_in_category_spec.rb    |  4 ++--
 spec/support/contentful_helpers.rb               |  2 +-
 11 files changed, 26 insertions(+), 26 deletions(-)
 rename spec/fixtures/contentful/steps/{contentful-radio-question.json => radio-question.json} (96%)

diff --git a/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb b/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
index f256a8866..5b957ab9f 100644
--- a/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
+++ b/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
@@ -1,11 +1,11 @@
 feature "Users can preview a journey step" do
   scenario "the appropriate step is displayed" do
     stub_get_contentful_entry(
-      entry_id: "contentful-radio-question",
-      fixture_filename: "steps/contentful-radio-question.json"
+      entry_id: "radio-question",
+      fixture_filename: "steps/radio-question.json"
     )
 
-    visit preview_entry_path("contentful-radio-question")
+    visit preview_entry_path("radio-question")
 
     expect(page).to have_content("Which service do you need?")
     expect(page).to have_content("Catering")
diff --git a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
index 249ff647a..520747fb1 100644
--- a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
@@ -22,7 +22,7 @@
         expect(page)
           .to have_link(
             "Which service do you need?",
-            href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/contentful-radio-question"
+            href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/radio-question"
           )
       end
       within(list_items[1]) do
@@ -59,7 +59,7 @@
 
         expect(page).to have_content(I18n.t("errors.repeat_step_in_the_contentful_journey.page_title"))
         expect(page).to have_content(
-          I18n.t("errors.repeat_step_in_the_contentful_journey.page_body", entry_id: "contentful-radio-question")
+          I18n.t("errors.repeat_step_in_the_contentful_journey.page_body", entry_id: "radio-question")
         )
       end
     end
diff --git a/spec/fixtures/contentful/categories/journey-with-multiple-entries.json b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
index 297481ead..353a001c5 100644
--- a/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
+++ b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
@@ -35,7 +35,7 @@
             "sys": {
                 "type": "Link",
                 "linkType": "Entry",
-                "id": "contentful-radio-question"
+                "id": "radio-question"
             }
           },
           {
diff --git a/spec/fixtures/contentful/categories/journey-with-repeat-entries.json b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
index ba32a6280..061bd5a7b 100644
--- a/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
+++ b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
@@ -35,14 +35,14 @@
             "sys": {
                 "type": "Link",
                 "linkType": "Entry",
-                "id": "contentful-radio-question"
+                "id": "radio-question"
             }
           },
           {
             "sys": {
                 "type": "Link",
                 "linkType": "Entry",
-                "id": "contentful-radio-question"
+                "id": "radio-question"
             }
           }
         ]
diff --git a/spec/fixtures/contentful/categories/radio-question.json b/spec/fixtures/contentful/categories/radio-question.json
index e81486777..a76fcee87 100644
--- a/spec/fixtures/contentful/categories/radio-question.json
+++ b/spec/fixtures/contentful/categories/radio-question.json
@@ -35,7 +35,7 @@
             "sys": {
                 "type": "Link",
                 "linkType": "Entry",
-                "id": "contentful-radio-question"
+                "id": "radio-question"
             }
           }
         ]
diff --git a/spec/fixtures/contentful/steps/contentful-radio-question.json b/spec/fixtures/contentful/steps/radio-question.json
similarity index 96%
rename from spec/fixtures/contentful/steps/contentful-radio-question.json
rename to spec/fixtures/contentful/steps/radio-question.json
index ddf2ba23b..93cbc00c6 100644
--- a/spec/fixtures/contentful/steps/contentful-radio-question.json
+++ b/spec/fixtures/contentful/steps/radio-question.json
@@ -7,7 +7,7 @@
                 "id": "jspwts36h1os"
             }
         },
-        "id": "contentful-radio-question",
+        "id": "radio-question",
         "type": "Entry",
         "createdAt": "2020-09-07T10:56:40.585Z",
         "updatedAt": "2020-09-14T22:16:54.633Z",
diff --git a/spec/jobs/warm_entry_cache_job_spec.rb b/spec/jobs/warm_entry_cache_job_spec.rb
index 2ec22fd18..62ac1d8c7 100644
--- a/spec/jobs/warm_entry_cache_job_spec.rb
+++ b/spec/jobs/warm_entry_cache_job_spec.rb
@@ -30,9 +30,9 @@
       described_class.perform_later
       perform_enqueued_jobs
 
-      expect(RedisCache.redis.get("contentful:entry:contentful-radio-question"))
+      expect(RedisCache.redis.get("contentful:entry:radio-question"))
         .to eql(
-          "\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"contentful-radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\""
+          "\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\""
         )
       expect(RedisCache.redis.get("contentful:entry:short-text-question"))
         .not_to be_nil
diff --git a/spec/requests/contentful_caching_spec.rb b/spec/requests/contentful_caching_spec.rb
index f81cb537d..7c5c7c8fa 100644
--- a/spec/requests/contentful_caching_spec.rb
+++ b/spec/requests/contentful_caching_spec.rb
@@ -23,8 +23,8 @@
       raw_category_response = File.read("#{Rails.root}/spec/fixtures/contentful/categories/radio-question.json")
       RedisCache.redis.set("contentful:entry:contentful-category-entry", JSON.dump(raw_category_response))
 
-      raw_step_response = File.read("#{Rails.root}/spec/fixtures/contentful/steps/contentful-radio-question.json")
-      RedisCache.redis.set("contentful:entry:contentful-radio-question", JSON.dump(raw_step_response))
+      raw_step_response = File.read("#{Rails.root}/spec/fixtures/contentful/steps/radio-question.json")
+      RedisCache.redis.set("contentful:entry:radio-question", JSON.dump(raw_step_response))
 
       expect_any_instance_of(Contentful::Client).not_to receive(:entry)
 
@@ -32,7 +32,7 @@
 
       expect(response).to have_http_status(:found)
 
-      RedisCache.redis.del("contentful:entry:contentful-radio-question")
+      RedisCache.redis.del("contentful:entry:radio-question")
     end
 
     it "stores the external contentful response in the cache" do
@@ -42,10 +42,10 @@
 
       get new_journey_path
 
-      expect(RedisCache.redis.get("contentful:entry:contentful-radio-question"))
-        .to eq("\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"contentful-radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\"")
+      expect(RedisCache.redis.get("contentful:entry:radio-question"))
+        .to eq("\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\"")
 
-      RedisCache.redis.del("contentful:entry:contentful-radio-question")
+      RedisCache.redis.del("contentful:entry:radio-question")
     end
 
     it "sets a TTL to 72 hours by default" do
@@ -56,11 +56,11 @@
       freeze_time do
         get new_journey_path
 
-        expect(RedisCache.redis.ttl("contentful:entry:contentful-radio-question"))
+        expect(RedisCache.redis.ttl("contentful:entry:radio-question"))
           .to eq(60 * 60 * 72)
       end
 
-      RedisCache.redis.del("contentful:entry:contentful-radio-question")
+      RedisCache.redis.del("contentful:entry:radio-question")
     end
   end
 
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index a2c5fa325..9c46162be 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -6,14 +6,14 @@
       it "creates a local copy of the new step" do
         journey = create(:journey, :catering)
         fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "steps/contentful-radio-question.json"
+          contentful_fixture_filename: "steps/radio-question.json"
         )
 
         step = described_class.new(journey: journey, contentful_entry: fake_entry).call
 
         expect(step.title).to eq("Which service do you need?")
         expect(step.help_text).to eq("Tell us which service you need.")
-        expect(step.contentful_id).to eq("contentful-radio-question")
+        expect(step.contentful_id).to eq("radio-question")
         expect(step.contentful_model).to eq("question")
         expect(step.contentful_type).to eq("radios")
         expect(step.options).to eq([{"value" => "Catering"}, {"value" => "Cleaning"}])
@@ -41,7 +41,7 @@
                 "type" => "Link"
               }
             },
-            "id" => "contentful-radio-question",
+            "id" => "radio-question",
             "locale" => "en-US",
             "revision" => 7,
             "space" => {
diff --git a/spec/services/get_entries_in_category_spec.rb b/spec/services/get_entries_in_category_spec.rb
index 148704037..f18026783 100644
--- a/spec/services/get_entries_in_category_spec.rb
+++ b/spec/services/get_entries_in_category_spec.rb
@@ -13,7 +13,7 @@
       # INFO: We should test this is a Contentful::Entry however it wasn't
       # possible to create an instance_double due to an unusual way the object
       # is constructed within the gem. Creating the object seems overly complex.
-      expect(result.first.id).to eq("contentful-radio-question")
+      expect(result.first.id).to eq("radio-question")
     end
 
     context "when the category entry cannot be found" do
@@ -49,7 +49,7 @@
             contentful_url: ENV["CONTENTFUL_URL"],
             contentful_space_id: ENV["CONTENTFUL_SPACE"],
             contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "contentful-radio-question")
+            contentful_entry_id: "radio-question")
           .and_call_original
 
         expect {
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index c06ce62be..778d8c7bb 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -1,6 +1,6 @@
 module ContentfulHelpers
   def stub_get_contentful_entry(
-    entry_id: "contentful-radio-question",
+    entry_id: "radio-question",
     fixture_filename: "radio-question-example.json"
   )
     contentful_connector = stub_contentful_connector

From f90c93b2f585c3fc9cb5e000d821004d1c1b5f8d Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 26 Jan 2021 15:07:08 +0000
Subject: [PATCH 018/249] Step factories no longer create associated answers

The step factory was also creating associated answers every time a step
was created. This does not mirror the behaviour of the system; answers
are only created at the point a user provides one, not when a step is
created.

Co-authored-by: Lorna <lorna@dxw.com>
---
 spec/factories/step.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/spec/factories/step.rb b/spec/factories/step.rb
index 016694639..99563e53e 100644
--- a/spec/factories/step.rb
+++ b/spec/factories/step.rb
@@ -11,35 +11,30 @@
       options { [{"value" => "Red"}, {"value" => "Green"}, {"value" => "Blue"}] }
       contentful_model { "question" }
       contentful_type { "radios" }
-      association :radio_answer
     end
 
     trait :short_text do
       options { nil }
       contentful_model { "question" }
       contentful_type { "short_text" }
-      association :short_text_answer
     end
 
     trait :long_text do
       options { nil }
       contentful_model { "question" }
       contentful_type { "long_text" }
-      association :long_text_answer
     end
 
     trait :single_date do
       options { nil }
       contentful_model { "question" }
       contentful_type { "single_date" }
-      association :single_date_answer
     end
 
     trait :checkbox_answers do
       options { [{"value" => "Brown"}, {"value" => "Gold"}] }
       contentful_model { "question" }
       contentful_type { "checkboxes" }
-      association :checkbox_answers
     end
 
     trait :static_content do

From 346d8d03fe706ef22c8c7dc9fdab0705c1de89ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Jan 2021 11:03:41 +0000
Subject: [PATCH 019/249] Bump brakeman from 4.10.1 to 5.0.0

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.10.1 to 5.0.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.10.1...v5.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fdee9196d..dab11b6b9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,7 +70,7 @@ GEM
     bindex (0.8.1)
     bootsnap (1.5.1)
       msgpack (~> 1.0)
-    brakeman (4.10.1)
+    brakeman (5.0.0)
     builder (3.2.4)
     bullet (6.1.3)
       activesupport (>= 3.0.0)

From dd0ad9d7804ca4ebe26cda80c0eeae540abdc684 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 28 Jan 2021 10:23:48 +0000
Subject: [PATCH 020/249] Remove unused spec helper

---
 spec/support/contentful_helpers.rb | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 778d8c7bb..775c7bd2c 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -10,21 +10,6 @@ def stub_get_contentful_entry(
       .and_return(contentful_response)
   end
 
-  def stub_get_contentful_entries(
-    entry_id: "contentful-starting-step",
-    fixture_filename: "multiple-entries-example.json"
-  )
-    raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{fixture_filename}")
-
-    contentful_connector = stub_contentful_connector
-    contentful_response = fake_contentful_entry_array(contentful_fixture_filename: fixture_filename)
-    allow(contentful_connector).to receive(:get_all_entries)
-      .and_return(contentful_response)
-
-    allow(contentful_response).to receive(:raw)
-      .and_return(raw_response)
-  end
-
   def stub_contentful_category(
     fixture_filename:,
     stub_steps: true,
@@ -97,11 +82,4 @@ def fake_contentful_entry(contentful_fixture_filename:)
       content_type: double(id: hash_response.dig("sys", "contentType", "sys", "id"))
     )
   end
-
-  def fake_contentful_entry_array(contentful_fixture_filename:)
-    raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{contentful_fixture_filename}")
-    response_hash = JSON.parse(raw_response)
-
-    Contentful::ResourceBuilder.new(response_hash).run
-  end
 end

From 43ff967763ca04f230b010e10af6a917d8d677a7 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 28 Jan 2021 10:25:04 +0000
Subject: [PATCH 021/249] Rename test helper for consistency

---
 .../features/visitors/anyone_can_preview_a_journey_step_spec.rb | 2 +-
 spec/support/contentful_helpers.rb                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb b/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
index 5b957ab9f..03ebaf47e 100644
--- a/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
+++ b/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
@@ -1,6 +1,6 @@
 feature "Users can preview a journey step" do
   scenario "the appropriate step is displayed" do
-    stub_get_contentful_entry(
+    stub_contentful_entry(
       entry_id: "radio-question",
       fixture_filename: "steps/radio-question.json"
     )
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 775c7bd2c..95dd31bc6 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -1,5 +1,5 @@
 module ContentfulHelpers
-  def stub_get_contentful_entry(
+  def stub_contentful_entry(
     entry_id: "radio-question",
     fixture_filename: "radio-question-example.json"
   )

From e1ed91bc9aa4910327464d62de14e80beb630f15 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 28 Jan 2021 10:26:32 +0000
Subject: [PATCH 022/249] Refactor stubbing a category into 2 methods for reuse

---
 spec/support/contentful_helpers.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 95dd31bc6..5e44e294c 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -27,12 +27,16 @@ def stub_contentful_category(
 
     # For each step in the category mock a GET request
     if stub_steps
-      category.steps.each do |step|
-        step = fake_contentful_entry(contentful_fixture_filename: "steps/#{step.id}.json")
-        allow(contentful_connector).to receive(:get_entry_by_id)
-          .with(step.id)
-          .and_return(step)
-      end
+      stub_contentful_category_steps(category: category, contentful_connector: contentful_connector)
+    end
+  end
+
+  def stub_contentful_category_steps(category:, contentful_connector:)
+    category.steps.each do |step|
+      step = fake_contentful_entry(contentful_fixture_filename: "steps/#{step.id}.json")
+      allow(contentful_connector).to receive(:get_entry_by_id)
+        .with(step.id)
+        .and_return(step)
     end
   end
 

From 6184dfef46e592e4f97ce86d5859465a8e009684 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 28 Jan 2021 10:31:25 +0000
Subject: [PATCH 023/249] Rename GetContentfulEntry to GetEntry for clarity

The fact the resource called Entry comes from Contentful is implementation. We don't expect there to be 2 types of Entry so the shorter name should hopefully make sense when it sits with: `GetCategory` and `GetEntriesInCategory`
---
 app/controllers/journey_maps_controller.rb                  | 2 +-
 app/controllers/journeys_controller.rb                      | 2 +-
 app/controllers/preview/entries_controller.rb               | 2 +-
 app/services/get_entries_in_category.rb                     | 6 +++---
 app/services/{get_contentful_entry.rb => get_entry.rb}      | 2 +-
 spec/requests/entry_preview_spec.rb                         | 2 +-
 spec/services/get_entries_in_category_spec.rb               | 2 +-
 .../{get_contentful_entry_spec.rb => get_entry_spec.rb}     | 6 +++---
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename app/services/{get_contentful_entry.rb => get_entry.rb} (97%)
 rename spec/services/{get_contentful_entry_spec.rb => get_entry_spec.rb} (91%)

diff --git a/app/controllers/journey_maps_controller.rb b/app/controllers/journey_maps_controller.rb
index dca9d8b59..b4aacd2ce 100644
--- a/app/controllers/journey_maps_controller.rb
+++ b/app/controllers/journey_maps_controller.rb
@@ -5,7 +5,7 @@ class JourneyMapsController < ApplicationController
     render "errors/repeat_step_in_the_contentful_journey", status: 500, locals: {error: exception}
   end
 
-  rescue_from GetContentfulEntry::EntryNotFound do |exception|
+  rescue_from GetEntry::EntryNotFound do |exception|
     render "errors/contentful_entry_not_found", status: 500
   end
 
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 6e1b57ca9..22c98f212 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -13,7 +13,7 @@ class JourneysController < ApplicationController
     render "errors/unexpected_contentful_step_type", status: 500
   end
 
-  rescue_from GetContentfulEntry::EntryNotFound do |exception|
+  rescue_from GetEntry::EntryNotFound do |exception|
     render "errors/contentful_entry_not_found", status: 500
   end
 
diff --git a/app/controllers/preview/entries_controller.rb b/app/controllers/preview/entries_controller.rb
index b2b8d72d6..1f06eb262 100644
--- a/app/controllers/preview/entries_controller.rb
+++ b/app/controllers/preview/entries_controller.rb
@@ -1,7 +1,7 @@
 class Preview::EntriesController < ApplicationController
   def show
     @journey = Journey.create(category: "catering", liquid_template: "<p>N/A</p>")
-    contentful_entry = GetContentfulEntry.new(entry_id: entry_id).call
+    contentful_entry = GetEntry.new(entry_id: entry_id).call
     @step = CreateJourneyStep.new(
       journey: @journey, contentful_entry: contentful_entry
     ).call
diff --git a/app/services/get_entries_in_category.rb b/app/services/get_entries_in_category.rb
index 4642229fd..a5b7ab4a0 100644
--- a/app/services/get_entries_in_category.rb
+++ b/app/services/get_entries_in_category.rb
@@ -8,8 +8,8 @@ def initialize(category_entry_id:)
 
   def call
     category_entry = begin
-      GetContentfulEntry.new(entry_id: category_entry_id).call
-    rescue GetContentfulEntry::EntryNotFound
+      GetEntry.new(entry_id: category_entry_id).call
+    rescue GetEntry::EntryNotFound
       send_rollbar_error(message: "A Contentful category entry was not found", entry_id: category_entry_id)
       raise
     end
@@ -25,7 +25,7 @@ def call
     end
 
     question_entry_ids.map { |entry_id|
-      GetContentfulEntry.new(entry_id: entry_id).call
+      GetEntry.new(entry_id: entry_id).call
     }
   end
 
diff --git a/app/services/get_contentful_entry.rb b/app/services/get_entry.rb
similarity index 97%
rename from app/services/get_contentful_entry.rb
rename to app/services/get_entry.rb
index 304d3d975..c88f5fd9c 100644
--- a/app/services/get_contentful_entry.rb
+++ b/app/services/get_entry.rb
@@ -1,4 +1,4 @@
-class GetContentfulEntry
+class GetEntry
   class EntryNotFound < StandardError; end
   include CacheableEntry
 
diff --git a/spec/requests/entry_preview_spec.rb b/spec/requests/entry_preview_spec.rb
index c6927ca36..5a3ca6fea 100644
--- a/spec/requests/entry_preview_spec.rb
+++ b/spec/requests/entry_preview_spec.rb
@@ -9,7 +9,7 @@
       .and_return(fake_journey)
 
     fake_get_contentful_entry = instance_double(Contentful::Entry)
-    allow_any_instance_of(GetContentfulEntry).to receive(:call)
+    allow_any_instance_of(GetEntry).to receive(:call)
       .and_return(fake_get_contentful_entry)
 
     fake_step = create(:step, :radio)
diff --git a/spec/services/get_entries_in_category_spec.rb b/spec/services/get_entries_in_category_spec.rb
index f18026783..6446b70f5 100644
--- a/spec/services/get_entries_in_category_spec.rb
+++ b/spec/services/get_entries_in_category_spec.rb
@@ -36,7 +36,7 @@
 
         expect {
           described_class.new(category_entry_id: "a-category-id-that-does-not-exist").call
-        }.to raise_error(GetContentfulEntry::EntryNotFound)
+        }.to raise_error(GetEntry::EntryNotFound)
       end
     end
 
diff --git a/spec/services/get_contentful_entry_spec.rb b/spec/services/get_entry_spec.rb
similarity index 91%
rename from spec/services/get_contentful_entry_spec.rb
rename to spec/services/get_entry_spec.rb
index 6e534076c..5e4a796ce 100644
--- a/spec/services/get_contentful_entry_spec.rb
+++ b/spec/services/get_entry_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe GetContentfulEntry do
+RSpec.describe GetEntry do
   let(:contentful_journey_start_entry_id) { "1a2b3c4d5" }
 
   describe "#call" do
@@ -29,7 +29,7 @@
           .and_return(nil)
 
         expect { described_class.new(entry_id: missing_entry_id).call }
-          .to raise_error(GetContentfulEntry::EntryNotFound)
+          .to raise_error(GetEntry::EntryNotFound)
       end
 
       it "raises a rollbar event" do
@@ -47,7 +47,7 @@
             contentful_entry_id: "123")
           .and_call_original
         expect { described_class.new(entry_id: "123").call }
-          .to raise_error(GetContentfulEntry::EntryNotFound)
+          .to raise_error(GetEntry::EntryNotFound)
       end
     end
   end

From ba843464c1078c9e04d0f7c2eeb3e4ff46f7647b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Jan 2021 11:02:55 +0000
Subject: [PATCH 024/249] Bump jbuilder from 2.11.1 to 2.11.2

Bumps [jbuilder](https://github.com/rails/jbuilder) from 2.11.1 to 2.11.2.
- [Release notes](https://github.com/rails/jbuilder/releases)
- [Changelog](https://github.com/rails/jbuilder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/jbuilder/compare/v2.11.1...v2.11.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fdee9196d..da45ae55f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,7 +153,7 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.11.1)
+    jbuilder (2.11.2)
       activesupport (>= 5.0.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)

From 92779818b79956210d3bbe3c524afa63d21adc69 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Jan 2021 11:03:29 +0000
Subject: [PATCH 025/249] Bump puma from 5.1.1 to 5.2.0

Bumps [puma](https://github.com/puma/puma) from 5.1.1 to 5.2.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.1.1...v5.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index c44df0a95..553a96818 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem "jquery-rails"
 gem "liquid"
 gem "pg"
 gem "mini_racer"
-gem "puma", "~> 5.1"
+gem "puma", "~> 5.2"
 gem "redis", "~> 4.2"
 gem "redis-namespace"
 gem "rollbar"
diff --git a/Gemfile.lock b/Gemfile.lock
index fdee9196d..799319f78 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -196,7 +196,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.1.1)
+    puma (5.2.0)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.5.2)
@@ -378,7 +378,7 @@ DEPENDENCIES
   mock_redis
   pg
   pry
-  puma (~> 5.1)
+  puma (~> 5.2)
   rails (~> 6.1.1)
   rails_layout
   redis (~> 4.2)

From bdeabb5c0d10996187e91868998fe1060bba9d87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 11:04:08 +0000
Subject: [PATCH 026/249] Bump capybara from 3.34.0 to 3.35.3

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.34.0 to 3.35.3.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.34.0...3.35.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fdee9196d..e9d8d2121 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -76,13 +76,13 @@ GEM
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
-    capybara (3.34.0)
+    capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     childprocess (3.0.0)
     climate_control (0.2.0)
@@ -238,7 +238,7 @@ GEM
     redis (4.2.5)
     redis-namespace (1.8.0)
       redis (>= 3.0.4)
-    regexp_parser (1.8.2)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
     rollbar (3.1.1)
     rspec-core (3.10.1)

From 52a4e274b48856d4a7232403e8088c4555dc15cb Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 28 Jan 2021 11:25:59 +0000
Subject: [PATCH 027/249] Refactor how we get a Category so it can handle
 liquid template validation

Change the behaviour so that the getting of a category is not directly tied to the getting of category steps. Instead we find the category first (using the same GetEntry service under the hood) and then inject that onwards into the GetCategoryEntries service.

This change is being made at this poiint because we have a new need. The Category Entry will begin returning a new field called `specification_template`. This value needs additional validation to make sure it looks like a value that Liquid can parse. We should not move onto loading steps from a category unless the category itself is valid. Moving this into a 2 step process therefore makes sense and gives us a class to add further validations in future.

Testing improvements can also be made where we can now inject a category object into tests instead of stubbing additional calls. We make some tweaks to how many times we expect the ContentfulConnector so it is an accurate representation of the real world. When we ask for a category, we only expect 1 call. If we have a category with steps we expect exactly `steps.count` number of calls to be made.
---
 app/controllers/journey_maps_controller.rb    |  3 +-
 app/jobs/warm_entry_cache_job.rb              |  3 +-
 app/services/create_journey.rb                |  3 +-
 app/services/get_category.rb                  | 27 ++++++++++++++
 app/services/get_entries_in_category.rb       | 15 ++------
 .../anyone_can_complete_a_journey_spec.rb     | 11 +-----
 ..._see_the_map_of_journey_steps_page_spec.rb |  5 ++-
 spec/jobs/warm_entry_cache_job_spec.rb        | 18 +++++++--
 spec/services/create_journey_spec.rb          |  6 ++-
 spec/services/get_category_spec.rb            | 35 ++++++++++++++++++
 spec/services/get_entries_in_category_spec.rb | 37 ++++---------------
 spec/support/contentful_helpers.rb            | 17 +++++++--
 12 files changed, 118 insertions(+), 62 deletions(-)
 create mode 100644 app/services/get_category.rb
 create mode 100644 spec/services/get_category_spec.rb

diff --git a/app/controllers/journey_maps_controller.rb b/app/controllers/journey_maps_controller.rb
index b4aacd2ce..88dbbec2f 100644
--- a/app/controllers/journey_maps_controller.rb
+++ b/app/controllers/journey_maps_controller.rb
@@ -10,6 +10,7 @@ class JourneyMapsController < ApplicationController
   end
 
   def new
-    @journey_map = GetEntriesInCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
+    category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
+    @journey_map = GetEntriesInCategory.new(category: category).call
   end
 end
diff --git a/app/jobs/warm_entry_cache_job.rb b/app/jobs/warm_entry_cache_job.rb
index 1a4192ba3..6fd7abd09 100644
--- a/app/jobs/warm_entry_cache_job.rb
+++ b/app/jobs/warm_entry_cache_job.rb
@@ -5,7 +5,8 @@ class WarmEntryCacheJob < ApplicationJob
   sidekiq_options retry: 5
 
   def perform
-    entries = GetEntriesInCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
+    category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
+    entries = GetEntriesInCategory.new(category: category).call
 
     entries.each do |entry|
       store_in_cache(cache: cache, key: "contentful:entry:#{entry.id}", entry: entry)
diff --git a/app/services/create_journey.rb b/app/services/create_journey.rb
index cf8fac827..9d610ef3f 100644
--- a/app/services/create_journey.rb
+++ b/app/services/create_journey.rb
@@ -11,7 +11,8 @@ def call
       liquid_template: liquid_template
     )
 
-    question_entries = GetEntriesInCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
+    category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
+    question_entries = GetEntriesInCategory.new(category: category).call
     question_entries.each do |entry|
       CreateJourneyStep.new(
         journey: journey, contentful_entry: entry
diff --git a/app/services/get_category.rb b/app/services/get_category.rb
new file mode 100644
index 000000000..2cfc3a2fc
--- /dev/null
+++ b/app/services/get_category.rb
@@ -0,0 +1,27 @@
+class GetCategory
+  attr_accessor :category_entry_id
+  def initialize(category_entry_id:)
+    self.category_entry_id = category_entry_id
+  end
+
+  def call
+    begin
+      GetEntry.new(entry_id: category_entry_id).call
+    rescue GetEntry::EntryNotFound
+      send_rollbar_error(message: "A Contentful category entry was not found", entry_id: category_entry_id)
+      raise
+    end
+  end
+
+  private
+
+  def send_rollbar_error(message:, entry_id:)
+    Rollbar.error(
+      message,
+      contentful_url: ENV["CONTENTFUL_URL"],
+      contentful_space_id: ENV["CONTENTFUL_SPACE"],
+      contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+      contentful_entry_id: entry_id
+    )
+  end
+end
diff --git a/app/services/get_entries_in_category.rb b/app/services/get_entries_in_category.rb
index a5b7ab4a0..2b96bd3d1 100644
--- a/app/services/get_entries_in_category.rb
+++ b/app/services/get_entries_in_category.rb
@@ -1,21 +1,14 @@
 class GetEntriesInCategory
   class RepeatEntryDetected < StandardError; end
 
-  attr_accessor :category_entry_id
-  def initialize(category_entry_id:)
-    self.category_entry_id = category_entry_id
+  attr_accessor :category
+  def initialize(category:)
+    self.category = category
   end
 
   def call
-    category_entry = begin
-      GetEntry.new(entry_id: category_entry_id).call
-    rescue GetEntry::EntryNotFound
-      send_rollbar_error(message: "A Contentful category entry was not found", entry_id: category_entry_id)
-      raise
-    end
-
     question_entry_ids = []
-    category_entry.steps.each do |step|
+    category.steps.each do |step|
       if question_entry_ids.include?(step.id)
         send_rollbar_error(message: "A repeated Contentful entry was found in the same journey", entry_id: step.id)
         raise RepeatEntryDetected.new(step.id)
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 158b46e8f..6ab321899 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -174,15 +174,8 @@ def start_journey_from_category_and_go_to_question(category:)
 
   context "when the starting entry id doesn't exist" do
     scenario "a Contentful entry_id does not exist" do
-      contentful_connector = instance_double(ContentfulConnector)
-      stub_contentful_category(
-        fixture_filename: "missing-entry-id.json",
-        stub_steps: false,
-        contentful_connector: contentful_connector
-      )
-
-      allow(contentful_connector).to receive(:get_entry_by_id)
-        .with("missing-entry-id")
+      allow(stub_contentful_connector).to receive(:get_entry_by_id)
+        .with("contentful-category-entry")
         .and_return(nil)
 
       visit new_journey_path
diff --git a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
index 520747fb1..82d6cb2ee 100644
--- a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
@@ -53,7 +53,10 @@
       end
 
       it "returns an error message" do
-        stub_contentful_category(fixture_filename: "journey-with-repeat-entries.json")
+        stub_contentful_category(
+          fixture_filename: "journey-with-repeat-entries.json",
+          stub_steps: false
+        )
 
         visit new_journey_map_path
 
diff --git a/spec/jobs/warm_entry_cache_job_spec.rb b/spec/jobs/warm_entry_cache_job_spec.rb
index 62ac1d8c7..98d8193bd 100644
--- a/spec/jobs/warm_entry_cache_job_spec.rb
+++ b/spec/jobs/warm_entry_cache_job_spec.rb
@@ -3,7 +3,9 @@
 RSpec.describe WarmEntryCacheJob, type: :job do
   include ActiveJob::TestHelper
 
-  before(:each) { ActiveJob::Base.queue_adapter = :test }
+  before(:each) do
+    ActiveJob::Base.queue_adapter = :test
+  end
   after(:each) { RedisCache.redis.flushdb }
 
   around do |example|
@@ -23,9 +25,7 @@
     end
 
     it "asks GetAllContentfulEntries for the Contentful entries" do
-      stub_contentful_category(
-        fixture_filename: "journey-with-multiple-entries.json"
-      )
+      stub_contentful_category(fixture_filename: "journey-with-multiple-entries.json")
 
       described_class.perform_later
       perform_enqueued_jobs
@@ -43,6 +43,11 @@
 
     context "when the journey order cannot be built" do
       it "does not add new items to the cache" do
+        stub_contentful_category(
+          fixture_filename: "journey-with-multiple-entries.json",
+          stub_steps: false
+        )
+
         allow_any_instance_of(GetEntriesInCategory)
           .to receive(:call)
           .and_raise(GetEntriesInCategory::RepeatEntryDetected)
@@ -56,6 +61,11 @@
       it "extends the TTL on all existing items by 24 hours" do
         RedisCache.redis.set("contentful:entry:contentful-starting-step", "\"{\\}\"")
 
+        stub_contentful_category(
+          fixture_filename: "journey-with-multiple-entries.json",
+          stub_steps: false
+        )
+
         allow_any_instance_of(GetEntriesInCategory)
           .to receive(:call)
           .and_raise(GetEntriesInCategory::RepeatEntryDetected)
diff --git a/spec/services/create_journey_spec.rb b/spec/services/create_journey_spec.rb
index 61a451282..58a56abd8 100644
--- a/spec/services/create_journey_spec.rb
+++ b/spec/services/create_journey_spec.rb
@@ -12,7 +12,8 @@
   describe "#call" do
     it "creates a new journey" do
       stub_contentful_category(
-        fixture_filename: "category-with-no-steps.json"
+        fixture_filename: "category-with-no-steps.json",
+        stub_steps: false
       )
       expect { described_class.new(category: "catering").call }
         .to change { Journey.count }.by(1)
@@ -21,7 +22,8 @@
 
     it "stores a copy of the Liquid template" do
       stub_contentful_category(
-        fixture_filename: "category-with-liquid-template.json"
+        fixture_filename: "category-with-liquid-template.json",
+        stub_steps: false
       )
       fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/basic_catering.liquid")
       finder = instance_double(FindLiquidTemplate)
diff --git a/spec/services/get_category_spec.rb b/spec/services/get_category_spec.rb
new file mode 100644
index 000000000..761a24609
--- /dev/null
+++ b/spec/services/get_category_spec.rb
@@ -0,0 +1,35 @@
+require "rails_helper"
+
+RSpec.describe GetCategory do
+  describe "#call" do
+    it "returns a Contenetful::Entry for the category_entry_id" do
+      stub_contentful_category(fixture_filename: "static-content.json")
+      result = described_class.new(category_entry_id: "contentful-category-entry").call
+      expect(result.id).to eql("contentful-category-entry")
+    end
+
+    context "when the category entry cannot be found" do
+      it "sends a message to rollbar" do
+        contentful_connector = instance_double(ContentfulConnector)
+        expect(ContentfulConnector).to receive(:new)
+          .and_return(contentful_connector)
+
+        allow(contentful_connector).to receive(:get_entry_by_id)
+          .with(anything)
+          .and_return(nil)
+
+        expect(Rollbar).to receive(:error)
+          .with("A Contentful category entry was not found",
+            contentful_url: ENV["CONTENTFUL_URL"],
+            contentful_space_id: ENV["CONTENTFUL_SPACE"],
+            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+            contentful_entry_id: "a-category-id-that-does-not-exist")
+          .and_call_original
+
+        expect {
+          described_class.new(category_entry_id: "a-category-id-that-does-not-exist").call
+        }.to raise_error(GetEntry::EntryNotFound)
+      end
+    end
+  end
+end
diff --git a/spec/services/get_entries_in_category_spec.rb b/spec/services/get_entries_in_category_spec.rb
index 6446b70f5..af5c4c540 100644
--- a/spec/services/get_entries_in_category_spec.rb
+++ b/spec/services/get_entries_in_category_spec.rb
@@ -3,11 +3,12 @@
 RSpec.describe GetEntriesInCategory do
   describe "#call" do
     it "returns the list of entry objects referenced by the category list" do
-      stub_contentful_category(
-        fixture_filename: "journey-with-multiple-entries.json"
+      category = fake_contentful_category(
+        contentful_fixture_filename: "journey-with-multiple-entries.json"
       )
+      stub_contentful_category_steps(category: category)
 
-      result = described_class.new(category_entry_id: "contentful-category-entry").call
+      result = described_class.new(category: category).call
 
       expect(result).to be_kind_of(Array)
       # INFO: We should test this is a Contentful::Entry however it wasn't
@@ -16,33 +17,11 @@
       expect(result.first.id).to eq("radio-question")
     end
 
-    context "when the category entry cannot be found" do
-      it "sends a message to rollbar" do
-        contentful_connector = instance_double(ContentfulConnector)
-        expect(ContentfulConnector).to receive(:new)
-          .and_return(contentful_connector)
-
-        allow(contentful_connector).to receive(:get_entry_by_id)
-          .with(anything)
-          .and_return(nil)
-
-        expect(Rollbar).to receive(:error)
-          .with("A Contentful category entry was not found",
-            contentful_url: ENV["CONTENTFUL_URL"],
-            contentful_space_id: ENV["CONTENTFUL_SPACE"],
-            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "a-category-id-that-does-not-exist")
-          .and_call_original
-
-        expect {
-          described_class.new(category_entry_id: "a-category-id-that-does-not-exist").call
-        }.to raise_error(GetEntry::EntryNotFound)
-      end
-    end
-
     context "when the same entry is found twice" do
       it "returns an error message" do
-        stub_contentful_category(fixture_filename: "journey-with-repeat-entries.json")
+        category = fake_contentful_category(
+          contentful_fixture_filename: "journey-with-repeat-entries.json"
+        )
 
         expect(Rollbar).to receive(:error)
           .with("A repeated Contentful entry was found in the same journey",
@@ -53,7 +32,7 @@
           .and_call_original
 
         expect {
-          described_class.new(category_entry_id: "contentful-category-entry").call
+          described_class.new(category: category).call
         }.to raise_error(GetEntriesInCategory::RepeatEntryDetected)
       end
     end
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 5e44e294c..145d62b38 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -13,12 +13,12 @@ def stub_contentful_entry(
   def stub_contentful_category(
     fixture_filename:,
     stub_steps: true,
-    contentful_connector: instance_double(ContentfulConnector)
+    contentful_connector: instance_double(ContentfulConnector) # TODO: I suspect the double doesn't do anything and we need stub_contentful_connector
   )
     category = fake_contentful_category(contentful_fixture_filename: fixture_filename)
 
     expect(ContentfulConnector).to receive(:new)
-      .and_return(contentful_connector).at_least(:once) # This twice is a problem..
+      .and_return(contentful_connector).once
 
     # Mock the GET request for the Category Entry
     allow(contentful_connector).to receive(:get_entry_by_id)
@@ -29,9 +29,20 @@ def stub_contentful_category(
     if stub_steps
       stub_contentful_category_steps(category: category, contentful_connector: contentful_connector)
     end
+
+    category
   end
 
-  def stub_contentful_category_steps(category:, contentful_connector:)
+  def stub_contentful_category_steps(
+    category:,
+    contentful_connector: instance_double(ContentfulConnector)
+  )
+    return if category.steps.count.zero?
+
+    expect(ContentfulConnector).to receive(:new)
+      .and_return(contentful_connector)
+      .exactly(category.steps.count)
+
     category.steps.each do |step|
       step = fake_contentful_entry(contentful_fixture_filename: "steps/#{step.id}.json")
       allow(contentful_connector).to receive(:get_entry_by_id)

From bfe38e67948ad3849258f0970d84eb7c042ab813 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 28 Jan 2021 12:08:40 +0000
Subject: [PATCH 028/249] Contentful category fixtures include new required
 field

This will ensure that any fixture that is used to create a Contentful::Entry in the test suite will have a placeholder value when `entry.specification_template` is used.
---
 .../contentful/categories/category-with-liquid-template.json   | 3 ++-
 .../fixtures/contentful/categories/category-with-no-steps.json | 3 ++-
 spec/fixtures/contentful/categories/checkboxes-question.json   | 3 ++-
 .../contentful/categories/extended-radio-question.json         | 3 ++-
 .../contentful/categories/journey-with-multiple-entries.json   | 3 ++-
 .../contentful/categories/journey-with-repeat-entries.json     | 3 ++-
 spec/fixtures/contentful/categories/long-text-question.json    | 3 ++-
 spec/fixtures/contentful/categories/missing-entry-id.json      | 3 ++-
 spec/fixtures/contentful/categories/radio-question.json        | 3 ++-
 spec/fixtures/contentful/categories/short-text-question.json   | 3 ++-
 spec/fixtures/contentful/categories/single-date-question.json  | 3 ++-
 spec/fixtures/contentful/categories/static-content.json        | 3 ++-
 .../categories/unexpected-contentful-question-type.json        | 3 ++-
 .../contentful/categories/unexpected-contentful-type.json      | 3 ++-
 14 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/spec/fixtures/contentful/categories/category-with-liquid-template.json b/spec/fixtures/contentful/categories/category-with-liquid-template.json
index 890715a1b..2ac22ec67 100644
--- a/spec/fixtures/contentful/categories/category-with-liquid-template.json
+++ b/spec/fixtures/contentful/categories/category-with-liquid-template.json
@@ -31,6 +31,7 @@
     "fields": {
         "title": "Catering",
         "steps": [
-        ]
+        ],
+        "specification_template": "<h1>Liquid {{templating}}</h1>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/category-with-no-steps.json b/spec/fixtures/contentful/categories/category-with-no-steps.json
index 890715a1b..7c143f50d 100644
--- a/spec/fixtures/contentful/categories/category-with-no-steps.json
+++ b/spec/fixtures/contentful/categories/category-with-no-steps.json
@@ -31,6 +31,7 @@
     "fields": {
         "title": "Catering",
         "steps": [
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/checkboxes-question.json b/spec/fixtures/contentful/categories/checkboxes-question.json
index 33eabb88b..6911168e9 100644
--- a/spec/fixtures/contentful/categories/checkboxes-question.json
+++ b/spec/fixtures/contentful/categories/checkboxes-question.json
@@ -38,6 +38,7 @@
                 "id": "checkboxes-question"
             }
           }
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/extended-radio-question.json b/spec/fixtures/contentful/categories/extended-radio-question.json
index 96ca2de66..707233167 100644
--- a/spec/fixtures/contentful/categories/extended-radio-question.json
+++ b/spec/fixtures/contentful/categories/extended-radio-question.json
@@ -38,6 +38,7 @@
                 "id": "extended-radio-question"
             }
           }
-        ]
+        ],
+        "specification_template": "<h1>Liquid {{templating}}</h1>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/journey-with-multiple-entries.json b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
index 353a001c5..686dafcc0 100644
--- a/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
+++ b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
@@ -52,6 +52,7 @@
                 "id": "long-text-question"
             }
           }
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/journey-with-repeat-entries.json b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
index 061bd5a7b..cd767ae75 100644
--- a/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
+++ b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
@@ -45,6 +45,7 @@
                 "id": "radio-question"
             }
           }
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/long-text-question.json b/spec/fixtures/contentful/categories/long-text-question.json
index 6b844a620..e6dd142f4 100644
--- a/spec/fixtures/contentful/categories/long-text-question.json
+++ b/spec/fixtures/contentful/categories/long-text-question.json
@@ -38,6 +38,7 @@
                 "id": "long-text-question"
             }
           }
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/missing-entry-id.json b/spec/fixtures/contentful/categories/missing-entry-id.json
index a933430ae..9040b1601 100644
--- a/spec/fixtures/contentful/categories/missing-entry-id.json
+++ b/spec/fixtures/contentful/categories/missing-entry-id.json
@@ -38,6 +38,7 @@
                 "id": "missing-entry-id"
             }
           }
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/radio-question.json b/spec/fixtures/contentful/categories/radio-question.json
index a76fcee87..aed0d68b9 100644
--- a/spec/fixtures/contentful/categories/radio-question.json
+++ b/spec/fixtures/contentful/categories/radio-question.json
@@ -38,6 +38,7 @@
                 "id": "radio-question"
             }
           }
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/short-text-question.json b/spec/fixtures/contentful/categories/short-text-question.json
index aa4e5ace3..5f49ff878 100644
--- a/spec/fixtures/contentful/categories/short-text-question.json
+++ b/spec/fixtures/contentful/categories/short-text-question.json
@@ -38,6 +38,7 @@
                 "id": "short-text-question"
             }
           }
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/single-date-question.json b/spec/fixtures/contentful/categories/single-date-question.json
index 0edf917b1..ef8c3263d 100644
--- a/spec/fixtures/contentful/categories/single-date-question.json
+++ b/spec/fixtures/contentful/categories/single-date-question.json
@@ -38,6 +38,7 @@
                 "id": "single-date-question"
             }
           }
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/static-content.json b/spec/fixtures/contentful/categories/static-content.json
index 8dfeb3f45..858ff8245 100644
--- a/spec/fixtures/contentful/categories/static-content.json
+++ b/spec/fixtures/contentful/categories/static-content.json
@@ -38,6 +38,7 @@
                 "id": "static-content"
             }
           }
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json b/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
index 617e780bd..f10636591 100644
--- a/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
+++ b/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
@@ -38,6 +38,7 @@
                 "id": "unexpected-contentful-question-type"
             }
           }
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/unexpected-contentful-type.json b/spec/fixtures/contentful/categories/unexpected-contentful-type.json
index 903c4946a..af0b7366e 100644
--- a/spec/fixtures/contentful/categories/unexpected-contentful-type.json
+++ b/spec/fixtures/contentful/categories/unexpected-contentful-type.json
@@ -38,6 +38,7 @@
                 "id": "unexpected-contentful-type"
             }
           }
-        ]
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }

From f1830c3d372f515723ae601846b8e670a7df16d2 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 28 Jan 2021 12:09:57 +0000
Subject: [PATCH 029/249] GetCategory will validate the template as a Liquid
 parsable value

---
 app/services/get_category.rb                  | 17 ++++++++-
 ...category-with-invalid-liquid-template.json | 37 +++++++++++++++++++
 spec/services/get_category_spec.rb            | 30 ++++++++++++++-
 spec/support/contentful_helpers.rb            |  3 +-
 4 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json

diff --git a/app/services/get_category.rb b/app/services/get_category.rb
index 2cfc3a2fc..7e927a5f7 100644
--- a/app/services/get_category.rb
+++ b/app/services/get_category.rb
@@ -1,16 +1,27 @@
 class GetCategory
+  class InvalidLiquidSyntax < StandardError; end
+
   attr_accessor :category_entry_id
   def initialize(category_entry_id:)
     self.category_entry_id = category_entry_id
   end
 
   def call
-    begin
+    category = begin
       GetEntry.new(entry_id: category_entry_id).call
     rescue GetEntry::EntryNotFound
       send_rollbar_error(message: "A Contentful category entry was not found", entry_id: category_entry_id)
       raise
     end
+
+    begin
+      validate_liquid(template: category.specification_template)
+    rescue Liquid::SyntaxError => error
+      send_rollbar_error(message: "A user couldn't start a journey because of an invalid Specification", entry_id: category_entry_id)
+      raise InvalidLiquidSyntax.new(message: error.message)
+    end
+
+    category
   end
 
   private
@@ -24,4 +35,8 @@ def send_rollbar_error(message:, entry_id:)
       contentful_entry_id: entry_id
     )
   end
+
+  def validate_liquid(template:)
+    Liquid::Template.parse(template, error_mode: :strict)
+  end
 end
diff --git a/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json b/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json
new file mode 100644
index 000000000..c69e54c0d
--- /dev/null
+++ b/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json
@@ -0,0 +1,37 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+        ],
+        "specification_template": "<h1>{{{invalid Liquid%}}}</h1>"
+    }
+}
diff --git a/spec/services/get_category_spec.rb b/spec/services/get_category_spec.rb
index 761a24609..f30e145a2 100644
--- a/spec/services/get_category_spec.rb
+++ b/spec/services/get_category_spec.rb
@@ -3,7 +3,10 @@
 RSpec.describe GetCategory do
   describe "#call" do
     it "returns a Contenetful::Entry for the category_entry_id" do
-      stub_contentful_category(fixture_filename: "static-content.json")
+      stub_contentful_category(
+        fixture_filename: "static-content.json",
+        stub_steps: false
+      )
       result = described_class.new(category_entry_id: "contentful-category-entry").call
       expect(result.id).to eql("contentful-category-entry")
     end
@@ -31,5 +34,30 @@
         }.to raise_error(GetEntry::EntryNotFound)
       end
     end
+
+    context "when the Liquid contents are invalid (using the gems own parser)" do
+      it "raises an error" do
+        stub_contentful_category(fixture_filename: "category-with-invalid-liquid-template.json")
+
+        expect {
+          described_class.new(category_entry_id: "contentful-category-entry").call
+        }.to raise_error(GetCategory::InvalidLiquidSyntax)
+      end
+
+      it "sends an error to rollbar" do
+        stub_contentful_category(fixture_filename: "category-with-invalid-liquid-template.json")
+
+        expect(Rollbar).to receive(:error)
+          .with("A user couldn't start a journey because of an invalid Specification",
+            contentful_url: ENV["CONTENTFUL_URL"],
+            contentful_space_id: ENV["CONTENTFUL_SPACE"],
+            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+            contentful_entry_id: "contentful-category-entry").and_call_original
+
+        expect {
+          described_class.new(category_entry_id: "contentful-category-entry").call
+        }.to raise_error(GetCategory::InvalidLiquidSyntax)
+      end
+    end
   end
 end
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 145d62b38..9d95c0217 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -75,7 +75,8 @@ def fake_contentful_category(contentful_fixture_filename:)
     double(
       Contentful::Entry,
       id: hash_response.dig("sys", "id"),
-      steps: steps
+      steps: steps,
+      specification_template: hash_response.dig("fields", "specification_template")
     )
   end
 

From 8579016a450a3143b33a635e308e2683529f742d Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 28 Jan 2021 12:21:28 +0000
Subject: [PATCH 030/249] GetCategory is now responsible for sourcing the
 specification_template

This functionality was added to GetCategory in a previous commit though the value wasn't used in order to keep these commits smaller.
---
 CHANGELOG.md                                  |  2 +
 app/controllers/journeys_controller.rb        |  4 +-
 app/services/create_journey.rb                | 17 +++---
 app/services/find_liquid_template.rb          | 36 ------------
 .../anyone_can_complete_a_journey_spec.rb     |  3 +-
 ...nload_their_catering_specification_spec.rb | 19 ++-----
 ...n_see_their_catering_specification_spec.rb | 25 +++++----
 ...category-with-dynamic-liquid-template.json | 44 +++++++++++++++
 .../category-with-liquid-template.json        |  9 ++-
 .../categories/extended-radio-question.json   |  2 +-
 spec/rails_helper.rb                          |  1 -
 spec/services/create_journey_spec.rb          | 14 ++---
 spec/services/find_liquid_template_spec.rb    | 56 -------------------
 spec/support/liquid_helpers.rb                | 12 ----
 14 files changed, 86 insertions(+), 158 deletions(-)
 delete mode 100644 app/services/find_liquid_template.rb
 create mode 100644 spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json
 delete mode 100644 spec/services/find_liquid_template_spec.rb
 delete mode 100644 spec/support/liquid_helpers.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c96cc783..9f227d258 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog 1.0.0].
 
 ## [Unreleased]
 
+- specification templates are now sourced from the Contentful Category entry
+
 ## [release-005] - 2021-1-19
 
 - users can see an initial slice of their specification as HTML at the end of their journey
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 22c98f212..2cccc886c 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class JourneysController < ApplicationController
-  rescue_from FindLiquidTemplate::InvalidLiquidSyntax do |exception|
+  rescue_from GetCategory::InvalidLiquidSyntax do |exception|
     render "errors/specification_template_invalid", status: 500, locals: {error: exception}
   end
 
@@ -18,7 +18,7 @@ class JourneysController < ApplicationController
   end
 
   def new
-    journey = CreateJourney.new(category: "catering").call
+    journey = CreateJourney.new(category_name: "catering").call
     redirect_to journey_path(journey)
   end
 
diff --git a/app/services/create_journey.rb b/app/services/create_journey.rb
index 9d610ef3f..e413d3c74 100644
--- a/app/services/create_journey.rb
+++ b/app/services/create_journey.rb
@@ -1,17 +1,18 @@
 class CreateJourney
-  attr_accessor :category
+  attr_accessor :category_name
 
-  def initialize(category:)
-    self.category = category
+  def initialize(category_name:)
+    self.category_name = category_name
   end
 
   def call
+    category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
+
     journey = Journey.create(
-      category: category,
-      liquid_template: liquid_template
+      category: category_name,
+      liquid_template: category.specification_template
     )
 
-    category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
     question_entries = GetEntriesInCategory.new(category: category).call
     question_entries.each do |entry|
       CreateJourneyStep.new(
@@ -20,8 +21,4 @@ def call
     end
     journey
   end
-
-  private def liquid_template
-    FindLiquidTemplate.new(category: category).call
-  end
 end
diff --git a/app/services/find_liquid_template.rb b/app/services/find_liquid_template.rb
deleted file mode 100644
index 412667553..000000000
--- a/app/services/find_liquid_template.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-class FindLiquidTemplate
-  class InvalidLiquidSyntax < StandardError; end
-
-  attr_accessor :category, :environment
-
-  def initialize(category:, environment: Rails.env)
-    self.category = category
-    self.environment = environment
-  end
-
-  def call
-    validate_liquid
-    file
-  rescue Liquid::SyntaxError => error
-    send_rollbar_error
-    raise InvalidLiquidSyntax.new(message: error.message)
-  end
-
-  private def file
-    @file ||= File.read("lib/specification_templates/#{category}.#{environment}.liquid")
-  end
-
-  private def validate_liquid
-    Liquid::Template.parse(file, error_mode: :strict)
-  end
-
-  private def send_rollbar_error
-    Rollbar.error(
-      "A user couldn't start a journey because of an invalid Specification",
-      contentful_url: ENV["CONTENTFUL_URL"],
-      contentful_space_id: ENV["CONTENTFUL_SPACE"],
-      contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-      category: category
-    )
-  end
-end
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 6ab321899..675ab616c 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -187,8 +187,7 @@ def start_journey_from_category_and_go_to_question(category:)
 
   context "when the Liquid template was invalid" do
     it "raises an error" do
-      fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/invalid.liquid")
-      allow_any_instance_of(FindLiquidTemplate).to receive(:file).and_return(fake_liquid_template)
+      stub_contentful_category(fixture_filename: "category-with-invalid-liquid-template.json")
 
       visit root_path
 
diff --git a/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
index 91ae26a98..e5b2a9d0f 100644
--- a/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
@@ -1,10 +1,10 @@
 feature "Users can see their catering specification" do
   scenario "HTML" do
-    journey = create(:journey, :catering, liquid_template: stub_liquid_template)
-    step = create(:step, :long_text, long_text_answer: nil, journey: journey, contentful_id: "NxJWpbiFeEAmvcw17EysX")
-    _answer = create(:long_text_answer, step: step, response: "Red tractor")
+    start_journey_from_category_and_go_to_question(category: "category-with-liquid-template.json")
 
-    visit journey_path(journey)
+    choose("Catering")
+
+    click_on(I18n.t("generic.button.next"))
 
     expect(page).to have_content(I18n.t("journey.specification.header"))
 
@@ -15,15 +15,4 @@
     expect(header).to match(/^attachment/)
     expect(header).to match(/filename="specification.docx"/)
   end
-
-  def stub_liquid_template
-    fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/food_catering.liquid")
-
-    finder = instance_double(FindLiquidTemplate)
-    allow(FindLiquidTemplate).to receive(:new).with(category: "catering")
-      .and_return(finder)
-    allow(finder).to receive(:call).and_return(fake_liquid_template)
-
-    fake_liquid_template
-  end
 end
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
index b0ec0e1ee..a2bff7b16 100644
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
@@ -1,11 +1,9 @@
 feature "Users can see their catering specification" do
   scenario "HTML" do
-    liquid_template = stub_liquid_template(filename: "food_catering.liquid")
-    journey = create(:journey, :catering, liquid_template: liquid_template)
-    step = create(:step, :long_text, long_text_answer: nil, journey: journey, contentful_id: "NxJWpbiFeEAmvcw17EysX")
-    answer = create(:long_text_answer, step: step, response: "Red tractor")
+    start_journey_from_category_and_go_to_question(category: "category-with-dynamic-liquid-template.json")
 
-    visit journey_path(journey)
+    choose("Catering")
+    click_on(I18n.t("generic.button.next"))
 
     expect(page).to have_content(I18n.t("journey.specification.header"))
 
@@ -13,22 +11,25 @@
       expect(page).to have_content("Menus and ordering")
       expect(page).to have_content("Food standards")
       expect(page).to have_content("The school also requires the service to comply with the following non-mandatory food standards or schemes:")
-      expect(page).to have_content(answer.response)
+      expect(page).to have_content("Catering")
     end
   end
 
   scenario "renders responses that need extra formatting" do
-    liquid_template = stub_liquid_template(filename: "food_catering.liquid")
-    journey = create(:journey, :catering, liquid_template: liquid_template)
-    step = create(:step, :radio, radio_answer: nil, journey: journey, contentful_id: "NxJWpbiFeEAmvcw17EysX")
-    _answer = create(:radio_answer, step: step, response: "Red tractor", further_information: "Lots more detail")
+    stub_contentful_category(fixture_filename: "extended-radio-question.json")
+    visit root_path
+    click_on(I18n.t("generic.button.start"))
 
-    visit journey_path(journey)
+    click_first_link_in_task_list
+
+    choose("Catering")
+    fill_in "answer[further_information]", with: "The school needs the kitchen cleaned once a day"
+    click_on(I18n.t("generic.button.next"))
 
     expect(page).to have_content(I18n.t("journey.specification.header"))
 
     within("article#specification") do
-      expect(page).to have_content("Red tractor - Lots more detail")
+      expect(page).to have_content("Catering - The school needs the kitchen cleaned once a day")
     end
   end
 end
diff --git a/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json b/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json
new file mode 100644
index 000000000..34caabcd4
--- /dev/null
+++ b/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-question"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'>\n  <section>\n    <h2>Menus and ordering</h2>\n    <h3>Food standards</h2>\n    <ol>\n      {% if answer_radio-question %}\n        <li>\n          <p class='govuk-body'>The school also requires the service to comply with the following non-mandatory food standards or schemes:</p>\n          <p class='govuk-body'>{{answer_radio-question}}</p>\n        </li>\n      {% endif %}\n    </ol>\n  </section>\n</artcile>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/category-with-liquid-template.json b/spec/fixtures/contentful/categories/category-with-liquid-template.json
index 2ac22ec67..aed0d68b9 100644
--- a/spec/fixtures/contentful/categories/category-with-liquid-template.json
+++ b/spec/fixtures/contentful/categories/category-with-liquid-template.json
@@ -31,7 +31,14 @@
     "fields": {
         "title": "Catering",
         "steps": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-question"
+            }
+          }
         ],
-        "specification_template": "<h1>Liquid {{templating}}</h1>"
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/extended-radio-question.json b/spec/fixtures/contentful/categories/extended-radio-question.json
index 707233167..b04694ec2 100644
--- a/spec/fixtures/contentful/categories/extended-radio-question.json
+++ b/spec/fixtures/contentful/categories/extended-radio-question.json
@@ -39,6 +39,6 @@
             }
           }
         ],
-        "specification_template": "<h1>Liquid {{templating}}</h1>"
+        "specification_template": "<article id='specification'><h1>{{answer_extended-radio-question}}</h1></article>"
     }
 }
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index f4b3d5b75..a57abfa97 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -34,7 +34,6 @@
 end
 RSpec.configure do |config|
   config.include ContentfulHelpers
-  config.include LiquidHelpers
   config.include ActiveSupport::Testing::TimeHelpers
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
diff --git a/spec/services/create_journey_spec.rb b/spec/services/create_journey_spec.rb
index 58a56abd8..910ca9929 100644
--- a/spec/services/create_journey_spec.rb
+++ b/spec/services/create_journey_spec.rb
@@ -15,26 +15,20 @@
         fixture_filename: "category-with-no-steps.json",
         stub_steps: false
       )
-      expect { described_class.new(category: "catering").call }
+      expect { described_class.new(category_name: "catering").call }
         .to change { Journey.count }.by(1)
       expect(Journey.last.category).to eql("catering")
     end
 
     it "stores a copy of the Liquid template" do
       stub_contentful_category(
-        fixture_filename: "category-with-liquid-template.json",
-        stub_steps: false
+        fixture_filename: "category-with-liquid-template.json"
       )
-      fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/basic_catering.liquid")
-      finder = instance_double(FindLiquidTemplate)
-      allow(FindLiquidTemplate).to receive(:new).with(category: "catering")
-        .and_return(finder)
-      allow(finder).to receive(:call).and_return(fake_liquid_template)
 
-      described_class.new(category: "catering").call
+      described_class.new(category_name: "catering").call
 
       expect(Journey.last.liquid_template)
-        .to eql("<article id=\"specification\">\n  {% if answer_contentful-starting-step %}\n    <section>\n      <p class=\"govuk-body\">I'm the first article and should be seen</p>\n    </section>\n  {% endif %}\n</article>\n")
+        .to eql("<article id='specification'><h1>Liquid {{templating}}</h1></article>")
     end
   end
 end
diff --git a/spec/services/find_liquid_template_spec.rb b/spec/services/find_liquid_template_spec.rb
deleted file mode 100644
index 135ddbb6a..000000000
--- a/spec/services/find_liquid_template_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require "rails_helper"
-
-RSpec.describe FindLiquidTemplate do
-  describe "#call" do
-    context "when the Liquid contents are invalid (using the gems own parser)" do
-      it "raises an error" do
-        fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/invalid.liquid")
-
-        finder = described_class.new(category: "catering")
-        allow(finder).to receive(:file).and_return(fake_liquid_template)
-
-        expect { finder.call }.to raise_error(FindLiquidTemplate::InvalidLiquidSyntax)
-      end
-
-      it "sends an error to rollbar" do
-        fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/invalid.liquid")
-
-        finder = described_class.new(category: "catering")
-        allow(finder).to receive(:file).and_return(fake_liquid_template)
-
-        expect(Rollbar).to receive(:error)
-          .with("A user couldn't start a journey because of an invalid Specification",
-            contentful_url: ENV["CONTENTFUL_URL"],
-            contentful_space_id: ENV["CONTENTFUL_SPACE"],
-            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            category: "catering").and_call_original
-
-        expect { finder.call }.to raise_error(FindLiquidTemplate::InvalidLiquidSyntax)
-      end
-    end
-
-    context "when in development" do
-      it "loads the development liquid template" do
-        category = "catering"
-        expect(File).to receive(:read).with("lib/specification_templates/#{category}.development.liquid").at_least(:once)
-        described_class.new(category: category, environment: "development").call
-      end
-    end
-
-    context "when in staging" do
-      it "loads the staging liquid template" do
-        category = "catering"
-        expect(File).to receive(:read).with("lib/specification_templates/#{category}.staging.liquid").at_least(:once)
-        described_class.new(category: category, environment: "staging").call
-      end
-    end
-
-    context "when in production" do
-      it "loads the production liquid template" do
-        category = "catering"
-        expect(File).to receive(:read).with("lib/specification_templates/#{category}.production.liquid").at_least(:once)
-        described_class.new(category: category, environment: "production").call
-      end
-    end
-  end
-end
diff --git a/spec/support/liquid_helpers.rb b/spec/support/liquid_helpers.rb
deleted file mode 100644
index 157c1fd33..000000000
--- a/spec/support/liquid_helpers.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module LiquidHelpers
-  def stub_liquid_template(filename: "basic_catering.liquid")
-    fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/#{filename}")
-
-    finder = instance_double(FindLiquidTemplate)
-    allow(FindLiquidTemplate).to receive(:new).with(category: "catering")
-      .and_return(finder)
-    allow(finder).to receive(:call).and_return(fake_liquid_template)
-
-    fake_liquid_template
-  end
-end

From ea76cd6774c2035d70b658319f1329ac1264a9b1 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 28 Jan 2021 12:33:25 +0000
Subject: [PATCH 031/249] Extract spec helper methods for reuse

---
 .../anyone_can_complete_a_journey_spec.rb     | 18 ------------------
 spec/rails_helper.rb                          |  1 +
 spec/support/journey_helpers.rb               | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 spec/support/journey_helpers.rb

diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 675ab616c..c8dc21ff8 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -21,24 +21,6 @@
     expect(page).to have_content("Not started")
   end
 
-  def click_first_link_in_task_list
-    within("ol.app-task-list") do
-      first("a").click
-    end
-  end
-
-  def start_journey_from_category_and_go_to_question(category:)
-    stub_contentful_category(
-      fixture_filename: category
-    )
-
-    visit root_path
-
-    click_on(I18n.t("generic.button.start"))
-
-    click_first_link_in_task_list
-  end
-
   scenario "an answer must be provided" do
     start_journey_from_category_and_go_to_question(category: "radio-question.json")
 
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index a57abfa97..dede3e4d0 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -34,6 +34,7 @@
 end
 RSpec.configure do |config|
   config.include ContentfulHelpers
+  config.include JourneyHelpers, type: :feature
   config.include ActiveSupport::Testing::TimeHelpers
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
diff --git a/spec/support/journey_helpers.rb b/spec/support/journey_helpers.rb
new file mode 100644
index 000000000..67593d07e
--- /dev/null
+++ b/spec/support/journey_helpers.rb
@@ -0,0 +1,19 @@
+module JourneyHelpers
+  def click_first_link_in_task_list
+    within("ol.app-task-list") do
+      first("a").click
+    end
+  end
+
+  def start_journey_from_category_and_go_to_question(category:)
+    stub_contentful_category(
+      fixture_filename: category
+    )
+
+    visit root_path
+
+    click_on(I18n.t("generic.button.start"))
+
+    click_first_link_in_task_list
+  end
+end

From daf31170275bb9ef3b5df0193089cac6097351cd Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 28 Jan 2021 15:07:43 +0000
Subject: [PATCH 032/249] Remove redundant set of hardcoded liquid templates

---
 .../catering.development.liquid               | 36 ------------
 .../catering.production.liquid                | 56 -------------------
 .../catering.test.liquid                      | 19 -------
 3 files changed, 111 deletions(-)
 delete mode 100644 lib/specification_templates/catering.development.liquid
 delete mode 100644 lib/specification_templates/catering.production.liquid
 delete mode 100644 lib/specification_templates/catering.test.liquid

diff --git a/lib/specification_templates/catering.development.liquid b/lib/specification_templates/catering.development.liquid
deleted file mode 100644
index 5ba71c4e5..000000000
--- a/lib/specification_templates/catering.development.liquid
+++ /dev/null
@@ -1,36 +0,0 @@
-<article id="specification">
-  <section>
-    <h2>Menus and ordering</h2>
-    <h3>Food standards</h3>
-    <ol>
-      <li>
-        <p>It will be the suppliers responsibility to ensure that all food served within the school day complies with both current and future government legislation and guidelines on the provision of healthy school meals. </p>
-        <p>The supplier should encourage the use of seasonal produce and promotion of healthy eating to pupils wherever practical and desirable.</p>
-        <p>It will be the suppliers responsibility to comply fully with DfE food and nutrient based standards, and to promote and comply with this policy throughout the contract term through effective menu planning.</p>
-      </li>
-      <!-- /food-standards -->
-      {% if answer_NxJWpbiFeEAmvcw17EysX %}
-        <li>
-          <p>The school also requires the service to comply with the following non-mandatory food standards or schemes:</p>
-          <p>{{answer_NxJWpbiFeEAmvcw17EysX}}</p>
-        </li>
-      {% endif %}
-      <li>
-        <p>The supplier must work with the school to provide safe and enjoyable meals for any pupils with allergies or intolerances, ensuring that the ingredients, preparation and handling of food for those children are completely allergen-free.</p>
-      </li>
-      <!-- /track-allergens -->
-      {% if answer_5xxbqrasSXH9x9Lt3YhRkX contains "yes" %}
-        <li>
-          <p>The supplier is required to track allergen information through their supply chain and must be able to demonstrate their allergen tracking plan.</p>
-        </li>
-      {% endif %}
-      <!-- /food-objectives -->
-      {% if answer_4HfGoYL6s806Azx93jp5IY %}
-        <li>
-          <p>The school has the following objectives around the quantity, quality or variety of food offered, beyond the mandatory standards:</p>
-          <p>{{answer_4HfGoYL6s806Azx93jp5IY}}</p>
-        </li>
-      {% endif %}
-    </ol>
-  </section>
-</article>
diff --git a/lib/specification_templates/catering.production.liquid b/lib/specification_templates/catering.production.liquid
deleted file mode 100644
index 6d06700c5..000000000
--- a/lib/specification_templates/catering.production.liquid
+++ /dev/null
@@ -1,56 +0,0 @@
-<article id="specification">
-  <section>
-    <h2>Menus and ordering</h2>
-    <h3>Food standards</h3>
-    <ol>
-      <!-- 5. Static text -->
-      <li>
-        <p>It will be the suppliers responsibility to ensure that all food served within the school day complies with both current and future government legislation and guidelines on the provision of healthy school meals. </p>
-        <p>The supplier should encourage the use of seasonal produce and promotion of healthy eating to pupils wherever practical and desirable.</p>
-        <p>It will be the suppliers responsibility to comply fully with DfE food and nutrient based standards, and to promote and comply with this policy throughout the contract term through effective menu planning.</p>
-      </li>
-      <!-- 6. /food-standards -->
-      {% if answer_2fVajdGxgwD58vt4VvAI9Y %}
-        <li>
-          <p>The school also requires the service to comply with the following non-mandatory food standards or schemes:</p>
-          <p>{{answer_2fVajdGxgwD58vt4VvAI9Y}}</p>
-        </li>
-      {% endif %}
-      <!-- 8. -->
-      <li>
-        <p>The supplier must work with the school to provide safe and enjoyable meals for any pupils with allergies or intolerances, ensuring that the ingredients, preparation and handling of food for those children are completely allergen-free.</p>
-      </li>
-      <!-- 9. -->
-      <li>
-        <p>All food and drink must comply with food labelling law, which says you must provide information to customers on any of the 14 allergens used as ingredients in foods you make and sell. It is important that all staff receive training and information on the 14 allergens contained in food.</p>
-      </li>
-      <!-- 10. /detail-allergens-to-avoid -->
-      {% if answer_ypxhCAkhp2qmFiapHpVpK contains "Yes" %}
-        <li>
-          <p>All ingredients, handling and preparation of food and drink provided by the supplier must be free from:</p>
-          <p>{{answer_ypxhCAkhp2qmFiapHpVpK}}</p>
-        </li>
-      {% endif %}
-      <!-- 11. /track-allergens -->
-      {% if answer_5tq13woHxVnzfOZFixoqku contains "Yes" %}
-        <li>
-          <p>The supplier is required to track allergen information through their supply chain and must be able to demonstrate their allergen tracking plan.</p>
-        </li>
-      {% endif %}
-      <!-- 12. /meeting-standard-requirements -->
-      {% if answer_17OxghBLlrGQypc5NflRSW contains "Yes" %}
-        <li>
-          <p>The school has the following requirements for how the School Food Standards are met:</p>
-          <p>{{answer_17OxghBLlrGQypc5NflRSW}}</p>
-        </li>
-      {% endif %}
-      <!-- 13. /food-objectives -->
-      {% if answer_nJBe4ba05Av5JfKEFIxn7 %}
-        <li>
-          <p>The school has the following objectives around the quantity, quality or variety of food offered, beyond the mandatory standards:</p>
-          <p>{{answer_nJBe4ba05Av5JfKEFIxn7}}</p>
-        </li>
-      {% endif %}
-    </ol>
-  </section>
-</article>
diff --git a/lib/specification_templates/catering.test.liquid b/lib/specification_templates/catering.test.liquid
deleted file mode 100644
index 340b3c934..000000000
--- a/lib/specification_templates/catering.test.liquid
+++ /dev/null
@@ -1,19 +0,0 @@
-<article id="specification">
-  <section>
-    <h2 class="govuk-heading-m">Menus and ordering</h2>
-    <h3 class="govuk-heading-s">Food standards</h2>
-    <ol class="govuk-list govuk-list--number">
-      <li>
-        <p class="govuk-body">It will be the suppliers responsibility to ensure that all food served within the school day complies with both current and future government legislation and guidelines on the provision of healthy school meals. </p>
-        <p class="govuk-body">The supplier should encourage the use of seasonal produce and promotion of healthy eating to pupils wherever practical and desirable.</p>
-        <p class="govuk-body">It will be the suppliers responsibility to comply fully with DfE food and nutrient based standards, and to promote and comply with this policy throughout the contract term through effective menu planning.</p>
-      </li>
-      {% if answer_NxJWpbiFeEAmvcw17EysX %}
-        <li>
-          <p class="govuk-body">The school also requires the service to comply with the following non-mandatory food standards or schemes:</p>
-          <p class="govuk-body">{{answer_NxJWpbiFeEAmvcw17EysX}}</p>
-        </li>
-      {% endif %}
-    </ul>
-  </section>
-</article>

From 68d8fddf1972c6f667f6373475275c0bebf66987 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Feb 2021 09:53:48 +0000
Subject: [PATCH 033/249] Bump database_cleaner from 1.8.5 to 2.0.0

Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 1.8.5 to 2.0.0.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases)
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc)
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.5...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fdee9196d..dc387171d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,7 +102,12 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    database_cleaner (1.8.5)
+    database_cleaner (2.0.0)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.0)
     diff-lcs (1.4.4)
     docile (1.3.4)
     domain_name (0.5.20190701)
@@ -153,7 +158,7 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.11.1)
+    jbuilder (2.11.2)
       activesupport (>= 5.0.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)

From 04ce8314fbbc891532c300d97ae8deefe3657f71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Feb 2021 09:53:58 +0000
Subject: [PATCH 034/249] Bump webmock from 3.11.1 to 3.11.2

Bumps [webmock](https://github.com/bblimke/webmock) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.11.1...v3.11.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fdee9196d..bd0bf276b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,7 +153,7 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.11.1)
+    jbuilder (2.11.2)
       activesupport (>= 5.0.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -338,7 +338,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.11.1)
+    webmock (3.11.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

From fe65a02f6268e500c13bf78aa4b0e6622f7801a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Feb 2021 09:54:22 +0000
Subject: [PATCH 035/249] Bump standard from 0.11.0 to 0.12.0

Bumps [standard](https://github.com/testdouble/standard) from 0.11.0 to 0.12.0.
- [Release notes](https://github.com/testdouble/standard/releases)
- [Changelog](https://github.com/testdouble/standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testdouble/standard/compare/v0.11.0...v0.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fdee9196d..4d380e12e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -62,7 +62,7 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    ast (2.4.2)
     better_errors (2.9.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
@@ -153,7 +153,7 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.11.1)
+    jbuilder (2.11.2)
       activesupport (>= 5.0.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -258,16 +258,16 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.1)
-    rubocop (1.7.0)
+    rubocop (1.8.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     rubocop-performance (1.9.2)
       rubocop (>= 0.90.0, < 2.0)
@@ -316,8 +316,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    standard (0.11.0)
-      rubocop (= 1.7.0)
+    standard (0.12.0)
+      rubocop (= 1.8.1)
       rubocop-performance (= 1.9.2)
     thor (1.0.1)
     tilt (2.0.10)
@@ -331,7 +331,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     uniform_notifier (1.13.2)
     web-console (4.1.0)
       actionview (>= 6.0.0)

From 26d906b819541fa97ab8f5017182cd6fd0bca2aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Feb 2021 09:59:20 +0000
Subject: [PATCH 036/249] Bump govuk_design_system_formbuilder from 2.1.6 to
 2.1.7

Bumps [govuk_design_system_formbuilder](https://github.com/DFE-Digital/govuk_design_system_formbuilder) from 2.1.6 to 2.1.7.
- [Release notes](https://github.com/DFE-Digital/govuk_design_system_formbuilder/releases)
- [Commits](https://github.com/DFE-Digital/govuk_design_system_formbuilder/compare/v2.1.6...v2.1.7)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index da45ae55f..3c8d62fc0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,19 +70,19 @@ GEM
     bindex (0.8.1)
     bootsnap (1.5.1)
       msgpack (~> 1.0)
-    brakeman (4.10.1)
+    brakeman (5.0.0)
     builder (3.2.4)
     bullet (6.1.3)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
-    capybara (3.34.0)
+    capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     childprocess (3.0.0)
     climate_control (0.2.0)
@@ -131,10 +131,10 @@ GEM
       raabro (~> 1.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    govuk_design_system_formbuilder (2.1.6)
-      actionview (~> 6.1.0, >= 6.1)
-      activemodel (~> 6.1.0, >= 6.1)
-      activesupport (~> 6.1.0, >= 6.1)
+    govuk_design_system_formbuilder (2.1.7)
+      actionview (>= 5.2)
+      activemodel (>= 5.2)
+      activesupport (>= 5.2)
     hashdiff (1.0.1)
     high_voltage (3.1.2)
     htmltoword (1.1.1)
@@ -151,7 +151,7 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
-    i18n (1.8.7)
+    i18n (1.8.8)
       concurrent-ruby (~> 1.0)
     jbuilder (2.11.2)
       activesupport (>= 5.0.0)
@@ -166,7 +166,7 @@ GEM
     listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.8.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -196,7 +196,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.1.1)
+    puma (5.2.0)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.5.2)
@@ -238,7 +238,7 @@ GEM
     redis (4.2.5)
     redis-namespace (1.8.0)
       redis (>= 3.0.4)
-    regexp_parser (1.8.2)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
     rollbar (3.1.1)
     rspec-core (3.10.1)
@@ -378,7 +378,7 @@ DEPENDENCIES
   mock_redis
   pg
   pry
-  puma (~> 5.1)
+  puma (~> 5.2)
   rails (~> 6.1.1)
   rails_layout
   redis (~> 4.2)

From f114a241b02cdf1e0c4bab130a55ffc7a38a8eb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Feb 2021 09:59:31 +0000
Subject: [PATCH 037/249] Bump bootsnap from 1.5.1 to 1.7.0

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.5.1 to 1.7.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.5.1...v1.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 02146ae73..43065b4bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,7 +68,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindex (0.8.1)
-    bootsnap (1.5.1)
+    bootsnap (1.7.0)
       msgpack (~> 1.0)
     brakeman (5.0.0)
     builder (3.2.4)
@@ -182,7 +182,7 @@ GEM
     minitest (5.14.3)
     mock_redis (0.27.3)
       ruby2_keywords
-    msgpack (1.3.3)
+    msgpack (1.4.2)
     multi_json (1.15.0)
     nio4r (2.5.4)
     nokogiri (1.11.1)

From 0c084463ed8fb40f9933e61e81d21e1928dbbfbd Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Mon, 1 Feb 2021 15:18:32 +0000
Subject: [PATCH 038/249] Add rspec config to allow use of --only-failures
 command

---
 .gitignore          | 1 +
 spec/spec_helper.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index bedb8d661..6e6fe3e48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ rerun.txt
 pickle-email-*.html
 .zeus.sock
 /node_modules
+/spec/examples.txt
 
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b5c1e182a..a441047b6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -66,7 +66,7 @@
   #   # Allows RSpec to persist some state between runs in order to support
   #   # the `--only-failures` and `--next-failure` CLI options. We recommend
   #   # you configure your source control system to ignore this file.
-  #   config.example_status_persistence_file_path = "spec/examples.txt"
+  config.example_status_persistence_file_path = "spec/examples.txt"
   #
   #   # Limits the available syntax to the non-monkey patched syntax that is
   #   # recommended. For more details, see:

From 4ea6ab6f174b0ec2ad24152404f6826b3c2f12d9 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 28 Jan 2021 17:33:35 +0000
Subject: [PATCH 039/249] Refactor answer finding into a tested service

---
 CHANGELOG.md                                  |  1 +
 app/controllers/journeys_controller.rb        | 15 +---
 app/services/find_all_journey_answers.rb      | 24 +++++++
 .../services/find_all_journey_answers_spec.rb | 69 +++++++++++++++++++
 4 files changed, 95 insertions(+), 14 deletions(-)
 create mode 100644 app/services/find_all_journey_answers.rb
 create mode 100644 spec/services/find_all_journey_answers_spec.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f227d258..8b737e3b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog 1.0.0].
 ## [Unreleased]
 
 - specification templates are now sourced from the Contentful Category entry
+- refactor how we find all journey answers into isolated service
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 2cccc886c..cd4391c61 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -28,24 +28,11 @@ def show
     ).find(journey_id)
     @steps = @journey.steps.map { |step| StepPresenter.new(step) }
 
-    # TODO: Move this logic into a tested class along with a Presenter factory
-    @answers = @journey.steps.that_are_questions.each_with_object({}) { |step, hash|
-      answer = case step.answer.class.name
-      when "ShortTextAnswer" then ShortTextAnswerPresenter.new(step.answer)
-      when "LongTextAnswer" then LongTextAnswerPresenter.new(step.answer)
-      when "RadioAnswer" then RadioAnswerPresenter.new(step.answer)
-      when "SingleDateAnswer" then SingleDateAnswerPresenter.new(step.answer)
-      when "CheckboxAnswers" then CheckboxesAnswerPresenter.new(step.answer)
-      else
-        step.answer
-      end
-      hash["answer_#{step.contentful_id}"] = answer&.response.to_s
-    }
-
     @specification_template = Liquid::Template.parse(
       @journey.liquid_template, error_mode: :strict
     )
 
+    @answers = FindAllJourneyAnswers.new(journey: @journey).call
     specification_html = @specification_template.render(@answers)
 
     respond_to do |format|
diff --git a/app/services/find_all_journey_answers.rb b/app/services/find_all_journey_answers.rb
new file mode 100644
index 000000000..ecf02384e
--- /dev/null
+++ b/app/services/find_all_journey_answers.rb
@@ -0,0 +1,24 @@
+class FindAllJourneyAnswers
+  class UnexpectedAnswer < StandardError; end
+
+  attr_accessor :journey
+  def initialize(journey:)
+    self.journey = journey
+  end
+
+  def call
+    @answers = @journey.steps.that_are_questions.each_with_object({}) { |step, hash|
+      next unless step.answer
+
+      answer = case step.answer.class.name
+      when "ShortTextAnswer" then ShortTextAnswerPresenter.new(step.answer)
+      when "LongTextAnswer" then LongTextAnswerPresenter.new(step.answer)
+      when "RadioAnswer" then RadioAnswerPresenter.new(step.answer)
+      when "SingleDateAnswer" then SingleDateAnswerPresenter.new(step.answer)
+      when "CheckboxAnswers" then CheckboxesAnswerPresenter.new(step.answer)
+      else raise UnexpectedAnswer.new("Trying to present an unknown type of answer: #{step.answer.class.name}")
+      end
+      hash["answer_#{step.contentful_id}"] = answer&.response.to_s
+    }
+  end
+end
diff --git a/spec/services/find_all_journey_answers_spec.rb b/spec/services/find_all_journey_answers_spec.rb
new file mode 100644
index 000000000..e6ff12888
--- /dev/null
+++ b/spec/services/find_all_journey_answers_spec.rb
@@ -0,0 +1,69 @@
+require "rails_helper"
+
+RSpec.shared_examples "returns the answer in a hash" do |factory_name, presenter, response|
+  it "returns the response for a #{factory_name} in the result" do
+    answer = create(factory_name, response: response)
+    result = described_class.new(journey: answer.step.journey).call
+    expect(result).to include(
+      {"answer_#{answer.step.contentful_id}" => presenter.new(answer).response}
+    )
+  end
+end
+
+RSpec.describe FindAllJourneyAnswers do
+  describe "#call" do
+    it "only returns answers for the given journey" do
+      relevant_answer = create(:short_text_answer, response: "Red")
+      irrelevant_answer = create(:short_text_answer, response: "Blue")
+
+      result = described_class.new(journey: relevant_answer.step.journey).call
+
+      expect(result).to be_a(Hash)
+      expect(result).to include(
+        {"answer_#{relevant_answer.step.contentful_id}" => "Red"}
+      )
+      expect(result).not_to include(
+        {"answer_#{irrelevant_answer.step.contentful_id}" => "Blue"}
+      )
+    end
+
+    context "when the answer is of type short_text_answer" do
+      it_behaves_like "returns the answer in a hash", :short_text_answer, ShortTextAnswerPresenter, "Red"
+    end
+
+    context "when the answer is of type long_text_answer" do
+      it_behaves_like "returns the answer in a hash", :long_text_answer, LongTextAnswerPresenter, "<p>Red Blue Yellow</p>"
+    end
+
+    context "when the answer is of type single_date_answer" do
+      it_behaves_like "returns the answer in a hash", :single_date_answer, SingleDateAnswerPresenter, "12 Jan 2020"
+    end
+
+    context "when the answer is of type radio_answer" do
+      it_behaves_like "returns the answer in a hash", :radio_answer, RadioAnswerPresenter, "Catering"
+    end
+
+    context "when the answer is of type checkbox_answers" do
+      it_behaves_like "returns the answer in a hash", :checkbox_answers, CheckboxesAnswerPresenter, "Foo, Bar"
+    end
+
+    context "when a step does not have an answer" do
+      it "the step does not have an answer in the result" do
+        unanswered_step = create(:step, :radio)
+        result = described_class.new(journey: unanswered_step.journey).call
+        expect(result.keys).not_to include("answer_#{unanswered_step.contentful_id}")
+      end
+    end
+
+    context "when the type of answer is unknown" do
+      it "raises an unexpected error" do
+        allow_any_instance_of(Step).to receive(:answer)
+          .and_return(double(class: double(name: "UnknownClass")))
+        step = create(:step, :radio)
+        expect {
+          described_class.new(journey: step.journey).call
+        }.to raise_error(FindAllJourneyAnswers::UnexpectedAnswer)
+      end
+    end
+  end
+end

From 17374be86ffec371878155083c60bf1c775d9eb4 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 3 Feb 2021 11:15:24 +0000
Subject: [PATCH 040/249] Prevent empty answers for unanswered steps being
 passed to Liquid

Before this change a step without an answer would still make it into the hash.

Liquid would see this empty string value and interpret it as falsey which would show a block of the spec to a user.

This change makes sure that we ignore any steps without answers.
---
 app/services/find_all_journey_answers.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/services/find_all_journey_answers.rb b/app/services/find_all_journey_answers.rb
index ecf02384e..c99603a0d 100644
--- a/app/services/find_all_journey_answers.rb
+++ b/app/services/find_all_journey_answers.rb
@@ -18,7 +18,8 @@ def call
       when "CheckboxAnswers" then CheckboxesAnswerPresenter.new(step.answer)
       else raise UnexpectedAnswer.new("Trying to present an unknown type of answer: #{step.answer.class.name}")
       end
-      hash["answer_#{step.contentful_id}"] = answer&.response.to_s
+
+      hash["answer_#{step.contentful_id}"] = answer.response.to_s
     }
   end
 end

From bed62766017c973017cc824a39cd441aee732f96 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 2 Feb 2021 14:24:55 +0000
Subject: [PATCH 041/249] Add notification with details on resuming journey
 using URL

It is currently possible to resume or view any specification journey
just by knowing that journey's unique id. This change displays the
complete URL for any journey on its task page, informing users of this
fact and giving them easy access to the necessary link.

Since IDs are non-deterministic and effectively unguessable, this does
not present a significant risk of users being able to discover and
potentially modify other specifications unless those specifications have
previously been shared.
---
 .../journeys/_resume_journey_notice.html.erb      | 15 +++++++++++++++
 app/views/journeys/show.html.erb                  |  2 ++
 config/locales/en.yml                             |  4 ++++
 .../visitors/anyone_can_resume_a_journey_spec.rb  | 15 +++++++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 app/views/journeys/_resume_journey_notice.html.erb
 create mode 100644 spec/features/visitors/anyone_can_resume_a_journey_spec.rb

diff --git a/app/views/journeys/_resume_journey_notice.html.erb b/app/views/journeys/_resume_journey_notice.html.erb
new file mode 100644
index 000000000..51efe08de
--- /dev/null
+++ b/app/views/journeys/_resume_journey_notice.html.erb
@@ -0,0 +1,15 @@
+<div class="govuk-notification-banner" role="region" id="govuk-recovery-advice-banner" aria-labelledby="govuk-recovery-advice-banner-title" data-module="govuk-notification-banner">
+  <div class="govuk-notification-banner__header">
+    <h2 class="govuk-notification-banner__title" id="govuk-recovery-advice-banner-title">
+      <%= I18n.t("resume.notification.title") %>
+    </h2>
+  </div>
+  <div class="govuk-notification-banner__content">
+    <p class="govuk-body">
+      <%= I18n.t("resume.notification.body") %>
+    </p>
+    <p class="govuk-body">
+      <code><%=journey_url(@journey) %></code>
+    </p>
+  </div>
+</div>
diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index fc549a8ed..cca856477 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -25,6 +25,8 @@
   </li>
 </ol>
 
+<%= render "resume_journey_notice" %>
+
 <h1 class="govuk-heading-l"><%= I18n.t("journey.specification.header") %></h1>
 <%= link_to "Download (.docx)", journey_path(@journey, format: :docx), class: "govuk-button" %>
 <%= @specification_template.render(@answers).html_safe %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 96c92fa8b..466884702 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -45,6 +45,10 @@ en:
       completed: Completed
   journey_map:
     page_title: "Contentful entry map"
+  resume:
+    notification:
+      title: "Returning to this specification"
+      body: "You can return to this page to make changes or view your specification at any time, either by bookmarking this page in your browser or by making a note of the following address:"
   errors:
     contentful_entry_not_found:
       page_title: "An unexpected error occurred"
diff --git a/spec/features/visitors/anyone_can_resume_a_journey_spec.rb b/spec/features/visitors/anyone_can_resume_a_journey_spec.rb
new file mode 100644
index 000000000..21fd57f2f
--- /dev/null
+++ b/spec/features/visitors/anyone_can_resume_a_journey_spec.rb
@@ -0,0 +1,15 @@
+require "rails_helper"
+
+feature "Users can see how to resume a journey" do
+  context "on the task list" do
+    let(:journey) { create(:journey) }
+    scenario "displays the notification banner" do
+      visit journey_path(journey)
+      expect(page).to have_content(I18n.t("resume.notification.title"))
+    end
+    scenario "displays the journey URL" do
+      visit journey_path(journey)
+      expect(page).to have_content(journey_url(journey))
+    end
+  end
+end

From 9dbd51396608e6cac84686fd652bdbc92d7d10a6 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 2 Feb 2021 14:28:34 +0000
Subject: [PATCH 042/249] Exclude all journey paths from searches

Although it is unlikely that search engines will discover a journey path
or any journey step, this explicitly tells well-behaved search engines
to not index any of the (currently publicly visible, but not publicly
promoted) journey task lists or generated specifications.
---
 public/robots.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/robots.txt b/public/robots.txt
index 37b576a4a..f7b7e314d 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1 +1,3 @@
 # See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+
+Disallow: /journeys/

From 3b7d2a9e2a907f310f1860d39a3cad035b836ec8 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 2 Feb 2021 14:35:40 +0000
Subject: [PATCH 043/249] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b737e3b5..a112b4958 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog 1.0.0].
 
 - specification templates are now sourced from the Contentful Category entry
 - refactor how we find all journey answers into isolated service
+- users are now told how they can resume a journey, and an address is provided for this
+- robots.txt now excludes all journey and step pages
 
 ## [release-005] - 2021-1-19
 

From 9daa0c2723c1a4f48b167b3352b89a0ec0db1cb8 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Feb 2021 14:44:42 +0000
Subject: [PATCH 044/249] Update Contenful fixtures with Sections

Category objects now return a `sections` element. For the time being this is as well as `steps` which will be removed once all functionality is migrated across and replicated through the use of `sections`.
---
 ...category-with-dynamic-liquid-template.json |  9 +++
 ...category-with-invalid-liquid-template.json |  4 +-
 .../category-with-liquid-template.json        |  9 +++
 .../categories/category-with-no-steps.json    |  4 +-
 .../categories/checkboxes-question.json       |  9 +++
 .../categories/extended-radio-question.json   |  9 +++
 .../journey-with-multiple-entries.json        |  9 +++
 .../journey-with-repeat-entries.json          |  9 +++
 .../categories/long-text-question.json        |  9 +++
 .../categories/missing-entry-id.json          |  1 +
 .../contentful/categories/radio-question.json |  9 +++
 .../categories/short-text-question.json       |  9 +++
 .../categories/single-date-question.json      |  9 +++
 .../contentful/categories/static-content.json |  9 +++
 .../unexpected-contentful-question-type.json  |  9 +++
 .../unexpected-contentful-type.json           |  9 +++
 .../sections/checkboxes-section.json          | 43 ++++++++++++++
 .../sections/extended-radio-section.json      | 43 ++++++++++++++
 ...journey-with-multiple-entries-section.json | 57 +++++++++++++++++++
 .../journey-with-repeat-entries-section.json  | 50 ++++++++++++++++
 .../sections/long-text-section.json           | 43 ++++++++++++++
 .../contentful/sections/radio-section.json    | 43 ++++++++++++++
 .../sections/short-text-section.json          | 43 ++++++++++++++
 .../sections/single-date-section.json         | 43 ++++++++++++++
 .../sections/static-content-section.json      | 43 ++++++++++++++
 ...cted-contentful-question-type-section.json | 43 ++++++++++++++
 .../unexpected-contentful-type-section.json   | 43 ++++++++++++++
 27 files changed, 616 insertions(+), 4 deletions(-)
 create mode 100644 spec/fixtures/contentful/sections/checkboxes-section.json
 create mode 100644 spec/fixtures/contentful/sections/extended-radio-section.json
 create mode 100644 spec/fixtures/contentful/sections/journey-with-multiple-entries-section.json
 create mode 100644 spec/fixtures/contentful/sections/journey-with-repeat-entries-section.json
 create mode 100644 spec/fixtures/contentful/sections/long-text-section.json
 create mode 100644 spec/fixtures/contentful/sections/radio-section.json
 create mode 100644 spec/fixtures/contentful/sections/short-text-section.json
 create mode 100644 spec/fixtures/contentful/sections/single-date-section.json
 create mode 100644 spec/fixtures/contentful/sections/static-content-section.json
 create mode 100644 spec/fixtures/contentful/sections/unexpected-contentful-question-type-section.json
 create mode 100644 spec/fixtures/contentful/sections/unexpected-contentful-type-section.json

diff --git a/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json b/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json
index 34caabcd4..a361a00f0 100644
--- a/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json
+++ b/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json
@@ -39,6 +39,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'>\n  <section>\n    <h2>Menus and ordering</h2>\n    <h3>Food standards</h2>\n    <ol>\n      {% if answer_radio-question %}\n        <li>\n          <p class='govuk-body'>The school also requires the service to comply with the following non-mandatory food standards or schemes:</p>\n          <p class='govuk-body'>{{answer_radio-question}}</p>\n        </li>\n      {% endif %}\n    </ol>\n  </section>\n</artcile>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json b/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json
index c69e54c0d..8881bd0e0 100644
--- a/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json
+++ b/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json
@@ -30,8 +30,8 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-        ],
+        "steps": [],
+        "sections": [],
         "specification_template": "<h1>{{{invalid Liquid%}}}</h1>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/category-with-liquid-template.json b/spec/fixtures/contentful/categories/category-with-liquid-template.json
index aed0d68b9..03d2e27c0 100644
--- a/spec/fixtures/contentful/categories/category-with-liquid-template.json
+++ b/spec/fixtures/contentful/categories/category-with-liquid-template.json
@@ -39,6 +39,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/category-with-no-steps.json b/spec/fixtures/contentful/categories/category-with-no-steps.json
index 7c143f50d..a545470bd 100644
--- a/spec/fixtures/contentful/categories/category-with-no-steps.json
+++ b/spec/fixtures/contentful/categories/category-with-no-steps.json
@@ -30,8 +30,8 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-        ],
+        "steps": [],
+        "sections": [],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/checkboxes-question.json b/spec/fixtures/contentful/categories/checkboxes-question.json
index 6911168e9..91485a6ea 100644
--- a/spec/fixtures/contentful/categories/checkboxes-question.json
+++ b/spec/fixtures/contentful/categories/checkboxes-question.json
@@ -39,6 +39,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "checkboxes-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/extended-radio-question.json b/spec/fixtures/contentful/categories/extended-radio-question.json
index b04694ec2..edc23380c 100644
--- a/spec/fixtures/contentful/categories/extended-radio-question.json
+++ b/spec/fixtures/contentful/categories/extended-radio-question.json
@@ -39,6 +39,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "extended-radio-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>{{answer_extended-radio-question}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/journey-with-multiple-entries.json b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
index 686dafcc0..ad0c99138 100644
--- a/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
+++ b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
@@ -53,6 +53,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "journey-with-multiple-entries-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/journey-with-repeat-entries.json b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
index cd767ae75..7a0977f9c 100644
--- a/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
+++ b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
@@ -46,6 +46,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "journey-with-repeat-entries-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/long-text-question.json b/spec/fixtures/contentful/categories/long-text-question.json
index e6dd142f4..3316b612c 100644
--- a/spec/fixtures/contentful/categories/long-text-question.json
+++ b/spec/fixtures/contentful/categories/long-text-question.json
@@ -39,6 +39,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "long-text-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/missing-entry-id.json b/spec/fixtures/contentful/categories/missing-entry-id.json
index 9040b1601..23c732865 100644
--- a/spec/fixtures/contentful/categories/missing-entry-id.json
+++ b/spec/fixtures/contentful/categories/missing-entry-id.json
@@ -39,6 +39,7 @@
             }
           }
         ],
+        "sections": [],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/radio-question.json b/spec/fixtures/contentful/categories/radio-question.json
index aed0d68b9..03d2e27c0 100644
--- a/spec/fixtures/contentful/categories/radio-question.json
+++ b/spec/fixtures/contentful/categories/radio-question.json
@@ -39,6 +39,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/short-text-question.json b/spec/fixtures/contentful/categories/short-text-question.json
index 5f49ff878..1b74bddb3 100644
--- a/spec/fixtures/contentful/categories/short-text-question.json
+++ b/spec/fixtures/contentful/categories/short-text-question.json
@@ -39,6 +39,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "short-text-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/single-date-question.json b/spec/fixtures/contentful/categories/single-date-question.json
index ef8c3263d..0f2b686d4 100644
--- a/spec/fixtures/contentful/categories/single-date-question.json
+++ b/spec/fixtures/contentful/categories/single-date-question.json
@@ -39,6 +39,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "single-date-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/static-content.json b/spec/fixtures/contentful/categories/static-content.json
index 858ff8245..6f099c5f1 100644
--- a/spec/fixtures/contentful/categories/static-content.json
+++ b/spec/fixtures/contentful/categories/static-content.json
@@ -39,6 +39,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "static-content-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json b/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
index f10636591..5732ed68e 100644
--- a/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
+++ b/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
@@ -39,6 +39,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "unexpected-contentful-question-type-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/categories/unexpected-contentful-type.json b/spec/fixtures/contentful/categories/unexpected-contentful-type.json
index af0b7366e..6f271e7a8 100644
--- a/spec/fixtures/contentful/categories/unexpected-contentful-type.json
+++ b/spec/fixtures/contentful/categories/unexpected-contentful-type.json
@@ -39,6 +39,15 @@
             }
           }
         ],
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "unexpected-contentful-type-section"
+            }
+          }
+        ],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
 }
diff --git a/spec/fixtures/contentful/sections/checkboxes-section.json b/spec/fixtures/contentful/sections/checkboxes-section.json
new file mode 100644
index 000000000..e2668ad17
--- /dev/null
+++ b/spec/fixtures/contentful/sections/checkboxes-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "checkboxes-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "checkboxes-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/extended-radio-section.json b/spec/fixtures/contentful/sections/extended-radio-section.json
new file mode 100644
index 000000000..0547e9fe3
--- /dev/null
+++ b/spec/fixtures/contentful/sections/extended-radio-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-radio-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "extended-radio-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/journey-with-multiple-entries-section.json b/spec/fixtures/contentful/sections/journey-with-multiple-entries-section.json
new file mode 100644
index 000000000..63a6a0612
--- /dev/null
+++ b/spec/fixtures/contentful/sections/journey-with-multiple-entries-section.json
@@ -0,0 +1,57 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "journey-with-multiple-entries-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "radio-question"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "short-text-question"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "long-text-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/journey-with-repeat-entries-section.json b/spec/fixtures/contentful/sections/journey-with-repeat-entries-section.json
new file mode 100644
index 000000000..14b9ea73e
--- /dev/null
+++ b/spec/fixtures/contentful/sections/journey-with-repeat-entries-section.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "journey-with-repeat-entries-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "radio-question"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "radio-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/long-text-section.json b/spec/fixtures/contentful/sections/long-text-section.json
new file mode 100644
index 000000000..e2d0bbd7b
--- /dev/null
+++ b/spec/fixtures/contentful/sections/long-text-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "long-text-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "long-text-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/radio-section.json b/spec/fixtures/contentful/sections/radio-section.json
new file mode 100644
index 000000000..027cbf571
--- /dev/null
+++ b/spec/fixtures/contentful/sections/radio-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "radio-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "radio-question"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/short-text-section.json b/spec/fixtures/contentful/sections/short-text-section.json
new file mode 100644
index 000000000..a64641194
--- /dev/null
+++ b/spec/fixtures/contentful/sections/short-text-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "short-text-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "short-text-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/single-date-section.json b/spec/fixtures/contentful/sections/single-date-section.json
new file mode 100644
index 000000000..8cd9ef8a9
--- /dev/null
+++ b/spec/fixtures/contentful/sections/single-date-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "single-date-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "single-date-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/static-content-section.json b/spec/fixtures/contentful/sections/static-content-section.json
new file mode 100644
index 000000000..c340bc3f7
--- /dev/null
+++ b/spec/fixtures/contentful/sections/static-content-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "static-content-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "static-content"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/unexpected-contentful-question-type-section.json b/spec/fixtures/contentful/sections/unexpected-contentful-question-type-section.json
new file mode 100644
index 000000000..bdec0acc9
--- /dev/null
+++ b/spec/fixtures/contentful/sections/unexpected-contentful-question-type-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "unexpected-contentful-question-type-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "unexpected-contentful-question-type"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/unexpected-contentful-type-section.json b/spec/fixtures/contentful/sections/unexpected-contentful-type-section.json
new file mode 100644
index 000000000..9cd4e6b19
--- /dev/null
+++ b/spec/fixtures/contentful/sections/unexpected-contentful-type-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "unexpected-contentful-type-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "unexpected-contentful-type"
+              }
+            }
+        ]
+    }
+}

From f9dde72f205ffd6c051b11ef90978cc8f49dd247 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Feb 2021 14:49:51 +0000
Subject: [PATCH 045/249] Rename GetEntriesInCategory service before
 introducing sections

"Entries" is being used a lot. We have Category entries, and question/step entires. I'm about to do some worth to support Section entries too. I think it is worth being more specific about which kind of entry we are dealing with in our naming.

This class will end up being renamed again to `GetStepsFromSection` alongside the new `GetSectionFromCategory`.
---
 app/controllers/journey_maps_controller.rb                | 4 ++--
 app/jobs/warm_entry_cache_job.rb                          | 4 ++--
 app/services/create_journey.rb                            | 2 +-
 ..._entries_in_category.rb => get_steps_from_category.rb} | 2 +-
 spec/jobs/warm_entry_cache_job_spec.rb                    | 8 ++++----
 ...n_category_spec.rb => get_steps_from_category_spec.rb} | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename app/services/{get_entries_in_category.rb => get_steps_from_category.rb} (97%)
 rename spec/services/{get_entries_in_category_spec.rb => get_steps_from_category_spec.rb} (93%)

diff --git a/app/controllers/journey_maps_controller.rb b/app/controllers/journey_maps_controller.rb
index 88dbbec2f..335704480 100644
--- a/app/controllers/journey_maps_controller.rb
+++ b/app/controllers/journey_maps_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class JourneyMapsController < ApplicationController
-  rescue_from GetEntriesInCategory::RepeatEntryDetected do |exception|
+  rescue_from GetStepsFromCategory::RepeatEntryDetected do |exception|
     render "errors/repeat_step_in_the_contentful_journey", status: 500, locals: {error: exception}
   end
 
@@ -11,6 +11,6 @@ class JourneyMapsController < ApplicationController
 
   def new
     category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
-    @journey_map = GetEntriesInCategory.new(category: category).call
+    @journey_map = GetStepsFromCategory.new(category: category).call
   end
 end
diff --git a/app/jobs/warm_entry_cache_job.rb b/app/jobs/warm_entry_cache_job.rb
index 6fd7abd09..415a8f0bc 100644
--- a/app/jobs/warm_entry_cache_job.rb
+++ b/app/jobs/warm_entry_cache_job.rb
@@ -6,12 +6,12 @@ class WarmEntryCacheJob < ApplicationJob
 
   def perform
     category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
-    entries = GetEntriesInCategory.new(category: category).call
+    entries = GetStepsFromCategory.new(category: category).call
 
     entries.each do |entry|
       store_in_cache(cache: cache, key: "contentful:entry:#{entry.id}", entry: entry)
     end
-  rescue GetEntriesInCategory::RepeatEntryDetected
+  rescue GetStepsFromCategory::RepeatEntryDetected
     cache.extend_ttl_on_all_entries
   end
 
diff --git a/app/services/create_journey.rb b/app/services/create_journey.rb
index e413d3c74..649f9983d 100644
--- a/app/services/create_journey.rb
+++ b/app/services/create_journey.rb
@@ -13,7 +13,7 @@ def call
       liquid_template: category.specification_template
     )
 
-    question_entries = GetEntriesInCategory.new(category: category).call
+    question_entries = GetStepsFromCategory.new(category: category).call
     question_entries.each do |entry|
       CreateJourneyStep.new(
         journey: journey, contentful_entry: entry
diff --git a/app/services/get_entries_in_category.rb b/app/services/get_steps_from_category.rb
similarity index 97%
rename from app/services/get_entries_in_category.rb
rename to app/services/get_steps_from_category.rb
index 2b96bd3d1..105e99481 100644
--- a/app/services/get_entries_in_category.rb
+++ b/app/services/get_steps_from_category.rb
@@ -1,4 +1,4 @@
-class GetEntriesInCategory
+class GetStepsFromCategory
   class RepeatEntryDetected < StandardError; end
 
   attr_accessor :category
diff --git a/spec/jobs/warm_entry_cache_job_spec.rb b/spec/jobs/warm_entry_cache_job_spec.rb
index 98d8193bd..e3fe91c06 100644
--- a/spec/jobs/warm_entry_cache_job_spec.rb
+++ b/spec/jobs/warm_entry_cache_job_spec.rb
@@ -48,9 +48,9 @@
           stub_steps: false
         )
 
-        allow_any_instance_of(GetEntriesInCategory)
+        allow_any_instance_of(GetStepsFromCategory)
           .to receive(:call)
-          .and_raise(GetEntriesInCategory::RepeatEntryDetected)
+          .and_raise(GetStepsFromCategory::RepeatEntryDetected)
 
         described_class.perform_later
         perform_enqueued_jobs
@@ -66,9 +66,9 @@
           stub_steps: false
         )
 
-        allow_any_instance_of(GetEntriesInCategory)
+        allow_any_instance_of(GetStepsFromCategory)
           .to receive(:call)
-          .and_raise(GetEntriesInCategory::RepeatEntryDetected)
+          .and_raise(GetStepsFromCategory::RepeatEntryDetected)
 
         freeze_time do
           ttl_extension = 60 * 60 * 24
diff --git a/spec/services/get_entries_in_category_spec.rb b/spec/services/get_steps_from_category_spec.rb
similarity index 93%
rename from spec/services/get_entries_in_category_spec.rb
rename to spec/services/get_steps_from_category_spec.rb
index af5c4c540..3b87891b8 100644
--- a/spec/services/get_entries_in_category_spec.rb
+++ b/spec/services/get_steps_from_category_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe GetEntriesInCategory do
+RSpec.describe GetStepsFromCategory do
   describe "#call" do
     it "returns the list of entry objects referenced by the category list" do
       category = fake_contentful_category(
@@ -33,7 +33,7 @@
 
         expect {
           described_class.new(category: category).call
-        }.to raise_error(GetEntriesInCategory::RepeatEntryDetected)
+        }.to raise_error(GetStepsFromCategory::RepeatEntryDetected)
       end
     end
   end

From 62a0641d4c7ef207d728bec3e7f4dd72cbb2bf2a Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Feb 2021 16:10:07 +0000
Subject: [PATCH 046/249] Remove expectations on connector initialisations

When trying to introduce 'sections' into the mix I got heavily bogged down by trying to ensure this test continued to pass at all stages.

On reflection I don't think the assertion is valuable. The most important thing is that an expected set of objects are returned, it doesn't really matter how many connections were made. I suppose the value this was meant to provide was to prevent making more calls that was necessary. Given we are making 1 request per entry we know we'll be making a lot of calls. I think we can set this back to a simpler stub.
---
 spec/support/contentful_helpers.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 9d95c0217..0d27ee52f 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -17,8 +17,8 @@ def stub_contentful_category(
   )
     category = fake_contentful_category(contentful_fixture_filename: fixture_filename)
 
-    expect(ContentfulConnector).to receive(:new)
-      .and_return(contentful_connector).once
+    allow(ContentfulConnector).to receive(:new)
+      .and_return(contentful_connector)
 
     # Mock the GET request for the Category Entry
     allow(contentful_connector).to receive(:get_entry_by_id)
@@ -39,9 +39,8 @@ def stub_contentful_category_steps(
   )
     return if category.steps.count.zero?
 
-    expect(ContentfulConnector).to receive(:new)
+    allow(ContentfulConnector).to receive(:new)
       .and_return(contentful_connector)
-      .exactly(category.steps.count)
 
     category.steps.each do |step|
       step = fake_contentful_entry(contentful_fixture_filename: "steps/#{step.id}.json")

From a2db955963e9e42c73eaadeac9dbf01e1412de4f Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Feb 2021 16:13:11 +0000
Subject: [PATCH 047/249] Remove redundant comments

These were mine that were left in by mistake in a previous pull request. I'm no longer concerned about using the double instead of the stub.
---
 spec/support/contentful_helpers.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 0d27ee52f..99c0545d8 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -13,19 +13,17 @@ def stub_contentful_entry(
   def stub_contentful_category(
     fixture_filename:,
     stub_steps: true,
-    contentful_connector: instance_double(ContentfulConnector) # TODO: I suspect the double doesn't do anything and we need stub_contentful_connector
+    contentful_connector: instance_double(ContentfulConnector)
   )
     category = fake_contentful_category(contentful_fixture_filename: fixture_filename)
 
     allow(ContentfulConnector).to receive(:new)
       .and_return(contentful_connector)
 
-    # Mock the GET request for the Category Entry
     allow(contentful_connector).to receive(:get_entry_by_id)
       .with(category.id)
       .and_return(category)
 
-    # For each step in the category mock a GET request
     if stub_steps
       stub_contentful_category_steps(category: category, contentful_connector: contentful_connector)
     end

From 6758eedb8d171d3473cc919402ea3d90b98c3ed5 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Feb 2021 16:26:29 +0000
Subject: [PATCH 048/249] Rename test helper away from "entries" to make way
 for section helpers

---
 spec/services/create_journey_step_spec.rb | 20 ++++++++++----------
 spec/support/contentful_helpers.rb        |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index 9c46162be..abfc863ee 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -5,7 +5,7 @@
     context "when the new step is of type step" do
       it "creates a local copy of the new step" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
+        fake_entry = fake_contentful_step(
           contentful_fixture_filename: "steps/radio-question.json"
         )
 
@@ -61,7 +61,7 @@
     context "when the question is of type 'short_text'" do
       it "sets help_text and options to nil" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
+        fake_entry = fake_contentful_step(
           contentful_fixture_filename: "steps/short-text-question.json"
         )
 
@@ -72,7 +72,7 @@
 
       it "replaces spaces with underscores" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
+        fake_entry = fake_contentful_step(
           contentful_fixture_filename: "steps/short-text-question.json"
         )
 
@@ -85,7 +85,7 @@
     context "when the new entry has a body field" do
       it "updates the step with the body" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
+        fake_entry = fake_contentful_step(
           contentful_fixture_filename: "steps/static-content.json"
         )
 
@@ -103,7 +103,7 @@
     context "when the new entry has a 'primaryCallToAction' field" do
       it "updates the step with the body" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
+        fake_entry = fake_contentful_step(
           contentful_fixture_filename: "steps/primary-button.json"
         )
 
@@ -118,7 +118,7 @@
     context "when no 'primaryCallToAction' is provided" do
       it "default copy is used for the button" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
+        fake_entry = fake_contentful_step(
           contentful_fixture_filename: "steps/no-primary-button.json"
         )
 
@@ -133,7 +133,7 @@
     context "when the new entry has an unexpected content model" do
       it "raises an error" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
+        fake_entry = fake_contentful_step(
           contentful_fixture_filename: "steps/unexpected-contentful-type.json"
         )
 
@@ -144,7 +144,7 @@
       it "raises a rollbar event" do
         journey = create(:journey, :catering)
 
-        fake_entry = fake_contentful_entry(
+        fake_entry = fake_contentful_step(
           contentful_fixture_filename: "steps/unexpected-contentful-type.json"
         )
 
@@ -167,7 +167,7 @@
     context "when the new step has an unexpected step type" do
       it "raises an error" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
+        fake_entry = fake_contentful_step(
           contentful_fixture_filename: "steps/unexpected-contentful-question-type.json"
         )
 
@@ -178,7 +178,7 @@
       it "raises a rollbar event" do
         journey = create(:journey, :catering)
 
-        fake_entry = fake_contentful_entry(
+        fake_entry = fake_contentful_step(
           contentful_fixture_filename: "steps/unexpected-contentful-question-type.json"
         )
 
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 99c0545d8..a0e4dbea3 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -4,7 +4,7 @@ def stub_contentful_entry(
     fixture_filename: "radio-question-example.json"
   )
     contentful_connector = stub_contentful_connector
-    contentful_response = fake_contentful_entry(contentful_fixture_filename: fixture_filename)
+    contentful_response = fake_contentful_step(contentful_fixture_filename: fixture_filename)
     allow(contentful_connector).to receive(:get_entry_by_id)
       .with(entry_id)
       .and_return(contentful_response)
@@ -41,7 +41,7 @@ def stub_contentful_category_steps(
       .and_return(contentful_connector)
 
     category.steps.each do |step|
-      step = fake_contentful_entry(contentful_fixture_filename: "steps/#{step.id}.json")
+      step = fake_contentful_step(contentful_fixture_filename: "steps/#{step.id}.json")
       allow(contentful_connector).to receive(:get_entry_by_id)
         .with(step.id)
         .and_return(step)
@@ -77,7 +77,7 @@ def fake_contentful_category(contentful_fixture_filename:)
     )
   end
 
-  def fake_contentful_entry(contentful_fixture_filename:)
+  def fake_contentful_step(contentful_fixture_filename:)
     raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{contentful_fixture_filename}")
     hash_response = JSON.parse(raw_response)
 

From 17689fad3cb23b82aed4afb395254fe3774dbd95 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Feb 2021 16:15:01 +0000
Subject: [PATCH 049/249] New services to support loading steps from sections
 instead of categories

This commit intends to change no behaviour.

We add 2 new services in with unit tests and make minor tweaks to the test helpers without "plugging them in". This is being done in 2 stages as it's a big change to all happen in the same commit. Adding sections cuts through the whole service for: create_journey, journey_map and warm_entry_cache.
---
 app/services/get_sections_from_category.rb    | 10 ++++
 app/services/get_steps_from_section.rb        | 36 +++++++++++++
 .../get_sections_from_category_spec.rb        | 17 ++++++
 spec/services/get_steps_from_section_spec.rb  | 40 ++++++++++++++
 spec/support/contentful_helpers.rb            | 54 +++++++++++++++++++
 5 files changed, 157 insertions(+)
 create mode 100644 app/services/get_sections_from_category.rb
 create mode 100644 app/services/get_steps_from_section.rb
 create mode 100644 spec/services/get_sections_from_category_spec.rb
 create mode 100644 spec/services/get_steps_from_section_spec.rb

diff --git a/app/services/get_sections_from_category.rb b/app/services/get_sections_from_category.rb
new file mode 100644
index 000000000..a49dd4203
--- /dev/null
+++ b/app/services/get_sections_from_category.rb
@@ -0,0 +1,10 @@
+class GetSectionsFromCategory
+  attr_accessor :category
+  def initialize(category:)
+    self.category = category
+  end
+
+  def call
+    category.sections.map { |section| GetEntry.new(entry_id: section.id).call }
+  end
+end
diff --git a/app/services/get_steps_from_section.rb b/app/services/get_steps_from_section.rb
new file mode 100644
index 000000000..33dd1d47b
--- /dev/null
+++ b/app/services/get_steps_from_section.rb
@@ -0,0 +1,36 @@
+class GetStepsFromSection
+  class RepeatEntryDetected < StandardError; end
+
+  attr_accessor :section
+  def initialize(section:)
+    self.section = section
+  end
+
+  def call
+    question_entry_ids = []
+    section.steps.each do |step|
+      if question_entry_ids.include?(step.id)
+        send_rollbar_error(message: "A repeated Contentful entry was found in the same section", entry_id: step.id)
+        raise RepeatEntryDetected.new(step.id)
+      else
+        question_entry_ids << step.id
+      end
+    end
+
+    question_entry_ids.map { |entry_id|
+      GetEntry.new(entry_id: entry_id).call
+    }
+  end
+
+  private
+
+  def send_rollbar_error(message:, entry_id:)
+    Rollbar.error(
+      message,
+      contentful_url: ENV["CONTENTFUL_URL"],
+      contentful_space_id: ENV["CONTENTFUL_SPACE"],
+      contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+      contentful_entry_id: entry_id
+    )
+  end
+end
diff --git a/spec/services/get_sections_from_category_spec.rb b/spec/services/get_sections_from_category_spec.rb
new file mode 100644
index 000000000..c5374f44b
--- /dev/null
+++ b/spec/services/get_sections_from_category_spec.rb
@@ -0,0 +1,17 @@
+require "rails_helper"
+
+RSpec.describe GetSectionsFromCategory do
+  describe "#call" do
+    it "returns an array of sections" do
+      category = stub_contentful_category(
+        fixture_filename: "radio-question.json",
+        stub_steps: false
+      )
+      sections = stub_contentful_sections(category: category)
+
+      result = described_class.new(category: category).call
+
+      expect(result).to eq(sections)
+    end
+  end
+end
diff --git a/spec/services/get_steps_from_section_spec.rb b/spec/services/get_steps_from_section_spec.rb
new file mode 100644
index 000000000..557eb2a53
--- /dev/null
+++ b/spec/services/get_steps_from_section_spec.rb
@@ -0,0 +1,40 @@
+require "rails_helper"
+
+RSpec.describe GetStepsFromSection do
+  describe "#call" do
+    it "returns the list of entry objects referenced by the section list" do
+      section = fake_contentful_section(
+        contentful_fixture_filename: "sections/journey-with-multiple-entries-section.json"
+      )
+      stub_contentful_section_steps(sections: [section])
+
+      result = described_class.new(section: section).call
+
+      expect(result).to be_kind_of(Array)
+      # INFO: We should test this is a Contentful::Entry however it wasn't
+      # possible to create an instance_double due to an unusual way the object
+      # is constructed within the gem. Creating the object seems overly complex.
+      expect(result.first.id).to eq("radio-question")
+    end
+
+    context "when the same entry is found twice" do
+      it "returns an error message" do
+        section = fake_contentful_section(
+          contentful_fixture_filename: "sections/journey-with-repeat-entries-section.json"
+        )
+
+        expect(Rollbar).to receive(:error)
+          .with("A repeated Contentful entry was found in the same section",
+            contentful_url: ENV["CONTENTFUL_URL"],
+            contentful_space_id: ENV["CONTENTFUL_SPACE"],
+            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+            contentful_entry_id: "radio-question")
+          .and_call_original
+
+        expect {
+          described_class.new(section: section).call
+        }.to raise_error(GetStepsFromSection::RepeatEntryDetected)
+      end
+    end
+  end
+end
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index a0e4dbea3..2223f2cc2 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -31,6 +31,44 @@ def stub_contentful_category(
     category
   end
 
+  def stub_contentful_sections(
+    category:,
+    contentful_connector: instance_double(ContentfulConnector)
+  )
+    allow(ContentfulConnector).to receive(:new)
+      .and_return(contentful_connector)
+
+    fake_sections = category.sections.map { |section|
+      fake_section = fake_contentful_section(contentful_fixture_filename: "sections/#{section.id}.json")
+      expect(contentful_connector).to receive(:get_entry_by_id)
+        .with(fake_section.id)
+        .and_return(fake_section)
+      fake_section
+    }
+
+    allow(category).to receive(:sections).and_return(fake_sections)
+    fake_sections
+  end
+
+  def stub_contentful_section_steps(
+    sections:,
+    contentful_connector: instance_double(ContentfulConnector)
+  )
+    allow(ContentfulConnector).to receive(:new)
+      .and_return(contentful_connector)
+
+    sections.each do |section|
+      fake_steps = section.steps.map { |step|
+        fake_step = fake_contentful_step(contentful_fixture_filename: "steps/#{step.id}.json")
+        expect(contentful_connector).to receive(:get_entry_by_id)
+          .with(fake_step.id)
+          .and_return(fake_step)
+        fake_step
+      }
+      allow(section).to receive(:steps).and_return(fake_steps)
+    end
+  end
+
   def stub_contentful_category_steps(
     category:,
     contentful_connector: instance_double(ContentfulConnector)
@@ -68,15 +106,31 @@ def fake_contentful_category(contentful_fixture_filename:)
     hash_response = JSON.parse(raw_response)
 
     steps = hash_response.dig("fields", "steps").map { |step| double(id: step.dig("sys", "id")) }
+    sections = hash_response.dig("fields", "sections").map { |section|
+      double(id: section.dig("sys", "id"))
+    }
 
     double(
       Contentful::Entry,
       id: hash_response.dig("sys", "id"),
       steps: steps,
+      sections: sections,
       specification_template: hash_response.dig("fields", "specification_template")
     )
   end
 
+  def fake_contentful_section(contentful_fixture_filename:)
+    raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{contentful_fixture_filename}")
+    hash_response = JSON.parse(raw_response)
+
+    double(
+      Contentful::Entry,
+      id: hash_response.dig("sys", "id"),
+      title: hash_response.dig("fields", "title"),
+      steps: hash_response.dig("fields", "steps").map { |step_hash| double(id: step_hash.dig("sys", "id")) }
+    )
+  end
+
   def fake_contentful_step(contentful_fixture_filename:)
     raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{contentful_fixture_filename}")
     hash_response = JSON.parse(raw_response)

From a0719784d62591bffe66b008292492d70b74b97c Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Feb 2021 17:30:15 +0000
Subject: [PATCH 050/249] Store the section grouping on the Journey for
 presentation

This change also adds `null: false` back to `liquid_template` catching an earlier mistake made here [1].

[1] https://github.com/DFE-Digital/buy-for-your-school/commit/1e79a3af9198a80dbb24f2eb4588ce24cfcef265#diff-cbf8b25d6d853acf58fa9057841f407d29ffe90649c75cf9e3f51b2d6e3aa1d3R33
---
 db/migrate/20210202170113_add_section_order_to_journey.rb | 5 +++++
 db/schema.rb                                              | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20210202170113_add_section_order_to_journey.rb

diff --git a/db/migrate/20210202170113_add_section_order_to_journey.rb b/db/migrate/20210202170113_add_section_order_to_journey.rb
new file mode 100644
index 000000000..02f2e90e7
--- /dev/null
+++ b/db/migrate/20210202170113_add_section_order_to_journey.rb
@@ -0,0 +1,5 @@
+class AddSectionOrderToJourney < ActiveRecord::Migration[6.1]
+  def change
+    add_column :journeys, :section_groups, :jsonb
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 101cc61a3..5d52883ad 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_01_25_171840) do
+ActiveRecord::Schema.define(version: 2021_02_02_170113) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -29,7 +29,8 @@
     t.string "category", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.jsonb "liquid_template"
+    t.jsonb "liquid_template", null: false
+    t.jsonb "section_groups"
   end
 
   create_table "long_text_answers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|

From 29bea3dffe888549b07e2e1d66c1cd8fd101d444 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Feb 2021 17:35:43 +0000
Subject: [PATCH 051/249] Steps are now always loaded through Sections

This commit completes the migration from finding steps directly from the Category, to instead go through an intermediary section layer.

We remove the now unused serviced called GetStepsFromCategory
---
 app/controllers/journey_maps_controller.rb    |  7 +++-
 app/jobs/warm_entry_cache_job.rb              |  8 ++--
 app/services/create_journey.rb                | 22 ++++++----
 app/services/get_steps_from_category.rb       | 36 -----------------
 app/views/journey_maps/new.html.erb           |  2 +-
 spec/jobs/warm_entry_cache_job_spec.rb        |  8 ++--
 spec/requests/contentful_caching_spec.rb      |  5 +++
 spec/services/get_category_spec.rb            |  2 +-
 .../get_sections_from_category_spec.rb        |  3 +-
 spec/services/get_steps_from_category_spec.rb | 40 -------------------
 spec/support/contentful_helpers.rb            | 12 ++++--
 11 files changed, 45 insertions(+), 100 deletions(-)
 delete mode 100644 app/services/get_steps_from_category.rb
 delete mode 100644 spec/services/get_steps_from_category_spec.rb

diff --git a/app/controllers/journey_maps_controller.rb b/app/controllers/journey_maps_controller.rb
index 335704480..9d0e18e45 100644
--- a/app/controllers/journey_maps_controller.rb
+++ b/app/controllers/journey_maps_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class JourneyMapsController < ApplicationController
-  rescue_from GetStepsFromCategory::RepeatEntryDetected do |exception|
+  rescue_from GetStepsFromSection::RepeatEntryDetected do |exception|
     render "errors/repeat_step_in_the_contentful_journey", status: 500, locals: {error: exception}
   end
 
@@ -11,6 +11,9 @@ class JourneyMapsController < ApplicationController
 
   def new
     category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
-    @journey_map = GetStepsFromCategory.new(category: category).call
+    sections = GetSectionsFromCategory.new(category: category).call
+    @steps = sections.map { |section|
+      GetStepsFromSection.new(section: section).call
+    }.flatten
   end
 end
diff --git a/app/jobs/warm_entry_cache_job.rb b/app/jobs/warm_entry_cache_job.rb
index 415a8f0bc..362895eff 100644
--- a/app/jobs/warm_entry_cache_job.rb
+++ b/app/jobs/warm_entry_cache_job.rb
@@ -6,12 +6,14 @@ class WarmEntryCacheJob < ApplicationJob
 
   def perform
     category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
-    entries = GetStepsFromCategory.new(category: category).call
+    sections = GetSectionsFromCategory.new(category: category).call
+    steps = sections.map { |section| GetStepsFromSection.new(section: section).call }
 
-    entries.each do |entry|
+    # TODO: Cache category and sections too
+    [steps].flatten.each do |entry|
       store_in_cache(cache: cache, key: "contentful:entry:#{entry.id}", entry: entry)
     end
-  rescue GetStepsFromCategory::RepeatEntryDetected
+  rescue GetStepsFromSection::RepeatEntryDetected
     cache.extend_ttl_on_all_entries
   end
 
diff --git a/app/services/create_journey.rb b/app/services/create_journey.rb
index 649f9983d..81974a0b3 100644
--- a/app/services/create_journey.rb
+++ b/app/services/create_journey.rb
@@ -7,18 +7,26 @@ def initialize(category_name:)
 
   def call
     category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
-
-    journey = Journey.create(
+    sections = GetSectionsFromCategory.new(category: category).call
+    journey = Journey.new(
       category: category_name,
       liquid_template: category.specification_template
     )
 
-    question_entries = GetStepsFromCategory.new(category: category).call
-    question_entries.each do |entry|
-      CreateJourneyStep.new(
-        journey: journey, contentful_entry: entry
-      ).call
+    journey.section_groups = sections.each_with_object({}) { |section, result|
+      result[section.title] = section.steps.map(&:id)
+    }
+    journey.save
+
+    sections.each do |section|
+      question_entries = GetStepsFromSection.new(section: section).call
+      question_entries.each do |entry|
+        CreateJourneyStep.new(
+          journey: journey, contentful_entry: entry
+        ).call
+      end
     end
+
     journey
   end
 end
diff --git a/app/services/get_steps_from_category.rb b/app/services/get_steps_from_category.rb
deleted file mode 100644
index 105e99481..000000000
--- a/app/services/get_steps_from_category.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-class GetStepsFromCategory
-  class RepeatEntryDetected < StandardError; end
-
-  attr_accessor :category
-  def initialize(category:)
-    self.category = category
-  end
-
-  def call
-    question_entry_ids = []
-    category.steps.each do |step|
-      if question_entry_ids.include?(step.id)
-        send_rollbar_error(message: "A repeated Contentful entry was found in the same journey", entry_id: step.id)
-        raise RepeatEntryDetected.new(step.id)
-      else
-        question_entry_ids << step.id
-      end
-    end
-
-    question_entry_ids.map { |entry_id|
-      GetEntry.new(entry_id: entry_id).call
-    }
-  end
-
-  private
-
-  def send_rollbar_error(message:, entry_id:)
-    Rollbar.error(
-      message,
-      contentful_url: ENV["CONTENTFUL_URL"],
-      contentful_space_id: ENV["CONTENTFUL_SPACE"],
-      contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-      contentful_entry_id: entry_id
-    )
-  end
-end
diff --git a/app/views/journey_maps/new.html.erb b/app/views/journey_maps/new.html.erb
index 02268a6b5..9ed3d8d1f 100644
--- a/app/views/journey_maps/new.html.erb
+++ b/app/views/journey_maps/new.html.erb
@@ -2,7 +2,7 @@
 <h1 class="govuk-heading-xl"><%= I18n.t("journey_map.page_title") %></h1>
 
 <ol class="govuk-list govuk-list--number">
-  <% @journey_map.each do |entry| %>
+  <% @steps.each do |entry| %>
     <li>
       <%= link_to entry.title, "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/#{entry.id}", target: :blank, class: "govuk-link" %>
     </li>
diff --git a/spec/jobs/warm_entry_cache_job_spec.rb b/spec/jobs/warm_entry_cache_job_spec.rb
index e3fe91c06..cf1d54d98 100644
--- a/spec/jobs/warm_entry_cache_job_spec.rb
+++ b/spec/jobs/warm_entry_cache_job_spec.rb
@@ -48,9 +48,9 @@
           stub_steps: false
         )
 
-        allow_any_instance_of(GetStepsFromCategory)
+        allow_any_instance_of(GetStepsFromSection)
           .to receive(:call)
-          .and_raise(GetStepsFromCategory::RepeatEntryDetected)
+          .and_raise(GetStepsFromSection::RepeatEntryDetected)
 
         described_class.perform_later
         perform_enqueued_jobs
@@ -66,9 +66,9 @@
           stub_steps: false
         )
 
-        allow_any_instance_of(GetStepsFromCategory)
+        allow_any_instance_of(GetStepsFromSection)
           .to receive(:call)
-          .and_raise(GetStepsFromCategory::RepeatEntryDetected)
+          .and_raise(GetStepsFromSection::RepeatEntryDetected)
 
         freeze_time do
           ttl_extension = 60 * 60 * 24
diff --git a/spec/requests/contentful_caching_spec.rb b/spec/requests/contentful_caching_spec.rb
index 7c5c7c8fa..8fb582c3e 100644
--- a/spec/requests/contentful_caching_spec.rb
+++ b/spec/requests/contentful_caching_spec.rb
@@ -20,9 +20,14 @@
     after(:each) { RedisCache.redis.flushdb }
 
     it "checks the Redis cache instead of making an external request" do
+      # TODO: In reality we do not cache categories, but should
       raw_category_response = File.read("#{Rails.root}/spec/fixtures/contentful/categories/radio-question.json")
       RedisCache.redis.set("contentful:entry:contentful-category-entry", JSON.dump(raw_category_response))
 
+      # TODO: In reality we do not cache sections, but should
+      raw_section_response = File.read("#{Rails.root}/spec/fixtures/contentful/sections/radio-section.json")
+      RedisCache.redis.set("contentful:entry:radio-section", JSON.dump(raw_section_response))
+
       raw_step_response = File.read("#{Rails.root}/spec/fixtures/contentful/steps/radio-question.json")
       RedisCache.redis.set("contentful:entry:radio-question", JSON.dump(raw_step_response))
 
diff --git a/spec/services/get_category_spec.rb b/spec/services/get_category_spec.rb
index f30e145a2..d63dce078 100644
--- a/spec/services/get_category_spec.rb
+++ b/spec/services/get_category_spec.rb
@@ -5,7 +5,7 @@
     it "returns a Contenetful::Entry for the category_entry_id" do
       stub_contentful_category(
         fixture_filename: "static-content.json",
-        stub_steps: false
+        stub_sections: false
       )
       result = described_class.new(category_entry_id: "contentful-category-entry").call
       expect(result.id).to eql("contentful-category-entry")
diff --git a/spec/services/get_sections_from_category_spec.rb b/spec/services/get_sections_from_category_spec.rb
index c5374f44b..33c602b4d 100644
--- a/spec/services/get_sections_from_category_spec.rb
+++ b/spec/services/get_sections_from_category_spec.rb
@@ -7,11 +7,10 @@
         fixture_filename: "radio-question.json",
         stub_steps: false
       )
-      sections = stub_contentful_sections(category: category)
 
       result = described_class.new(category: category).call
 
-      expect(result).to eq(sections)
+      expect(result).to eq(category.sections)
     end
   end
 end
diff --git a/spec/services/get_steps_from_category_spec.rb b/spec/services/get_steps_from_category_spec.rb
deleted file mode 100644
index 3b87891b8..000000000
--- a/spec/services/get_steps_from_category_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require "rails_helper"
-
-RSpec.describe GetStepsFromCategory do
-  describe "#call" do
-    it "returns the list of entry objects referenced by the category list" do
-      category = fake_contentful_category(
-        contentful_fixture_filename: "journey-with-multiple-entries.json"
-      )
-      stub_contentful_category_steps(category: category)
-
-      result = described_class.new(category: category).call
-
-      expect(result).to be_kind_of(Array)
-      # INFO: We should test this is a Contentful::Entry however it wasn't
-      # possible to create an instance_double due to an unusual way the object
-      # is constructed within the gem. Creating the object seems overly complex.
-      expect(result.first.id).to eq("radio-question")
-    end
-
-    context "when the same entry is found twice" do
-      it "returns an error message" do
-        category = fake_contentful_category(
-          contentful_fixture_filename: "journey-with-repeat-entries.json"
-        )
-
-        expect(Rollbar).to receive(:error)
-          .with("A repeated Contentful entry was found in the same journey",
-            contentful_url: ENV["CONTENTFUL_URL"],
-            contentful_space_id: ENV["CONTENTFUL_SPACE"],
-            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "radio-question")
-          .and_call_original
-
-        expect {
-          described_class.new(category: category).call
-        }.to raise_error(GetStepsFromCategory::RepeatEntryDetected)
-      end
-    end
-  end
-end
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 2223f2cc2..2e4be850d 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -12,20 +12,24 @@ def stub_contentful_entry(
 
   def stub_contentful_category(
     fixture_filename:,
+    stub_sections: true,
     stub_steps: true,
-    contentful_connector: instance_double(ContentfulConnector)
+    contentful_connector: instance_double(ContentfulConnector) # TODO: I suspect the double doesn't do anything and we need stub_contentful_connector
   )
     category = fake_contentful_category(contentful_fixture_filename: fixture_filename)
 
-    allow(ContentfulConnector).to receive(:new)
+    expect(ContentfulConnector).to receive(:new)
       .and_return(contentful_connector)
 
     allow(contentful_connector).to receive(:get_entry_by_id)
       .with(category.id)
       .and_return(category)
 
-    if stub_steps
-      stub_contentful_category_steps(category: category, contentful_connector: contentful_connector)
+    if stub_sections
+      sections = stub_contentful_sections(category: category, contentful_connector: contentful_connector)
+      if stub_steps
+        stub_contentful_section_steps(sections: sections, contentful_connector: contentful_connector)
+      end
     end
 
     category

From 52b467b0312259b3dfd5e580e0509829694f95d2 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Feb 2021 17:41:32 +0000
Subject: [PATCH 052/249] Remove test support for steps in Category fixtures

---
 .../anyone_can_view_a_list_of_tasks_spec.rb   |  4 ++++
 ...category-with-dynamic-liquid-template.json |  9 --------
 ...category-with-invalid-liquid-template.json |  1 -
 .../category-with-liquid-template.json        |  9 --------
 .../categories/category-with-no-steps.json    |  1 -
 .../categories/checkboxes-question.json       |  9 --------
 .../categories/extended-radio-question.json   |  9 --------
 .../journey-with-multiple-entries.json        | 23 -------------------
 .../journey-with-repeat-entries.json          | 16 -------------
 .../categories/long-text-question.json        |  9 --------
 .../categories/missing-entry-id.json          |  9 --------
 .../contentful/categories/radio-question.json |  9 --------
 .../categories/short-text-question.json       |  9 --------
 .../categories/single-date-question.json      |  9 --------
 .../contentful/categories/static-content.json |  9 --------
 .../unexpected-contentful-question-type.json  |  9 --------
 .../unexpected-contentful-type.json           |  9 --------
 spec/support/contentful_helpers.rb            |  2 --
 18 files changed, 4 insertions(+), 151 deletions(-)

diff --git a/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb b/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
index 908283b28..8c6173209 100644
--- a/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
+++ b/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
@@ -1,6 +1,10 @@
 require "rails_helper"
 
 feature "Users can view the task list" do
+  it "tasks are grouped by their section" do
+
+  end
+  
   context "When a question has been answered" do
     let(:answer) { create(:short_text_answer, response: "answer") }
 
diff --git a/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json b/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json
index a361a00f0..f37b3a8ed 100644
--- a/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json
+++ b/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "radio-question"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json b/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json
index 8881bd0e0..355232e65 100644
--- a/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json
+++ b/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json
@@ -30,7 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [],
         "sections": [],
         "specification_template": "<h1>{{{invalid Liquid%}}}</h1>"
     }
diff --git a/spec/fixtures/contentful/categories/category-with-liquid-template.json b/spec/fixtures/contentful/categories/category-with-liquid-template.json
index 03d2e27c0..b9bd3872c 100644
--- a/spec/fixtures/contentful/categories/category-with-liquid-template.json
+++ b/spec/fixtures/contentful/categories/category-with-liquid-template.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "radio-question"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/category-with-no-steps.json b/spec/fixtures/contentful/categories/category-with-no-steps.json
index a545470bd..d1267d882 100644
--- a/spec/fixtures/contentful/categories/category-with-no-steps.json
+++ b/spec/fixtures/contentful/categories/category-with-no-steps.json
@@ -30,7 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [],
         "sections": [],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
diff --git a/spec/fixtures/contentful/categories/checkboxes-question.json b/spec/fixtures/contentful/categories/checkboxes-question.json
index 91485a6ea..3e50e9fb0 100644
--- a/spec/fixtures/contentful/categories/checkboxes-question.json
+++ b/spec/fixtures/contentful/categories/checkboxes-question.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "checkboxes-question"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/extended-radio-question.json b/spec/fixtures/contentful/categories/extended-radio-question.json
index edc23380c..c99e658f5 100644
--- a/spec/fixtures/contentful/categories/extended-radio-question.json
+++ b/spec/fixtures/contentful/categories/extended-radio-question.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "extended-radio-question"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/journey-with-multiple-entries.json b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
index ad0c99138..ac51a486c 100644
--- a/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
+++ b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
@@ -30,29 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "radio-question"
-            }
-          },
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "short-text-question"
-            }
-          },
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "long-text-question"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/journey-with-repeat-entries.json b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
index 7a0977f9c..abcdb2f89 100644
--- a/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
+++ b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
@@ -30,22 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "radio-question"
-            }
-          },
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "radio-question"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/long-text-question.json b/spec/fixtures/contentful/categories/long-text-question.json
index 3316b612c..0791bddf1 100644
--- a/spec/fixtures/contentful/categories/long-text-question.json
+++ b/spec/fixtures/contentful/categories/long-text-question.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "long-text-question"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/missing-entry-id.json b/spec/fixtures/contentful/categories/missing-entry-id.json
index 23c732865..d1267d882 100644
--- a/spec/fixtures/contentful/categories/missing-entry-id.json
+++ b/spec/fixtures/contentful/categories/missing-entry-id.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "missing-entry-id"
-            }
-          }
-        ],
         "sections": [],
         "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
     }
diff --git a/spec/fixtures/contentful/categories/radio-question.json b/spec/fixtures/contentful/categories/radio-question.json
index 03d2e27c0..b9bd3872c 100644
--- a/spec/fixtures/contentful/categories/radio-question.json
+++ b/spec/fixtures/contentful/categories/radio-question.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "radio-question"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/short-text-question.json b/spec/fixtures/contentful/categories/short-text-question.json
index 1b74bddb3..a1733707d 100644
--- a/spec/fixtures/contentful/categories/short-text-question.json
+++ b/spec/fixtures/contentful/categories/short-text-question.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "short-text-question"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/single-date-question.json b/spec/fixtures/contentful/categories/single-date-question.json
index 0f2b686d4..6aa53af6f 100644
--- a/spec/fixtures/contentful/categories/single-date-question.json
+++ b/spec/fixtures/contentful/categories/single-date-question.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "single-date-question"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/static-content.json b/spec/fixtures/contentful/categories/static-content.json
index 6f099c5f1..6b65f352c 100644
--- a/spec/fixtures/contentful/categories/static-content.json
+++ b/spec/fixtures/contentful/categories/static-content.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "static-content"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json b/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
index 5732ed68e..7bf54b054 100644
--- a/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
+++ b/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "unexpected-contentful-question-type"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/fixtures/contentful/categories/unexpected-contentful-type.json b/spec/fixtures/contentful/categories/unexpected-contentful-type.json
index 6f271e7a8..3ae97150e 100644
--- a/spec/fixtures/contentful/categories/unexpected-contentful-type.json
+++ b/spec/fixtures/contentful/categories/unexpected-contentful-type.json
@@ -30,15 +30,6 @@
     },
     "fields": {
         "title": "Catering",
-        "steps": [
-          {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "unexpected-contentful-type"
-            }
-          }
-        ],
         "sections": [
           {
             "sys": {
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 2e4be850d..9c8195a12 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -109,7 +109,6 @@ def fake_contentful_category(contentful_fixture_filename:)
     raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/categories/#{contentful_fixture_filename}")
     hash_response = JSON.parse(raw_response)
 
-    steps = hash_response.dig("fields", "steps").map { |step| double(id: step.dig("sys", "id")) }
     sections = hash_response.dig("fields", "sections").map { |section|
       double(id: section.dig("sys", "id"))
     }
@@ -117,7 +116,6 @@ def fake_contentful_category(contentful_fixture_filename:)
     double(
       Contentful::Entry,
       id: hash_response.dig("sys", "id"),
-      steps: steps,
       sections: sections,
       specification_template: hash_response.dig("fields", "specification_template")
     )

From 4cc77cc81d1d7014a3f9c6bf51aba69719fa0940 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Feb 2021 17:46:56 +0000
Subject: [PATCH 053/249] Refactor task list links into a reusable partial

---
 app/views/journeys/_step_list.html.erb | 19 +++++++++++++++++++
 app/views/journeys/show.html.erb       | 20 +-------------------
 2 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 app/views/journeys/_step_list.html.erb

diff --git a/app/views/journeys/_step_list.html.erb b/app/views/journeys/_step_list.html.erb
new file mode 100644
index 000000000..06c812421
--- /dev/null
+++ b/app/views/journeys/_step_list.html.erb
@@ -0,0 +1,19 @@
+<ul class="app-task-list__items">
+  <% steps.each do |step| %>
+    <% if step.question? %>
+    <li class="app-task-list__item">
+      <% if step.answer %>
+        <span class="app-task-list__task-name">
+          <%= link_to step.title, edit_journey_step_path(journey, step), class: "govuk-link", 'aria-describedby': step.id + "-status"%>
+        </span>
+        <strong class="govuk-tag app-task-list__tag" id="<%= step.id + "-status" %>"><%= I18n.t("task_list.status.completed") %></strong>
+      <% else %>
+        <span class="app-task-list__task-name">
+          <%= link_to step.title, journey_step_path(journey, step), class: "govuk-link", 'aria-describedby': step.id + "-status"%>
+        </span>
+        <strong class="govuk-tag govuk-tag--grey app-task-list__tag" id="<%= step.id + "-status" %>"><%= I18n.t("task_list.status.not_started") %></strong>
+      <% end %>
+    </li>
+    <% end %>
+  <% end %>
+</ul>
diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index cca856477..ad9993d6e 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -3,25 +3,7 @@
 <h1 class="govuk-heading-xl"><%= @journey.category.capitalize %></h1>
 <ol class="app-task-list">
   <li>
-    <ul class="app-task-list__items">
-      <% @steps.each do |step| %>
-        <% if step.question? %>
-        <li class="app-task-list__item">
-          <% if step.answer %>
-            <span class="app-task-list__task-name">
-              <%= link_to step.title, edit_journey_step_path(@journey, step), class: "govuk-link", 'aria-describedby': step.id + "-status"%>
-            </span>
-            <strong class="govuk-tag app-task-list__tag" id="<%= step.id + "-status" %>"><%= I18n.t("task_list.status.completed") %></strong>
-          <% else %>
-            <span class="app-task-list__task-name">
-              <%= link_to step.title, journey_step_path(@journey, step), class: "govuk-link", 'aria-describedby': step.id + "-status"%>
-            </span>
-            <strong class="govuk-tag govuk-tag--grey app-task-list__tag" id="<%= step.id + "-status" %>"><%= I18n.t("task_list.status.not_started") %></strong>
-          <% end %>
-        </li>
-        <% end %>
-      <% end %>
-    </ul>
+    <%= render "step_list", journey: @journey, steps: @steps %>
   </li>
 </ol>
 

From c5f4ada6949ded14026f05355aef520e5402c3df Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Feb 2021 18:19:14 +0000
Subject: [PATCH 054/249] Task list is separated by Section headers defined in
 Contentful

A narly change was needed to `anyone_can_edit_their_answers_spec.rb` because we were trying to fake out a state where an answer existed and skipped the contentful stubbing. Because of this the journey has no section_steps and we can't use factories to create a factory with the right sections because the answers are needed up front. This route feels painful.

Instead the other option (which I went with) is to perform an update on the journey within the few tests where this happens to set the grouping after the faking of data.
---
 CHANGELOG.md                                  |  1 +
 app/controllers/journeys_controller.rb        |  3 ++
 app/views/journeys/show.html.erb              |  9 ++--
 spec/factories/journey.rb                     |  1 +
 .../anyone_can_edit_their_answers_spec.rb     |  4 ++
 .../anyone_can_view_a_list_of_tasks_spec.rb   | 25 ++++++++-
 .../categories/multiple-sections.json         | 51 +++++++++++++++++++
 .../sections/long-text-section.json           |  2 +-
 8 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 spec/fixtures/contentful/categories/multiple-sections.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a112b4958..4507ce29e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - refactor how we find all journey answers into isolated service
 - users are now told how they can resume a journey, and an address is provided for this
 - robots.txt now excludes all journey and step pages
+- steps/questions/tasks in the task lists are now grouped by Contentful Section entries
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index cd4391c61..208d40a6d 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -27,6 +27,9 @@ def show
       steps: [:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers]
     ).find(journey_id)
     @steps = @journey.steps.map { |step| StepPresenter.new(step) }
+    @section_groups = @journey.section_groups.each_with_object({}) { |group, result|
+      result[group[0]] = @steps.select { |step| group[1].include?(step.contentful_id) }
+    }
 
     @specification_template = Liquid::Template.parse(
       @journey.liquid_template, error_mode: :strict
diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index ad9993d6e..7407f3faf 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -2,9 +2,12 @@
 
 <h1 class="govuk-heading-xl"><%= @journey.category.capitalize %></h1>
 <ol class="app-task-list">
-  <li>
-    <%= render "step_list", journey: @journey, steps: @steps %>
-  </li>
+  <% @section_groups.each_pair do |section_title, steps| %>
+    <h2 class="app-task-list__section"><%= section_title %></h2>
+    <li>
+      <%= render "step_list", journey: @journey, steps: steps %>
+    </li>
+  <% end %>
 </ol>
 
 <%= render "resume_journey_notice" %>
diff --git a/spec/factories/journey.rb b/spec/factories/journey.rb
index 1fb390acc..fd64d133b 100644
--- a/spec/factories/journey.rb
+++ b/spec/factories/journey.rb
@@ -2,6 +2,7 @@
   factory :journey do
     category { "catering" }
     liquid_template { "Your answer was {{ answer_47EI2X2T5EDTpJX9WjRR9p }}" }
+    section_groups { [] }
 
     trait :catering do
       category { "catering" }
diff --git a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
index 73b8b0ede..78cc78dc9 100644
--- a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
+++ b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
@@ -1,6 +1,10 @@
 require "rails_helper"
 
 feature "Users can edit their answers" do
+  before do
+    journey = answer.step.journey
+    journey.update(section_groups: {"Section A" => [answer.step.contentful_id]})
+  end
   let(:answer) { create(:short_text_answer, response: "answer") }
 
   context "when the question is short_text" do
diff --git a/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb b/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
index 8c6173209..416e31e21 100644
--- a/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
+++ b/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
@@ -2,10 +2,33 @@
 
 feature "Users can view the task list" do
   it "tasks are grouped by their section" do
+    stub_contentful_category(fixture_filename: "multiple-sections.json")
 
+    visit root_path
+
+    click_on(I18n.t("generic.button.start"))
+
+    within(".app-task-list") do
+      expect(page).to have_content("Section A")
+      expect(page).to have_content("Section B")
+    end
+
+    task_lists = find_all(".app-task-list__items")
+
+    within(task_lists[0]) do
+      expect(page).to have_content("Which service do you need?")
+    end
+
+    within(task_lists[1]) do
+      expect(page).to have_content("Describe what you need")
+    end
   end
-  
+
   context "When a question has been answered" do
+    before do
+      journey = answer.step.journey
+      journey.update(section_groups: {"Section A" => [answer.step.contentful_id]})
+    end
     let(:answer) { create(:short_text_answer, response: "answer") }
 
     scenario "The task is marked as completed" do
diff --git a/spec/fixtures/contentful/categories/multiple-sections.json b/spec/fixtures/contentful/categories/multiple-sections.json
new file mode 100644
index 000000000..85fd97373
--- /dev/null
+++ b/spec/fixtures/contentful/categories/multiple-sections.json
@@ -0,0 +1,51 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-section"
+            }
+          },
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "long-text-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/long-text-section.json b/spec/fixtures/contentful/sections/long-text-section.json
index e2d0bbd7b..3ad55bccd 100644
--- a/spec/fixtures/contentful/sections/long-text-section.json
+++ b/spec/fixtures/contentful/sections/long-text-section.json
@@ -29,7 +29,7 @@
         "locale": "en-US"
     },
     "fields": {
-        "title": "Section A",
+        "title": "Section B",
         "steps": [
             {
               "sys": {

From 2aa30fc1472df8b07b34cdddad2acf396c33d16f Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Wed, 3 Feb 2021 17:44:37 +0000
Subject: [PATCH 055/249] Update start page content

---
 CHANGELOG.md                                  |  1 +
 app/views/pages/planning_start_page.html.erb  | 31 ++++++++++---
 config/locales/en.yml                         | 44 ++++++++++++-------
 ...yone_can_see_a_planning_start_page_spec.rb | 23 ++++++++--
 4 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4507ce29e..f0e96ca6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - users are now told how they can resume a journey, and an address is provided for this
 - robots.txt now excludes all journey and step pages
 - steps/questions/tasks in the task lists are now grouped by Contentful Section entries
+- start page now has revised copy with details on eligibility and what to expect
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/views/pages/planning_start_page.html.erb b/app/views/pages/planning_start_page.html.erb
index 20cf4f34f..fa1850e93 100644
--- a/app/views/pages/planning_start_page.html.erb
+++ b/app/views/pages/planning_start_page.html.erb
@@ -2,17 +2,38 @@
 
 <h1 class="govuk-heading-xl"><%= I18n.t("planning.start_page.page_title") %></h1>
 
-<h2 class="govuk-heading-l"><%= I18n.t("planning.start_page.overview_title") %></h2>
 <% I18n.t("planning.start_page.overview_body").each do |paragraph| %>
   <p class="govuk-body"><%= paragraph %></p>
 <% end %>
 
-<h2 class="govuk-heading-l"><%= I18n.t("planning.start_page.before_you_start_title") %></h2>
-<p class="govuk-body"><%= I18n.t("planning.start_page.before_you_start_list_title") %></p>
+<h2 class="govuk-heading-l"><%= I18n.t("planning.start_page.who_for_title") %></h2>
+<p class="govuk-body"><%= I18n.t("planning.start_page.who_for_can_use_body") %></p>
 <ul class="govuk-list govuk-list--bullet"">
-  <% I18n.t("planning.start_page.before_you_start_list_items").each do |list_item| %>
+  <% I18n.t("planning.start_page.who_for_can_use_list").each do |list_item| %>
     <li><%= list_item %></li>
   <% end %>
 </ul>
-<p class="govuk-body"><%= I18n.t("planning.start_page.before_you_start_body") %></p>
+<p class="govuk-body"><%= I18n.t("planning.start_page.who_for_cannot_use_body") %></p>
+<ul class="govuk-list govuk-list--bullet"">
+  <% I18n.t("planning.start_page.who_for_cannot_use_list").each do |list_item| %>
+    <li><%= list_item %></li>
+  <% end %>
+</ul>
+
+<h2 class="govuk-heading-l"><%= I18n.t("planning.start_page.how_service_works_title") %></h2>
+<p class="govuk-body"><%= I18n.t("planning.start_page.how_service_works_document_body") %></p>
+<ul class="govuk-list govuk-list--bullet"">
+  <% I18n.t("planning.start_page.how_service_works_document_list").each do |list_item| %>
+    <li><%= list_item %></li>
+  <% end %>
+</ul>
+<p class="govuk-body"><%= I18n.t("planning.start_page.how_service_works_themes_body") %></p>
+<ul class="govuk-list govuk-list--bullet"">
+  <% I18n.t("planning.start_page.how_service_works_themes_list").each do |list_item| %>
+    <li><%= list_item %></li>
+  <% end %>
+</ul>
+
+<p class="govuk-body"><%= I18n.t("planning.start_page.pause_and_resume_body") %></p>
+
 <%= link_to I18n.t("generic.button.start"), new_journey_path, class: "govuk-button" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 466884702..06d01fd2e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -6,7 +6,7 @@ en:
       default: "%-d %b %Y"
   generic:
     button:
-      start: "Continue"
+      start: "Start"
       next: "Continue"
       change_answer: "Change"
       update: "Update"
@@ -19,21 +19,35 @@ en:
       message: "This environment is only for previewing Contentful changes before publishing."
   planning:
     start_page:
-      page_title: "Identify the level of support you need for what you're buying"
-      overview_title: "Overview"
+      page_title: Create a specification to procure a catering service for your school
       overview_body:
-        - "Get the right level of support you need to buy goods and services for your school."
-        - "By telling us about your experience and confidence levels in buying the goods or service, we will tailor the guidance that will be shown to you on screen."
-        - "More guidance will be shown if you need more support. For experienced buyers, the guidance will be hidden, but will be accessible to you within each page if you need it."
-      before_you_start_title: "Before you start"
-      before_you_start_list_title: "Consider:"
-      before_you_start_list_items:
-        - any previous experience in buying the goods or services you need
-        - your level of understanding of the procurement process
-        - your school's procurement policy
-        - support you have access to in your school
-        - information on the current contract
-      before_you_start_body: "It will take around 3 minutes to complete the process"
+        - Use this service to create a specification for a new catering service for a single school in England.
+      who_for_title: Who this service is for
+      who_for_can_use_body: "You can use this service if you:"
+      who_for_can_use_list:
+        - are responsible for procuring a new catering service for a school
+        - are procuring for one school – either a local authority maintained school or an academy in a single or multi-academy trust
+        - intend to run your own procurement process or choose a supplier from a framework – read more about the different procurement routes you can take
+      who_for_cannot_use_body: "You currently cannot use this service to create a specification for any of the following:"
+      who_for_cannot_use_list:
+        - any other service outside of catering
+        - goods, supplies or equipment only
+        - multiple schools at the same time
+      how_service_works_title: How this service works
+      how_service_works_document_body: "Use this service to create a document that:"
+      how_service_works_document_list:
+        - describes the service your school is looking for
+        - collates all the information that any suppliers interested in your contract need to know
+        - includes all the standard regulations and requirements that school catering suppliers must comply with – we’ll add these automatically for you, you do not need to know what these are
+      how_service_works_themes_body: "We’ll guide you through a series of questions about your school and your requirements, including specific questions around the following themes:"
+      how_service_works_themes_list:
+        - any mission statement, food policy or goals your school has that are relevant to the new service
+        - any objectives you may have relating to social value
+        - any requirements you may have relating to management of the contract, operational overheads and staff
+        - the dates, types, times and customer numbers of existing catering services
+        - any requirements for the food served, as well as ordering and payment systems
+        - the catering spaces and equipment available to a supplier in your school
+      pause_and_resume_body: You can pause and resume your specification at any time.
     errors:
       contentful_entry_not_found: "An unexpected error occurred. The starting step has been revoked by the content team."
   journey:
diff --git a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
index 31203aa32..4429056ac 100644
--- a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
@@ -6,15 +6,30 @@
 
     expect(page).to have_content(I18n.t("planning.start_page.page_title"))
 
-    expect(page).to have_content(I18n.t("planning.start_page.overview_title"))
     I18n.t("planning.start_page.overview_body").each do |paragraph|
       expect(page).to have_content(paragraph)
     end
 
-    expect(page).to have_content(I18n.t("planning.start_page.before_you_start_list_title"))
-    I18n.t("planning.start_page.before_you_start_list_items").each do |list_item|
+    expect(page).to have_content(I18n.t("planning.start_page.who_for_title"))
+    expect(page).to have_content(I18n.t("planning.start_page.who_for_can_use_body"))
+    I18n.t("planning.start_page.who_for_can_use_list").each do |list_item|
       expect(page).to have_content(list_item)
     end
-    expect(page).to have_content(I18n.t("planning.start_page.before_you_start_body"))
+    expect(page).to have_content(I18n.t("planning.start_page.who_for_cannot_use_body"))
+    I18n.t("planning.start_page.who_for_cannot_use_list").each do |list_item|
+      expect(page).to have_content(list_item)
+    end
+
+    expect(page).to have_content(I18n.t("planning.start_page.how_service_works_title"))
+    expect(page).to have_content(I18n.t("planning.start_page.how_service_works_document_body"))
+    I18n.t("planning.start_page.how_service_works_document_list").each do |list_item|
+      expect(page).to have_content(list_item)
+    end
+    expect(page).to have_content(I18n.t("planning.start_page.how_service_works_themes_body"))
+    I18n.t("planning.start_page.how_service_works_themes_list").each do |list_item|
+      expect(page).to have_content(list_item)
+    end
+
+    expect(page).to have_content(I18n.t("planning.start_page.pause_and_resume_body"))
   end
 end

From 3585833c2e82a191c06a658f46818fc549884ac3 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Thu, 4 Feb 2021 13:28:54 +0000
Subject: [PATCH 056/249] Be more explicit about what links on journey map do

Previously, each step title would link directly to the step in
Contentful, with no context about the action which would happen. This
changes behaviour so that the step title is not a link, and there is an
explicit link to the "edit" action below.

This paves the way to adding additional context and information to each
step in the map.
---
 CHANGELOG.md                                   |  1 +
 app/views/journey_maps/new.html.erb            |  3 ++-
 config/locales/en.yml                          |  1 +
 ...n_see_the_map_of_journey_steps_page_spec.rb | 18 +++++++++++++++---
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0e96ca6a..d3f788568 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - robots.txt now excludes all journey and step pages
 - steps/questions/tasks in the task lists are now grouped by Contentful Section entries
 - start page now has revised copy with details on eligibility and what to expect
+- The journey map is now clearer about what happens when you click a link
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/views/journey_maps/new.html.erb b/app/views/journey_maps/new.html.erb
index 9ed3d8d1f..a007ad7b4 100644
--- a/app/views/journey_maps/new.html.erb
+++ b/app/views/journey_maps/new.html.erb
@@ -4,7 +4,8 @@
 <ol class="govuk-list govuk-list--number">
   <% @steps.each do |entry| %>
     <li>
-      <%= link_to entry.title, "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/#{entry.id}", target: :blank, class: "govuk-link" %>
+      <b><%= entry.title %></b><br>
+      <small><%= link_to I18n.t("journey_map.edit_step_link_text"), "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/#{entry.id}", target: :blank, class: "govuk-link" %></small>
     </li>
   <% end %>
 </ol>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 06d01fd2e..e21ffaed1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -59,6 +59,7 @@ en:
       completed: Completed
   journey_map:
     page_title: "Contentful entry map"
+    edit_step_link_text: "Edit step in Contentful"
   resume:
     notification:
       title: "Returning to this specification"
diff --git a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
index 82d6cb2ee..d53bcbaef 100644
--- a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
@@ -19,23 +19,35 @@
     within(".govuk-list") do
       list_items = find_all("li")
       within(list_items[0]) do
+        expect(page)
+          .to have_content(
+            "Which service do you need?"
+          )
         expect(page)
           .to have_link(
-            "Which service do you need?",
+            I18n.t("journey_map.edit_step_link_text"),
             href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/radio-question"
           )
       end
       within(list_items[1]) do
+        expect(page)
+          .to have_content(
+            "What email address did you use?"
+          )
         expect(page)
           .to have_link(
-            "What email address did you use?",
+            I18n.t("journey_map.edit_step_link_text"),
             href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/short-text-question"
           )
       end
       within(list_items[2]) do
+        expect(page)
+          .to have_content(
+            "Describe what you need"
+          )
         expect(page)
           .to have_link(
-            "Describe what you need",
+            I18n.t("journey_map.edit_step_link_text"),
             href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/long-text-question"
           )
       end

From c78e14b386c5ed90c63e689a67ee74d7a70e6643 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Thu, 4 Feb 2021 13:31:18 +0000
Subject: [PATCH 057/249] Increase spacing between items in journey map

This improves visibility of each step within the journey map
---
 app/views/journey_maps/new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/journey_maps/new.html.erb b/app/views/journey_maps/new.html.erb
index a007ad7b4..6c322e498 100644
--- a/app/views/journey_maps/new.html.erb
+++ b/app/views/journey_maps/new.html.erb
@@ -3,7 +3,7 @@
 
 <ol class="govuk-list govuk-list--number">
   <% @steps.each do |entry| %>
-    <li>
+    <li class="govuk-!-margin-bottom-4">
       <b><%= entry.title %></b><br>
       <small><%= link_to I18n.t("journey_map.edit_step_link_text"), "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/#{entry.id}", target: :blank, class: "govuk-link" %></small>
     </li>

From d41c3a601f9cc83ab28d8e851892ac5719638d3e Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Thu, 4 Feb 2021 13:36:18 +0000
Subject: [PATCH 058/249] Add preview links to steps in journey map

For any step, quickly jump to a preview of the step in the service
itself.
---
 CHANGELOG.md                                      |  1 +
 app/views/journey_maps/new.html.erb               |  5 ++++-
 config/locales/en.yml                             |  1 +
 ..._can_see_the_map_of_journey_steps_page_spec.rb | 15 +++++++++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3f788568..fa2a10e6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - steps/questions/tasks in the task lists are now grouped by Contentful Section entries
 - start page now has revised copy with details on eligibility and what to expect
 - The journey map is now clearer about what happens when you click a link
+- The journey map now includes links to preview a step
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/views/journey_maps/new.html.erb b/app/views/journey_maps/new.html.erb
index 6c322e498..3553a487a 100644
--- a/app/views/journey_maps/new.html.erb
+++ b/app/views/journey_maps/new.html.erb
@@ -5,7 +5,10 @@
   <% @steps.each do |entry| %>
     <li class="govuk-!-margin-bottom-4">
       <b><%= entry.title %></b><br>
-      <small><%= link_to I18n.t("journey_map.edit_step_link_text"), "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/#{entry.id}", target: :blank, class: "govuk-link" %></small>
+      <small>
+        <%= link_to I18n.t("journey_map.edit_step_link_text"), "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/#{entry.id}", target: :blank, class: "govuk-link" %> &middot;
+        <%= link_to I18n.t("journey_map.preview_step_link_text"), preview_entry_path(entry.id), target: :blank, class: "govuk-link" %>
+      </small>
     </li>
   <% end %>
 </ol>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e21ffaed1..2ab119c26 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -60,6 +60,7 @@ en:
   journey_map:
     page_title: "Contentful entry map"
     edit_step_link_text: "Edit step in Contentful"
+    preview_step_link_text: "Preview step in service"
   resume:
     notification:
       title: "Returning to this specification"
diff --git a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
index d53bcbaef..286dc0389 100644
--- a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
@@ -28,6 +28,11 @@
             I18n.t("journey_map.edit_step_link_text"),
             href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/radio-question"
           )
+        expect(page)
+          .to have_link(
+            I18n.t("journey_map.preview_step_link_text"),
+            href: preview_entry_path("radio-question")
+          )
       end
       within(list_items[1]) do
         expect(page)
@@ -39,6 +44,11 @@
             I18n.t("journey_map.edit_step_link_text"),
             href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/short-text-question"
           )
+        expect(page)
+          .to have_link(
+            I18n.t("journey_map.preview_step_link_text"),
+            href: preview_entry_path("short-text-question")
+          )
       end
       within(list_items[2]) do
         expect(page)
@@ -50,6 +60,11 @@
             I18n.t("journey_map.edit_step_link_text"),
             href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/long-text-question"
           )
+        expect(page)
+          .to have_link(
+            I18n.t("journey_map.preview_step_link_text"),
+            href: preview_entry_path("long-text-question")
+          )
       end
     end
   end

From 3c9001f3321f05032c566e2d40716ccd791330f2 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Thu, 4 Feb 2021 13:41:11 +0000
Subject: [PATCH 059/249] Add specification template tags to the journey map

This provides a single reference point for the tags which can be used in
Liquid specification templates for all steps in a journey, saving having
to refer to Contentful.
---
 CHANGELOG.md                                         |  1 +
 app/views/journey_maps/new.html.erb                  |  3 ++-
 config/locales/en.yml                                |  1 +
 ...one_can_see_the_map_of_journey_steps_page_spec.rb | 12 ++++++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa2a10e6d..5898659cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - start page now has revised copy with details on eligibility and what to expect
 - The journey map is now clearer about what happens when you click a link
 - The journey map now includes links to preview a step
+- The journey map now displays markup to include a step's answer in the specification template
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/views/journey_maps/new.html.erb b/app/views/journey_maps/new.html.erb
index 3553a487a..d95b3f5ae 100644
--- a/app/views/journey_maps/new.html.erb
+++ b/app/views/journey_maps/new.html.erb
@@ -7,7 +7,8 @@
       <b><%= entry.title %></b><br>
       <small>
         <%= link_to I18n.t("journey_map.edit_step_link_text"), "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/#{entry.id}", target: :blank, class: "govuk-link" %> &middot;
-        <%= link_to I18n.t("journey_map.preview_step_link_text"), preview_entry_path(entry.id), target: :blank, class: "govuk-link" %>
+        <%= link_to I18n.t("journey_map.preview_step_link_text"), preview_entry_path(entry.id), target: :blank, class: "govuk-link" %><br>
+        <%= I18n.t("journey_map.spec_template_tag_title") %>: <code>{{ answer_<%= entry.id %> }}</code>
       </small>
     </li>
   <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2ab119c26..ce949d7fc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -61,6 +61,7 @@ en:
     page_title: "Contentful entry map"
     edit_step_link_text: "Edit step in Contentful"
     preview_step_link_text: "Preview step in service"
+    spec_template_tag_title: "Specification tag"
   resume:
     notification:
       title: "Returning to this specification"
diff --git a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
index 286dc0389..5b512f35d 100644
--- a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
@@ -33,6 +33,10 @@
             I18n.t("journey_map.preview_step_link_text"),
             href: preview_entry_path("radio-question")
           )
+        expect(page)
+          .to have_content(
+            "{{ answer_radio-question }}"
+          )
       end
       within(list_items[1]) do
         expect(page)
@@ -49,6 +53,10 @@
             I18n.t("journey_map.preview_step_link_text"),
             href: preview_entry_path("short-text-question")
           )
+        expect(page)
+          .to have_content(
+            "{{ answer_short-text-question }}"
+          )
       end
       within(list_items[2]) do
         expect(page)
@@ -65,6 +73,10 @@
             I18n.t("journey_map.preview_step_link_text"),
             href: preview_entry_path("long-text-question")
           )
+        expect(page)
+          .to have_content(
+            "{{ answer_long-text-question }}"
+          )
       end
     end
   end

From 2565180272dd6ea24da1c2cfdfce7884bbf8296f Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Mon, 1 Feb 2021 15:45:20 +0000
Subject: [PATCH 060/249] Raise an exception when AnswerFactory receives
 unexpected question type

---
 app/services/answer_factory.rb       | 3 +++
 spec/services/answer_factory_spec.rb | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/services/answer_factory.rb b/app/services/answer_factory.rb
index b42b9392e..0b758ec97 100644
--- a/app/services/answer_factory.rb
+++ b/app/services/answer_factory.rb
@@ -1,4 +1,6 @@
 class AnswerFactory
+  class UnexpectedQuestionType < StandardError; end
+
   attr_accessor :step
 
   def initialize(step:)
@@ -12,6 +14,7 @@ def call
     when "long_text" then LongTextAnswer.new
     when "single_date" then SingleDateAnswer.new
     when "checkboxes" then CheckboxAnswers.new
+    else raise UnexpectedQuestionType.new "Trying to create answer for unknown question type #{step.contentful_type}"
     end
   end
 end
diff --git a/spec/services/answer_factory_spec.rb b/spec/services/answer_factory_spec.rb
index 05e16c883..7e9ed9d0a 100644
--- a/spec/services/answer_factory_spec.rb
+++ b/spec/services/answer_factory_spec.rb
@@ -2,6 +2,15 @@
 
 RSpec.describe AnswerFactory do
   describe "#call" do
+    context "when the step is for an unknown question type" do
+      it "raises an unexpected question type error" do
+        step = create(:step, options: nil, contentful_model: "question", contentful_type: "telepathy")
+        expect {
+          described_class.new(step: step).call
+        }.to raise_error(AnswerFactory::UnexpectedQuestionType)
+      end
+    end
+
     context "when the step is for radios" do
       it "returns a new RadioAnswer object" do
         step = create(:step, :radio)

From d2ba85f8e7ffc81575bdca9e99e8e71382db5d87 Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Wed, 27 Jan 2021 17:04:30 +0000
Subject: [PATCH 061/249] Users can answer questions which expect a number

---
 CHANGELOG.md                                  |  1 +
 app/controllers/journeys_controller.rb        |  2 +-
 app/models/number_answer.rb                   |  6 +++
 app/models/step.rb                            |  4 +-
 app/presenters/number_answer_presenter.rb     |  2 +
 app/services/answer_factory.rb                |  1 +
 app/services/create_journey_step.rb           |  1 +
 app/services/find_all_journey_answers.rb      |  1 +
 app/views/steps/number.html.erb               |  6 +++
 config/environments/test.rb                   |  1 +
 .../20210127154732_create_number_answer.rb    | 13 ++++++
 db/schema.rb                                  |  8 ++++
 spec/factories/answer.rb                      |  6 +++
 spec/factories/step.rb                        |  6 +++
 .../anyone_can_complete_a_journey_spec.rb     | 31 +++++++++++++
 .../categories/number-question.json           | 44 +++++++++++++++++++
 .../contentful/sections/number-section.json   | 43 ++++++++++++++++++
 .../contentful/steps/number-question.json     | 37 ++++++++++++++++
 .../number_answer_presenter_spec.rb           | 11 +++++
 spec/services/answer_factory_spec.rb          |  8 ++++
 20 files changed, 230 insertions(+), 2 deletions(-)
 create mode 100644 app/models/number_answer.rb
 create mode 100644 app/presenters/number_answer_presenter.rb
 create mode 100644 app/views/steps/number.html.erb
 create mode 100644 db/migrate/20210127154732_create_number_answer.rb
 create mode 100644 spec/fixtures/contentful/categories/number-question.json
 create mode 100644 spec/fixtures/contentful/sections/number-section.json
 create mode 100644 spec/fixtures/contentful/steps/number-question.json
 create mode 100644 spec/presenters/number_answer_presenter_spec.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5898659cc..5575df420 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - The journey map is now clearer about what happens when you click a link
 - The journey map now includes links to preview a step
 - The journey map now displays markup to include a step's answer in the specification template
+- users can answer questions which expect a number
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 208d40a6d..927bc8c25 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -24,7 +24,7 @@ def new
 
   def show
     @journey = Journey.includes(
-      steps: [:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers]
+      steps: [:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers, :number_answer]
     ).find(journey_id)
     @steps = @journey.steps.map { |step| StepPresenter.new(step) }
     @section_groups = @journey.section_groups.each_with_object({}) { |group, result|
diff --git a/app/models/number_answer.rb b/app/models/number_answer.rb
new file mode 100644
index 000000000..b914ce779
--- /dev/null
+++ b/app/models/number_answer.rb
@@ -0,0 +1,6 @@
+class NumberAnswer < ActiveRecord::Base
+  self.implicit_order_column = "created_at"
+  belongs_to :step
+
+  validates :response, presence: true, numericality: {only_integer: true}
+end
diff --git a/app/models/step.rb b/app/models/step.rb
index d1cab14c7..c5924e3d5 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -7,6 +7,7 @@ class Step < ApplicationRecord
   has_one :long_text_answer
   has_one :single_date_answer
   has_one :checkbox_answers
+  has_one :number_answer
 
   scope :that_are_questions, -> { where(contentful_model: "question") }
 
@@ -16,7 +17,8 @@ def answer
       short_text_answer ||
       long_text_answer ||
       single_date_answer ||
-      checkbox_answers
+      checkbox_answers ||
+      number_answer
   end
 
   def primary_call_to_action_text
diff --git a/app/presenters/number_answer_presenter.rb b/app/presenters/number_answer_presenter.rb
new file mode 100644
index 000000000..e7629c70b
--- /dev/null
+++ b/app/presenters/number_answer_presenter.rb
@@ -0,0 +1,2 @@
+class NumberAnswerPresenter < SimpleDelegator
+end
diff --git a/app/services/answer_factory.rb b/app/services/answer_factory.rb
index 0b758ec97..361f1f521 100644
--- a/app/services/answer_factory.rb
+++ b/app/services/answer_factory.rb
@@ -10,6 +10,7 @@ def initialize(step:)
   def call
     case step.contentful_type
     when "radios" then RadioAnswer.new
+    when "number" then NumberAnswer.new
     when "short_text" then ShortTextAnswer.new
     when "long_text" then LongTextAnswer.new
     when "single_date" then SingleDateAnswer.new
diff --git a/app/services/create_journey_step.rb b/app/services/create_journey_step.rb
index c2efb8ce3..b7cf865db 100644
--- a/app/services/create_journey_step.rb
+++ b/app/services/create_journey_step.rb
@@ -11,6 +11,7 @@ class UnexpectedContentfulStepType < StandardError; end
     paragraphs
     single_date
     checkboxes
+    number
   ].freeze
 
   attr_accessor :journey, :contentful_entry
diff --git a/app/services/find_all_journey_answers.rb b/app/services/find_all_journey_answers.rb
index c99603a0d..8cae7cdf2 100644
--- a/app/services/find_all_journey_answers.rb
+++ b/app/services/find_all_journey_answers.rb
@@ -16,6 +16,7 @@ def call
       when "RadioAnswer" then RadioAnswerPresenter.new(step.answer)
       when "SingleDateAnswer" then SingleDateAnswerPresenter.new(step.answer)
       when "CheckboxAnswers" then CheckboxesAnswerPresenter.new(step.answer)
+      when "NumberAnswer" then NumberAnswerPresenter.new(step.answer)
       else raise UnexpectedAnswer.new("Trying to present an unknown type of answer: #{step.answer.class.name}")
       end
 
diff --git a/app/views/steps/number.html.erb b/app/views/steps/number.html.erb
new file mode 100644
index 000000000..28c6b6ef7
--- /dev/null
+++ b/app/views/steps/number.html.erb
@@ -0,0 +1,6 @@
+<%= render layout: layout do |f| %>
+  <%= f.govuk_text_field :response,
+    label: { text: @step.title, size: "l" },
+    hint: { text: @step.help_text }
+  %>
+<% end %>
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 87d513e60..e6be30878 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -64,5 +64,6 @@
     Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :long_text_answer
     Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :single_date_answer
     Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :checkbox_answers
+    Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :number_answer
   end
 end
diff --git a/db/migrate/20210127154732_create_number_answer.rb b/db/migrate/20210127154732_create_number_answer.rb
new file mode 100644
index 000000000..acf25acdb
--- /dev/null
+++ b/db/migrate/20210127154732_create_number_answer.rb
@@ -0,0 +1,13 @@
+class CreateNumberAnswer < ActiveRecord::Migration[6.1]
+  def up
+    create_table :number_answers, id: :uuid do |t|
+      t.references :step, type: :uuid
+      t.integer :response, null: false
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :number_answers
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5d52883ad..55a4a7292 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -41,6 +41,14 @@
     t.index ["step_id"], name: "index_long_text_answers_on_step_id"
   end
 
+  create_table "number_answers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "step_id"
+    t.integer "response", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["step_id"], name: "index_number_answers_on_step_id"
+  end
+
   create_table "radio_answers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "step_id"
     t.string "response", null: false
diff --git a/spec/factories/answer.rb b/spec/factories/answer.rb
index 48e361a25..6b3cbd93f 100644
--- a/spec/factories/answer.rb
+++ b/spec/factories/answer.rb
@@ -29,4 +29,10 @@
 
     response { ["breakfast", "lunch", ""] }
   end
+
+  factory :number_answer do
+    association :step, factory: :step, contentful_type: "number", contentful_model: "question"
+
+    response { 150 }
+  end
 end
diff --git a/spec/factories/step.rb b/spec/factories/step.rb
index 99563e53e..49a9980a6 100644
--- a/spec/factories/step.rb
+++ b/spec/factories/step.rb
@@ -37,6 +37,12 @@
       contentful_type { "checkboxes" }
     end
 
+    trait :number do
+      options { nil }
+      contentful_model { "question" }
+      contentful_type { "number" }
+    end
+
     trait :static_content do
       options { nil }
       contentful_model { "staticContent" }
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index c8dc21ff8..4efb08155 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -45,6 +45,37 @@
       end
     end
 
+    context "when Contentful entry is of type numbers" do
+      scenario "user can answer using a number input" do
+        start_journey_from_category_and_go_to_question(category: "number-question.json")
+
+        fill_in "answer[response]", with: "190"
+        click_on(I18n.t("generic.button.next"))
+
+        click_first_link_in_task_list
+
+        expect(find_field("answer-response-field").value).to eql("190")
+      end
+
+      scenario "users receive an error when not entering a number" do
+        start_journey_from_category_and_go_to_question(category: "number-question.json")
+
+        fill_in "answer[response]", with: "foo"
+        click_on(I18n.t("generic.button.next"))
+
+        expect(page).to have_content("is not a number")
+      end
+
+      scenario "users receive an error when entering a decimal number" do
+        start_journey_from_category_and_go_to_question(category: "number-question.json")
+
+        fill_in "answer[response]", with: "435.65"
+        click_on(I18n.t("generic.button.next"))
+
+        expect(page).to have_content("must be an integer")
+      end
+    end
+
     context "when Contentful entry is of type long_text" do
       scenario "user can answer using free text with multiple lines" do
         start_journey_from_category_and_go_to_question(category: "long-text-question.json")
diff --git a/spec/fixtures/contentful/categories/number-question.json b/spec/fixtures/contentful/categories/number-question.json
new file mode 100644
index 000000000..6fb8b6c8b
--- /dev/null
+++ b/spec/fixtures/contentful/categories/number-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Number",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "number-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/number-section.json b/spec/fixtures/contentful/sections/number-section.json
new file mode 100644
index 000000000..ddba3ea4a
--- /dev/null
+++ b/spec/fixtures/contentful/sections/number-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "number-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "number-question"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/number-question.json b/spec/fixtures/contentful/steps/number-question.json
new file mode 100644
index 000000000..5ed0e299b
--- /dev/null
+++ b/spec/fixtures/contentful/steps/number-question.json
@@ -0,0 +1,37 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "number-question",
+        "type": "Number",
+        "createdAt": "2020-11-05T16:42:58.340Z",
+        "updatedAt": "2020-11-05T16:42:58.340Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/how-many-days-of-the-year-will-the-service-operate",
+        "title": "How many days of the year will the service operate?",
+        "helpText": "This is the maximum number of days including expected periods of school closures, such as snow days, inset days and polling days. It does not include unexpected periods of closures.",
+        "type": "number"
+    }
+}
diff --git a/spec/presenters/number_answer_presenter_spec.rb b/spec/presenters/number_answer_presenter_spec.rb
new file mode 100644
index 000000000..479903566
--- /dev/null
+++ b/spec/presenters/number_answer_presenter_spec.rb
@@ -0,0 +1,11 @@
+require "rails_helper"
+
+RSpec.describe NumberAnswerPresenter do
+  describe "#response" do
+    it "returns the response" do
+      step = build(:number_answer, response: 100)
+      presenter = described_class.new(step)
+      expect(presenter.response).to eq(100)
+    end
+  end
+end
diff --git a/spec/services/answer_factory_spec.rb b/spec/services/answer_factory_spec.rb
index 7e9ed9d0a..dd9164577 100644
--- a/spec/services/answer_factory_spec.rb
+++ b/spec/services/answer_factory_spec.rb
@@ -35,4 +35,12 @@
       end
     end
   end
+
+  context "when the step is for number" do
+    it "returns a new NumberAnswer object" do
+      step = create(:step, :number)
+      result = described_class.new(step: step).call
+      expect(result).to be_kind_of(NumberAnswer)
+    end
+  end
 end

From 499eb17fa9f6bf8f7554d2c5e130947478ed3e52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Feb 2021 11:03:12 +0000
Subject: [PATCH 062/249] Bump redis-namespace from 1.8.0 to 1.8.1

Bumps [redis-namespace](https://github.com/resque/redis-namespace) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/resque/redis-namespace/releases)
- [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md)
- [Commits](https://github.com/resque/redis-namespace/compare/v1.8.0...v1.8.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4f8bddefa..8f2710e13 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,7 +241,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redis (4.2.5)
-    redis-namespace (1.8.0)
+    redis-namespace (1.8.1)
       redis (>= 3.0.4)
     regexp_parser (2.0.3)
     rexml (3.2.4)

From 9468ce1779f1ca1b8bba0bc6e6cd86ba426f2b6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Feb 2021 11:03:23 +0000
Subject: [PATCH 063/249] Bump bootsnap from 1.7.0 to 1.7.1

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.7.0...v1.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4f8bddefa..a68ce1513 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,7 +68,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindex (0.8.1)
-    bootsnap (1.7.0)
+    bootsnap (1.7.1)
       msgpack (~> 1.0)
     brakeman (5.0.0)
     builder (3.2.4)

From e442d6139a0f441f53e84487d7e52c8f05547015 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Feb 2021 11:03:33 +0000
Subject: [PATCH 064/249] Bump database_cleaner from 2.0.0 to 2.0.1

Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases)
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc)
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v2.0.0...v2.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4f8bddefa..1c219645b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,12 +102,12 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    database_cleaner (2.0.0)
+    database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
     database_cleaner-active_record (2.0.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
-    database_cleaner-core (2.0.0)
+    database_cleaner-core (2.0.1)
     diff-lcs (1.4.4)
     docile (1.3.4)
     domain_name (0.5.20190701)

From 466f8fa0db99ca77caffe90caf8e95841829e0b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Feb 2021 11:03:11 +0000
Subject: [PATCH 065/249] Bump puma from 5.2.0 to 5.2.1

Bumps [puma](https://github.com/puma/puma) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.2.0...v5.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5f1ffa09d..a0c39d54e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,7 +189,7 @@ GEM
       ruby2_keywords
     msgpack (1.4.2)
     multi_json (1.15.0)
-    nio4r (2.5.4)
+    nio4r (2.5.5)
     nokogiri (1.11.1)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
@@ -201,7 +201,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.2.0)
+    puma (5.2.1)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.5.2)

From 0fb0e79aa983d5bb12c09ca463ead56e19fdbce0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Feb 2021 11:03:31 +0000
Subject: [PATCH 066/249] Bump bootsnap from 1.7.1 to 1.7.2

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.7.1 to 1.7.2.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.7.1...v1.7.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5f1ffa09d..a6a0ecef5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,7 +68,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindex (0.8.1)
-    bootsnap (1.7.1)
+    bootsnap (1.7.2)
       msgpack (~> 1.0)
     brakeman (5.0.0)
     builder (3.2.4)

From 10b6329e949c844e9d339dd6d2ae46a852a28d22 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Mon, 8 Feb 2021 11:52:50 +0000
Subject: [PATCH 067/249] Options are no longer capitalised in checkbox
 questions

The desired behaviour is that fields as displayed to the user in
checkbox questions are provided exactly as in Contentful. This commit
changes the behavior of `checkbox_options` in `StepHelper` to no longer
capitalise options.

NB: This does _not_ modify how checkbox options are rendered in
specification output, as further work is planned to provide a wider
range of options which will supersede this.
---
 CHANGELOG.md                                               | 1 +
 app/helpers/step_helper.rb                                 | 2 +-
 .../visitors/anyone_can_complete_a_journey_spec.rb         | 5 +++++
 spec/fixtures/contentful/steps/checkboxes-question.json    | 7 ++++---
 spec/helpers/step_helper_spec.rb                           | 4 ++--
 spec/presenters/checkboxes_answer_presenter_spec.rb        | 4 ++--
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5575df420..3a659642c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - The journey map now includes links to preview a step
 - The journey map now displays markup to include a step's answer in the specification template
 - users can answer questions which expect a number
+- checkbox questions no longer alter the capitalisation of options
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/helpers/step_helper.rb b/app/helpers/step_helper.rb
index c67f11950..dc153d116 100644
--- a/app/helpers/step_helper.rb
+++ b/app/helpers/step_helper.rb
@@ -3,7 +3,7 @@
 module StepHelper
   def checkbox_options(array_of_options:)
     array_of_options.map { |option|
-      OpenStruct.new(id: option.downcase, name: option.titleize)
+      OpenStruct.new(id: option.downcase, name: option)
     }
   end
 end
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 4efb08155..a1f034f6d 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -121,6 +121,11 @@
         expect(page).to have_checked_field("answer-response-breakfast-field")
         expect(page).to have_checked_field("answer-response-lunch-field")
       end
+
+      scenario "options follow the capitalisation given" do
+        start_journey_from_category_and_go_to_question(category: "checkboxes-question.json")
+        expect(page).to have_content("Morning break")
+      end
     end
 
     context "when Contentful entry is of type radios" do
diff --git a/spec/fixtures/contentful/steps/checkboxes-question.json b/spec/fixtures/contentful/steps/checkboxes-question.json
index cd8444e72..e90859e22 100644
--- a/spec/fixtures/contentful/steps/checkboxes-question.json
+++ b/spec/fixtures/contentful/steps/checkboxes-question.json
@@ -33,9 +33,10 @@
         "type": "checkboxes",
         "title": "Everyday services that are required and need to be considered",
         "extendedOptions": [
-          { "value": "breakfast" },
-          { "value": "lunch" },
-          { "value": "dinner" }
+          { "value": "Breakfast" },
+          { "value": "Morning break" },
+          { "value": "Lunch" },
+          { "value": "Dinner" }
         ]
     }
 }
diff --git a/spec/helpers/step_helper_spec.rb b/spec/helpers/step_helper_spec.rb
index 0603279db..a223ce955 100644
--- a/spec/helpers/step_helper_spec.rb
+++ b/spec/helpers/step_helper_spec.rb
@@ -6,8 +6,8 @@
       options = ["red", "blue"]
       result = helper.checkbox_options(array_of_options: options)
       expect(result).to match([
-        OpenStruct.new(id: "red", name: "Red"),
-        OpenStruct.new(id: "blue", name: "Blue")
+        OpenStruct.new(id: "red", name: "red"),
+        OpenStruct.new(id: "blue", name: "blue")
       ])
     end
   end
diff --git a/spec/presenters/checkboxes_answer_presenter_spec.rb b/spec/presenters/checkboxes_answer_presenter_spec.rb
index 13ab392c1..0bfae9a7f 100644
--- a/spec/presenters/checkboxes_answer_presenter_spec.rb
+++ b/spec/presenters/checkboxes_answer_presenter_spec.rb
@@ -3,9 +3,9 @@
 RSpec.describe CheckboxesAnswerPresenter do
   describe "#response" do
     it "returns all none nil values, capitalised as a comma separated string" do
-      step = build(:checkbox_answers, response: ["yes", "no", ""])
+      step = build(:checkbox_answers, response: ["yes", "no", "morning break", ""])
       presenter = described_class.new(step)
-      expect(presenter.response).to eq("Yes, No")
+      expect(presenter.response).to eq("Yes, No, Morning break")
     end
   end
 end

From ad6f1fbc7882f2ac856d46f55441ee2a7514dd5b Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 8 Feb 2021 12:28:00 +0000
Subject: [PATCH 068/249] Step factory randomly sets a unique contentful ID

This avoids ID clashing in the test suite. When e create multiple steps and they all have the same contentful_id this is a problem:

1. it's not realistic and may lead to unexpected bugs or gaps in our tests
2. makes it impractical to use this field for additional calculations (which is what I am looking to do)
---
 spec/factories/step.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/factories/step.rb b/spec/factories/step.rb
index 49a9980a6..1bd12e2c8 100644
--- a/spec/factories/step.rb
+++ b/spec/factories/step.rb
@@ -2,8 +2,8 @@
   factory :step do
     title { "What is your favourite colour?" }
     help_text { "Choose the primary colour closest to your choice" }
-    raw { {"sys": {"id" => "123"}} }
-    contentful_id { "123" }
+    contentful_id { SecureRandom.hex }
+    raw { |attrs| {"sys": {"id" => attrs["contentful_id"]}} }
 
     association :journey, factory: :journey
 

From f992b5191366767b7277b686138472f3fcc1e31e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 8 Feb 2021 12:32:56 +0000
Subject: [PATCH 069/249] Fix section and step ordering in the task list

We discovered a bug on staging where the section _and_ step ordering was mixed up and not as the user defined in Contentful.

Our tests did attempt to cover this but perhaps without enough sections/steps and with different title names.

When we saved the `section_group` onto the journey as a hash it would set a correctly ordered hash into the database in a different order. When we retrieved it the order would be different.

To fix this I have been very explicit about the ordering we expect in the data structure we set on the journey. Whilst I could have used a simpler array of steps and trusted the natural array index to keep track of the ordering, this felt implicit and not clear to the reader.

We store the data structure with the correct order values and use a helper to unpack the ordering and get the step objects ready for the view to handle as it did before.
---
 CHANGELOG.md                                  |  1 +
 app/controllers/journeys_controller.rb        |  3 -
 app/helpers/journey_helper.rb                 | 14 +++
 app/services/create_journey.rb                | 16 +++-
 app/views/journeys/show.html.erb              |  7 +-
 .../anyone_can_edit_their_answers_spec.rb     | 13 ++-
 .../anyone_can_view_a_list_of_tasks_spec.rb   | 13 ++-
 .../multiple-sections-and-steps.json          | 51 ++++++++++
 .../sections/multiple-long-text-section.json  | 50 ++++++++++
 .../sections/multiple-radio-section.json      | 50 ++++++++++
 spec/helpers/journey_helper_spec.rb           | 96 +++++++++++++++++++
 spec/services/create_journey_spec.rb          | 29 ++++++
 12 files changed, 332 insertions(+), 11 deletions(-)
 create mode 100644 app/helpers/journey_helper.rb
 create mode 100644 spec/fixtures/contentful/categories/multiple-sections-and-steps.json
 create mode 100644 spec/fixtures/contentful/sections/multiple-long-text-section.json
 create mode 100644 spec/fixtures/contentful/sections/multiple-radio-section.json
 create mode 100644 spec/helpers/journey_helper_spec.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a659642c..1f53e451a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - The journey map now displays markup to include a step's answer in the specification template
 - users can answer questions which expect a number
 - checkbox questions no longer alter the capitalisation of options
+- fix ordering of section and step items
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 927bc8c25..93d54e5f4 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -27,9 +27,6 @@ def show
       steps: [:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers, :number_answer]
     ).find(journey_id)
     @steps = @journey.steps.map { |step| StepPresenter.new(step) }
-    @section_groups = @journey.section_groups.each_with_object({}) { |group, result|
-      result[group[0]] = @steps.select { |step| group[1].include?(step.contentful_id) }
-    }
 
     @specification_template = Liquid::Template.parse(
       @journey.liquid_template, error_mode: :strict
diff --git a/app/helpers/journey_helper.rb b/app/helpers/journey_helper.rb
new file mode 100644
index 000000000..3f23aee1b
--- /dev/null
+++ b/app/helpers/journey_helper.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module JourneyHelper
+  def section_group_with_steps(journey:, steps:)
+    step_lookup = steps.group_by(&:contentful_id)
+
+    journey.section_groups.each do |section|
+      ordered_step_objects = section["steps"].each_with_object([]) { |step, result|
+        result[step["order"]] = step_lookup[step["contentful_id"]].first
+      }
+      section["steps"] = ordered_step_objects.compact
+    end
+  end
+end
diff --git a/app/services/create_journey.rb b/app/services/create_journey.rb
index 81974a0b3..9a5ba6a01 100644
--- a/app/services/create_journey.rb
+++ b/app/services/create_journey.rb
@@ -13,9 +13,7 @@ def call
       liquid_template: category.specification_template
     )
 
-    journey.section_groups = sections.each_with_object({}) { |section, result|
-      result[section.title] = section.steps.map(&:id)
-    }
+    journey.section_groups = build_section_groupings(sections: sections)
     journey.save
 
     sections.each do |section|
@@ -29,4 +27,16 @@ def call
 
     journey
   end
+
+  private def build_section_groupings(sections:)
+    sections.each_with_object([]).with_index { |(section, result), index|
+      result[index] = {
+        order: index,
+        title: section.title,
+        steps: section.steps.each_with_object([]).with_index { |(step, result), index|
+          result << {contentful_id: step.id, order: index}
+        }
+      }
+    }
+  end
 end
diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index 7407f3faf..d400a2de7 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -2,10 +2,11 @@
 
 <h1 class="govuk-heading-xl"><%= @journey.category.capitalize %></h1>
 <ol class="app-task-list">
-  <% @section_groups.each_pair do |section_title, steps| %>
-    <h2 class="app-task-list__section"><%= section_title %></h2>
+  
+  <% section_group_with_steps(journey: @journey, steps: @steps).each do |grouping| %>
+    <h2 class="app-task-list__section"><%= grouping["title"] %></h2>
     <li>
-      <%= render "step_list", journey: @journey, steps: steps %>
+      <%= render "step_list", journey: @journey, steps: grouping["steps"] %>
     </li>
   <% end %>
 </ol>
diff --git a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
index 78cc78dc9..71784beed 100644
--- a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
+++ b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
@@ -3,7 +3,18 @@
 feature "Users can edit their answers" do
   before do
     journey = answer.step.journey
-    journey.update(section_groups: {"Section A" => [answer.step.contentful_id]})
+    journey.update(section_groups: [
+      {
+        "order" => 0,
+        "title" => "Section A",
+        "steps" => [
+          {
+            "contentful_id" => answer.step.contentful_id,
+            "order" => 0
+          }
+        ]
+      }
+    ])
   end
   let(:answer) { create(:short_text_answer, response: "answer") }
 
diff --git a/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb b/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
index 416e31e21..23f47c000 100644
--- a/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
+++ b/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
@@ -27,7 +27,18 @@
   context "When a question has been answered" do
     before do
       journey = answer.step.journey
-      journey.update(section_groups: {"Section A" => [answer.step.contentful_id]})
+      journey.update(section_groups: [
+        {
+          "order" => 0,
+          "title" => "Section A",
+          "steps" => [
+            {
+              "contentful_id" => answer.step.contentful_id,
+              "order" => 0
+            }
+          ]
+        }
+      ])
     end
     let(:answer) { create(:short_text_answer, response: "answer") }
 
diff --git a/spec/fixtures/contentful/categories/multiple-sections-and-steps.json b/spec/fixtures/contentful/categories/multiple-sections-and-steps.json
new file mode 100644
index 000000000..98e670941
--- /dev/null
+++ b/spec/fixtures/contentful/categories/multiple-sections-and-steps.json
@@ -0,0 +1,51 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "multiple-radio-section"
+            }
+          },
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "multiple-long-text-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/multiple-long-text-section.json b/spec/fixtures/contentful/sections/multiple-long-text-section.json
new file mode 100644
index 000000000..49ddfd5b6
--- /dev/null
+++ b/spec/fixtures/contentful/sections/multiple-long-text-section.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "long-text-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section B",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "long-text-question"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "short-text-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/multiple-radio-section.json b/spec/fixtures/contentful/sections/multiple-radio-section.json
new file mode 100644
index 000000000..ecad2304a
--- /dev/null
+++ b/spec/fixtures/contentful/sections/multiple-radio-section.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "radio-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "radio-question"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "single-date-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/helpers/journey_helper_spec.rb b/spec/helpers/journey_helper_spec.rb
new file mode 100644
index 000000000..1d4d7df67
--- /dev/null
+++ b/spec/helpers/journey_helper_spec.rb
@@ -0,0 +1,96 @@
+require "rails_helper"
+
+RSpec.describe JourneyHelper, type: :helper do
+  describe "#section_group_with_steps" do
+    it "returns an ordered array of steps" do
+      journey = create(:journey, section_groups: "", steps: [])
+      step_1 = StepPresenter.new(create(:step, :radio, journey: journey))
+      step_2 = StepPresenter.new(create(:step, :long_text, journey: journey))
+      step_3 = StepPresenter.new(create(:step, :short_text, journey: journey))
+
+      section_groups = [
+        {
+          "order" => 0,
+          "title" => "Objectives",
+          "steps" => [
+            {
+              "contentful_id" => step_1.contentful_id,
+              "order" => 0
+            },
+            {
+              "contentful_id" => step_2.contentful_id,
+              "order" => 1
+            }
+          ]
+        },
+        {
+          "order" => 1,
+          "title" => "Social value",
+          "steps" => [
+            {
+              "contentful_id" => step_3.contentful_id,
+              "order" => 0
+            }
+          ]
+        }
+      ]
+      journey.update(section_groups: section_groups)
+
+      result = helper.section_group_with_steps(
+        journey: journey, steps: [step_1, step_2, step_3]
+      )
+
+      expect(result.first["steps"]).to eq([step_1, step_2])
+      expect(result.second["steps"]).to eq([step_3])
+    end
+  end
+
+  context "when the ordering we want does not match the order saved in the database" do
+    it "the ordering defined by 'order' is preserved" do
+      journey = create(:journey, section_groups: "", steps: [])
+      step_1 = StepPresenter.new(create(:step, :radio, title: "First question", journey: journey))
+      step_2 = StepPresenter.new(create(:step, :long_text, title: "Second question", journey: journey))
+      step_3 = StepPresenter.new(create(:step, :short_text, title: "Third question", journey: journey))
+      step_4 = StepPresenter.new(create(:step, :short_text, title: "Fourth question", journey: journey))
+
+      section_groups = [
+        {
+          "order" => 1,
+          "title" => "Objectives",
+          "steps" => [
+            {
+              "contentful_id" => step_2.contentful_id,
+              "order" => 2
+            },
+            {
+              "contentful_id" => step_1.contentful_id,
+              "order" => 1
+            },
+            {
+              "contentful_id" => step_3.contentful_id,
+              "order" => 3
+            }
+          ]
+        },
+        {
+          "order" => 0,
+          "title" => "Social value",
+          "steps" => [
+            {
+              "contentful_id" => step_4.contentful_id,
+              "order" => 0
+            }
+          ]
+        }
+      ]
+      journey.update(section_groups: section_groups)
+
+      result = helper.section_group_with_steps(
+        journey: journey, steps: [step_1, step_2, step_3, step_4]
+      )
+
+      expect(result.first["steps"]).to eq([step_1, step_2, step_3])
+      expect(result.second["steps"]).to eq([step_4])
+    end
+  end
+end
diff --git a/spec/services/create_journey_spec.rb b/spec/services/create_journey_spec.rb
index 910ca9929..1d4d68732 100644
--- a/spec/services/create_journey_spec.rb
+++ b/spec/services/create_journey_spec.rb
@@ -30,5 +30,34 @@
       expect(Journey.last.liquid_template)
         .to eql("<article id='specification'><h1>Liquid {{templating}}</h1></article>")
     end
+
+    it "stores the section grouping on the journey in the expected order" do
+      stub_contentful_category(
+        fixture_filename: "multiple-sections-and-steps.json"
+      )
+
+      described_class.new(category_name: "catering").call
+
+      journey = Journey.last
+
+      expect(journey.reload.section_groups).to eq([
+        {
+          "order" => 0,
+          "title" => "Section A",
+          "steps" => [
+            {"contentful_id" => "radio-question", "order" => 0},
+            {"contentful_id" => "single-date-question", "order" => 1}
+          ]
+        },
+        {
+          "order" => 1,
+          "title" => "Section B",
+          "steps" => [
+            {"contentful_id" => "long-text-question", "order" => 0},
+            {"contentful_id" => "short-text-question", "order" => 1}
+          ]
+        }
+      ])
+    end
   end
 end

From b6b54206568391c3fdc84992345663ef6113fd39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Feb 2021 11:02:43 +0000
Subject: [PATCH 070/249] Bump govuk-frontend from 3.10.2 to 3.11.0

Bumps [govuk-frontend](https://github.com/alphagov/govuk-frontend) from 3.10.2 to 3.11.0.
- [Release notes](https://github.com/alphagov/govuk-frontend/releases)
- [Changelog](https://github.com/alphagov/govuk-frontend/blob/master/CHANGELOG.md)
- [Commits](https://github.com/alphagov/govuk-frontend/compare/v3.10.2...v3.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95dc44d75..1447a4746 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,9 +4,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "govuk-frontend": {
-      "version": "3.10.2",
-      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.10.2.tgz",
-      "integrity": "sha512-MpMymgLsKoMw40MggZ0XLCAj1FY5N2s8Pf3aQR+k0cZOsegjLsnejxNfEB9qEl9jcma2fiiVcvsEZ+Ipo+Oo2g=="
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.11.0.tgz",
+      "integrity": "sha512-1hW/3etYBtKPM+PNdWVOijvWVI3mpYL8eb7WLTtlh/Qxf2mCp6LkCsZk9I034n4EJBYQ5jlUWsUlTOOIypftpg=="
     }
   }
 }
diff --git a/package.json b/package.json
index ade382d33..aa1b68d7d 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,6 @@
   "name": "rails-template",
   "private": true,
   "dependencies": {
-    "govuk-frontend": "^3.10.2"
+    "govuk-frontend": "^3.11.0"
   }
 }

From 6c36316a188aea12528f6de94185a78a2c113ea0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Feb 2021 11:03:36 +0000
Subject: [PATCH 071/249] Bump pry from 0.13.1 to 0.14.0

Bumps [pry](https://github.com/pry/pry) from 0.13.1 to 0.14.0.
- [Release notes](https://github.com/pry/pry/releases)
- [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pry/pry/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 81854cc5a..2c40c0d79 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,7 +197,7 @@ GEM
     parser (3.0.0.0)
       ast (~> 2.4.1)
     pg (1.2.3)
-    pry (0.13.1)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)

From bfe5a78c3217eeaf20e8565a63be1bc59631f9fd Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 9 Feb 2021 14:12:38 +0000
Subject: [PATCH 072/249] Move "resume journey" notification directly below
 title

This better matches the pattern as given by the GOV.UK Design Framework.
---
 app/views/journeys/show.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index d400a2de7..c68eb784f 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -1,8 +1,11 @@
 <%= content_for :title, @journey.category.capitalize %>
 
 <h1 class="govuk-heading-xl"><%= @journey.category.capitalize %></h1>
+
+<%= render "resume_journey_notice" %>
+
 <ol class="app-task-list">
-  
+
   <% section_group_with_steps(journey: @journey, steps: @steps).each do |grouping| %>
     <h2 class="app-task-list__section"><%= grouping["title"] %></h2>
     <li>
@@ -11,8 +14,6 @@
   <% end %>
 </ol>
 
-<%= render "resume_journey_notice" %>
-
 <h1 class="govuk-heading-l"><%= I18n.t("journey.specification.header") %></h1>
 <%= link_to "Download (.docx)", journey_path(@journey, format: :docx), class: "govuk-button" %>
 <%= @specification_template.render(@answers).html_safe %>

From 51d2be7cc11356ee49e5fa87abc49b7aff301047 Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Mon, 8 Feb 2021 11:28:08 +0000
Subject: [PATCH 073/249] Users can answer questions which expect a currency

The presenter adds the currency symbol and overloads the save method to
strip out commas.
Precision 11 has been set for the currency decimal
value within the database to ensure an element of future proofing. We
believe this value is higher than what any school would spend. This
helps give us confidence that there wouldn't need to be any changes to
the database in the future.

Co-authored-by: Tom <tomh@dxw.com>
---
 CHANGELOG.md                                  |  1 +
 app/controllers/journeys_controller.rb        |  2 +-
 app/models/currency_answer.rb                 | 14 ++++++
 app/models/step.rb                            |  4 +-
 app/presenters/currency_answer_presenter.rb   |  7 +++
 app/services/answer_factory.rb                |  1 +
 app/services/create_journey_step.rb           |  1 +
 app/services/find_all_journey_answers.rb      |  1 +
 app/views/steps/currency.html.erb             |  7 +++
 config/environments/test.rb                   |  1 +
 .../20210202120716_create_currency_answer.rb  | 13 ++++++
 db/schema.rb                                  |  8 ++++
 spec/factories/answer.rb                      |  6 +++
 spec/factories/step.rb                        |  6 +++
 .../anyone_can_complete_a_journey_spec.rb     | 22 ++++++++++
 .../categories/currency-question.json         | 44 +++++++++++++++++++
 .../contentful/sections/currency-section.json | 43 ++++++++++++++++++
 .../contentful/steps/currency-question.json   | 37 ++++++++++++++++
 spec/models/currency_answer_spec.rb           | 21 +++++++++
 .../currency_answer_presenter_spec.rb         | 11 +++++
 spec/services/answer_factory_spec.rb          |  8 ++++
 21 files changed, 256 insertions(+), 2 deletions(-)
 create mode 100644 app/models/currency_answer.rb
 create mode 100644 app/presenters/currency_answer_presenter.rb
 create mode 100644 app/views/steps/currency.html.erb
 create mode 100644 db/migrate/20210202120716_create_currency_answer.rb
 create mode 100644 spec/fixtures/contentful/categories/currency-question.json
 create mode 100644 spec/fixtures/contentful/sections/currency-section.json
 create mode 100644 spec/fixtures/contentful/steps/currency-question.json
 create mode 100644 spec/models/currency_answer_spec.rb
 create mode 100644 spec/presenters/currency_answer_presenter_spec.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f53e451a..c5e91fc6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - users can answer questions which expect a number
 - checkbox questions no longer alter the capitalisation of options
 - fix ordering of section and step items
+- users can answer questions which expect a currency
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 93d54e5f4..bfc76ae93 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -24,7 +24,7 @@ def new
 
   def show
     @journey = Journey.includes(
-      steps: [:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers, :number_answer]
+      steps: [:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers, :number_answer, :currency_answer]
     ).find(journey_id)
     @steps = @journey.steps.map { |step| StepPresenter.new(step) }
 
diff --git a/app/models/currency_answer.rb b/app/models/currency_answer.rb
new file mode 100644
index 000000000..ab422a0f4
--- /dev/null
+++ b/app/models/currency_answer.rb
@@ -0,0 +1,14 @@
+class CurrencyAnswer < ActiveRecord::Base
+  self.implicit_order_column = "created_at"
+  belongs_to :step
+
+  validates :response, presence: true, numericality: {greater_than_or_equal_to: 0, message: "does not accept £ signs or other non numerical characters"}
+
+  def response=(value)
+    if value.is_a?(String)
+      super(value.delete(","))
+      return
+    end
+    super(value)
+  end
+end
diff --git a/app/models/step.rb b/app/models/step.rb
index c5924e3d5..3cc8756df 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -8,6 +8,7 @@ class Step < ApplicationRecord
   has_one :single_date_answer
   has_one :checkbox_answers
   has_one :number_answer
+  has_one :currency_answer
 
   scope :that_are_questions, -> { where(contentful_model: "question") }
 
@@ -18,7 +19,8 @@ def answer
       long_text_answer ||
       single_date_answer ||
       checkbox_answers ||
-      number_answer
+      number_answer ||
+      currency_answer
   end
 
   def primary_call_to_action_text
diff --git a/app/presenters/currency_answer_presenter.rb b/app/presenters/currency_answer_presenter.rb
new file mode 100644
index 000000000..c1c13c8cc
--- /dev/null
+++ b/app/presenters/currency_answer_presenter.rb
@@ -0,0 +1,7 @@
+class CurrencyAnswerPresenter < SimpleDelegator
+  include ActionView::Helpers::NumberHelper
+
+  def response
+    number_to_currency(super, unit: "£", precision: 2)
+  end
+end
diff --git a/app/services/answer_factory.rb b/app/services/answer_factory.rb
index 361f1f521..f4a70d883 100644
--- a/app/services/answer_factory.rb
+++ b/app/services/answer_factory.rb
@@ -11,6 +11,7 @@ def call
     case step.contentful_type
     when "radios" then RadioAnswer.new
     when "number" then NumberAnswer.new
+    when "currency" then CurrencyAnswer.new
     when "short_text" then ShortTextAnswer.new
     when "long_text" then LongTextAnswer.new
     when "single_date" then SingleDateAnswer.new
diff --git a/app/services/create_journey_step.rb b/app/services/create_journey_step.rb
index b7cf865db..edbf6dcb8 100644
--- a/app/services/create_journey_step.rb
+++ b/app/services/create_journey_step.rb
@@ -12,6 +12,7 @@ class UnexpectedContentfulStepType < StandardError; end
     single_date
     checkboxes
     number
+    currency
   ].freeze
 
   attr_accessor :journey, :contentful_entry
diff --git a/app/services/find_all_journey_answers.rb b/app/services/find_all_journey_answers.rb
index 8cae7cdf2..4037a13ae 100644
--- a/app/services/find_all_journey_answers.rb
+++ b/app/services/find_all_journey_answers.rb
@@ -17,6 +17,7 @@ def call
       when "SingleDateAnswer" then SingleDateAnswerPresenter.new(step.answer)
       when "CheckboxAnswers" then CheckboxesAnswerPresenter.new(step.answer)
       when "NumberAnswer" then NumberAnswerPresenter.new(step.answer)
+      when "CurrencyAnswer" then CurrencyAnswerPresenter.new(step.answer)
       else raise UnexpectedAnswer.new("Trying to present an unknown type of answer: #{step.answer.class.name}")
       end
 
diff --git a/app/views/steps/currency.html.erb b/app/views/steps/currency.html.erb
new file mode 100644
index 000000000..6d07b3bb0
--- /dev/null
+++ b/app/views/steps/currency.html.erb
@@ -0,0 +1,7 @@
+<%= render layout: layout do |f| %>
+  <%= f.govuk_text_field :response,
+    label: { text: @step.title, size: "l" },
+    prefix_text: "£",
+    hint: { text: @step.help_text }
+  %>
+<% end %>
diff --git a/config/environments/test.rb b/config/environments/test.rb
index e6be30878..1349c2e8a 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -65,5 +65,6 @@
     Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :single_date_answer
     Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :checkbox_answers
     Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :number_answer
+    Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :currency_answer
   end
 end
diff --git a/db/migrate/20210202120716_create_currency_answer.rb b/db/migrate/20210202120716_create_currency_answer.rb
new file mode 100644
index 000000000..83b2b6071
--- /dev/null
+++ b/db/migrate/20210202120716_create_currency_answer.rb
@@ -0,0 +1,13 @@
+class CreateCurrencyAnswer < ActiveRecord::Migration[6.1]
+  def up
+    create_table :currency_answers, id: :uuid do |t|
+      t.references :step, type: :uuid
+      t.decimal :response, null: false, precision: 11, scale: 2
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :currency_answers
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 55a4a7292..5e795f0b5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -25,6 +25,14 @@
     t.index ["step_id"], name: "index_checkbox_answers_on_step_id"
   end
 
+  create_table "currency_answers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "step_id"
+    t.decimal "response", precision: 11, scale: 2, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["step_id"], name: "index_currency_answers_on_step_id"
+  end
+
   create_table "journeys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "category", null: false
     t.datetime "created_at", precision: 6, null: false
diff --git a/spec/factories/answer.rb b/spec/factories/answer.rb
index 6b3cbd93f..1ca6d54e2 100644
--- a/spec/factories/answer.rb
+++ b/spec/factories/answer.rb
@@ -35,4 +35,10 @@
 
     response { 150 }
   end
+
+  factory :currency_answer do
+    association :step, factory: :step, contentful_type: "currency", contentful_model: "question"
+
+    response { 1000.01 }
+  end
 end
diff --git a/spec/factories/step.rb b/spec/factories/step.rb
index 1bd12e2c8..990498b6b 100644
--- a/spec/factories/step.rb
+++ b/spec/factories/step.rb
@@ -43,6 +43,12 @@
       contentful_type { "number" }
     end
 
+    trait :currency do
+      options { nil }
+      contentful_model { "question" }
+      contentful_type { "currency" }
+    end
+
     trait :static_content do
       options { nil }
       contentful_model { "staticContent" }
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index a1f034f6d..bfb8732f2 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -76,6 +76,28 @@
       end
     end
 
+    context "when Contentful entry is of type currency" do
+      scenario "user can answer using a currency number input" do
+        start_journey_from_category_and_go_to_question(category: "currency-question.json")
+
+        fill_in "answer[response]", with: "1,000.01"
+        click_on(I18n.t("generic.button.next"))
+
+        click_first_link_in_task_list
+
+        expect(find_field("answer-response-field").value).to eql("1000.01")
+      end
+
+      scenario "throws error when non numerical values are entered" do
+        start_journey_from_category_and_go_to_question(category: "currency-question.json")
+
+        fill_in "answer[response]", with: "one hundred pounds"
+        click_on(I18n.t("generic.button.next"))
+
+        expect(page).to have_content("does not accept £ signs or other non numerical characters")
+      end
+    end
+
     context "when Contentful entry is of type long_text" do
       scenario "user can answer using free text with multiple lines" do
         start_journey_from_category_and_go_to_question(category: "long-text-question.json")
diff --git a/spec/fixtures/contentful/categories/currency-question.json b/spec/fixtures/contentful/categories/currency-question.json
new file mode 100644
index 000000000..68d2e80b0
--- /dev/null
+++ b/spec/fixtures/contentful/categories/currency-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Currency",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "currency-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/currency-section.json b/spec/fixtures/contentful/sections/currency-section.json
new file mode 100644
index 000000000..e73ea86f0
--- /dev/null
+++ b/spec/fixtures/contentful/sections/currency-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "currency-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "currency-question"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/currency-question.json b/spec/fixtures/contentful/steps/currency-question.json
new file mode 100644
index 000000000..1738f056a
--- /dev/null
+++ b/spec/fixtures/contentful/steps/currency-question.json
@@ -0,0 +1,37 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "currency-question",
+        "type": "Currency",
+        "createdAt": "2020-11-05T16:42:58.340Z",
+        "updatedAt": "2020-11-05T16:42:58.340Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/what-funds-does-the-school-have-available-for-the-maintenance-or-replacement-of-heavy-equipment-in-the-coming-year",
+        "title": "What funds does the school have available for the maintenance or replacement of heavy equipment in the coming year?",
+        "helpText": "Give an estimate of the funds available.",
+        "type": "currency"
+    }
+}
diff --git a/spec/models/currency_answer_spec.rb b/spec/models/currency_answer_spec.rb
new file mode 100644
index 000000000..5705fa1cb
--- /dev/null
+++ b/spec/models/currency_answer_spec.rb
@@ -0,0 +1,21 @@
+require "rails_helper"
+
+RSpec.describe CurrencyAnswer, type: :model do
+  it { should belong_to(:step) }
+
+  describe "#response" do
+    it "correctly strips out commas from a string" do
+      answer = build(:currency_answer, response: "1,000.01")
+      expect(answer.response).to eq(1000.01)
+    end
+
+    it "returns a number" do
+      answer = build(:currency_answer, response: "1000.01")
+      expect(answer.response).to eq(1000.01)
+    end
+  end
+
+  describe "validations" do
+    it { is_expected.to validate_presence_of(:response) }
+  end
+end
diff --git a/spec/presenters/currency_answer_presenter_spec.rb b/spec/presenters/currency_answer_presenter_spec.rb
new file mode 100644
index 000000000..bbfc1e113
--- /dev/null
+++ b/spec/presenters/currency_answer_presenter_spec.rb
@@ -0,0 +1,11 @@
+require "rails_helper"
+
+RSpec.describe CurrencyAnswerPresenter do
+  describe "#response" do
+    it "returns the response formatted as a currency" do
+      step = build(:currency_answer, response: 1000.01)
+      presenter = described_class.new(step)
+      expect(presenter.response).to eq("£1,000.01")
+    end
+  end
+end
diff --git a/spec/services/answer_factory_spec.rb b/spec/services/answer_factory_spec.rb
index dd9164577..1bc49b48f 100644
--- a/spec/services/answer_factory_spec.rb
+++ b/spec/services/answer_factory_spec.rb
@@ -43,4 +43,12 @@
       expect(result).to be_kind_of(NumberAnswer)
     end
   end
+
+  context "when the step is for currency" do
+    it "returns a new CurrencyAnswer object" do
+      step = create(:step, :currency)
+      result = described_class.new(step: step).call
+      expect(result).to be_kind_of(CurrencyAnswer)
+    end
+  end
 end

From e74ff0fcac17e6f228bf401c7b1784bb6b32d403 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Feb 2021 11:03:34 +0000
Subject: [PATCH 074/249] Bump faker from 2.15.1 to 2.16.0

Bumps [faker](https://github.com/faker-ruby/faker) from 2.15.1 to 2.16.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.15.1...v2.16.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2c40c0d79..425d0e746 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,7 +125,7 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    faker (2.15.1)
+    faker (2.16.0)
       i18n (>= 1.6, < 2)
     ffi (1.14.2)
     ffi-compiler (1.0.1)

From b0cd72c0f7d924c87538f0be90cc3e23b6dfbd2a Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 10 Feb 2021 11:31:59 +0000
Subject: [PATCH 075/249] Steps can store the state of whether they should be
 hidden

Default to false as the previous behaviour is always to show every step.
---
 db/migrate/20210209111509_add_hidden_state_to_step.rb | 5 +++++
 db/schema.rb                                          | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20210209111509_add_hidden_state_to_step.rb

diff --git a/db/migrate/20210209111509_add_hidden_state_to_step.rb b/db/migrate/20210209111509_add_hidden_state_to_step.rb
new file mode 100644
index 000000000..b98ee4aa3
--- /dev/null
+++ b/db/migrate/20210209111509_add_hidden_state_to_step.rb
@@ -0,0 +1,5 @@
+class AddHiddenStateToStep < ActiveRecord::Migration[6.1]
+  def change
+    add_column :steps, :hidden, :boolean, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5e795f0b5..73c3e8abc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_02_02_170113) do
+ActiveRecord::Schema.define(version: 2021_02_09_111509) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -95,6 +95,7 @@
     t.string "contentful_id", null: false
     t.jsonb "raw", null: false
     t.jsonb "options"
+    t.boolean "hidden", default: false
     t.index ["journey_id"], name: "index_steps_on_journey_id"
   end
 

From a4503417976243d13c751a50b3c712a46b66a900 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 10 Feb 2021 11:47:37 +0000
Subject: [PATCH 076/249] Contentful can mark a Step as hidden from the user by
 default

Steps that are marked as hidden will not appear in the task list. Meaning this change does not change anything for the user yet. The next change will look at at deciding when to mark a hidden step as ready or qualified to be shown.

This field is not required in Contentful for convienence. If the user doesn't specify Yes/No then we will assume the previous behaviour which is to always show it.
---
 CHANGELOG.md                                  |  1 +
 app/controllers/journeys_controller.rb        | 14 ++++--
 app/helpers/journey_helper.rb                 |  1 +
 app/services/create_journey_step.rb           |  7 +++
 .../anyone_can_view_a_list_of_tasks_spec.rb   | 12 +++++
 .../contentful/categories/hidden-field.json   | 44 ++++++++++++++++
 .../contentful/sections/hidden-section.json   | 50 +++++++++++++++++++
 .../contentful/steps/hidden-field.json        | 49 ++++++++++++++++++
 .../contentful/steps/no-hidden-field.json     | 48 ++++++++++++++++++
 .../contentful/steps/radio-question.json      |  3 +-
 .../contentful/steps/shown-field.json         | 49 ++++++++++++++++++
 spec/jobs/warm_entry_cache_job_spec.rb        |  2 +-
 spec/requests/contentful_caching_spec.rb      |  2 +-
 spec/services/create_journey_step_spec.rb     | 19 ++++++-
 spec/support/contentful_helpers.rb            |  1 +
 15 files changed, 295 insertions(+), 7 deletions(-)
 create mode 100644 spec/fixtures/contentful/categories/hidden-field.json
 create mode 100644 spec/fixtures/contentful/sections/hidden-section.json
 create mode 100644 spec/fixtures/contentful/steps/hidden-field.json
 create mode 100644 spec/fixtures/contentful/steps/no-hidden-field.json
 create mode 100644 spec/fixtures/contentful/steps/shown-field.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5e91fc6b..d29c5f417 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - checkbox questions no longer alter the capitalisation of options
 - fix ordering of section and step items
 - users can answer questions which expect a currency
+- questions can be hidden from view
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index bfc76ae93..66eb12d11 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -24,14 +24,22 @@ def new
 
   def show
     @journey = Journey.includes(
-      steps: [:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers, :number_answer, :currency_answer]
+      steps: [
+        :radio_answer,
+        :short_text_answer,
+        :long_text_answer,
+        :single_date_answer,
+        :checkbox_answers,
+        :number_answer,
+        :currency_answer
+      ]
     ).find(journey_id)
-    @steps = @journey.steps.map { |step| StepPresenter.new(step) }
+
+    @steps = @journey.steps.viewable.map { |step| StepPresenter.new(step) }
 
     @specification_template = Liquid::Template.parse(
       @journey.liquid_template, error_mode: :strict
     )
-
     @answers = FindAllJourneyAnswers.new(journey: @journey).call
     specification_html = @specification_template.render(@answers)
 
diff --git a/app/helpers/journey_helper.rb b/app/helpers/journey_helper.rb
index 3f23aee1b..87e6dbf12 100644
--- a/app/helpers/journey_helper.rb
+++ b/app/helpers/journey_helper.rb
@@ -6,6 +6,7 @@ def section_group_with_steps(journey:, steps:)
 
     journey.section_groups.each do |section|
       ordered_step_objects = section["steps"].each_with_object([]) { |step, result|
+        next unless step_lookup[step["contentful_id"]]
         result[step["order"]] = step_lookup[step["contentful_id"]].first
       }
       section["steps"] = ordered_step_objects.compact
diff --git a/app/services/create_journey_step.rb b/app/services/create_journey_step.rb
index edbf6dcb8..d0940f480 100644
--- a/app/services/create_journey_step.rb
+++ b/app/services/create_journey_step.rb
@@ -41,6 +41,7 @@ def call
       contentful_type: step_type,
       options: options,
       primary_call_to_action_text: primary_call_to_action_text,
+      hidden: hidden,
       raw: raw,
       journey: journey
     )
@@ -100,6 +101,12 @@ def primary_call_to_action_text
     contentful_entry.primary_call_to_action
   end
 
+  def hidden
+    return false unless contentful_entry.respond_to?(:always_show_the_user)
+    return false if contentful_entry.always_show_the_user.nil?
+    !contentful_entry.always_show_the_user
+  end
+
   def raw
     contentful_entry.raw
   end
diff --git a/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb b/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
index 23f47c000..20f3a259b 100644
--- a/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
+++ b/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
@@ -48,4 +48,16 @@
       expect(page).to have_content(I18n.t("task_list.status.completed"))
     end
   end
+
+  context "When a question has been hidden" do
+    it "should not appear in the task list" do
+      stub_contentful_category(fixture_filename: "hidden-field.json")
+      visit root_path
+
+      click_on(I18n.t("generic.button.start"))
+
+      expect(page).not_to have_content("You should NOT be able to see this question")
+      expect(page).to have_content("You should be able to see this question")
+    end
+  end
 end
diff --git a/spec/fixtures/contentful/categories/hidden-field.json b/spec/fixtures/contentful/categories/hidden-field.json
new file mode 100644
index 000000000..4ded472a5
--- /dev/null
+++ b/spec/fixtures/contentful/categories/hidden-field.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "hidden-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>{{answer_hidden-field}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/hidden-section.json b/spec/fixtures/contentful/sections/hidden-section.json
new file mode 100644
index 000000000..e6776e1b4
--- /dev/null
+++ b/spec/fixtures/contentful/sections/hidden-section.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "hidden-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "hidden-field"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "shown-field"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/hidden-field.json b/spec/fixtures/contentful/steps/hidden-field.json
new file mode 100644
index 000000000..c6ce2f5de
--- /dev/null
+++ b/spec/fixtures/contentful/steps/hidden-field.json
@@ -0,0 +1,49 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "hidden-field",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "You should NOT be able to see this question?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "School expert"
+            },
+            {
+                "value": "External expert"
+            },
+            {
+                "value": "None"
+            }
+        ],
+        "alwaysShowTheUser": false
+    }
+}
diff --git a/spec/fixtures/contentful/steps/no-hidden-field.json b/spec/fixtures/contentful/steps/no-hidden-field.json
new file mode 100644
index 000000000..f8a166510
--- /dev/null
+++ b/spec/fixtures/contentful/steps/no-hidden-field.json
@@ -0,0 +1,48 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "hidden-field",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "You should NOT be able to see this question?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "School expert"
+            },
+            {
+                "value": "External expert"
+            },
+            {
+                "value": "None"
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/radio-question.json b/spec/fixtures/contentful/steps/radio-question.json
index 93cbc00c6..870ae6272 100644
--- a/spec/fixtures/contentful/steps/radio-question.json
+++ b/spec/fixtures/contentful/steps/radio-question.json
@@ -40,6 +40,7 @@
           {
               "value": "Cleaning"
           }
-        ]
+        ],
+        "alwaysShowTheUser": true
     }
 }
diff --git a/spec/fixtures/contentful/steps/shown-field.json b/spec/fixtures/contentful/steps/shown-field.json
new file mode 100644
index 000000000..6ccbdbc07
--- /dev/null
+++ b/spec/fixtures/contentful/steps/shown-field.json
@@ -0,0 +1,49 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "shown-field",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "You should be able to see this question?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "School expert"
+            },
+            {
+                "value": "External expert"
+            },
+            {
+                "value": "None"
+            }
+        ],
+        "alwaysShowTheUser": true
+    }
+}
diff --git a/spec/jobs/warm_entry_cache_job_spec.rb b/spec/jobs/warm_entry_cache_job_spec.rb
index cf1d54d98..2fd8dd8fc 100644
--- a/spec/jobs/warm_entry_cache_job_spec.rb
+++ b/spec/jobs/warm_entry_cache_job_spec.rb
@@ -32,7 +32,7 @@
 
       expect(RedisCache.redis.get("contentful:entry:radio-question"))
         .to eql(
-          "\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\""
+          "\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}],\\\"alwaysShowTheUser\\\":true}}\""
         )
       expect(RedisCache.redis.get("contentful:entry:short-text-question"))
         .not_to be_nil
diff --git a/spec/requests/contentful_caching_spec.rb b/spec/requests/contentful_caching_spec.rb
index 8fb582c3e..d7eeb9424 100644
--- a/spec/requests/contentful_caching_spec.rb
+++ b/spec/requests/contentful_caching_spec.rb
@@ -48,7 +48,7 @@
       get new_journey_path
 
       expect(RedisCache.redis.get("contentful:entry:radio-question"))
-        .to eq("\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\"")
+        .to eq("\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}],\\\"alwaysShowTheUser\\\":true}}\"")
 
       RedisCache.redis.del("contentful:entry:radio-question")
     end
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index abfc863ee..098fee728 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -17,13 +17,15 @@
         expect(step.contentful_model).to eq("question")
         expect(step.contentful_type).to eq("radios")
         expect(step.options).to eq([{"value" => "Catering"}, {"value" => "Cleaning"}])
+        expect(step.hidden).to eq(false)
         expect(step.raw).to eq(
           "fields" => {
             "helpText" => "Tell us which service you need.",
             "extendedOptions" => [{"value" => "Catering"}, {"value" => "Cleaning"}],
             "slug" => "/which-service",
             "title" => "Which service do you need?",
-            "type" => "radios"
+            "type" => "radios",
+            "alwaysShowTheUser" => true
           },
           "sys" => {
             "contentType" => {
@@ -130,6 +132,21 @@
       end
     end
 
+    context "when no 'alwaysShowTheUser' is provided" do
+      it "default hidden to true" do
+        journey = create(:journey, :catering)
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/no-hidden-field.json"
+        )
+
+        step, _answer = described_class.new(
+          journey: journey, contentful_entry: fake_entry
+        ).call
+
+        expect(step.hidden).to eq(false)
+      end
+    end
+
     context "when the new entry has an unexpected content model" do
       it "raises an error" do
         journey = create(:journey, :catering)
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 9c8195a12..84022508f 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -147,6 +147,7 @@ def fake_contentful_step(contentful_fixture_filename:)
       type: hash_response.dig("fields", "type"),
       next: double(id: hash_response.dig("fields", "next", "sys", "id")),
       primary_call_to_action: hash_response.dig("fields", "primaryCallToAction"),
+      always_show_the_user: hash_response.dig("fields", "alwaysShowTheUser"),
       raw: hash_response,
       content_type: double(id: hash_response.dig("sys", "contentType", "sys", "id"))
     )

From 782201c77bb24124b3eef4b6e441c51956a2834f Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 10 Feb 2021 12:12:29 +0000
Subject: [PATCH 077/249] Fix bullet warnings by removing unnecessary scope

When adding a new feature this class starts to introduce bullet warnings due to steps being loaded that aren't used (because the scope was filtering them out)

If we remove this scope usage no unit tests fail which is a sign that it's not doing anything.

I added a new unit test to be sure of this. Making sure that we can safely ignore steps that don't have answers. This sits next to the test that makes sure we error when we find an unexpected answer.
---
 app/controllers/journeys_controller.rb        | 27 +++++++++----------
 app/models/journey.rb                         |  1 +
 ...ey_answers.rb => get_answers_for_steps.rb} | 10 +++----
 spec/factories/step.rb                        |  1 +
 ..._spec.rb => get_answers_for_steps_spec.rb} | 26 +++++++++++++-----
 5 files changed, 40 insertions(+), 25 deletions(-)
 rename app/services/{find_all_journey_answers.rb => get_answers_for_steps.rb} (81%)
 rename spec/services/{find_all_journey_answers_spec.rb => get_answers_for_steps_spec.rb} (70%)

diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 66eb12d11..62f34148a 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -23,24 +23,23 @@ def new
   end
 
   def show
-    @journey = Journey.includes(
-      steps: [
-        :radio_answer,
-        :short_text_answer,
-        :long_text_answer,
-        :single_date_answer,
-        :checkbox_answers,
-        :number_answer,
-        :currency_answer
-      ]
-    ).find(journey_id)
-
-    @steps = @journey.steps.viewable.map { |step| StepPresenter.new(step) }
+    @journey = Journey.find(journey_id)
+    @visible_steps = @journey.visible_steps.includes([
+      :radio_answer,
+      :short_text_answer,
+      :long_text_answer,
+      :single_date_answer,
+      :checkbox_answers,
+      :number_answer,
+      :currency_answer
+    ])
+    @steps = @visible_steps.map { |step| StepPresenter.new(step) }
 
     @specification_template = Liquid::Template.parse(
       @journey.liquid_template, error_mode: :strict
     )
-    @answers = FindAllJourneyAnswers.new(journey: @journey).call
+
+    @answers = GetAnswersForSteps.new(visible_steps: @visible_steps).call
     specification_html = @specification_template.render(@answers)
 
     respond_to do |format|
diff --git a/app/models/journey.rb b/app/models/journey.rb
index ec827d682..c89f8d55d 100644
--- a/app/models/journey.rb
+++ b/app/models/journey.rb
@@ -1,6 +1,7 @@
 class Journey < ApplicationRecord
   self.implicit_order_column = "created_at"
   has_many :steps
+  has_many :visible_steps, -> { where(steps: {hidden: false}) }, class_name: "Step"
 
   validates :liquid_template, presence: true
 end
diff --git a/app/services/find_all_journey_answers.rb b/app/services/get_answers_for_steps.rb
similarity index 81%
rename from app/services/find_all_journey_answers.rb
rename to app/services/get_answers_for_steps.rb
index 4037a13ae..4eb8e46ca 100644
--- a/app/services/find_all_journey_answers.rb
+++ b/app/services/get_answers_for_steps.rb
@@ -1,13 +1,13 @@
-class FindAllJourneyAnswers
+class GetAnswersForSteps
   class UnexpectedAnswer < StandardError; end
 
-  attr_accessor :journey
-  def initialize(journey:)
-    self.journey = journey
+  attr_accessor :visible_steps
+  def initialize(visible_steps:)
+    self.visible_steps = visible_steps
   end
 
   def call
-    @answers = @journey.steps.that_are_questions.each_with_object({}) { |step, hash|
+    visible_steps.each_with_object({}) { |step, hash|
       next unless step.answer
 
       answer = case step.answer.class.name
diff --git a/spec/factories/step.rb b/spec/factories/step.rb
index 990498b6b..28c4e19e6 100644
--- a/spec/factories/step.rb
+++ b/spec/factories/step.rb
@@ -4,6 +4,7 @@
     help_text { "Choose the primary colour closest to your choice" }
     contentful_id { SecureRandom.hex }
     raw { |attrs| {"sys": {"id" => attrs["contentful_id"]}} }
+    hidden { false }
 
     association :journey, factory: :journey
 
diff --git a/spec/services/find_all_journey_answers_spec.rb b/spec/services/get_answers_for_steps_spec.rb
similarity index 70%
rename from spec/services/find_all_journey_answers_spec.rb
rename to spec/services/get_answers_for_steps_spec.rb
index e6ff12888..b350cc3e8 100644
--- a/spec/services/find_all_journey_answers_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -3,20 +3,20 @@
 RSpec.shared_examples "returns the answer in a hash" do |factory_name, presenter, response|
   it "returns the response for a #{factory_name} in the result" do
     answer = create(factory_name, response: response)
-    result = described_class.new(journey: answer.step.journey).call
+    result = described_class.new(visible_steps: [answer.step]).call
     expect(result).to include(
       {"answer_#{answer.step.contentful_id}" => presenter.new(answer).response}
     )
   end
 end
 
-RSpec.describe FindAllJourneyAnswers do
+RSpec.describe GetAnswersForSteps do
   describe "#call" do
     it "only returns answers for the given journey" do
       relevant_answer = create(:short_text_answer, response: "Red")
       irrelevant_answer = create(:short_text_answer, response: "Blue")
 
-      result = described_class.new(journey: relevant_answer.step.journey).call
+      result = described_class.new(visible_steps: [relevant_answer.step]).call
 
       expect(result).to be_a(Hash)
       expect(result).to include(
@@ -50,7 +50,7 @@
     context "when a step does not have an answer" do
       it "the step does not have an answer in the result" do
         unanswered_step = create(:step, :radio)
-        result = described_class.new(journey: unanswered_step.journey).call
+        result = described_class.new(visible_steps: [unanswered_step]).call
         expect(result.keys).not_to include("answer_#{unanswered_step.contentful_id}")
       end
     end
@@ -61,8 +61,22 @@
           .and_return(double(class: double(name: "UnknownClass")))
         step = create(:step, :radio)
         expect {
-          described_class.new(journey: step.journey).call
-        }.to raise_error(FindAllJourneyAnswers::UnexpectedAnswer)
+          described_class.new(visible_steps: [step]).call
+        }.to raise_error(GetAnswersForSteps::UnexpectedAnswer)
+      end
+    end
+
+    context "when there is no answer for a step" do
+      it "does not try to prepare that answer in the result" do
+        journey = create(:journey)
+        answerable_step = create(:step, :radio, journey: journey)
+        _answer = create(:short_text_answer, step: answerable_step)
+        unanswerable_step = create(:step, :radio, journey: journey)
+
+        result = described_class.new(visible_steps: [answerable_step]).call
+
+        expect(result.keys).to include("answer_#{answerable_step.contentful_id}")
+        expect(result.keys).not_to include("answer_#{unanswerable_step.contentful_id}")
       end
     end
   end

From b55dd7c38cb298d3e4cb54790f473b20352c8ca1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:17:19 +0000
Subject: [PATCH 078/249] Bump rollbar from 3.1.1 to 3.1.2

Bumps [rollbar](https://github.com/rollbar/rollbar-gem) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/rollbar/rollbar-gem/releases)
- [Changelog](https://github.com/rollbar/rollbar-gem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollbar/rollbar-gem/compare/v3.1.1...v3.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 425d0e746..fff17f41e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -245,7 +245,7 @@ GEM
       redis (>= 3.0.4)
     regexp_parser (2.0.3)
     rexml (3.2.4)
-    rollbar (3.1.1)
+    rollbar (3.1.2)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.1)

From 0c3fc66d208e621c420db9562cdd3f92bf1b67f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Feb 2021 14:37:42 +0000
Subject: [PATCH 079/249] Bump rails from 6.1.1 to 6.1.2.1

Bumps [rails](https://github.com/rails/rails) from 6.1.1 to 6.1.2.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.1.1...v6.1.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |   2 +-
 Gemfile.lock | 112 +++++++++++++++++++++++++--------------------------
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/Gemfile b/Gemfile
index 553a96818..9179fc529 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem "puma", "~> 5.2"
 gem "redis", "~> 4.2"
 gem "redis-namespace"
 gem "rollbar"
-gem "rails", "~> 6.1.1"
+gem "rails", "~> 6.1.2"
 gem "sass-rails", "~> 6.0"
 gem "sidekiq", "~> 6.1"
 gem "sidekiq-cron", "~> 1.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index fff17f41e..aa5f92542 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,60 +1,60 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
+    actioncable (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.1)
-      actionpack (= 6.1.1)
-      activejob (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionmailbox (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      activejob (= 6.1.2.1)
+      activerecord (= 6.1.2.1)
+      activestorage (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.1)
-      actionpack (= 6.1.1)
-      actionview (= 6.1.1)
-      activejob (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionmailer (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      actionview (= 6.1.2.1)
+      activejob (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.1)
-      actionview (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionpack (6.1.2.1)
+      actionview (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.1)
-      actionpack (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    actiontext (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      activerecord (= 6.1.2.1)
+      activestorage (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.1)
-      activesupport (= 6.1.1)
+    actionview (6.1.2.1)
+      activesupport (= 6.1.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.1)
-      activesupport (= 6.1.1)
+    activejob (6.1.2.1)
+      activesupport (= 6.1.2.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.1)
-      activesupport (= 6.1.1)
-    activerecord (6.1.1)
-      activemodel (= 6.1.1)
-      activesupport (= 6.1.1)
-    activestorage (6.1.1)
-      actionpack (= 6.1.1)
-      activejob (= 6.1.1)
-      activerecord (= 6.1.1)
-      activesupport (= 6.1.1)
+    activemodel (6.1.2.1)
+      activesupport (= 6.1.2.1)
+    activerecord (6.1.2.1)
+      activemodel (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
+    activestorage (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      activejob (= 6.1.2.1)
+      activerecord (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
       marcel (~> 0.3.1)
       mimemagic (~> 0.3.2)
-    activesupport (6.1.1)
+    activesupport (6.1.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -156,7 +156,7 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
-    i18n (1.8.8)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     jbuilder (2.11.2)
       activesupport (>= 5.0.0)
@@ -208,20 +208,20 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.1)
-      actioncable (= 6.1.1)
-      actionmailbox (= 6.1.1)
-      actionmailer (= 6.1.1)
-      actionpack (= 6.1.1)
-      actiontext (= 6.1.1)
-      actionview (= 6.1.1)
-      activejob (= 6.1.1)
-      activemodel (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    rails (6.1.2.1)
+      actioncable (= 6.1.2.1)
+      actionmailbox (= 6.1.2.1)
+      actionmailer (= 6.1.2.1)
+      actionpack (= 6.1.2.1)
+      actiontext (= 6.1.2.1)
+      actionview (= 6.1.2.1)
+      activejob (= 6.1.2.1)
+      activemodel (= 6.1.2.1)
+      activerecord (= 6.1.2.1)
+      activestorage (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.1)
+      railties (= 6.1.2.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -229,9 +229,9 @@ GEM
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rails_layout (1.0.42)
-    railties (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
+    railties (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
       method_source
       rake (>= 0.8.7)
       thor (~> 1.0)
@@ -324,7 +324,7 @@ GEM
     standard (0.12.0)
       rubocop (= 1.8.1)
       rubocop-performance (= 1.9.2)
-    thor (1.0.1)
+    thor (1.1.0)
     tilt (2.0.10)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
@@ -384,7 +384,7 @@ DEPENDENCIES
   pg
   pry
   puma (~> 5.2)
-  rails (~> 6.1.1)
+  rails (~> 6.1.2)
   rails_layout
   redis (~> 4.2)
   redis-namespace

From 83697b624bb84aff9ed351c1b9a2e754dec90671 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 15 Feb 2021 16:27:25 +0000
Subject: [PATCH 080/249] Users see a spec warning when there are incomplete
 steps

* We make sure we exclude hidden steps from the calculation
---
 CHANGELOG.md                                  |  1 +
 app/models/journey.rb                         |  4 ++
 app/views/journeys/show.html.erb              |  9 ++++
 config/locales/en.yml                         |  1 +
 ...n_see_their_catering_specification_spec.rb | 12 +++++
 spec/models/journey_spec.rb                   | 52 +++++++++++++++++++
 6 files changed, 79 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d29c5f417..5d7c0f0e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - fix ordering of section and step items
 - users can answer questions which expect a currency
 - questions can be hidden from view
+- specification warning if there are incomplete tasks
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/models/journey.rb b/app/models/journey.rb
index c89f8d55d..024d4b76b 100644
--- a/app/models/journey.rb
+++ b/app/models/journey.rb
@@ -4,4 +4,8 @@ class Journey < ApplicationRecord
   has_many :visible_steps, -> { where(steps: {hidden: false}) }, class_name: "Step"
 
   validates :liquid_template, presence: true
+
+  def all_steps_completed?
+    visible_steps.all? { |step| step.answer.present? }
+  end
 end
diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index c68eb784f..6f0d106ad 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -15,5 +15,14 @@
 </ol>
 
 <h1 class="govuk-heading-l"><%= I18n.t("journey.specification.header") %></h1>
+<% unless @journey.all_steps_completed? %>
+  <div class="govuk-warning-text">
+    <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
+    <strong class="govuk-warning-text__text">
+      <span class="govuk-warning-text__assistive">Warning</span>
+      <%= I18n.t("journey.specification.warning") %>
+    </strong>
+  </div>
+<% end %>
 <%= link_to "Download (.docx)", journey_path(@journey, format: :docx), class: "govuk-button" %>
 <%= @specification_template.render(@answers).html_safe %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ce949d7fc..2644f44d6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -53,6 +53,7 @@ en:
   journey:
     specification:
       header: "Your specification"
+      warning: "There are incomplete tasks, this specification is not ready for use."
   task_list:
     status:
       not_started: Not started
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
index a2bff7b16..82054ea41 100644
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
@@ -32,4 +32,16 @@
       expect(page).to have_content("Catering - The school needs the kitchen cleaned once a day")
     end
   end
+
+  context "when the spec is incomplete" do
+    it "warns the user that the contents are in a partially completed state" do
+      stub_contentful_category(fixture_filename: "extended-radio-question.json")
+      visit root_path
+      click_on(I18n.t("generic.button.start"))
+
+      # Don't answer any questions to create a in progress spec
+
+      expect(page).to have_content("There are incomplete tasks, this specification is not ready for use.")
+    end
+  end
 end
diff --git a/spec/models/journey_spec.rb b/spec/models/journey_spec.rb
index 52a89ed82..6a5ecf86f 100644
--- a/spec/models/journey_spec.rb
+++ b/spec/models/journey_spec.rb
@@ -11,4 +11,56 @@
     journey = build(:journey, :catering)
     expect(journey.category).to eql("catering")
   end
+
+  describe "all_steps_completed?" do
+    context "when all steps have been completed" do
+      it "returns true" do
+        journey = create(:journey)
+
+        step_1 = create(:step, :radio, journey: journey)
+        create(:radio_answer, step: step_1)
+
+        step_2 = create(:step, :radio, journey: journey)
+        create(:radio_answer, step: step_2)
+
+        expect(journey.all_steps_completed?).to be true
+      end
+    end
+
+    context "when no steps have been completed" do
+      it "returns false " do
+        journey = create(:journey)
+
+        create_list(:step, 2, :radio, journey: journey)
+
+        expect(journey.all_steps_completed?).to be false
+      end
+    end
+
+    context "when only some steps have been completed" do
+      it "returns false" do
+        journey = create(:journey)
+
+        step_1 = create(:step, :radio, journey: journey)
+        create(:radio_answer, step: step_1)
+
+        create(:step, :radio, journey: journey)
+
+        expect(journey.all_steps_completed?).to be false
+      end
+    end
+
+    context "when there are uncompleted hidden steps" do
+      it "ignores them and returns true" do
+        journey = create(:journey)
+
+        step_1 = create(:step, :radio, journey: journey)
+        create(:radio_answer, step: step_1)
+
+        _hidden_step_without_an_answer = create(:step, :radio, journey: journey, hidden: true)
+
+        expect(journey.all_steps_completed?).to be true
+      end
+    end
+  end
 end

From 74f476fe3554d3d046e92a523cb0ae72ce788840 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Feb 2021 17:02:50 +0000
Subject: [PATCH 081/249] Bump govuk_design_system_formbuilder from 2.1.7 to
 2.1.8

Bumps [govuk_design_system_formbuilder](https://github.com/DFE-Digital/govuk_design_system_formbuilder) from 2.1.7 to 2.1.8.
- [Release notes](https://github.com/DFE-Digital/govuk_design_system_formbuilder/releases)
- [Commits](https://github.com/DFE-Digital/govuk_design_system_formbuilder/compare/v2.1.7...v2.1.8)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index aa5f92542..0d4883a48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -136,7 +136,7 @@ GEM
       raabro (~> 1.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    govuk_design_system_formbuilder (2.1.7)
+    govuk_design_system_formbuilder (2.1.8)
       actionview (>= 5.2)
       activemodel (>= 5.2)
       activesupport (>= 5.2)

From 6966e7480ecda225e0f9b8e46620be6bdab30b72 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 11 Feb 2021 10:48:20 +0000
Subject: [PATCH 082/249] Steps store logic for showing/hiding additional steps

---
 app/services/create_journey_step.rb           |  6 ++++++
 ...104039_add_additional_step_rule_to_step.rb |  5 +++++
 db/schema.rb                                  |  3 ++-
 spec/services/create_journey_step_spec.rb     | 21 +++++++++++++++++++
 spec/support/contentful_helpers.rb            |  1 +
 5 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20210211104039_add_additional_step_rule_to_step.rb

diff --git a/app/services/create_journey_step.rb b/app/services/create_journey_step.rb
index d0940f480..fc8911673 100644
--- a/app/services/create_journey_step.rb
+++ b/app/services/create_journey_step.rb
@@ -42,6 +42,7 @@ def call
       options: options,
       primary_call_to_action_text: primary_call_to_action_text,
       hidden: hidden,
+      additional_step_rule: additional_step_rule,
       raw: raw,
       journey: journey
     )
@@ -107,6 +108,11 @@ def hidden
     !contentful_entry.always_show_the_user
   end
 
+  def additional_step_rule
+    return nil unless contentful_entry.respond_to?(:show_additional_question)
+    contentful_entry.show_additional_question
+  end
+
   def raw
     contentful_entry.raw
   end
diff --git a/db/migrate/20210211104039_add_additional_step_rule_to_step.rb b/db/migrate/20210211104039_add_additional_step_rule_to_step.rb
new file mode 100644
index 000000000..6179cddb7
--- /dev/null
+++ b/db/migrate/20210211104039_add_additional_step_rule_to_step.rb
@@ -0,0 +1,5 @@
+class AddAdditionalStepRuleToStep < ActiveRecord::Migration[6.1]
+  def change
+    add_column :steps, :additional_step_rule, :jsonb
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 73c3e8abc..044b2ae6b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_02_09_111509) do
+ActiveRecord::Schema.define(version: 2021_02_11_104039) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -96,6 +96,7 @@
     t.jsonb "raw", null: false
     t.jsonb "options"
     t.boolean "hidden", default: false
+    t.jsonb "additional_step_rule"
     t.index ["journey_id"], name: "index_steps_on_journey_id"
   end
 
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index 098fee728..e68d97598 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -18,6 +18,7 @@
         expect(step.contentful_type).to eq("radios")
         expect(step.options).to eq([{"value" => "Catering"}, {"value" => "Cleaning"}])
         expect(step.hidden).to eq(false)
+        expect(step.additional_step_rule).to eq(nil)
         expect(step.raw).to eq(
           "fields" => {
             "helpText" => "Tell us which service you need.",
@@ -147,6 +148,26 @@
       end
     end
 
+    context "when 'showAdditionalQuestion' is provided" do
+      it "stores the rule as JSON" do
+        journey = create(:journey, :catering)
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/show-additional-question.json"
+        )
+
+        step, _answer = described_class.new(
+          journey: journey, contentful_entry: fake_entry
+        ).call
+
+        expect(step.additional_step_rule).to eql([
+          {
+            "required_answer" => "Breakfast",
+            "question_identifier" => "hidden-field"
+          }
+        ])
+      end
+    end
+
     context "when the new entry has an unexpected content model" do
       it "raises an error" do
         journey = create(:journey, :catering)
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index 84022508f..ea33e3cee 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -148,6 +148,7 @@ def fake_contentful_step(contentful_fixture_filename:)
       next: double(id: hash_response.dig("fields", "next", "sys", "id")),
       primary_call_to_action: hash_response.dig("fields", "primaryCallToAction"),
       always_show_the_user: hash_response.dig("fields", "alwaysShowTheUser"),
+      show_additional_question: hash_response.dig("fields", "showAdditionalQuestion"),
       raw: hash_response,
       content_type: double(id: hash_response.dig("sys", "contentType", "sys", "id"))
     )

From 05d43078b0013bc2e489750013625d1a57a6a5e4 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 11 Feb 2021 11:56:09 +0000
Subject: [PATCH 083/249] Generic result object to support controller
 refactoring

So that we can perform more complex save logic outside of the controller we need to pass a result back to the controller. This object needs to communicate success and failure to support redirections as well as the original object which may or may not have errors added to it.
---
 app/services/result.rb     |  9 +++++++++
 spec/models/result_spec.rb | 39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 app/services/result.rb
 create mode 100644 spec/models/result_spec.rb

diff --git a/app/services/result.rb b/app/services/result.rb
new file mode 100644
index 000000000..936eb5a3b
--- /dev/null
+++ b/app/services/result.rb
@@ -0,0 +1,9 @@
+Result = Struct.new(:success, :object, :error_message) {
+  def success?
+    success == true
+  end
+
+  def failure?
+    !success
+  end
+}
diff --git a/spec/models/result_spec.rb b/spec/models/result_spec.rb
new file mode 100644
index 000000000..02ae20e19
--- /dev/null
+++ b/spec/models/result_spec.rb
@@ -0,0 +1,39 @@
+RSpec.describe Result do
+  describe "#success?" do
+    it "returns true when set to true" do
+      result = described_class.new(true).success?
+      expect(result).to eq true
+    end
+
+    it "returns false when set to false" do
+      result = described_class.new(false).success?
+      expect(result).to eq false
+    end
+  end
+
+  describe "#failure?" do
+    it "returns true when set to false" do
+      result = described_class.new(false).failure?
+      expect(result).to eq true
+    end
+
+    it "returns false when set to true" do
+      result = described_class.new(true).failure?
+      expect(result).to eq false
+    end
+  end
+
+  describe "#object" do
+    it "returns an object when set" do
+      object = double
+      result = described_class.new(true, object).object
+      expect(result).to eq object
+    end
+
+    it "returns nil when not set" do
+      _object = double
+      result = described_class.new(true).object
+      expect(result).to eq nil
+    end
+  end
+end

From d2fc1219339ea34c92ea3b0902ad6e000e0c14bb Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 11 Feb 2021 12:19:34 +0000
Subject: [PATCH 084/249] Refactor the creating and saving of answers into
 reusable class

With this class we can start to add additional logic in both cases without having to repeat.

We also have better test coverage through unit tests.

The next planned extension will be to update other steps if answers are updated a certain way. This should be defined in one place and be well tested. We could use after hooks via active record however there are side affects to using them. This approach is very explicit and gives us more control, we can still update an answer without rerunning any additional logic.
---
 app/controllers/answers_controller.rb | 25 +++++---------
 app/services/save_answer.rb           | 25 ++++++++++++++
 spec/services/save_answer_spec.rb     | 49 +++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 17 deletions(-)
 create mode 100644 app/services/save_answer.rb
 create mode 100644 spec/services/save_answer_spec.rb

diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 745f9c959..2b8873ec4 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -8,15 +8,11 @@ def create
     @answer = AnswerFactory.new(step: @step).call
     @answer.step = @step
 
-    case @step.contentful_type
-    when "checkboxes"
-      @answer.assign_attributes(checkbox_params)
-    else
-      @answer.assign_attributes(answer_params)
-    end
+    result = SaveAnswer.new(answer: @answer)
+      .call(checkbox_params: checkbox_params, answer_params: answer_params)
+    @answer = result.object
 
-    if @answer.valid?
-      @answer.save
+    if result.success?
       redirect_to journey_path(@journey)
     else
       render "steps/#{@step.contentful_type}", locals: {layout: "steps/new_form_wrapper"}
@@ -26,17 +22,12 @@ def create
   def update
     @journey = Journey.find(journey_id)
     @step = Step.find(step_id)
-    @answer = @step.answer
 
-    case @step.contentful_type
-    when "checkboxes"
-      @answer.assign_attributes(checkbox_params)
-    else
-      @answer.assign_attributes(answer_params)
-    end
+    result = SaveAnswer.new(answer: @step.answer)
+      .call(checkbox_params: checkbox_params, answer_params: answer_params)
+    @answer = result.object
 
-    if @answer.valid?
-      @answer.save
+    if result.success?
       redirect_to journey_path(@journey)
     else
       render "steps/#{@step.contentful_type}", locals: {layout: "steps/edit_form_wrapper"}
diff --git a/app/services/save_answer.rb b/app/services/save_answer.rb
new file mode 100644
index 000000000..0c465d085
--- /dev/null
+++ b/app/services/save_answer.rb
@@ -0,0 +1,25 @@
+class SaveAnswer
+  attr_accessor :answer, :step
+  def initialize(answer:)
+    self.answer = answer
+    self.step = answer.step
+  end
+
+  def call(answer_params: {}, checkbox_params: {})
+    result = Result.new(false, answer)
+
+    case step.contentful_type
+    when "checkboxes"
+      answer.assign_attributes(checkbox_params)
+    else
+      answer.assign_attributes(answer_params)
+    end
+
+    if answer.valid?
+      answer.save
+      result.success = true
+    end
+
+    result
+  end
+end
diff --git a/spec/services/save_answer_spec.rb b/spec/services/save_answer_spec.rb
new file mode 100644
index 000000000..639dfafd7
--- /dev/null
+++ b/spec/services/save_answer_spec.rb
@@ -0,0 +1,49 @@
+require "rails_helper"
+
+RSpec.describe SaveAnswer do
+  describe "#call" do
+    it "updates the answer with the answer_params" do
+      answer = create(:short_text_answer)
+      params = ActionController::Parameters.new(response: "A little text").permit!
+
+      result = described_class.new(answer: answer).call(answer_params: params)
+
+      expect(result.success?).to eql(true)
+      expect(result.object.response).to eql("A little text")
+    end
+
+    context "when the step is a checkbox question" do
+      it "updates the answer with the checkbox_params" do
+        answer = create(:checkbox_answers)
+        params = ActionController::Parameters.new(response: ["A", "B"]).permit!
+
+        result = described_class.new(answer: answer).call(checkbox_params: params)
+
+        expect(result.success?).to eql(true)
+        expect(result.object.response).to eql(["A", "B"])
+      end
+    end
+
+    context "when the answer is invalid" do
+      it "does not try to save the answer" do
+        answer = create(:checkbox_answers)
+
+        allow(answer).to receive(:valid?).and_return(false)
+        expect(answer).not_to receive(:save)
+
+        described_class.new(answer: answer).call(answer_params: {})
+      end
+
+      it "returns a failed result" do
+        answer = create(:short_text_answer)
+        params = ActionController::Parameters.new(response: "A").permit!
+
+        allow(answer).to receive(:valid?).and_return(false)
+
+        result = described_class.new(answer: answer).call(answer_params: params)
+
+        expect(result.success?).to eql(false)
+      end
+    end
+  end
+end

From d7c8beaf8d635fcbafc61a15025b16f760810b91 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 11 Feb 2021 14:39:17 +0000
Subject: [PATCH 085/249] Answering a step can show the user additional
 questions

Some resilience against answer casing is included to be match 2 strings of any different casings together as a match.

Since the `show_additional_step` value will contain a `contentful_id` and there may be many steps with the same value, we have to scope the search by only the journey the user is in. We do allow this value to be injected straight into a `find_by` query which is usually cause for concern however Contentful is a trusted source of input.

There is more work to do to ensure that if a shown/hidden step also includes logic to show/hide more questions, that we cascade this update all the way down.
---
 CHANGELOG.md                                  |  1 +
 app/models/step.rb                            |  9 +++
 app/services/save_answer.rb                   |  1 +
 .../anyone_can_complete_a_journey_spec.rb     | 12 +++
 .../categories/show-additional-question.json  | 44 +++++++++++
 .../show-additional-question-section.json     | 50 ++++++++++++
 .../steps/show-additional-question.json       | 54 +++++++++++++
 spec/models/step_spec.rb                      | 77 +++++++++++++++++++
 spec/services/create_journey_step_spec.rb     |  6 +-
 spec/services/save_answer_spec.rb             |  8 ++
 10 files changed, 259 insertions(+), 3 deletions(-)
 create mode 100644 spec/fixtures/contentful/categories/show-additional-question.json
 create mode 100644 spec/fixtures/contentful/sections/show-additional-question-section.json
 create mode 100644 spec/fixtures/contentful/steps/show-additional-question.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d7c0f0e8..2bd4574d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - users can answer questions which expect a currency
 - questions can be hidden from view
 - specification warning if there are incomplete tasks
+- hidden questions can be shown through a new show_additional_question field for each question
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/models/step.rb b/app/models/step.rb
index 3cc8756df..a57f36015 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -31,4 +31,13 @@ def primary_call_to_action_text
   def options_list
     options.map { |hash| hash["value"] }
   end
+
+  def check_to_show_additional_step!
+    return unless additional_step_rule
+    return unless additional_step_rule["required_answer"].downcase == answer.response.downcase
+
+    journey.steps
+      .find_by(contentful_id: additional_step_rule["question_identifier"])
+      .update(hidden: false)
+  end
 end
diff --git a/app/services/save_answer.rb b/app/services/save_answer.rb
index 0c465d085..dc9b8bf3f 100644
--- a/app/services/save_answer.rb
+++ b/app/services/save_answer.rb
@@ -17,6 +17,7 @@ def call(answer_params: {}, checkbox_params: {})
 
     if answer.valid?
       answer.save
+      answer.step.check_to_show_additional_step!
       result.success = true
     end
 
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index bfb8732f2..6d82f9298 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -168,6 +168,18 @@
         end
       end
     end
+
+    context "when Contentful entry includes a 'show additional question' rule" do
+      scenario "additional question is shown to the user" do
+        start_journey_from_category_and_go_to_question(category: "show-additional-question.json")
+
+        choose("School expert")
+
+        click_on(I18n.t("generic.button.next"))
+
+        expect(page).to have_content("You should NOT be able to see this question?")
+      end
+    end
   end
 
   context "when the Contentful model is of type staticContent" do
diff --git a/spec/fixtures/contentful/categories/show-additional-question.json b/spec/fixtures/contentful/categories/show-additional-question.json
new file mode 100644
index 000000000..201416b74
--- /dev/null
+++ b/spec/fixtures/contentful/categories/show-additional-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "show-additional-question-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>{{answer_hidden-field}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/show-additional-question-section.json b/spec/fixtures/contentful/sections/show-additional-question-section.json
new file mode 100644
index 000000000..89df84ea5
--- /dev/null
+++ b/spec/fixtures/contentful/sections/show-additional-question-section.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "number-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "show-additional-question"
+                }
+            },
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "hidden-field"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/show-additional-question.json b/spec/fixtures/contentful/steps/show-additional-question.json
new file mode 100644
index 000000000..f01a78887
--- /dev/null
+++ b/spec/fixtures/contentful/steps/show-additional-question.json
@@ -0,0 +1,54 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "show-additional-question",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "What support do you have available?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "School expert",
+                "display_further_information": true,
+                "further_information_help_text": "Explain why this is the case"
+            },
+            {
+                "value": "External expert"
+            },
+            {
+                "value": "None"
+            }
+        ],
+        "showAdditionalQuestion": {
+            "required_answer": "School expert",
+            "question_identifier": "hidden-field"
+        }
+    }
+}
diff --git a/spec/models/step_spec.rb b/spec/models/step_spec.rb
index 77a164794..d2936817f 100644
--- a/spec/models/step_spec.rb
+++ b/spec/models/step_spec.rb
@@ -87,4 +87,81 @@
       expect(step.options).to eql([{"value" => "foo", "other_config" => false}])
     end
   end
+
+  describe "#check_to_show_additional_step!" do
+    let(:journey) { create(:journey) }
+
+    context "when the additional_step_rule field is nil" do
+      it "returns nil" do
+        step = build(:step)
+        expect(step.check_to_show_additional_step!).to eq(nil)
+      end
+    end
+
+    context "when the additional_step_rule exists" do
+      it "only changes the additional steps within the same journey" do
+        step = create(:step,
+          :radio,
+          journey: journey,
+          additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+        create(:radio_answer, step: step, response: "Red")
+
+        another_step_to_show = create(:step,
+          :radio,
+          journey: journey,
+          contentful_id: "123",
+          hidden: true)
+
+        another_step_from_a_different_journey_to_keep_hidden = create(:step,
+          :radio,
+          contentful_id: "123",
+          hidden: true)
+
+        step.check_to_show_additional_step!
+
+        expect(another_step_to_show.reload.hidden).to eq(false)
+        expect(another_step_from_a_different_journey_to_keep_hidden.reload.hidden).to eq(true)
+      end
+
+      context "when the required_answer matches the answer exactly" do
+        it "updates the referenced step's hidden field to false" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+          create(:radio_answer, step: step, response: "Red")
+
+          step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: true)
+
+          step.check_to_show_additional_step!
+
+          expect(step_to_show.reload.hidden).to eq(false)
+        end
+      end
+
+      context "when the required_answer has different case to the answer" do
+        it "returns the updated step" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rule: {"required_answer" => "RED", "question_identifier" => "123"})
+          create(:radio_answer, step: step, response: "red")
+
+          step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: true)
+
+          step.check_to_show_additional_step!
+
+          expect(step_to_show.reload.hidden).to eq(false)
+        end
+      end
+    end
+  end
 end
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index e68d97598..c2e741883 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -159,12 +159,12 @@
           journey: journey, contentful_entry: fake_entry
         ).call
 
-        expect(step.additional_step_rule).to eql([
+        expect(step.additional_step_rule).to eql(
           {
-            "required_answer" => "Breakfast",
+            "required_answer" => "School expert",
             "question_identifier" => "hidden-field"
           }
-        ])
+        )
       end
     end
 
diff --git a/spec/services/save_answer_spec.rb b/spec/services/save_answer_spec.rb
index 639dfafd7..f6575c70f 100644
--- a/spec/services/save_answer_spec.rb
+++ b/spec/services/save_answer_spec.rb
@@ -12,6 +12,14 @@
       expect(result.object.response).to eql("A little text")
     end
 
+    it "checks to see if any other steps need to be updated" do
+      answer = create(:short_text_answer)
+
+      expect(answer.step).to receive(:check_to_show_additional_step!)
+
+      described_class.new(answer: answer).call(answer_params: {})
+    end
+
     context "when the step is a checkbox question" do
       it "updates the answer with the checkbox_params" do
         answer = create(:checkbox_answers)

From 780c01d1434f1f5300d5adfccf54fd6a6bbde144 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 11 Feb 2021 15:02:27 +0000
Subject: [PATCH 086/249] Editing a question can now re-hide additional
 questions

This does not handle the case where the additional questions can also have shown/hidden further questions, which is theoretically possible.
---
 app/models/step.rb                |  9 ++++
 app/services/save_answer.rb       |  1 +
 spec/models/step_spec.rb          | 77 +++++++++++++++++++++++++++++++
 spec/services/save_answer_spec.rb |  1 +
 4 files changed, 88 insertions(+)

diff --git a/app/models/step.rb b/app/models/step.rb
index a57f36015..7ec81c184 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -40,4 +40,13 @@ def check_to_show_additional_step!
       .find_by(contentful_id: additional_step_rule["question_identifier"])
       .update(hidden: false)
   end
+
+  def check_to_hide_additional_step!
+    return unless additional_step_rule
+    return unless additional_step_rule["required_answer"].downcase != answer.response.downcase
+
+    journey.steps
+      .find_by(contentful_id: additional_step_rule["question_identifier"])
+      .update(hidden: true)
+  end
 end
diff --git a/app/services/save_answer.rb b/app/services/save_answer.rb
index dc9b8bf3f..ee2dc53ee 100644
--- a/app/services/save_answer.rb
+++ b/app/services/save_answer.rb
@@ -18,6 +18,7 @@ def call(answer_params: {}, checkbox_params: {})
     if answer.valid?
       answer.save
       answer.step.check_to_show_additional_step!
+      answer.step.check_to_hide_additional_step!
       result.success = true
     end
 
diff --git a/spec/models/step_spec.rb b/spec/models/step_spec.rb
index d2936817f..91eabfa0b 100644
--- a/spec/models/step_spec.rb
+++ b/spec/models/step_spec.rb
@@ -163,5 +163,82 @@
         end
       end
     end
+
+    describe "#check_to_hide_additional_step!" do
+      let(:journey) { create(:journey) }
+
+      context "when the additional_step_rule field is nil" do
+        it "returns nil" do
+          step = build(:step)
+          expect(step.check_to_hide_additional_step!).to eq(nil)
+        end
+      end
+
+      context "when the additional_step_rule exists" do
+        it "only changes the additional steps within the same journey" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+          create(:radio_answer, step: step, response: "Blue")
+
+          another_step_to_hide = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: false)
+
+          another_step_from_a_different_journey_to_keep_visible = create(:step,
+            :radio,
+            contentful_id: "123",
+            hidden: false)
+
+          step.check_to_hide_additional_step!
+
+          expect(another_step_to_hide.reload.hidden).to eq(true)
+          expect(another_step_from_a_different_journey_to_keep_visible.reload.hidden).to eq(false)
+        end
+
+        context "when the required_answer does not match the answer exactly" do
+          it "updates the referenced step's hidden field to true" do
+            step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+            create(:radio_answer, step: step, response: "Blue")
+
+            step_to_show = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              hidden: false)
+
+            step.check_to_hide_additional_step!
+
+            expect(step_to_show.reload.hidden).to eq(true)
+          end
+        end
+
+        context "when the required_answer has different case to the answer" do
+          it "does not hide the step" do
+            step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rule: {"required_answer" => "RED", "question_identifier" => "123"})
+            create(:radio_answer, step: step, response: "red")
+
+            step_to_show = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              hidden: false)
+
+            step.check_to_hide_additional_step!
+
+            expect(step_to_show.reload.hidden).to eq(false)
+          end
+        end
+      end
+    end
   end
 end
diff --git a/spec/services/save_answer_spec.rb b/spec/services/save_answer_spec.rb
index f6575c70f..89fb7c49e 100644
--- a/spec/services/save_answer_spec.rb
+++ b/spec/services/save_answer_spec.rb
@@ -16,6 +16,7 @@
       answer = create(:short_text_answer)
 
       expect(answer.step).to receive(:check_to_show_additional_step!)
+      expect(answer.step).to receive(:check_to_hide_additional_step!)
 
       described_class.new(answer: answer).call(answer_params: {})
     end

From 12e7dd2c0f529dab305cfe6caa82b8b60a42c28e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 11 Feb 2021 15:49:16 +0000
Subject: [PATCH 087/249] Additional question fixtures updated to be a chain of
 3 steps

To simulate the case where we have a step that starts as hidden, is unlocked by another question, and itself unlocks another question.

When the first hidden step should be hidden again after an edit, so should the last step.
---
 .../anyone_can_complete_a_journey_spec.rb     | 11 +++-
 .../anyone_can_edit_their_answers_spec.rb     | 12 +++++
 .../show-additional-question-section.json     |  7 +++
 ...eld-that-shows-an-additional-question.json | 50 +++++++++++++++++++
 .../steps/show-additional-question.json       |  2 +-
 spec/services/create_journey_step_spec.rb     |  2 +-
 6 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json

diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 6d82f9298..9620f0c8b 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -170,14 +170,21 @@
     end
 
     context "when Contentful entry includes a 'show additional question' rule" do
-      scenario "additional question is shown to the user" do
+      scenario "additional questions are shown" do
         start_journey_from_category_and_go_to_question(category: "show-additional-question.json")
 
         choose("School expert")
+        click_on(I18n.t("generic.button.next"))
 
+        # This question should be made visible after the previous step
+        click_on("What colour is the sky?")
+        choose("Red")
         click_on(I18n.t("generic.button.next"))
 
-        expect(page).to have_content("You should NOT be able to see this question?")
+        # This question should be made visible after the previous step
+        click_on("You should NOT be able to see this question?")
+        choose("School expert")
+        click_on(I18n.t("generic.button.next"))
       end
     end
   end
diff --git a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
index 71784beed..a99a27fcd 100644
--- a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
+++ b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
@@ -90,4 +90,16 @@
       expect(page).to have_content("can't be blank")
     end
   end
+
+  context "when Contentful entry includes a 'show additional question' rule" do
+    scenario "an additional question is shown" do
+      start_journey_from_category_and_go_to_question(category: "show-additional-question.json")
+
+      choose("School expert")
+
+      click_on(I18n.t("generic.button.next"))
+
+      expect(page).to have_content("What support do you have available?")
+    end
+  end
 end
diff --git a/spec/fixtures/contentful/sections/show-additional-question-section.json b/spec/fixtures/contentful/sections/show-additional-question-section.json
index 89df84ea5..5e6353c96 100644
--- a/spec/fixtures/contentful/sections/show-additional-question-section.json
+++ b/spec/fixtures/contentful/sections/show-additional-question-section.json
@@ -38,6 +38,13 @@
                     "id": "show-additional-question"
                 }
             },
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "hidden-field-that-shows-an-additional-question"
+                }
+            },
             {
                 "sys": {
                     "type": "Link",
diff --git a/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json b/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
new file mode 100644
index 000000000..4505ec2f7
--- /dev/null
+++ b/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "hidden-field-that-shows-an-additional-question",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "What colour is the sky?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "Red"
+            },
+            {
+                "value": "Blue"
+            }
+        ],
+        "alwaysShowTheUser": false,
+        "showAdditionalQuestion": {
+            "required_answer": "Red",
+            "question_identifier": "hidden-field"
+        }
+    }
+}
diff --git a/spec/fixtures/contentful/steps/show-additional-question.json b/spec/fixtures/contentful/steps/show-additional-question.json
index f01a78887..58c06ce01 100644
--- a/spec/fixtures/contentful/steps/show-additional-question.json
+++ b/spec/fixtures/contentful/steps/show-additional-question.json
@@ -48,7 +48,7 @@
         ],
         "showAdditionalQuestion": {
             "required_answer": "School expert",
-            "question_identifier": "hidden-field"
+            "question_identifier": "hidden-field-that-shows-an-additional-question"
         }
     }
 }
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index c2e741883..6ac93fbcb 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -162,7 +162,7 @@
         expect(step.additional_step_rule).to eql(
           {
             "required_answer" => "School expert",
-            "question_identifier" => "hidden-field"
+            "question_identifier" => "hidden-field-that-shows-an-additional-question"
           }
         )
       end

From 29508d287c70a40b90a86a5b2c285d420f47365f Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 11 Feb 2021 16:39:27 +0000
Subject: [PATCH 088/249] =?UTF-8?q?Refactor=20the=20logic=20to=20show=20an?=
 =?UTF-8?q?d=20hide=20additional=20steps=20into=20service=C2=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We need to go further than only looking to the referenced step in order to show or hide it. We need to also check that that step doesn't include any other references. Before we do this more complex tree traversal operation we refactor the logic out of the model and into a service.
---
 app/models/step.rb                            |  18 --
 app/services/save_answer.rb                   |   3 +-
 app/services/toggle_additional_steps.rb       |  44 +++++
 spec/models/step_spec.rb                      | 154 ------------------
 spec/services/save_answer_spec.rb             |   5 +-
 spec/services/toggle_additional_steps_spec.rb | 122 ++++++++++++++
 6 files changed, 170 insertions(+), 176 deletions(-)
 create mode 100644 app/services/toggle_additional_steps.rb
 create mode 100644 spec/services/toggle_additional_steps_spec.rb

diff --git a/app/models/step.rb b/app/models/step.rb
index 7ec81c184..3cc8756df 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -31,22 +31,4 @@ def primary_call_to_action_text
   def options_list
     options.map { |hash| hash["value"] }
   end
-
-  def check_to_show_additional_step!
-    return unless additional_step_rule
-    return unless additional_step_rule["required_answer"].downcase == answer.response.downcase
-
-    journey.steps
-      .find_by(contentful_id: additional_step_rule["question_identifier"])
-      .update(hidden: false)
-  end
-
-  def check_to_hide_additional_step!
-    return unless additional_step_rule
-    return unless additional_step_rule["required_answer"].downcase != answer.response.downcase
-
-    journey.steps
-      .find_by(contentful_id: additional_step_rule["question_identifier"])
-      .update(hidden: true)
-  end
 end
diff --git a/app/services/save_answer.rb b/app/services/save_answer.rb
index ee2dc53ee..978b48abd 100644
--- a/app/services/save_answer.rb
+++ b/app/services/save_answer.rb
@@ -17,8 +17,7 @@ def call(answer_params: {}, checkbox_params: {})
 
     if answer.valid?
       answer.save
-      answer.step.check_to_show_additional_step!
-      answer.step.check_to_hide_additional_step!
+      ToggleAdditionalSteps.new(step: answer.step).call
       result.success = true
     end
 
diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
new file mode 100644
index 000000000..c44b1cdae
--- /dev/null
+++ b/app/services/toggle_additional_steps.rb
@@ -0,0 +1,44 @@
+class ToggleAdditionalSteps
+  attr_accessor :journey, :step
+  def initialize(step:)
+    self.journey = step.journey
+    self.step = step
+  end
+
+  def call
+    return unless additional_step_rule
+
+    check_to_show_additional_step!
+    check_to_hide_additional_step!
+  end
+
+  private
+
+  def additional_step_rule
+    step.additional_step_rule
+  end
+
+  def answer
+    step.answer
+  end
+
+  def matching_answer?
+    additional_step_rule["required_answer"].downcase == answer.response.downcase
+  end
+
+  def additional_step
+    journey.steps.find_by(contentful_id: additional_step_rule["question_identifier"])
+  end
+
+  def check_to_show_additional_step!
+    return unless matching_answer?
+
+    additional_step.update(hidden: false)
+  end
+
+  def check_to_hide_additional_step!
+    return if matching_answer?
+
+    additional_step.update(hidden: true)
+  end
+end
diff --git a/spec/models/step_spec.rb b/spec/models/step_spec.rb
index 91eabfa0b..77a164794 100644
--- a/spec/models/step_spec.rb
+++ b/spec/models/step_spec.rb
@@ -87,158 +87,4 @@
       expect(step.options).to eql([{"value" => "foo", "other_config" => false}])
     end
   end
-
-  describe "#check_to_show_additional_step!" do
-    let(:journey) { create(:journey) }
-
-    context "when the additional_step_rule field is nil" do
-      it "returns nil" do
-        step = build(:step)
-        expect(step.check_to_show_additional_step!).to eq(nil)
-      end
-    end
-
-    context "when the additional_step_rule exists" do
-      it "only changes the additional steps within the same journey" do
-        step = create(:step,
-          :radio,
-          journey: journey,
-          additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
-        create(:radio_answer, step: step, response: "Red")
-
-        another_step_to_show = create(:step,
-          :radio,
-          journey: journey,
-          contentful_id: "123",
-          hidden: true)
-
-        another_step_from_a_different_journey_to_keep_hidden = create(:step,
-          :radio,
-          contentful_id: "123",
-          hidden: true)
-
-        step.check_to_show_additional_step!
-
-        expect(another_step_to_show.reload.hidden).to eq(false)
-        expect(another_step_from_a_different_journey_to_keep_hidden.reload.hidden).to eq(true)
-      end
-
-      context "when the required_answer matches the answer exactly" do
-        it "updates the referenced step's hidden field to false" do
-          step = create(:step,
-            :radio,
-            journey: journey,
-            additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
-          create(:radio_answer, step: step, response: "Red")
-
-          step_to_show = create(:step,
-            :radio,
-            journey: journey,
-            contentful_id: "123",
-            hidden: true)
-
-          step.check_to_show_additional_step!
-
-          expect(step_to_show.reload.hidden).to eq(false)
-        end
-      end
-
-      context "when the required_answer has different case to the answer" do
-        it "returns the updated step" do
-          step = create(:step,
-            :radio,
-            journey: journey,
-            additional_step_rule: {"required_answer" => "RED", "question_identifier" => "123"})
-          create(:radio_answer, step: step, response: "red")
-
-          step_to_show = create(:step,
-            :radio,
-            journey: journey,
-            contentful_id: "123",
-            hidden: true)
-
-          step.check_to_show_additional_step!
-
-          expect(step_to_show.reload.hidden).to eq(false)
-        end
-      end
-    end
-
-    describe "#check_to_hide_additional_step!" do
-      let(:journey) { create(:journey) }
-
-      context "when the additional_step_rule field is nil" do
-        it "returns nil" do
-          step = build(:step)
-          expect(step.check_to_hide_additional_step!).to eq(nil)
-        end
-      end
-
-      context "when the additional_step_rule exists" do
-        it "only changes the additional steps within the same journey" do
-          step = create(:step,
-            :radio,
-            journey: journey,
-            additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
-          create(:radio_answer, step: step, response: "Blue")
-
-          another_step_to_hide = create(:step,
-            :radio,
-            journey: journey,
-            contentful_id: "123",
-            hidden: false)
-
-          another_step_from_a_different_journey_to_keep_visible = create(:step,
-            :radio,
-            contentful_id: "123",
-            hidden: false)
-
-          step.check_to_hide_additional_step!
-
-          expect(another_step_to_hide.reload.hidden).to eq(true)
-          expect(another_step_from_a_different_journey_to_keep_visible.reload.hidden).to eq(false)
-        end
-
-        context "when the required_answer does not match the answer exactly" do
-          it "updates the referenced step's hidden field to true" do
-            step = create(:step,
-              :radio,
-              journey: journey,
-              additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
-            create(:radio_answer, step: step, response: "Blue")
-
-            step_to_show = create(:step,
-              :radio,
-              journey: journey,
-              contentful_id: "123",
-              hidden: false)
-
-            step.check_to_hide_additional_step!
-
-            expect(step_to_show.reload.hidden).to eq(true)
-          end
-        end
-
-        context "when the required_answer has different case to the answer" do
-          it "does not hide the step" do
-            step = create(:step,
-              :radio,
-              journey: journey,
-              additional_step_rule: {"required_answer" => "RED", "question_identifier" => "123"})
-            create(:radio_answer, step: step, response: "red")
-
-            step_to_show = create(:step,
-              :radio,
-              journey: journey,
-              contentful_id: "123",
-              hidden: false)
-
-            step.check_to_hide_additional_step!
-
-            expect(step_to_show.reload.hidden).to eq(false)
-          end
-        end
-      end
-    end
-  end
 end
diff --git a/spec/services/save_answer_spec.rb b/spec/services/save_answer_spec.rb
index 89fb7c49e..de4a621ec 100644
--- a/spec/services/save_answer_spec.rb
+++ b/spec/services/save_answer_spec.rb
@@ -15,8 +15,9 @@
     it "checks to see if any other steps need to be updated" do
       answer = create(:short_text_answer)
 
-      expect(answer.step).to receive(:check_to_show_additional_step!)
-      expect(answer.step).to receive(:check_to_hide_additional_step!)
+      toggle_service = instance_double(ToggleAdditionalSteps)
+      expect(ToggleAdditionalSteps).to receive(:new).with(step: answer.step).and_return(toggle_service)
+      expect(toggle_service).to receive(:call)
 
       described_class.new(answer: answer).call(answer_params: {})
     end
diff --git a/spec/services/toggle_additional_steps_spec.rb b/spec/services/toggle_additional_steps_spec.rb
new file mode 100644
index 000000000..23c8edcf7
--- /dev/null
+++ b/spec/services/toggle_additional_steps_spec.rb
@@ -0,0 +1,122 @@
+require "rails_helper"
+
+RSpec.describe ToggleAdditionalSteps do
+  describe "#call" do
+    let(:journey) { create(:journey) }
+
+    context "when the additional_step_rule field is nil" do
+      it "returns nil" do
+        step = build(:step)
+        expect(described_class.new(step: step).call).to eq(nil)
+      end
+    end
+
+    context "when the additional_step_rule exists" do
+      context "when the answers match" do
+        it "only shows the additional steps within the same journey" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+          create(:radio_answer, step: step, response: "Red")
+
+          another_step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: true)
+
+          another_step_from_a_different_journey_to_keep_hidden = create(:step,
+            :radio,
+            contentful_id: "123",
+            hidden: true)
+
+          described_class.new(step: step).call
+
+          expect(another_step_to_show.reload.hidden).to eq(false)
+          expect(another_step_from_a_different_journey_to_keep_hidden.reload.hidden).to eq(true)
+        end
+
+        context "when the required_answer matches the answer exactly" do
+          it "updates the referenced step's hidden field to false" do
+            step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+            create(:radio_answer, step: step, response: "Red")
+
+            step_to_show = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              hidden: true)
+
+            described_class.new(step: step).call
+
+            expect(step_to_show.reload.hidden).to eq(false)
+          end
+        end
+
+        context "when the required_answer has different case to the answer" do
+          it "returns the updated step" do
+            step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rule: {"required_answer" => "RED", "question_identifier" => "123"})
+            create(:radio_answer, step: step, response: "red")
+
+            step_to_show = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              hidden: true)
+
+            described_class.new(step: step).call
+
+            expect(step_to_show.reload.hidden).to eq(false)
+          end
+        end
+      end
+
+      context "when the answers DO NOT match" do
+        it "updates the referenced step's hidden field to true" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+          create(:radio_answer, step: step, response: "Blue")
+
+          step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: false)
+
+          described_class.new(step: step).call
+
+          expect(step_to_show.reload.hidden).to eq(true)
+        end
+
+        context "when the required_answer has different case to the answer" do
+          it "does not hide the step" do
+            step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rule: {"required_answer" => "RED", "question_identifier" => "123"})
+            create(:radio_answer, step: step, response: "red")
+
+            step_to_show = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              hidden: false)
+
+            described_class.new(step: step).call
+
+            expect(step_to_show.reload.hidden).to eq(false)
+          end
+        end
+      end
+    end
+  end
+end

From 25187f70918144ed8c08408dabd9d368d3e39b2e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 11 Feb 2021 17:45:41 +0000
Subject: [PATCH 089/249] Hiding an optional step will hide all connected
 hidden steps

We know traversing the tree like this is not efficient. Ideally we would be keeping track over the tree of connected steps and be able to hide all without N+1 queries. We are not aware of real use cases that will chain many of these steps together right now, we imagie there may be at most 2-5 connected together.

When an optional step is hidden again we hide all of it's dependent steps without reevaluating. The dependant steps will become visible with their previous qualifiying answers if the user changes their mind again.
---
 CHANGELOG.md                                  |  1 +
 app/services/toggle_additional_steps.rb       | 47 +++++++++++++----
 .../anyone_can_edit_their_answers_spec.rb     | 17 ++++++-
 spec/services/toggle_additional_steps_spec.rb | 50 +++++++++++++++++++
 4 files changed, 104 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bd4574d4..7238c1ef0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - questions can be hidden from view
 - specification warning if there are incomplete tasks
 - hidden questions can be shown through a new show_additional_question field for each question
+- hidden questions can be rehidden again after changing the original answer
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index c44b1cdae..af12e6cf9 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -8,26 +8,40 @@ def initialize(step:)
   def call
     return unless additional_step_rule
 
-    check_to_show_additional_step!
-    check_to_hide_additional_step!
+    check_to_show_additional_step! if additional_step.hidden?
+    check_to_hide_additional_steps! unless additional_step.hidden?
   end
 
   private
 
+  def answer
+    step.answer
+  end
+
+  def journey_steps
+    @journey_steps ||= journey.steps
+  end
+
   def additional_step_rule
     step.additional_step_rule
   end
 
-  def answer
-    step.answer
+  def additional_step_id
+    additional_step_rule["question_identifier"]
   end
 
-  def matching_answer?
-    additional_step_rule["required_answer"].downcase == answer.response.downcase
+  def additional_step
+    journey_steps.find_by(contentful_id: additional_step_id)
   end
 
-  def additional_step
-    journey.steps.find_by(contentful_id: additional_step_rule["question_identifier"])
+  def matching_answer?
+    expected_answer = additional_step_rule["required_answer"].downcase
+    case answer.response.class.name
+    when "Array"
+      answer.response.map(&:downcase).include?(expected_answer)
+    else
+      expected_answer == answer.response.downcase
+    end
   end
 
   def check_to_show_additional_step!
@@ -36,9 +50,22 @@ def check_to_show_additional_step!
     additional_step.update(hidden: false)
   end
 
-  def check_to_hide_additional_step!
+  def check_to_hide_additional_steps!
     return if matching_answer?
 
-    additional_step.update(hidden: true)
+    recursively_toggle_additional_steps!(next_step_id: additional_step_id, hidden_state: true)
+  end
+
+  def recursively_toggle_additional_steps!(next_step_id:, hidden_state:)
+    if next_step_id
+
+      next_step = journey_steps.find_by(contentful_id: next_step_id)
+      next_step.update(hidden: hidden_state)
+
+      recursively_toggle_additional_steps!(
+        next_step_id: next_step.additional_step_rule&.fetch("question_identifier", nil),
+        hidden_state: hidden_state
+      )
+    end
   end
 end
diff --git a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
index a99a27fcd..766f54232 100644
--- a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
+++ b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
@@ -96,10 +96,25 @@
       start_journey_from_category_and_go_to_question(category: "show-additional-question.json")
 
       choose("School expert")
+      click_on(I18n.t("generic.button.next"))
+
+      # This question should be made visible after the previous step
+      click_on("What colour is the sky?")
+      choose("Red")
+      click_on(I18n.t("generic.button.next"))
 
+      # This question should be made visible after the previous step
+      click_on("You should NOT be able to see this question?")
+      choose("School expert")
       click_on(I18n.t("generic.button.next"))
 
-      expect(page).to have_content("What support do you have available?")
+      # Edit the first question to remove the chain of hidden questions
+      click_on("What support do you have available?")
+      choose("None")
+      click_on(I18n.t("generic.button.update"))
+
+      expect(page).not_to have_content("What colour is the sky? ")
+      expect(page).not_to have_content("You should NOT be able to see this question?")
     end
   end
 end
diff --git a/spec/services/toggle_additional_steps_spec.rb b/spec/services/toggle_additional_steps_spec.rb
index 23c8edcf7..67ac77744 100644
--- a/spec/services/toggle_additional_steps_spec.rb
+++ b/spec/services/toggle_additional_steps_spec.rb
@@ -116,6 +116,56 @@
             expect(step_to_show.reload.hidden).to eq(false)
           end
         end
+
+        context "when the referenced step also has an additional_step_rule rule" do
+          it "hides both connected questions" do
+            first_step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"},
+              hidden: false)
+            create(:radio_answer, step: first_step, response: "Changed from red")
+
+            second_step = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              additional_step_rule: {"required_answer" => "Blue", "question_identifier" => "456"},
+              hidden: false)
+            create(:radio_answer, step: second_step, response: "Blue")
+
+            third_step = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "456",
+              hidden: false)
+
+            described_class.new(step: first_step).call
+
+            expect(second_step.reload.hidden).to eq(true)
+            expect(third_step.reload.hidden).to eq(true)
+          end
+        end
+      end
+
+      context "when the answer response is an array" do
+        it "checks for a match against all answers" do
+          step = create(:step,
+            :checkbox_answers,
+            journey: journey,
+            additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+          create(:checkbox_answers, step: step, response: ["Blue", "Red"])
+
+          step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: true)
+
+          described_class.new(step: step).call
+
+          expect(step_to_show.reload.hidden).to eq(false)
+        end
       end
     end
   end

From 6b3f8db8adc51746b17579e1a1cf216213695883 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 15 Feb 2021 12:06:31 +0000
Subject: [PATCH 090/249] Answering a question can reshow all connected hidden
 steps

When a user goes down an optional path, answering questions and then changes any question in the chain, those questions will all disappear. This change allows the user to change their mind again to their previous choice. Doing so will reshow all the questions in the chain along with their original answer.
---
 CHANGELOG.md                                  |  1 +
 app/services/toggle_additional_steps.rb       |  6 ++--
 .../anyone_can_edit_their_answers_spec.rb     |  8 +++++
 spec/services/toggle_additional_steps_spec.rb | 30 +++++++++++++++++++
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7238c1ef0..f764590ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - specification warning if there are incomplete tasks
 - hidden questions can be shown through a new show_additional_question field for each question
 - hidden questions can be rehidden again after changing the original answer
+- hidden questions that were at one point answered, will be reshown with a change to an earlier question
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index af12e6cf9..b72b8b780 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -8,7 +8,7 @@ def initialize(step:)
   def call
     return unless additional_step_rule
 
-    check_to_show_additional_step! if additional_step.hidden?
+    check_to_show_additional_steps! if additional_step.hidden?
     check_to_hide_additional_steps! unless additional_step.hidden?
   end
 
@@ -44,10 +44,10 @@ def matching_answer?
     end
   end
 
-  def check_to_show_additional_step!
+  def check_to_show_additional_steps!
     return unless matching_answer?
 
-    additional_step.update(hidden: false)
+    recursively_toggle_additional_steps!(next_step_id: additional_step_id, hidden_state: false)
   end
 
   def check_to_hide_additional_steps!
diff --git a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
index 766f54232..e7f3bd812 100644
--- a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
+++ b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
@@ -115,6 +115,14 @@
 
       expect(page).not_to have_content("What colour is the sky? ")
       expect(page).not_to have_content("You should NOT be able to see this question?")
+
+      # Edit the first question to add back the full chain of hidden questions
+      click_on("What support do you have available?")
+      choose("School expert")
+      click_on(I18n.t("generic.button.update"))
+
+      expect(page).to have_content("What colour is the sky? ")
+      expect(page).to have_content("You should NOT be able to see this question?")
     end
   end
 end
diff --git a/spec/services/toggle_additional_steps_spec.rb b/spec/services/toggle_additional_steps_spec.rb
index 67ac77744..9d655f2d2 100644
--- a/spec/services/toggle_additional_steps_spec.rb
+++ b/spec/services/toggle_additional_steps_spec.rb
@@ -76,6 +76,36 @@
             expect(step_to_show.reload.hidden).to eq(false)
           end
         end
+
+        context "when the referenced step also has an additional_step_rule rule" do
+          it "shows both connected questions" do
+            first_step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"},
+              hidden: false)
+            create(:radio_answer, step: first_step, response: "Red")
+
+            second_step = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              additional_step_rule: {"required_answer" => "Blue", "question_identifier" => "456"},
+              hidden: true)
+            create(:radio_answer, step: second_step, response: "Blue")
+
+            third_step = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "456",
+              hidden: true)
+
+            described_class.new(step: first_step).call
+
+            expect(second_step.reload.hidden).to eq(false)
+            expect(third_step.reload.hidden).to eq(false)
+          end
+        end
       end
 
       context "when the answers DO NOT match" do

From 8ea6e6da38167f23bd2b6ab7993faa79fccbc531 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 15 Feb 2021 15:29:09 +0000
Subject: [PATCH 091/249] Add a DateHelper to parse params into a date object

If not date can be created by Ruby, we will return nil.
---
 app/helpers/date_helper.rb       | 11 +++++++++++
 spec/helpers/date_helper_spec.rb | 30 ++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 app/helpers/date_helper.rb
 create mode 100644 spec/helpers/date_helper_spec.rb

diff --git a/app/helpers/date_helper.rb b/app/helpers/date_helper.rb
new file mode 100644
index 000000000..31819db75
--- /dev/null
+++ b/app/helpers/date_helper.rb
@@ -0,0 +1,11 @@
+module DateHelper
+  def format_date(params)
+    date_parts = params.values_at(:day, :month, :year)
+    return unless date_parts.all?(&:present?)
+
+    day, month, year = date_parts.map(&:to_i)
+    Date.new(year, month, day)
+  rescue ArgumentError
+    nil
+  end
+end
diff --git a/spec/helpers/date_helper_spec.rb b/spec/helpers/date_helper_spec.rb
new file mode 100644
index 000000000..b93e24b56
--- /dev/null
+++ b/spec/helpers/date_helper_spec.rb
@@ -0,0 +1,30 @@
+require "rails_helper"
+
+RSpec.describe DateHelper, type: :helper do
+  describe "#format_date" do
+    it "returns a Date object from params" do
+      params = {day: "1", month: "2", year: "2020"}
+      expect(helper.format_date(params)).to eq(Date.new(2020, 2, 1))
+    end
+
+    it "returns nil when passed nil" do
+      params = {}
+      expect(helper.format_date(params)).to eq(nil)
+    end
+
+    it "returns nil when the date params are incomplete" do
+      params = {day: "", month: "", year: "2019"}
+      expect(helper.format_date(params)).to eq(nil)
+    end
+
+    it "returns nil when given an invalid date" do
+      params = {day: "40", month: "13", year: "2020"}
+      expect(helper.format_date(params)).to eq(nil)
+    end
+
+    it "returns nil when given a zero parameter" do
+      params = {day: "40", month: "0", year: "2020"}
+      expect(helper.format_date(params)).to eq(nil)
+    end
+  end
+end

From 1aa80e1ff4e9be46525aa2ac1e996f95e8c52330 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 15 Feb 2021 15:33:48 +0000
Subject: [PATCH 092/249] Date validations

When a date cannot be parsed into a valid date object within Ruby, we set it to nil and pass it onto the activerecord `presence` valdiation.

This does not feel like the correct approach. Ideally Rails will recieve the parameters `response_dd`, `response_mm`, `response_yyyy`, coerce them into a single attribute and run validation on the combination. This is how the MOJ date helper works [1]. Given that three other members of the team have already spent a lot of time trying to find the right solution, this approach is very much "just get something working". This approach is lifted from BEIS RODA [2].

We include a locale file for activerecord translations so we can change the message from "Can't be blank" to something more generic. Not ideal because it doesn't say what was wrong but it does at least prevent the critical error and instruct the user in some way so that they can recover.

[1] - https://github.com/ministryofjustice/gov_uk_date_fields#3-tell-your-models-attributes-are-gov_uk_dates
[2] - https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/blob/f94d7fdb18dcf8df15f8d3a36de7e9a67e2e822a/app/controllers/staff/activity_forms_controller.rb#L81
---
 app/controllers/answers_controller.rb               | 12 ++++++++++--
 app/models/single_date_answer.rb                    |  2 +-
 app/services/save_answer.rb                         |  4 +++-
 config/application.rb                               |  4 ++++
 config/locales/models/single_date_answer.en.yml     |  8 ++++++++
 .../visitors/anyone_can_complete_a_journey_spec.rb  | 11 +++++++++++
 spec/models/single_date_answer_spec.rb              |  7 ++++++-
 spec/services/save_answer_spec.rb                   | 13 +++++++++++++
 8 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 config/locales/models/single_date_answer.en.yml

diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 2b8873ec4..869e6046c 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class AnswersController < ApplicationController
+  include DateHelper
+
   def create
     @journey = Journey.find(journey_id)
     @step = Step.find(step_id)
@@ -9,7 +11,7 @@ def create
     @answer.step = @step
 
     result = SaveAnswer.new(answer: @answer)
-      .call(checkbox_params: checkbox_params, answer_params: answer_params)
+      .call(checkbox_params: checkbox_params, answer_params: answer_params, date_params: date_params)
     @answer = result.object
 
     if result.success?
@@ -24,7 +26,7 @@ def update
     @step = Step.find(step_id)
 
     result = SaveAnswer.new(answer: @step.answer)
-      .call(checkbox_params: checkbox_params, answer_params: answer_params)
+      .call(checkbox_params: checkbox_params, answer_params: answer_params, date_params: date_params)
     @answer = result.object
 
     if result.success?
@@ -51,4 +53,10 @@ def answer_params
   def checkbox_params
     params.require(:answer).permit(response: [])
   end
+
+  def date_params
+    answer = params.require(:answer).permit(:response)
+    date_hash = {day: answer["response(3i)"], month: answer["response(2i)"], year: answer["response(1i)"]}
+    {response: format_date(date_hash)}
+  end
 end
diff --git a/app/models/single_date_answer.rb b/app/models/single_date_answer.rb
index b85a192c3..316084f88 100644
--- a/app/models/single_date_answer.rb
+++ b/app/models/single_date_answer.rb
@@ -2,5 +2,5 @@ class SingleDateAnswer < ActiveRecord::Base
   self.implicit_order_column = "created_at"
   belongs_to :step
 
-  validates :response, presence: true
+  validates :response, presence: {message: I18n.t("activerecord.errors.models.single_date_answer.attributes.response")}
 end
diff --git a/app/services/save_answer.rb b/app/services/save_answer.rb
index 978b48abd..341a9276a 100644
--- a/app/services/save_answer.rb
+++ b/app/services/save_answer.rb
@@ -5,12 +5,14 @@ def initialize(answer:)
     self.step = answer.step
   end
 
-  def call(answer_params: {}, checkbox_params: {})
+  def call(answer_params: {}, checkbox_params: {}, date_params: {})
     result = Result.new(false, answer)
 
     case step.contentful_type
     when "checkboxes"
       answer.assign_attributes(checkbox_params)
+    when "single_date"
+      answer.assign_attributes(date_params)
     else
       answer.assign_attributes(answer_params)
     end
diff --git a/config/application.rb b/config/application.rb
index 0b9010946..7033663f4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -40,5 +40,9 @@ class Application < Rails::Application
     end
 
     config.active_job.queue_adapter = :sidekiq
+
+    config.i18n.load_path += Dir[Rails.root.join("config", "locales", "**", "*.{rb,yml}")]
+    config.i18n.default_locale = :en
+    config.i18n.enforce_available_locales = false
   end
 end
diff --git a/config/locales/models/single_date_answer.en.yml b/config/locales/models/single_date_answer.en.yml
new file mode 100644
index 000000000..05deddf52
--- /dev/null
+++ b/config/locales/models/single_date_answer.en.yml
@@ -0,0 +1,8 @@
+---
+en:
+  activerecord:
+    errors:
+      models:
+        single_date_answer:
+          attributes:
+            response: Provide a real date for this answer
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 9620f0c8b..8f13055b4 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -127,6 +127,17 @@
         expect(find_field("answer_response_2i").value).to eql("8")
         expect(find_field("answer_response_1i").value).to eql("2020")
       end
+
+      scenario "date validations" do
+        start_journey_from_category_and_go_to_question(category: "single-date-question.json")
+
+        fill_in "answer[response(3i)]", with: "2"
+        fill_in "answer[response(2i)]", with: "0"
+        fill_in "answer[response(1i)]", with: "0"
+
+        click_on(I18n.t("generic.button.next"))
+        expect(page).to have_content(I18n.t("activerecord.errors.models.single_date_answer.attributes.response"))
+      end
     end
 
     context "when Contentful entry is of type checkboxes" do
diff --git a/spec/models/single_date_answer_spec.rb b/spec/models/single_date_answer_spec.rb
index 58d8ac896..a10742c94 100644
--- a/spec/models/single_date_answer_spec.rb
+++ b/spec/models/single_date_answer_spec.rb
@@ -11,6 +11,11 @@
   end
 
   describe "validations" do
-    it { is_expected.to validate_presence_of(:response) }
+    it "validates missing response" do
+      answer = build(:single_date_answer, response: nil)
+
+      expect(answer.valid?).to eq(false)
+      expect(answer.errors.full_messages.first).to include(I18n.t("activerecord.errors.models.single_date_answer.attributes.response"))
+    end
   end
 end
diff --git a/spec/services/save_answer_spec.rb b/spec/services/save_answer_spec.rb
index de4a621ec..57fedd07c 100644
--- a/spec/services/save_answer_spec.rb
+++ b/spec/services/save_answer_spec.rb
@@ -34,6 +34,19 @@
       end
     end
 
+    context "when the step is a date question" do
+      it "updates the answer with the date_params" do
+        answer = build(:single_date_answer, response: nil)
+        date = Date.new(2000, 1, 29)
+        params = {response: date}
+
+        result = described_class.new(answer: answer).call(date_params: params)
+
+        expect(result.success?).to eql(true)
+        expect(result.object.response).to eql(date)
+      end
+    end
+
     context "when the answer is invalid" do
       it "does not try to save the answer" do
         answer = create(:checkbox_answers)

From 5346f38f569a6b861ab094a4c430fb70f5ff1d46 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 16 Feb 2021 14:55:19 +0000
Subject: [PATCH 093/249] Only reshow hidden questions that qualify

* Before this change the user could show a question and it would go and show all dependent questions regardless of them having answers, or indeed answers that were required.
* This change turns the `matching_answer?` method into a functional method so it can be reused within the recursion as well as outside it
* We continue to hide all dependent child questions regardless of their answer
---
 app/services/toggle_additional_steps.rb       | 44 ++++++++++++-------
 .../anyone_can_complete_a_journey_spec.rb     |  3 +-
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index b72b8b780..3de4be29b 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -34,37 +34,51 @@ def additional_step
     journey_steps.find_by(contentful_id: additional_step_id)
   end
 
-  def matching_answer?
-    expected_answer = additional_step_rule["required_answer"].downcase
-    case answer.response.class.name
+  def matching_answer?(a:, b:)
+    expected_answer = a.downcase
+    case b.class.name
     when "Array"
-      answer.response.map(&:downcase).include?(expected_answer)
+      b.map(&:downcase).include?(expected_answer)
     else
-      expected_answer == answer.response.downcase
+      expected_answer == b.downcase
     end
   end
 
   def check_to_show_additional_steps!
-    return unless matching_answer?
-
-    recursively_toggle_additional_steps!(next_step_id: additional_step_id, hidden_state: false)
+    recursively_show_additional_steps!(current_step: step, next_step_id: additional_step_id)
   end
 
   def check_to_hide_additional_steps!
-    return if matching_answer?
+    return if matching_answer?(a: step.additional_step_rule["required_answer"], b: step.answer.response)
+
+    recursively_hide_additional_steps!(current_step: step, next_step_id: additional_step_id)
+  end
+
+  def recursively_hide_additional_steps!(current_step:, next_step_id:)
+    if next_step_id
 
-    recursively_toggle_additional_steps!(next_step_id: additional_step_id, hidden_state: true)
+      next_step = journey_steps.find_by(contentful_id: next_step_id)
+      next_step.update(hidden: true)
+
+      recursively_hide_additional_steps!(
+        current_step: next_step,
+        next_step_id: next_step.additional_step_rule&.fetch("question_identifier", nil)
+      )
+    end
   end
 
-  def recursively_toggle_additional_steps!(next_step_id:, hidden_state:)
+  def recursively_show_additional_steps!(current_step:, next_step_id:)
+    return unless current_step.answer && current_step.additional_step_rule
+
     if next_step_id
+      return unless matching_answer?(a: current_step.additional_step_rule["required_answer"], b: current_step.answer.response)
 
       next_step = journey_steps.find_by(contentful_id: next_step_id)
-      next_step.update(hidden: hidden_state)
+      next_step.update(hidden: false)
 
-      recursively_toggle_additional_steps!(
-        next_step_id: next_step.additional_step_rule&.fetch("question_identifier", nil),
-        hidden_state: hidden_state
+      recursively_show_additional_steps!(
+        current_step: next_step,
+        next_step_id: next_step.additional_step_rule&.fetch("question_identifier", nil)
       )
     end
   end
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 8f13055b4..e7b9900f6 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -188,11 +188,12 @@
         click_on(I18n.t("generic.button.next"))
 
         # This question should be made visible after the previous step
+        expect(page).not_to have_content("You should NOT be able to see this question?")
         click_on("What colour is the sky?")
         choose("Red")
         click_on(I18n.t("generic.button.next"))
 
-        # This question should be made visible after the previous step
+        # This question should only be made visible after the previous step
         click_on("You should NOT be able to see this question?")
         choose("School expert")
         click_on(I18n.t("generic.button.next"))

From e7c9b5555a0f4a4e96e2c4d5c745f2f083bb3922 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 16 Feb 2021 17:10:13 +0000
Subject: [PATCH 094/249] Fix redis connection failures by depending only on
 REDIS_URL

The Heroku Redis addon controls the REDIS_URL environment variable. Sometimes this value changes[1] and the host and/or port changes leading to connection failures after a random interval, and without warning.

This commit changes our approach from making the database number configurable through ENV to being hardcoded into each service that uses Redis: Sidekiq and Redis for caching.

[1] https://data.heroku.com/datastores/49f12bfc-2341-465f-ae43-70f7c4edabcd#settings

> Please note that these credentials are not permanent.
Heroku rotates credentials periodically and updates applications where this datastore is attached.
---
 .env.example                   | 3 +--
 .env.test                      | 3 +--
 CHANGELOG.md                   | 1 +
 config/initializers/redis.rb   | 2 +-
 config/initializers/sidekiq.rb | 4 ++--
 docker-compose.ci.yml          | 2 +-
 docker-compose.test.yml        | 2 +-
 docker-compose.yml             | 3 +--
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.env.example b/.env.example
index 3b44aeb4a..7eadf1457 100644
--- a/.env.example
+++ b/.env.example
@@ -10,8 +10,7 @@ ROLLBAR_ACCESS_TOKEN=ROLLBAR_ACCESS_TOKEN
 ROLLBAR_ENV=development
 
 DATABASE_URL=postgres://postgres@localhost:5432/buy-for-your-school-development
-REDIS_CACHE_URL=redis://localhost:6379/1
-REDIS_SIDEKIQ_URL=redis://localhost:6379/2
+REDIS_URL=redis://localhost:6379
 
 # Contentful
 CONTENTFUL_URL=cdn.contentful.com
diff --git a/.env.test b/.env.test
index 0f92858fd..09357dba8 100644
--- a/.env.test
+++ b/.env.test
@@ -6,8 +6,7 @@
 # Reference: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
 
 DATABASE_URL=postgres://postgres@localhost:5432/buy-for-your-school-test
-REDIS_CACHE_URL=redis://localhost:6379/11
-REDIS_SIDEKIQ_URL=redis://localhost:6379/12
+REDIS_URL=redis://localhost:6379
 
 # Contentful
 CONTENTFUL_URL=cdn.contentful.com
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f764590ae..a4e517ed1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - hidden questions can be shown through a new show_additional_question field for each question
 - hidden questions can be rehidden again after changing the original answer
 - hidden questions that were at one point answered, will be reshown with a change to an earlier question
+- fix Redis connection errors on Heroku
 
 ## [release-005] - 2021-1-19
 
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
index 593ba4db3..c97ceae99 100644
--- a/config/initializers/redis.rb
+++ b/config/initializers/redis.rb
@@ -6,7 +6,7 @@ def redis
       else
         Redis::Namespace.new(
           "buy_for_your_school",
-          redis: Redis.new(url: ENV["REDIS_CACHE_URL"])
+          redis: Redis.new(url: ENV["REDIS_URL"], db: 1)
         )
       end
     end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index e80787b84..b4b90970f 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,5 +1,5 @@
 Sidekiq.configure_server do |config|
-  config.redis = {url: ENV["REDIS_SIDEKIQ_URL"]}
+  config.redis = {url: "#{ENV["REDIS_URL"]}/2"}
 
   # Sidekiq Cron
   schedule_file = "config/schedule.yml"
@@ -9,5 +9,5 @@
 end
 
 Sidekiq.configure_client do |config|
-  config.redis = {url: ENV["REDIS_SIDEKIQ_URL"]}
+  config.redis = {url: "#{ENV["REDIS_URL"]}/2"}
 end
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index c2d813f79..71ae4de43 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -16,7 +16,7 @@ services:
        - .env.test
     environment:
       DATABASE_URL: postgres://postgres:password@test-db:5432/buy-for-your-school-test
-      REDIS_CACHE_URL: redis://test-redis:6379/1
+      REDIS_URL: redis://redis:6379
       DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: "true"
     networks:
       - test
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 5ac8bd1ab..a7a2c37f1 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -16,7 +16,7 @@ services:
        - .env.test
     environment:
       DATABASE_URL: postgres://postgres:password@test-db:5432/buy-for-your-school-test
-      REDIS_CACHE_URL: redis://test-redis:6379/1
+      REDIS_URL: redis://redis:6379
       DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: "true"
     volumes:
       - .:/srv/app
diff --git a/docker-compose.yml b/docker-compose.yml
index 563dd002d..4e6d8ed59 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,8 +17,7 @@ services:
        - .env.development.local
     environment:
       DATABASE_URL: postgres://postgres:password@db:5432/buy-for-your-school-development
-      REDIS_CACHE_URL: redis://redis:6379/1
-      REDIS_SIDEKIQ_URL: redis://redis:6379/2
+      REDIS_URL: redis://redis:6379
     volumes:
       - .:/srv/app
     tty: true

From 195bd40e64b4b5bfa1786ce57a8e239f4b2be66e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Feb 2021 11:04:05 +0000
Subject: [PATCH 095/249] Bump standard from 0.12.0 to 0.13.0

Bumps [standard](https://github.com/testdouble/standard) from 0.12.0 to 0.13.0.
- [Release notes](https://github.com/testdouble/standard/releases)
- [Changelog](https://github.com/testdouble/standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testdouble/standard/compare/v0.12.0...v0.13.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0d4883a48..55888784a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -263,7 +263,7 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.1)
-    rubocop (1.8.1)
+    rubocop (1.10.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -321,8 +321,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    standard (0.12.0)
-      rubocop (= 1.8.1)
+    standard (0.13.0)
+      rubocop (= 1.10.0)
       rubocop-performance (= 1.9.2)
     thor (1.1.0)
     tilt (2.0.10)

From f31854ce07f720e6259874d1b500596d2d65add6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Feb 2021 15:19:32 +0000
Subject: [PATCH 096/249] Bump govuk_design_system_formbuilder from 2.1.8 to
 2.1.9

Bumps [govuk_design_system_formbuilder](https://github.com/DFE-Digital/govuk_design_system_formbuilder) from 2.1.8 to 2.1.9.
- [Release notes](https://github.com/DFE-Digital/govuk_design_system_formbuilder/releases)
- [Commits](https://github.com/DFE-Digital/govuk_design_system_formbuilder/compare/v2.1.8...v2.1.9)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 55888784a..1fe48a0d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -136,7 +136,7 @@ GEM
       raabro (~> 1.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    govuk_design_system_formbuilder (2.1.8)
+    govuk_design_system_formbuilder (2.1.9)
       actionview (>= 5.2)
       activemodel (>= 5.2)
       activesupport (>= 5.2)

From 79a6fda2433303b39344e677697a9de96d6999fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Feb 2021 11:03:28 +0000
Subject: [PATCH 097/249] Bump rails from 6.1.2.1 to 6.1.3

Bumps [rails](https://github.com/rails/rails) from 6.1.2.1 to 6.1.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.1.2.1...v6.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |   2 +-
 Gemfile.lock | 108 +++++++++++++++++++++++++--------------------------
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9179fc529..dbfe7c996 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem "puma", "~> 5.2"
 gem "redis", "~> 4.2"
 gem "redis-namespace"
 gem "rollbar"
-gem "rails", "~> 6.1.2"
+gem "rails", "~> 6.1.3"
 gem "sass-rails", "~> 6.0"
 gem "sidekiq", "~> 6.1"
 gem "sidekiq-cron", "~> 1.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1fe48a0d7..667364149 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,60 +1,60 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
+    actioncable (6.1.3)
+      actionpack (= 6.1.3)
+      activesupport (= 6.1.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      activejob (= 6.1.2.1)
-      activerecord (= 6.1.2.1)
-      activestorage (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
+    actionmailbox (6.1.3)
+      actionpack (= 6.1.3)
+      activejob (= 6.1.3)
+      activerecord (= 6.1.3)
+      activestorage (= 6.1.3)
+      activesupport (= 6.1.3)
       mail (>= 2.7.1)
-    actionmailer (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      actionview (= 6.1.2.1)
-      activejob (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
+    actionmailer (6.1.3)
+      actionpack (= 6.1.3)
+      actionview (= 6.1.3)
+      activejob (= 6.1.3)
+      activesupport (= 6.1.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.2.1)
-      actionview (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
+    actionpack (6.1.3)
+      actionview (= 6.1.3)
+      activesupport (= 6.1.3)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      activerecord (= 6.1.2.1)
-      activestorage (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
+    actiontext (6.1.3)
+      actionpack (= 6.1.3)
+      activerecord (= 6.1.3)
+      activestorage (= 6.1.3)
+      activesupport (= 6.1.3)
       nokogiri (>= 1.8.5)
-    actionview (6.1.2.1)
-      activesupport (= 6.1.2.1)
+    actionview (6.1.3)
+      activesupport (= 6.1.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.2.1)
-      activesupport (= 6.1.2.1)
+    activejob (6.1.3)
+      activesupport (= 6.1.3)
       globalid (>= 0.3.6)
-    activemodel (6.1.2.1)
-      activesupport (= 6.1.2.1)
-    activerecord (6.1.2.1)
-      activemodel (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
-    activestorage (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      activejob (= 6.1.2.1)
-      activerecord (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activestorage (6.1.3)
+      actionpack (= 6.1.3)
+      activejob (= 6.1.3)
+      activerecord (= 6.1.3)
+      activesupport (= 6.1.3)
       marcel (~> 0.3.1)
       mimemagic (~> 0.3.2)
-    activesupport (6.1.2.1)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -208,20 +208,20 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.2.1)
-      actioncable (= 6.1.2.1)
-      actionmailbox (= 6.1.2.1)
-      actionmailer (= 6.1.2.1)
-      actionpack (= 6.1.2.1)
-      actiontext (= 6.1.2.1)
-      actionview (= 6.1.2.1)
-      activejob (= 6.1.2.1)
-      activemodel (= 6.1.2.1)
-      activerecord (= 6.1.2.1)
-      activestorage (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
+    rails (6.1.3)
+      actioncable (= 6.1.3)
+      actionmailbox (= 6.1.3)
+      actionmailer (= 6.1.3)
+      actionpack (= 6.1.3)
+      actiontext (= 6.1.3)
+      actionview (= 6.1.3)
+      activejob (= 6.1.3)
+      activemodel (= 6.1.3)
+      activerecord (= 6.1.3)
+      activestorage (= 6.1.3)
+      activesupport (= 6.1.3)
       bundler (>= 1.15.0)
-      railties (= 6.1.2.1)
+      railties (= 6.1.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -229,9 +229,9 @@ GEM
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rails_layout (1.0.42)
-    railties (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
+    railties (6.1.3)
+      actionpack (= 6.1.3)
+      activesupport (= 6.1.3)
       method_source
       rake (>= 0.8.7)
       thor (~> 1.0)
@@ -384,7 +384,7 @@ DEPENDENCIES
   pg
   pry
   puma (~> 5.2)
-  rails (~> 6.1.2)
+  rails (~> 6.1.3)
   rails_layout
   redis (~> 4.2)
   redis-namespace

From 2c74cdb8a389d475aa262681890be14cd7bd6ba5 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 18 Feb 2021 11:47:39 +0000
Subject: [PATCH 098/249] Users can provide further info for their checkbox
 choice

In following the approach of the extended-radio pattern, we add extended-checkboxes.

We use the pattern and HTML from the DfE Form builder gem [1]

[1] https://govuk-form-builder.netlify.app/form-elements/checkboxes/#generating-checkboxes-with-a-conditionally-revealed-text-field
---
 CHANGELOG.md                                  |  1 +
 app/controllers/answers_controller.rb         |  2 +-
 app/views/steps/checkboxes.html.erb           | 23 ++++++---
 ...8_add_further_information_to_checkboxes.rb |  5 ++
 db/schema.rb                                  |  3 +-
 .../anyone_can_complete_a_journey_spec.rb     | 17 +++++++
 .../extended-checkboxes-question.json         | 44 +++++++++++++++++
 .../sections/extended-checkboxes-section.json | 43 +++++++++++++++++
 .../steps/extended-checkboxes-question.json   | 47 +++++++++++++++++++
 9 files changed, 177 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20210217145518_add_further_information_to_checkboxes.rb
 create mode 100644 spec/fixtures/contentful/categories/extended-checkboxes-question.json
 create mode 100644 spec/fixtures/contentful/sections/extended-checkboxes-section.json
 create mode 100644 spec/fixtures/contentful/steps/extended-checkboxes-question.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4e517ed1..68116ba0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - hidden questions can be rehidden again after changing the original answer
 - hidden questions that were at one point answered, will be reshown with a change to an earlier question
 - fix Redis connection errors on Heroku
+- users can be asked extended checkbox questions which ask for further information
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 869e6046c..560d233b3 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -51,7 +51,7 @@ def answer_params
   end
 
   def checkbox_params
-    params.require(:answer).permit(response: [])
+    params.require(:answer).permit(:further_information, response: [])
   end
 
   def date_params
diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index 60bb18963..8500e843e 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -1,8 +1,19 @@
 <%= render layout: layout do |f| %>
-  <%= f.govuk_collection_check_boxes :response,
-    checkbox_options(array_of_options: @step.options_list),
-    :id,
-    :name,
-    legend: { text: @step.title, size: "l" }
-  %>
+  <%= f.govuk_check_boxes_fieldset :response, legend: { text: @step.title, size: "l" } do %>
+    <% if @step.help_text.present? %>
+      <span class="govuk-hint">
+        <%= @step.help_text %>
+      </span>
+    <% end %>
+
+    <% @step.options.each do |option| %>
+      <% if option["further_information_required"] == true %>
+        <%= f.govuk_check_box :response, option["value"].downcase, label: { text: option["value"] } do %>
+          <%= f.govuk_text_field :further_information, label: { text: option["further_information_help_text"] } %>
+        <% end %>
+      <% else %>
+        <%= f.govuk_check_box :response, option["value"].downcase, label: { text: option["value"] } %>
+      <% end %>
+    <% end %>
+  <% end %>
 <% end %>
diff --git a/db/migrate/20210217145518_add_further_information_to_checkboxes.rb b/db/migrate/20210217145518_add_further_information_to_checkboxes.rb
new file mode 100644
index 000000000..90c37befa
--- /dev/null
+++ b/db/migrate/20210217145518_add_further_information_to_checkboxes.rb
@@ -0,0 +1,5 @@
+class AddFurtherInformationToCheckboxes < ActiveRecord::Migration[6.1]
+  def change
+    add_column :checkbox_answers, :further_information, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 044b2ae6b..a5607f3e9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_02_11_104039) do
+ActiveRecord::Schema.define(version: 2021_02_17_145518) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -22,6 +22,7 @@
     t.string "response", default: [], array: true
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.text "further_information"
     t.index ["step_id"], name: "index_checkbox_answers_on_step_id"
   end
 
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index e7b9900f6..9b76bcf3b 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -159,6 +159,23 @@
         start_journey_from_category_and_go_to_question(category: "checkboxes-question.json")
         expect(page).to have_content("Morning break")
       end
+
+      context "when extra configuration is passed to collect further info" do
+        scenario "asks the user for further information" do
+          start_journey_from_category_and_go_to_question(category: "extended-checkboxes-question.json")
+
+          check("Yes")
+          fill_in "answer[further_information]", with: "The school needs the kitchen cleaned once a day"
+
+          click_on(I18n.t("generic.button.next"))
+
+          click_first_link_in_task_list
+
+          expect(page).to have_checked_field("Yes")
+          expect(find_field("answer-further-information-field").value)
+            .to eql("The school needs the kitchen cleaned once a day")
+        end
+      end
     end
 
     context "when Contentful entry is of type radios" do
diff --git a/spec/fixtures/contentful/categories/extended-checkboxes-question.json b/spec/fixtures/contentful/categories/extended-checkboxes-question.json
new file mode 100644
index 000000000..294928cac
--- /dev/null
+++ b/spec/fixtures/contentful/categories/extended-checkboxes-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "extended-checkboxes-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/extended-checkboxes-section.json b/spec/fixtures/contentful/sections/extended-checkboxes-section.json
new file mode 100644
index 000000000..d3f612812
--- /dev/null
+++ b/spec/fixtures/contentful/sections/extended-checkboxes-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-checkboxes-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "extended-checkboxes-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/extended-checkboxes-question.json b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
new file mode 100644
index 000000000..177b6e70c
--- /dev/null
+++ b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
@@ -0,0 +1,47 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-checkboxes-question",
+        "type": "Entry",
+        "createdAt": "2021-02-17T14:09:56.405Z",
+        "updatedAt": "2021-02-17T14:38:07.806Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/extended-checkboxes",
+        "type": "checkboxes",
+        "title": "Extended checkboxes",
+        "extendedOptions": [
+            {
+                "value": "Yes",
+                "further_information_required": true,
+                "further_information_help_text": "You should tell us more"
+            },
+            {
+              "value": "No"
+            }
+        ],
+        "alwaysShowTheUser": true
+    }
+}

From 0a522338f5759d64d5ce796cd2de12a75f76c78a Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 17 Feb 2021 15:12:52 +0000
Subject: [PATCH 099/249] Remove redundant method

---
 app/models/step.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/step.rb b/app/models/step.rb
index 3cc8756df..2b3f51073 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -27,8 +27,4 @@ def primary_call_to_action_text
     return I18n.t("generic.button.next") unless super.present?
     super
   end
-
-  def options_list
-    options.map { |hash| hash["value"] }
-  end
 end

From 8c0cc0d788ce69ac214739122ffe6d16d66ef8ec Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 18 Feb 2021 15:45:58 +0000
Subject: [PATCH 100/249] Extended checkbox pattern can store multiple pieces
 of further information
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The DfE Form builder gem was only designed to support a single checkbox option that would show a text field, this is called "other", and allows the user to provide a single choice.

We are pushing this pattern to work for our own needs: every checkbox can have a field the user can give further information in.

This is difficult. The formbuilder gem expects and requires an activerecord object to behave normally. This object needs to have a unique attribute for each "further information".

We can't add `n` fields to the database table for `1_further_information`…`n_further_information` because we can't ever know ahead how many options will exist.

This approach modifies the form object when displayed to the user. It dynamically adds ephemeral attributes to the object so that the form object can work with unique fields such as `yes_further_information` rather than only `further_information`.
---
 app/controllers/answers_controller.rb         | 15 ++++++++-
 app/helpers/step_helper.rb                    | 15 +++++++++
 app/views/steps/checkboxes.html.erb           | 10 ++++--
 ...8_add_further_information_to_checkboxes.rb |  2 +-
 db/schema.rb                                  |  2 +-
 .../anyone_can_complete_a_journey_spec.rb     | 13 ++++++--
 .../steps/extended-checkboxes-question.json   |  4 ++-
 spec/helpers/step_helper_spec.rb              | 32 +++++++++++++++++++
 8 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 560d233b3..9c448fa7e 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -51,7 +51,20 @@ def answer_params
   end
 
   def checkbox_params
-    params.require(:answer).permit(:further_information, response: [])
+    answer_params = params.require(:answer)
+
+    if @step.options
+      allowed_further_information_keys = @step.options.map { |option|
+        "#{option["value"].tr(" ", "_").downcase}_further_information".to_sym
+      }
+    end
+
+    further_information_params = answer_params.permit(*allowed_further_information_keys)
+    further_information = further_information_params.to_hash
+
+    all_params = answer_params.permit(response: [])
+    all_params[:further_information] = further_information
+    all_params
   end
 
   def date_params
diff --git a/app/helpers/step_helper.rb b/app/helpers/step_helper.rb
index dc153d116..0f539d1e2 100644
--- a/app/helpers/step_helper.rb
+++ b/app/helpers/step_helper.rb
@@ -6,4 +6,19 @@ def checkbox_options(array_of_options:)
       OpenStruct.new(id: option.downcase, name: option)
     }
   end
+
+  def monkey_patch_form_object_with_further_information_field(
+    form_object:,
+    associated_choice:
+  )
+    existing_further_information = form_object&.further_information&.fetch(
+      "#{associated_choice}_further_information", nil
+    )
+
+    form_object.define_singleton_method("#{associated_choice}_further_information") do
+      existing_further_information
+    end
+
+    form_object
+  end
 end
diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index 8500e843e..3df3bf5ce 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -7,12 +7,16 @@
     <% end %>
 
     <% @step.options.each do |option| %>
+      <% machine_value = option["value"].tr(" ", "_").downcase %>
+
       <% if option["further_information_required"] == true %>
-        <%= f.govuk_check_box :response, option["value"].downcase, label: { text: option["value"] } do %>
-          <%= f.govuk_text_field :further_information, label: { text: option["further_information_help_text"] } %>
+        <% f.object = monkey_patch_form_object_with_further_information_field(form_object: f.object, associated_choice: machine_value) %>
+        <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
+          <%= f.govuk_text_field "#{machine_value}_further_information",
+            label: { text: option["further_information_help_text"] } %>
         <% end %>
       <% else %>
-        <%= f.govuk_check_box :response, option["value"].downcase, label: { text: option["value"] } %>
+        <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } %>
       <% end %>
     <% end %>
   <% end %>
diff --git a/db/migrate/20210217145518_add_further_information_to_checkboxes.rb b/db/migrate/20210217145518_add_further_information_to_checkboxes.rb
index 90c37befa..f10ff1332 100644
--- a/db/migrate/20210217145518_add_further_information_to_checkboxes.rb
+++ b/db/migrate/20210217145518_add_further_information_to_checkboxes.rb
@@ -1,5 +1,5 @@
 class AddFurtherInformationToCheckboxes < ActiveRecord::Migration[6.1]
   def change
-    add_column :checkbox_answers, :further_information, :text
+    add_column :checkbox_answers, :further_information, :jsonb
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index a5607f3e9..350791f2e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -22,7 +22,7 @@
     t.string "response", default: [], array: true
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.text "further_information"
+    t.jsonb "further_information"
     t.index ["step_id"], name: "index_checkbox_answers_on_step_id"
   end
 
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 9b76bcf3b..e12b4e2bc 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -165,15 +165,22 @@
           start_journey_from_category_and_go_to_question(category: "extended-checkboxes-question.json")
 
           check("Yes")
-          fill_in "answer[further_information]", with: "The school needs the kitchen cleaned once a day"
+          fill_in "answer[yes_further_information]", with: "The first piece of further information"
+
+          check("No")
+          fill_in "answer[no_further_information]", with: "A second piece of further information"
 
           click_on(I18n.t("generic.button.next"))
 
           click_first_link_in_task_list
 
           expect(page).to have_checked_field("Yes")
-          expect(find_field("answer-further-information-field").value)
-            .to eql("The school needs the kitchen cleaned once a day")
+          expect(find_field("answer-yes-further-information-field").value)
+            .to eql("The first piece of further information")
+
+          expect(page).to have_checked_field("No")
+          expect(find_field("answer-no-further-information-field").value)
+            .to eql("A second piece of further information")
         end
       end
     end
diff --git a/spec/fixtures/contentful/steps/extended-checkboxes-question.json b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
index 177b6e70c..dbd108b31 100644
--- a/spec/fixtures/contentful/steps/extended-checkboxes-question.json
+++ b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
@@ -39,7 +39,9 @@
                 "further_information_help_text": "You should tell us more"
             },
             {
-              "value": "No"
+                "value": "No",
+                "further_information_required": true,
+                "further_information_help_text": "You should tell us more"
             }
         ],
         "alwaysShowTheUser": true
diff --git a/spec/helpers/step_helper_spec.rb b/spec/helpers/step_helper_spec.rb
index a223ce955..56a3b10c2 100644
--- a/spec/helpers/step_helper_spec.rb
+++ b/spec/helpers/step_helper_spec.rb
@@ -11,4 +11,36 @@
       ])
     end
   end
+
+  describe "#monkey_patch_form_object_with_further_information_field" do
+    it "returns the modified form_object" do
+      object = OpenStruct.new
+      result = helper.monkey_patch_form_object_with_further_information_field(
+        form_object: object,
+        associated_choice: "foo"
+      )
+      expect(result).to eq(object)
+    end
+
+    it "adds a singleton method to the object" do
+      object = OpenStruct.new
+      result = helper.monkey_patch_form_object_with_further_information_field(
+        form_object: object,
+        associated_choice: "foo"
+      )
+      expect(result.foo_further_information).to eq(nil)
+      expect(result.foo_further_information = "bar").to eql("bar")
+    end
+
+    context "when the object has a further_information field" do
+      it "adds a singleton method with the same value as the return value" do
+        object = OpenStruct.new(further_information: {"foo_further_information" => :bar})
+        result = helper.monkey_patch_form_object_with_further_information_field(
+          form_object: object,
+          associated_choice: "foo"
+        )
+        expect(result.foo_further_information).to eq(:bar)
+      end
+    end
+  end
 end

From 724e94b7b67873c12262b19029cfb050a6fe6014 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 16 Feb 2021 14:20:31 +0000
Subject: [PATCH 101/249] Add missing helpText to single date fixture

---
 spec/fixtures/contentful/steps/single-date-question.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/fixtures/contentful/steps/single-date-question.json b/spec/fixtures/contentful/steps/single-date-question.json
index 0a40db1a9..b14bcef83 100644
--- a/spec/fixtures/contentful/steps/single-date-question.json
+++ b/spec/fixtures/contentful/steps/single-date-question.json
@@ -32,6 +32,7 @@
         "slug": "/starting-date",
         "type": "single date",
         "title": "When will this start?",
+        "helpText": "This will help set the timetable",
         "next": {
             "sys": {
                 "type": "Link",

From 0a49610968a40f409a98ad06e55f594b218b7027 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 16 Feb 2021 14:50:58 +0000
Subject: [PATCH 102/249] Add markdown parsing to question help text

This commit adds a new `help_text_html` method to a `Step`, which passes
the `helpText` field from Contentful through a markdown parser.

Using this field when presenting the help text to the user allows for
richer formatting to be used, including (most pertinently) paragraph
breaks and unordered lists, although the full range of markdown
formatting is supported.

Changing the behaviour of `hint` within the form builder to use a lambda
instead of a further hash means that the text will be wrapped in a
`<div>` instead of a `<span>`, which keeps semantics intact.
---
 CHANGELOG.md                                  |  1 +
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  2 +
 app/models/step.rb                            |  4 ++
 app/views/steps/checkboxes.html.erb           |  2 +-
 app/views/steps/currency.html.erb             |  2 +-
 app/views/steps/long_text.html.erb            |  2 +-
 app/views/steps/number.html.erb               |  2 +-
 app/views/steps/radios.html.erb               |  6 +--
 app/views/steps/short_text.html.erb           |  2 +-
 app/views/steps/single_date.html.erb          |  2 +-
 .../anyone_can_complete_a_journey_spec.rb     | 23 ++++++++++
 .../categories/markdown-help-text.json        | 44 ++++++++++++++++++
 .../sections/markdown-help-text-section.json  | 43 ++++++++++++++++++
 .../contentful/steps/markdown-help-text.json  | 45 +++++++++++++++++++
 15 files changed, 172 insertions(+), 9 deletions(-)
 create mode 100644 spec/fixtures/contentful/categories/markdown-help-text.json
 create mode 100644 spec/fixtures/contentful/sections/markdown-help-text-section.json
 create mode 100644 spec/fixtures/contentful/steps/markdown-help-text.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68116ba0c..8ccbdcd70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - hidden questions that were at one point answered, will be reshown with a change to an earlier question
 - fix Redis connection errors on Heroku
 - users can be asked extended checkbox questions which ask for further information
+- markdown in help text fields is now parsed into HTML
 
 ## [release-005] - 2021-1-19
 
diff --git a/Gemfile b/Gemfile
index dbfe7c996..583642006 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,6 +17,7 @@ gem "liquid"
 gem "pg"
 gem "mini_racer"
 gem "puma", "~> 5.2"
+gem "redcarpet", "~> 3.5"
 gem "redis", "~> 4.2"
 gem "redis-namespace"
 gem "rollbar"
diff --git a/Gemfile.lock b/Gemfile.lock
index 667364149..9809bca84 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -240,6 +240,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    redcarpet (3.5.1)
     redis (4.2.5)
     redis-namespace (1.8.1)
       redis (>= 3.0.4)
@@ -386,6 +387,7 @@ DEPENDENCIES
   puma (~> 5.2)
   rails (~> 6.1.3)
   rails_layout
+  redcarpet (~> 3.5)
   redis (~> 4.2)
   redis-namespace
   rollbar
diff --git a/app/models/step.rb b/app/models/step.rb
index 2b3f51073..fca5022f0 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -27,4 +27,8 @@ def primary_call_to_action_text
     return I18n.t("generic.button.next") unless super.present?
     super
   end
+
+  def help_text_html
+    Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(help_text)
+  end
 end
diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index 3df3bf5ce..fbba198a8 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -2,7 +2,7 @@
   <%= f.govuk_check_boxes_fieldset :response, legend: { text: @step.title, size: "l" } do %>
     <% if @step.help_text.present? %>
       <span class="govuk-hint">
-        <%= @step.help_text %>
+        <%= @step.help_text_html.html_safe %>
       </span>
     <% end %>
 
diff --git a/app/views/steps/currency.html.erb b/app/views/steps/currency.html.erb
index 6d07b3bb0..8513721f6 100644
--- a/app/views/steps/currency.html.erb
+++ b/app/views/steps/currency.html.erb
@@ -2,6 +2,6 @@
   <%= f.govuk_text_field :response,
     label: { text: @step.title, size: "l" },
     prefix_text: "£",
-    hint: { text: @step.help_text }
+    hint: -> { @step.help_text_html.html_safe }
   %>
 <% end %>
diff --git a/app/views/steps/long_text.html.erb b/app/views/steps/long_text.html.erb
index 4f4984116..c6b3e0d58 100644
--- a/app/views/steps/long_text.html.erb
+++ b/app/views/steps/long_text.html.erb
@@ -1,7 +1,7 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_area :response,
     label: { text: @step.title, size: "l" },
-    hint: { text: @step.help_text },
+    hint: -> { @step.help_text_html.html_safe },
     width: "one-third",
     rows: 9
   %>
diff --git a/app/views/steps/number.html.erb b/app/views/steps/number.html.erb
index 28c6b6ef7..eb717d370 100644
--- a/app/views/steps/number.html.erb
+++ b/app/views/steps/number.html.erb
@@ -1,6 +1,6 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_field :response,
     label: { text: @step.title, size: "l" },
-    hint: { text: @step.help_text }
+    hint: -> { @step.help_text_html.html_safe }
   %>
 <% end %>
diff --git a/app/views/steps/radios.html.erb b/app/views/steps/radios.html.erb
index b3ce99def..2df3275c8 100644
--- a/app/views/steps/radios.html.erb
+++ b/app/views/steps/radios.html.erb
@@ -2,9 +2,9 @@
   <%= f.hidden_field :response, value: nil %>
   <%= f.govuk_radio_buttons_fieldset(:response, legend: { size: "l", text: @step.title }) do %>
     <% if @step.help_text.present? %>
-      <span class="govuk-hint">
-        <%= @step.help_text %>
-      </span>
+      <div class="govuk-hint">
+        <%= @step.help_text_html.html_safe %>
+      </div>
     <% end %>
 
     <% @step.options.each do |option| %>
diff --git a/app/views/steps/short_text.html.erb b/app/views/steps/short_text.html.erb
index 172c6649d..5dffa345a 100644
--- a/app/views/steps/short_text.html.erb
+++ b/app/views/steps/short_text.html.erb
@@ -1,7 +1,7 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_field :response,
     label: { text: @step.title, size: "l" },
-    hint: { text: @step.help_text },
+    hint: -> { @step.help_text_html.html_safe },
     width: "one-third"
   %>
 <% end %>
diff --git a/app/views/steps/single_date.html.erb b/app/views/steps/single_date.html.erb
index b09581207..2af650697 100644
--- a/app/views/steps/single_date.html.erb
+++ b/app/views/steps/single_date.html.erb
@@ -1,6 +1,6 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_date_field :response,
     legend: { text: @step.title, size: "l" },
-    hint: { text: @step.help_text }
+    hint: -> { @step.help_text_html.html_safe }
   %>
 <% end %>
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index e12b4e2bc..71568fb97 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -245,6 +245,29 @@
     end
   end
 
+  context "when the help text contains Markdown" do
+    scenario "paragraph breaks are parsed as expected" do
+      start_journey_from_category_and_go_to_question(category: "markdown-help-text.json")
+
+      expect(page.html).to include("<p>Paragraph Test: Paragraph 1</p>")
+      expect(page.html).to include("<p>Paragraph Test: Paragraph 2</p>")
+    end
+
+    scenario "bold text is parsed as expected" do
+      start_journey_from_category_and_go_to_question(category: "markdown-help-text.json")
+
+      expect(page.html).to include("<strong>Bold text</strong> test")
+    end
+
+    scenario "lists are parsed as expected" do
+      start_journey_from_category_and_go_to_question(category: "markdown-help-text.json")
+
+      expect(page.html).to include("<li>List item one</li>")
+      expect(page.html).to include("<li>List item two</li>")
+      expect(page.html).to include("<li>List item three</li>")
+    end
+  end
+
   context "when Contentful entry model wasn't an expected type" do
     scenario "returns an error message" do
       stub_contentful_category(fixture_filename: "unexpected-contentful-type.json")
diff --git a/spec/fixtures/contentful/categories/markdown-help-text.json b/spec/fixtures/contentful/categories/markdown-help-text.json
new file mode 100644
index 000000000..142182217
--- /dev/null
+++ b/spec/fixtures/contentful/categories/markdown-help-text.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "markdown-help-text-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/markdown-help-text-section.json b/spec/fixtures/contentful/sections/markdown-help-text-section.json
new file mode 100644
index 000000000..77e5cbf13
--- /dev/null
+++ b/spec/fixtures/contentful/sections/markdown-help-text-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "radio-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "markdown-help-text"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/markdown-help-text.json b/spec/fixtures/contentful/steps/markdown-help-text.json
new file mode 100644
index 000000000..d82001c52
--- /dev/null
+++ b/spec/fixtures/contentful/steps/markdown-help-text.json
@@ -0,0 +1,45 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "jspwts36h1os"
+            }
+        },
+        "id": "markdown-help-text",
+        "type": "Entry",
+        "createdAt": "2020-09-07T10:56:40.585Z",
+        "updatedAt": "2020-09-14T22:16:54.633Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 7,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/which-service",
+        "title": "Which service do you need?",
+        "helpText": "Paragraph Test: Paragraph 1\n\nParagraph Test: Paragraph 2\n\n**Bold text** test\n\n- List item one\n- List item two\n- List item three",
+        "type": "radios",
+        "extendedOptions": [
+          {
+              "value": "Catering"
+          },
+          {
+              "value": "Cleaning"
+          }
+        ]
+    }
+}

From 04fdcc9047b1464f37538a229e1fc4abc353222f Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 23 Feb 2021 11:56:07 +0000
Subject: [PATCH 103/249] Add test to make sure nil help text works as expected

We thought that an empty help text may expose a bug in the code. This test makes sure that it doesn't.
---
 .../anyone_can_complete_a_journey_spec.rb     |  8 ++++
 .../contentful/categories/nil-help-text.json  | 44 +++++++++++++++++++
 .../sections/nil-help-text-section.json       | 43 ++++++++++++++++++
 .../contentful/steps/nil-help-text.json       | 44 +++++++++++++++++++
 4 files changed, 139 insertions(+)
 create mode 100644 spec/fixtures/contentful/categories/nil-help-text.json
 create mode 100644 spec/fixtures/contentful/sections/nil-help-text-section.json
 create mode 100644 spec/fixtures/contentful/steps/nil-help-text.json

diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 71568fb97..d840355c0 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -268,6 +268,14 @@
     end
   end
 
+  context "when the help text is nil" do
+    scenario "paragraph breaks are parsed as expected" do
+      start_journey_from_category_and_go_to_question(category: "nil-help-text.json")
+
+      expect(page.html).to include("Which service do you need?")
+    end
+  end
+
   context "when Contentful entry model wasn't an expected type" do
     scenario "returns an error message" do
       stub_contentful_category(fixture_filename: "unexpected-contentful-type.json")
diff --git a/spec/fixtures/contentful/categories/nil-help-text.json b/spec/fixtures/contentful/categories/nil-help-text.json
new file mode 100644
index 000000000..1ab55484c
--- /dev/null
+++ b/spec/fixtures/contentful/categories/nil-help-text.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "nil-help-text-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/nil-help-text-section.json b/spec/fixtures/contentful/sections/nil-help-text-section.json
new file mode 100644
index 000000000..4088011af
--- /dev/null
+++ b/spec/fixtures/contentful/sections/nil-help-text-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "nil-help-text-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "nil-help-text"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/nil-help-text.json b/spec/fixtures/contentful/steps/nil-help-text.json
new file mode 100644
index 000000000..b34c2cdfc
--- /dev/null
+++ b/spec/fixtures/contentful/steps/nil-help-text.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "jspwts36h1os"
+            }
+        },
+        "id": "nil-help-text",
+        "type": "Entry",
+        "createdAt": "2020-09-07T10:56:40.585Z",
+        "updatedAt": "2020-09-14T22:16:54.633Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 7,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/which-service",
+        "title": "Which service do you need?",
+        "type": "radios",
+        "extendedOptions": [
+          {
+              "value": "Catering"
+          },
+          {
+              "value": "Cleaning"
+          }
+        ]
+    }
+}

From 5f2d3d996f88ec008d0985b6690ebfcd861942f7 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Feb 2021 14:23:29 +0000
Subject: [PATCH 104/249] Correct tasklist header

Co-authored-by: Faye Goodworth <faye@paper.studio>
---
 app/views/journeys/show.html.erb                             | 2 +-
 spec/features/visitors/anyone_can_complete_a_journey_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index 6f0d106ad..e1baed67d 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -1,6 +1,6 @@
 <%= content_for :title, @journey.category.capitalize %>
 
-<h1 class="govuk-heading-xl"><%= @journey.category.capitalize %></h1>
+<h1 class="govuk-heading-xl"><%= I18n.t("planning.start_page.page_title") %></h1>
 
 <%= render "resume_journey_notice" %>
 
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index d840355c0..a48d6e889 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -16,7 +16,7 @@
 
     click_on(I18n.t("generic.button.start"))
 
-    expect(page).to have_content("Catering")
+    expect(page).to have_content(I18n.t("planning.start_page.page_title"))
     expect(page).to have_content("Which service do you need?")
     expect(page).to have_content("Not started")
   end

From 98484b343d4ff50ae1cc7e23292ee05e2b181527 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Feb 2021 15:51:54 +0000
Subject: [PATCH 105/249] Fix inconsistent reference to Contentful attribute

We already had `display_further_information` for radio questions and this has been used with our real questions. The addition of extended checkbox questions made an error with how it's fixture was produced. Switch this back to the original key name.
---
 app/views/steps/checkboxes.html.erb                           | 2 +-
 .../contentful/steps/extended-checkboxes-question.json        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index fbba198a8..1e705d927 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -9,7 +9,7 @@
     <% @step.options.each do |option| %>
       <% machine_value = option["value"].tr(" ", "_").downcase %>
 
-      <% if option["further_information_required"] == true %>
+      <% if option["display_further_information"] == true %>
         <% f.object = monkey_patch_form_object_with_further_information_field(form_object: f.object, associated_choice: machine_value) %>
         <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
           <%= f.govuk_text_field "#{machine_value}_further_information",
diff --git a/spec/fixtures/contentful/steps/extended-checkboxes-question.json b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
index dbd108b31..f2ce1a50f 100644
--- a/spec/fixtures/contentful/steps/extended-checkboxes-question.json
+++ b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
@@ -35,12 +35,12 @@
         "extendedOptions": [
             {
                 "value": "Yes",
-                "further_information_required": true,
+                "display_further_information": true,
                 "further_information_help_text": "You should tell us more"
             },
             {
                 "value": "No",
-                "further_information_required": true,
+                "display_further_information": true,
                 "further_information_help_text": "You should tell us more"
             }
         ],

From ff977ef1e527e62db7aa8ac87d9f52a0f7ec2264 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Feb 2021 16:40:40 +0000
Subject: [PATCH 106/249] Checkbox info fields no longer try and create their
 own label

..When one is not provided

Instead we use the `hidden` option on the `text_field` to make sure there is no visible label text but the label element remains there for screenreaders https://www.rubydoc.info/gems/govuk_design_system_formbuilder/GOVUKDesignSystemFormBuilder/Builder#govuk_text_field-instance_method
---
 app/views/steps/checkboxes.html.erb                           | 2 +-
 spec/features/visitors/anyone_can_complete_a_journey_spec.rb  | 4 ++++
 .../contentful/steps/extended-checkboxes-question.json        | 3 +--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index 1e705d927..1781c5299 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -13,7 +13,7 @@
         <% f.object = monkey_patch_form_object_with_further_information_field(form_object: f.object, associated_choice: machine_value) %>
         <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
           <%= f.govuk_text_field "#{machine_value}_further_information",
-            label: { text: option["further_information_help_text"] } %>
+            label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
         <% end %>
       <% else %>
         <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } %>
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index a48d6e889..c05542dc1 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -168,6 +168,10 @@
           fill_in "answer[yes_further_information]", with: "The first piece of further information"
 
           check("No")
+          expect(page).not_to have_content("No_further_information") # It should not create a label which one isn't specified
+          within("span.govuk-visually-hidden") do
+            expect(page).to have_content("Optional further information") # Default the hidden label to something understandable for screen readers
+          end
           fill_in "answer[no_further_information]", with: "A second piece of further information"
 
           click_on(I18n.t("generic.button.next"))
diff --git a/spec/fixtures/contentful/steps/extended-checkboxes-question.json b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
index f2ce1a50f..72a2b7e64 100644
--- a/spec/fixtures/contentful/steps/extended-checkboxes-question.json
+++ b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
@@ -40,8 +40,7 @@
             },
             {
                 "value": "No",
-                "display_further_information": true,
-                "further_information_help_text": "You should tell us more"
+                "display_further_information": true
             }
         ],
         "alwaysShowTheUser": true

From f2e79e23e85fd586f43ea24f7c8084da61fe63a5 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Feb 2021 17:04:42 +0000
Subject: [PATCH 107/249] Multiple optional questions can be shown and hidden

Before this change we allowed the content user to "bolt on" one additional question if the answer matched an expected pattern.

This change allows them to show as many additional questions as they like. Though the current need is for 2 additonal questions. We do this by accepting an array of identifiers rather than a single string.

The amount of calculation required to determine and follow the question branches through to their resolution is not ideal and we know this. A better approach would be to keep track of the state of the tree of questions and make the required database updates with fewer database queries. This would require more time than we have in the last sprint so we are opting for something that works and accepting the technical debt will need to be repaid.
---
 CHANGELOG.md                                  |  1 +
 app/services/toggle_additional_steps.rb       | 40 +++++----
 ...eld-that-shows-an-additional-question.json |  2 +-
 .../steps/show-additional-question.json       |  2 +-
 spec/services/create_journey_step_spec.rb     |  2 +-
 spec/services/toggle_additional_steps_spec.rb | 88 ++++++++++++++++---
 6 files changed, 103 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ccbdcd70..7b8148e27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - fix Redis connection errors on Heroku
 - users can be asked extended checkbox questions which ask for further information
 - markdown in help text fields is now parsed into HTML
+- show and hide more than one additional question at a time
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index 3de4be29b..610a2e33c 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -26,12 +26,12 @@ def additional_step_rule
     step.additional_step_rule
   end
 
-  def additional_step_id
+  def additional_step_ids
     additional_step_rule["question_identifier"]
   end
 
   def additional_step
-    journey_steps.find_by(contentful_id: additional_step_id)
+    journey_steps.find_by(contentful_id: additional_step_ids)
   end
 
   def matching_answer?(a:, b:)
@@ -45,41 +45,43 @@ def matching_answer?(a:, b:)
   end
 
   def check_to_show_additional_steps!
-    recursively_show_additional_steps!(current_step: step, next_step_id: additional_step_id)
+    recursively_show_additional_steps!(current_step: step, next_step_ids: additional_step_ids)
   end
 
   def check_to_hide_additional_steps!
     return if matching_answer?(a: step.additional_step_rule["required_answer"], b: step.answer.response)
 
-    recursively_hide_additional_steps!(current_step: step, next_step_id: additional_step_id)
+    recursively_hide_additional_steps!(next_step_ids: additional_step_ids)
   end
 
-  def recursively_hide_additional_steps!(current_step:, next_step_id:)
-    if next_step_id
-
-      next_step = journey_steps.find_by(contentful_id: next_step_id)
-      next_step.update(hidden: true)
+  def recursively_hide_additional_steps!(next_step_ids:)
+    if next_step_ids.compact.present?
+      next_steps = journey_steps.where(contentful_id: next_step_ids)
+      next_steps.update_all(hidden: true)
 
       recursively_hide_additional_steps!(
-        current_step: next_step,
-        next_step_id: next_step.additional_step_rule&.fetch("question_identifier", nil)
+        next_step_ids: next_steps.map { |next_step|
+          next_step.additional_step_rule&.fetch("question_identifier", nil)
+        }.flatten.compact
       )
     end
   end
 
-  def recursively_show_additional_steps!(current_step:, next_step_id:)
+  def recursively_show_additional_steps!(current_step:, next_step_ids:)
     return unless current_step.answer && current_step.additional_step_rule
 
-    if next_step_id
+    if next_step_ids
       return unless matching_answer?(a: current_step.additional_step_rule["required_answer"], b: current_step.answer.response)
 
-      next_step = journey_steps.find_by(contentful_id: next_step_id)
-      next_step.update(hidden: false)
+      next_steps = journey_steps.where(contentful_id: next_step_ids)
+      next_steps.update_all(hidden: false)
 
-      recursively_show_additional_steps!(
-        current_step: next_step,
-        next_step_id: next_step.additional_step_rule&.fetch("question_identifier", nil)
-      )
+      next_steps.map { |next_step|
+        recursively_show_additional_steps!(
+          current_step: next_step,
+          next_step_ids: next_step.additional_step_rule&.fetch("question_identifier", nil)
+        )
+      }
     end
   end
 end
diff --git a/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json b/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
index 4505ec2f7..ce8d04862 100644
--- a/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
+++ b/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
@@ -44,7 +44,7 @@
         "alwaysShowTheUser": false,
         "showAdditionalQuestion": {
             "required_answer": "Red",
-            "question_identifier": "hidden-field"
+            "question_identifier": ["hidden-field"]
         }
     }
 }
diff --git a/spec/fixtures/contentful/steps/show-additional-question.json b/spec/fixtures/contentful/steps/show-additional-question.json
index 58c06ce01..794b164b3 100644
--- a/spec/fixtures/contentful/steps/show-additional-question.json
+++ b/spec/fixtures/contentful/steps/show-additional-question.json
@@ -48,7 +48,7 @@
         ],
         "showAdditionalQuestion": {
             "required_answer": "School expert",
-            "question_identifier": "hidden-field-that-shows-an-additional-question"
+            "question_identifier": ["hidden-field-that-shows-an-additional-question"]
         }
     }
 }
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index 6ac93fbcb..c84546e86 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -162,7 +162,7 @@
         expect(step.additional_step_rule).to eql(
           {
             "required_answer" => "School expert",
-            "question_identifier" => "hidden-field-that-shows-an-additional-question"
+            "question_identifier" => ["hidden-field-that-shows-an-additional-question"]
           }
         )
       end
diff --git a/spec/services/toggle_additional_steps_spec.rb b/spec/services/toggle_additional_steps_spec.rb
index 9d655f2d2..6afe1f26d 100644
--- a/spec/services/toggle_additional_steps_spec.rb
+++ b/spec/services/toggle_additional_steps_spec.rb
@@ -17,7 +17,7 @@
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+            additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]})
           create(:radio_answer, step: step, response: "Red")
 
           another_step_to_show = create(:step,
@@ -37,12 +37,46 @@
           expect(another_step_from_a_different_journey_to_keep_hidden.reload.hidden).to eq(true)
         end
 
+        it "shows all additional_steps within the same journey" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rule: {
+              "required_answer" => "Red",
+              "question_identifier" => ["123", "456"]
+            })
+          create(:radio_answer, step: step, response: "Red")
+
+          first_additional_step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: true)
+
+          second_additional_step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "456",
+            hidden: true)
+
+          another_step_from_a_different_journey_to_keep_hidden = create(:step,
+            :radio,
+            contentful_id: "123",
+            hidden: true)
+
+          described_class.new(step: step).call
+
+          expect(first_additional_step_to_show.reload.hidden).to eq(false)
+          expect(second_additional_step_to_show.reload.hidden).to eq(false)
+          expect(another_step_from_a_different_journey_to_keep_hidden.reload.hidden).to eq(true)
+        end
+
         context "when the required_answer matches the answer exactly" do
           it "updates the referenced step's hidden field to false" do
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+              additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]})
             create(:radio_answer, step: step, response: "Red")
 
             step_to_show = create(:step,
@@ -62,7 +96,7 @@
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rule: {"required_answer" => "RED", "question_identifier" => "123"})
+              additional_step_rule: {"required_answer" => "RED", "question_identifier" => ["123"]})
             create(:radio_answer, step: step, response: "red")
 
             step_to_show = create(:step,
@@ -82,7 +116,7 @@
             first_step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"},
+              additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]},
               hidden: false)
             create(:radio_answer, step: first_step, response: "Red")
 
@@ -90,7 +124,7 @@
               :radio,
               journey: journey,
               contentful_id: "123",
-              additional_step_rule: {"required_answer" => "Blue", "question_identifier" => "456"},
+              additional_step_rule: {"required_answer" => "Blue", "question_identifier" => ["456"]},
               hidden: true)
             create(:radio_answer, step: second_step, response: "Blue")
 
@@ -113,7 +147,7 @@
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+            additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]})
           create(:radio_answer, step: step, response: "Blue")
 
           step_to_show = create(:step,
@@ -127,12 +161,46 @@
           expect(step_to_show.reload.hidden).to eq(true)
         end
 
+        it "hides all additional_steps within the same journey" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rule: {
+              "required_answer" => "Red",
+              "question_identifier" => ["123", "456"]
+            })
+          create(:radio_answer, step: step, response: "NOT Red")
+
+          first_additional_step_to_hide = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: false)
+
+          second_additional_step_to_hide = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "456",
+            hidden: false)
+
+          another_step_from_a_different_journey_to_keep_hidden = create(:step,
+            :radio,
+            contentful_id: "123",
+            hidden: true)
+
+          described_class.new(step: step).call
+
+          expect(first_additional_step_to_hide.reload.hidden).to eq(true)
+          expect(second_additional_step_to_hide.reload.hidden).to eq(true)
+          expect(another_step_from_a_different_journey_to_keep_hidden.reload.hidden).to eq(true)
+        end
+
         context "when the required_answer has different case to the answer" do
           it "does not hide the step" do
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rule: {"required_answer" => "RED", "question_identifier" => "123"})
+              additional_step_rule: {"required_answer" => "RED", "question_identifier" => ["123"]})
             create(:radio_answer, step: step, response: "red")
 
             step_to_show = create(:step,
@@ -152,7 +220,7 @@
             first_step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"},
+              additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]},
               hidden: false)
             create(:radio_answer, step: first_step, response: "Changed from red")
 
@@ -160,7 +228,7 @@
               :radio,
               journey: journey,
               contentful_id: "123",
-              additional_step_rule: {"required_answer" => "Blue", "question_identifier" => "456"},
+              additional_step_rule: {"required_answer" => "Blue", "question_identifier" => ["456"]},
               hidden: false)
             create(:radio_answer, step: second_step, response: "Blue")
 
@@ -183,7 +251,7 @@
           step = create(:step,
             :checkbox_answers,
             journey: journey,
-            additional_step_rule: {"required_answer" => "Red", "question_identifier" => "123"})
+            additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]})
           create(:checkbox_answers, step: step, response: ["Blue", "Red"])
 
           step_to_show = create(:step,

From 907eb3b8c3464bc54110532ef0356f470dd19fd1 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 23 Feb 2021 12:36:00 +0000
Subject: [PATCH 108/249] Make nil-help-text test more specific

Because we guard differently for certain question types, this test wasn't correctly exposing a failing case. Renaming this test to be more specific allows for a new test in future to cover this case.
---
 spec/features/visitors/anyone_can_complete_a_journey_spec.rb  | 4 ++--
 .../{nil-help-text.json => nil-help-text-radios.json}         | 2 +-
 ...lp-text-section.json => nil-help-text-radios-section.json} | 2 +-
 .../steps/{nil-help-text.json => nil-help-text-radios.json}   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename spec/fixtures/contentful/categories/{nil-help-text.json => nil-help-text-radios.json} (95%)
 rename spec/fixtures/contentful/sections/{nil-help-text-section.json => nil-help-text-radios-section.json} (95%)
 rename spec/fixtures/contentful/steps/{nil-help-text.json => nil-help-text-radios.json} (96%)

diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index c05542dc1..d7e919941 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -273,8 +273,8 @@
   end
 
   context "when the help text is nil" do
-    scenario "paragraph breaks are parsed as expected" do
-      start_journey_from_category_and_go_to_question(category: "nil-help-text.json")
+    scenario "step page still renders when question is a radio" do
+      start_journey_from_category_and_go_to_question(category: "nil-help-text-radios.json")
 
       expect(page.html).to include("Which service do you need?")
     end
diff --git a/spec/fixtures/contentful/categories/nil-help-text.json b/spec/fixtures/contentful/categories/nil-help-text-radios.json
similarity index 95%
rename from spec/fixtures/contentful/categories/nil-help-text.json
rename to spec/fixtures/contentful/categories/nil-help-text-radios.json
index 1ab55484c..19ce6ebbf 100644
--- a/spec/fixtures/contentful/categories/nil-help-text.json
+++ b/spec/fixtures/contentful/categories/nil-help-text-radios.json
@@ -35,7 +35,7 @@
             "sys": {
                 "type": "Link",
                 "linkType": "Entry",
-                "id": "nil-help-text-section"
+                "id": "nil-help-text-radios-section"
             }
           }
         ],
diff --git a/spec/fixtures/contentful/sections/nil-help-text-section.json b/spec/fixtures/contentful/sections/nil-help-text-radios-section.json
similarity index 95%
rename from spec/fixtures/contentful/sections/nil-help-text-section.json
rename to spec/fixtures/contentful/sections/nil-help-text-radios-section.json
index 4088011af..6ed3d42eb 100644
--- a/spec/fixtures/contentful/sections/nil-help-text-section.json
+++ b/spec/fixtures/contentful/sections/nil-help-text-radios-section.json
@@ -35,7 +35,7 @@
                 "sys": {
                     "type": "Link",
                     "linkType": "Entry",
-                    "id": "nil-help-text"
+                    "id": "nil-help-text-radios"
                 }
             }
         ]
diff --git a/spec/fixtures/contentful/steps/nil-help-text.json b/spec/fixtures/contentful/steps/nil-help-text-radios.json
similarity index 96%
rename from spec/fixtures/contentful/steps/nil-help-text.json
rename to spec/fixtures/contentful/steps/nil-help-text-radios.json
index b34c2cdfc..cfd393998 100644
--- a/spec/fixtures/contentful/steps/nil-help-text.json
+++ b/spec/fixtures/contentful/steps/nil-help-text-radios.json
@@ -7,7 +7,7 @@
                 "id": "jspwts36h1os"
             }
         },
-        "id": "nil-help-text",
+        "id": "nil-help-text-radios",
         "type": "Entry",
         "createdAt": "2020-09-07T10:56:40.585Z",
         "updatedAt": "2020-09-14T22:16:54.633Z",

From 6dc2b06e5fda47f47696e8d616dc68cc5c105917 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 23 Feb 2021 12:42:31 +0000
Subject: [PATCH 109/249] Fix cases where empty help text would cause errors

Since we weren't correctly guarding against empty `help_text` for some
question types, when the `help_text` was empty we would try call methods
on it which did not exist.

This also centralises the call to `.html_safe` in one place.
---
 app/models/step.rb                            |  3 +-
 app/views/steps/checkboxes.html.erb           |  2 +-
 app/views/steps/currency.html.erb             |  2 +-
 app/views/steps/long_text.html.erb            |  2 +-
 app/views/steps/number.html.erb               |  2 +-
 app/views/steps/radios.html.erb               |  2 +-
 app/views/steps/short_text.html.erb           |  2 +-
 app/views/steps/single_date.html.erb          |  2 +-
 .../anyone_can_complete_a_journey_spec.rb     |  6 +++
 .../categories/nil-help-text-short-text.json  | 44 +++++++++++++++++++
 .../nil-help-text-short-text-section.json     | 43 ++++++++++++++++++
 .../steps/nil-help-text-short-text.json       | 36 +++++++++++++++
 12 files changed, 138 insertions(+), 8 deletions(-)
 create mode 100644 spec/fixtures/contentful/categories/nil-help-text-short-text.json
 create mode 100644 spec/fixtures/contentful/sections/nil-help-text-short-text-section.json
 create mode 100644 spec/fixtures/contentful/steps/nil-help-text-short-text.json

diff --git a/app/models/step.rb b/app/models/step.rb
index fca5022f0..b443a0cee 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -29,6 +29,7 @@ def primary_call_to_action_text
   end
 
   def help_text_html
-    Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(help_text)
+    return unless help_text.present?
+    Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(help_text).html_safe
   end
 end
diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index 1781c5299..75cdb2dc9 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -2,7 +2,7 @@
   <%= f.govuk_check_boxes_fieldset :response, legend: { text: @step.title, size: "l" } do %>
     <% if @step.help_text.present? %>
       <span class="govuk-hint">
-        <%= @step.help_text_html.html_safe %>
+        <%= @step.help_text_html %>
       </span>
     <% end %>
 
diff --git a/app/views/steps/currency.html.erb b/app/views/steps/currency.html.erb
index 8513721f6..2fc515043 100644
--- a/app/views/steps/currency.html.erb
+++ b/app/views/steps/currency.html.erb
@@ -2,6 +2,6 @@
   <%= f.govuk_text_field :response,
     label: { text: @step.title, size: "l" },
     prefix_text: "£",
-    hint: -> { @step.help_text_html.html_safe }
+    hint: -> { @step.help_text_html }
   %>
 <% end %>
diff --git a/app/views/steps/long_text.html.erb b/app/views/steps/long_text.html.erb
index c6b3e0d58..5b8d55f0d 100644
--- a/app/views/steps/long_text.html.erb
+++ b/app/views/steps/long_text.html.erb
@@ -1,7 +1,7 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_area :response,
     label: { text: @step.title, size: "l" },
-    hint: -> { @step.help_text_html.html_safe },
+    hint: -> { @step.help_text_html },
     width: "one-third",
     rows: 9
   %>
diff --git a/app/views/steps/number.html.erb b/app/views/steps/number.html.erb
index eb717d370..9efee2dd7 100644
--- a/app/views/steps/number.html.erb
+++ b/app/views/steps/number.html.erb
@@ -1,6 +1,6 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_field :response,
     label: { text: @step.title, size: "l" },
-    hint: -> { @step.help_text_html.html_safe }
+    hint: -> { @step.help_text_html }
   %>
 <% end %>
diff --git a/app/views/steps/radios.html.erb b/app/views/steps/radios.html.erb
index 2df3275c8..d00183d90 100644
--- a/app/views/steps/radios.html.erb
+++ b/app/views/steps/radios.html.erb
@@ -3,7 +3,7 @@
   <%= f.govuk_radio_buttons_fieldset(:response, legend: { size: "l", text: @step.title }) do %>
     <% if @step.help_text.present? %>
       <div class="govuk-hint">
-        <%= @step.help_text_html.html_safe %>
+        <%= @step.help_text_html %>
       </div>
     <% end %>
 
diff --git a/app/views/steps/short_text.html.erb b/app/views/steps/short_text.html.erb
index 5dffa345a..a58a3bed5 100644
--- a/app/views/steps/short_text.html.erb
+++ b/app/views/steps/short_text.html.erb
@@ -1,7 +1,7 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_field :response,
     label: { text: @step.title, size: "l" },
-    hint: -> { @step.help_text_html.html_safe },
+    hint: -> { @step.help_text_html },
     width: "one-third"
   %>
 <% end %>
diff --git a/app/views/steps/single_date.html.erb b/app/views/steps/single_date.html.erb
index 2af650697..f0581006c 100644
--- a/app/views/steps/single_date.html.erb
+++ b/app/views/steps/single_date.html.erb
@@ -1,6 +1,6 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_date_field :response,
     legend: { text: @step.title, size: "l" },
-    hint: -> { @step.help_text_html.html_safe }
+    hint: -> { @step.help_text_html }
   %>
 <% end %>
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index d7e919941..b61dd1ab6 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -278,6 +278,12 @@
 
       expect(page.html).to include("Which service do you need?")
     end
+
+    scenario "step page still renders when question is a short text" do
+      start_journey_from_category_and_go_to_question(category: "nil-help-text-short-text.json")
+
+      expect(page.html).to include("What email address did you use?")
+    end
   end
 
   context "when Contentful entry model wasn't an expected type" do
diff --git a/spec/fixtures/contentful/categories/nil-help-text-short-text.json b/spec/fixtures/contentful/categories/nil-help-text-short-text.json
new file mode 100644
index 000000000..9d69928b2
--- /dev/null
+++ b/spec/fixtures/contentful/categories/nil-help-text-short-text.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "nil-help-text-short-text-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/nil-help-text-short-text-section.json b/spec/fixtures/contentful/sections/nil-help-text-short-text-section.json
new file mode 100644
index 000000000..a2b62bb78
--- /dev/null
+++ b/spec/fixtures/contentful/sections/nil-help-text-short-text-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "nil-help-text-short-text-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "nil-help-text-short-text"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/nil-help-text-short-text.json b/spec/fixtures/contentful/steps/nil-help-text-short-text.json
new file mode 100644
index 000000000..6b12a1fc7
--- /dev/null
+++ b/spec/fixtures/contentful/steps/nil-help-text-short-text.json
@@ -0,0 +1,36 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "nil-help-text-short-text",
+        "type": "Entry",
+        "createdAt": "2020-11-05T16:42:58.340Z",
+        "updatedAt": "2020-11-05T16:42:58.340Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/what-email-address-did-you-use",
+        "title": "What email address did you use?",
+        "type": "short text"
+    }
+}

From 00a42a758e6c43b5545e22f700ad0e382a0b57c5 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 23 Feb 2021 15:55:16 +0000
Subject: [PATCH 110/249] Rename @steps to @step_presenters in journey view

This makes it clearer that the view is using the steps' presentation
layer, as well as making it more consistent with upcoming changes for
individual step views to use the presenters.
---
 app/controllers/journeys_controller.rb | 2 +-
 app/views/journeys/show.html.erb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 62f34148a..855ce35f4 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -33,7 +33,7 @@ def show
       :number_answer,
       :currency_answer
     ])
-    @steps = @visible_steps.map { |step| StepPresenter.new(step) }
+    @step_presenters = @visible_steps.map { |step| StepPresenter.new(step) }
 
     @specification_template = Liquid::Template.parse(
       @journey.liquid_template, error_mode: :strict
diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index e1baed67d..a807b73ad 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -6,7 +6,7 @@
 
 <ol class="app-task-list">
 
-  <% section_group_with_steps(journey: @journey, steps: @steps).each do |grouping| %>
+  <% section_group_with_steps(journey: @journey, steps: @step_presenters).each do |grouping| %>
     <h2 class="app-task-list__section"><%= grouping["title"] %></h2>
     <li>
       <%= render "step_list", journey: @journey, steps: grouping["steps"] %>

From c537eaf4f807423cc9ec2404b54df03c26af53f0 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 23 Feb 2021 16:02:36 +0000
Subject: [PATCH 111/249] Swap step views to use StepPresenter for text

Individual step views now use an instance of `StepPresenter` for all
textual content (titles, help text, button text etc) to allow for a
clearer separation of model logic from presentation logic and
transformation.
---
 app/controllers/answers_controller.rb       | 2 ++
 app/controllers/steps_controller.rb         | 6 ++++++
 app/views/steps/_edit_form_wrapper.html.erb | 2 +-
 app/views/steps/_new_form_wrapper.html.erb  | 4 ++--
 app/views/steps/checkboxes.html.erb         | 4 ++--
 app/views/steps/currency.html.erb           | 4 ++--
 app/views/steps/long_text.html.erb          | 4 ++--
 app/views/steps/number.html.erb             | 4 ++--
 app/views/steps/paragraphs.html.erb         | 8 ++++----
 app/views/steps/radios.html.erb             | 4 ++--
 app/views/steps/short_text.html.erb         | 4 ++--
 app/views/steps/single_date.html.erb        | 4 ++--
 12 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 9c448fa7e..eff0b8089 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -6,6 +6,7 @@ class AnswersController < ApplicationController
   def create
     @journey = Journey.find(journey_id)
     @step = Step.find(step_id)
+    @step_presenter = StepPresenter.new(@step)
 
     @answer = AnswerFactory.new(step: @step).call
     @answer.step = @step
@@ -24,6 +25,7 @@ def create
   def update
     @journey = Journey.find(journey_id)
     @step = Step.find(step_id)
+    @step_presenter = StepPresenter.new(@step)
 
     result = SaveAnswer.new(answer: @step.answer)
       .call(checkbox_params: checkbox_params, answer_params: answer_params, date_params: date_params)
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index 5186477ca..58a027a59 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -3,7 +3,10 @@
 class StepsController < ApplicationController
   def show
     @journey = Journey.find(journey_id)
+
     @step = Step.find(params[:id])
+    @step_presenter = StepPresenter.new(@step)
+
     @answer = AnswerFactory.new(step: @step).call
 
     render @step.contentful_type, locals: {layout: "steps/new_form_wrapper"}
@@ -11,7 +14,10 @@ def show
 
   def edit
     @journey = Journey.find(journey_id)
+
     @step = Step.find(params[:id])
+    @step_presenter = StepPresenter.new(@step)
+
     @answer = @step.answer
 
     render "steps/#{@step.contentful_type}", locals: {layout: "steps/edit_form_wrapper"}
diff --git a/app/views/steps/_edit_form_wrapper.html.erb b/app/views/steps/_edit_form_wrapper.html.erb
index 72300574c..8e174312a 100644
--- a/app/views/steps/_edit_form_wrapper.html.erb
+++ b/app/views/steps/_edit_form_wrapper.html.erb
@@ -1,4 +1,4 @@
-<%= content_for :title, @step.title %>
+<%= content_for :title, @step_presenter.title %>
 <%= form_for @answer, as: :answer, method: "put", url: journey_step_answer_path(@journey, @step, @answer) do |f| %>
   <%= yield f %>
   <%= f.submit I18n.t("generic.button.update"), class: "govuk-button" %>
diff --git a/app/views/steps/_new_form_wrapper.html.erb b/app/views/steps/_new_form_wrapper.html.erb
index f72359486..fc0bbb909 100644
--- a/app/views/steps/_new_form_wrapper.html.erb
+++ b/app/views/steps/_new_form_wrapper.html.erb
@@ -1,5 +1,5 @@
-<%= content_for :title, @step.title %>
+<%= content_for :title, @step_presenter.title %>
 <%= form_for @answer, as: :answer, url: journey_step_answers_path(@journey, @step), method: "post" do |f| %>
   <%= yield f %>
-  <%= f.submit @step.primary_call_to_action_text, class: "govuk-button" %>
+  <%= f.submit @step_presenter.primary_call_to_action_text, class: "govuk-button" %>
 <% end %>
diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index 75cdb2dc9..a7e86c0e0 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -1,8 +1,8 @@
 <%= render layout: layout do |f| %>
-  <%= f.govuk_check_boxes_fieldset :response, legend: { text: @step.title, size: "l" } do %>
+  <%= f.govuk_check_boxes_fieldset :response, legend: { text: @step_presenter.title, size: "l" } do %>
     <% if @step.help_text.present? %>
       <span class="govuk-hint">
-        <%= @step.help_text_html %>
+        <%= @step_presenter.help_text_html %>
       </span>
     <% end %>
 
diff --git a/app/views/steps/currency.html.erb b/app/views/steps/currency.html.erb
index 2fc515043..95ba6567c 100644
--- a/app/views/steps/currency.html.erb
+++ b/app/views/steps/currency.html.erb
@@ -1,7 +1,7 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_field :response,
-    label: { text: @step.title, size: "l" },
+    label: { text: @step_presenter.title, size: "l" },
     prefix_text: "£",
-    hint: -> { @step.help_text_html }
+    hint: -> { @step_presenter.help_text_html }
   %>
 <% end %>
diff --git a/app/views/steps/long_text.html.erb b/app/views/steps/long_text.html.erb
index 5b8d55f0d..8cd8d3079 100644
--- a/app/views/steps/long_text.html.erb
+++ b/app/views/steps/long_text.html.erb
@@ -1,7 +1,7 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_area :response,
-    label: { text: @step.title, size: "l" },
-    hint: -> { @step.help_text_html },
+    label: { text: @step_presenter.title, size: "l" },
+    hint: -> { @step_presenter.help_text_html },
     width: "one-third",
     rows: 9
   %>
diff --git a/app/views/steps/number.html.erb b/app/views/steps/number.html.erb
index 9efee2dd7..3848947d0 100644
--- a/app/views/steps/number.html.erb
+++ b/app/views/steps/number.html.erb
@@ -1,6 +1,6 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_field :response,
-    label: { text: @step.title, size: "l" },
-    hint: -> { @step.help_text_html }
+    label: { text: @step_presenter.title, size: "l" },
+    hint: -> { @step_presenter.help_text_html }
   %>
 <% end %>
diff --git a/app/views/steps/paragraphs.html.erb b/app/views/steps/paragraphs.html.erb
index 39f541597..ecc83ddbf 100644
--- a/app/views/steps/paragraphs.html.erb
+++ b/app/views/steps/paragraphs.html.erb
@@ -1,7 +1,7 @@
-<%= content_for :title, @step.title %>
+<%= content_for :title, @step_presenter.title %>
 
-<h1 class="govuk-heading-xl"><%= @step.title %></h1>
+<h1 class="govuk-heading-xl"><%= @step_presenter.title %></h1>
 <div class="static-content">
-  <%= simple_format(@step.body, wrapper_tag: "p", class: "govuk-body") %>
+  <%= simple_format(@step_presenter.body, wrapper_tag: "p", class: "govuk-body") %>
 </div>
-<%= link_to @step.primary_call_to_action_text, journey_path(@journey), class: "govuk-button" %>
+<%= link_to @step_presenter.primary_call_to_action_text, journey_path(@journey), class: "govuk-button" %>
diff --git a/app/views/steps/radios.html.erb b/app/views/steps/radios.html.erb
index d00183d90..4c7db701c 100644
--- a/app/views/steps/radios.html.erb
+++ b/app/views/steps/radios.html.erb
@@ -1,9 +1,9 @@
 <%= render layout: layout do |f| %>
   <%= f.hidden_field :response, value: nil %>
-  <%= f.govuk_radio_buttons_fieldset(:response, legend: { size: "l", text: @step.title }) do %>
+  <%= f.govuk_radio_buttons_fieldset(:response, legend: { size: "l", text: @step_presenter.title }) do %>
     <% if @step.help_text.present? %>
       <div class="govuk-hint">
-        <%= @step.help_text_html %>
+        <%= @step_presenter.help_text_html %>
       </div>
     <% end %>
 
diff --git a/app/views/steps/short_text.html.erb b/app/views/steps/short_text.html.erb
index a58a3bed5..04a495804 100644
--- a/app/views/steps/short_text.html.erb
+++ b/app/views/steps/short_text.html.erb
@@ -1,7 +1,7 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_field :response,
-    label: { text: @step.title, size: "l" },
-    hint: -> { @step.help_text_html },
+    label: { text: @step_presenter.title, size: "l" },
+    hint: -> { @step_presenter.help_text_html },
     width: "one-third"
   %>
 <% end %>
diff --git a/app/views/steps/single_date.html.erb b/app/views/steps/single_date.html.erb
index f0581006c..cf8b660fa 100644
--- a/app/views/steps/single_date.html.erb
+++ b/app/views/steps/single_date.html.erb
@@ -1,6 +1,6 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_date_field :response,
-    legend: { text: @step.title, size: "l" },
-    hint: -> { @step.help_text_html }
+    legend: { text: @step_presenter.title, size: "l" },
+    hint: -> { @step_presenter.help_text_html }
   %>
 <% end %>

From 0b415254e63e6bd71e88562f5791fdcd3962e2dc Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 23 Feb 2021 16:07:29 +0000
Subject: [PATCH 112/249] Move help_text_html to StepPresenter

This moves the `help_text_html` transform function which performs
markdown rendering into the `StepPresenter` class, putting a clearer
separation between model logic and presentation.
---
 app/models/step.rb               | 5 -----
 app/presenters/step_presenter.rb | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/step.rb b/app/models/step.rb
index b443a0cee..2b3f51073 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -27,9 +27,4 @@ def primary_call_to_action_text
     return I18n.t("generic.button.next") unless super.present?
     super
   end
-
-  def help_text_html
-    return unless help_text.present?
-    Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(help_text).html_safe
-  end
 end
diff --git a/app/presenters/step_presenter.rb b/app/presenters/step_presenter.rb
index e018c14d8..c58296bfd 100644
--- a/app/presenters/step_presenter.rb
+++ b/app/presenters/step_presenter.rb
@@ -2,4 +2,9 @@ class StepPresenter < SimpleDelegator
   def question?
     contentful_model == "question"
   end
+
+  def help_text_html
+    return unless help_text.present?
+    Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(help_text).html_safe
+  end
 end

From 888773124301e63e9a444413cc88392e52377058 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Feb 2021 10:25:59 +0000
Subject: [PATCH 113/249] Remove redundnant conditional checks

---
 app/services/toggle_additional_steps.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index 610a2e33c..7398f628b 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -8,8 +8,8 @@ def initialize(step:)
   def call
     return unless additional_step_rule
 
-    check_to_show_additional_steps! if additional_step.hidden?
-    check_to_hide_additional_steps! unless additional_step.hidden?
+    check_to_show_additional_steps!
+    check_to_hide_additional_steps!
   end
 
   private

From 5b1533c24ef5867bf43e13d887892d60dc43cb89 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Feb 2021 11:33:54 +0000
Subject: [PATCH 114/249] Pluralise additional_step_rule column

This prepares the field so that it can contain more than one rule within an array whilst not confusing the reader.
---
 app/services/create_journey_step.rb           |  4 +--
 app/services/toggle_additional_steps.rb       | 18 +++++------
 ...102716_change_additional_step_rule_name.rb |  5 +++
 db/schema.rb                                  |  4 +--
 spec/factories/step.rb                        |  1 +
 spec/services/create_journey_step_spec.rb     |  4 +--
 spec/services/toggle_additional_steps_spec.rb | 32 +++++++++----------
 7 files changed, 37 insertions(+), 31 deletions(-)
 create mode 100644 db/migrate/20210223102716_change_additional_step_rule_name.rb

diff --git a/app/services/create_journey_step.rb b/app/services/create_journey_step.rb
index fc8911673..be26b5839 100644
--- a/app/services/create_journey_step.rb
+++ b/app/services/create_journey_step.rb
@@ -42,7 +42,7 @@ def call
       options: options,
       primary_call_to_action_text: primary_call_to_action_text,
       hidden: hidden,
-      additional_step_rule: additional_step_rule,
+      additional_step_rules: additional_step_rules,
       raw: raw,
       journey: journey
     )
@@ -108,7 +108,7 @@ def hidden
     !contentful_entry.always_show_the_user
   end
 
-  def additional_step_rule
+  def additional_step_rules
     return nil unless contentful_entry.respond_to?(:show_additional_question)
     contentful_entry.show_additional_question
   end
diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index 7398f628b..8e92ed7fc 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -6,7 +6,7 @@ def initialize(step:)
   end
 
   def call
-    return unless additional_step_rule
+    return unless additional_step_rules
 
     check_to_show_additional_steps!
     check_to_hide_additional_steps!
@@ -22,12 +22,12 @@ def journey_steps
     @journey_steps ||= journey.steps
   end
 
-  def additional_step_rule
-    step.additional_step_rule
+  def additional_step_rules
+    step.additional_step_rules
   end
 
   def additional_step_ids
-    additional_step_rule["question_identifier"]
+    additional_step_rules["question_identifier"]
   end
 
   def additional_step
@@ -49,7 +49,7 @@ def check_to_show_additional_steps!
   end
 
   def check_to_hide_additional_steps!
-    return if matching_answer?(a: step.additional_step_rule["required_answer"], b: step.answer.response)
+    return if matching_answer?(a: step.additional_step_rules["required_answer"], b: step.answer.response)
 
     recursively_hide_additional_steps!(next_step_ids: additional_step_ids)
   end
@@ -61,17 +61,17 @@ def recursively_hide_additional_steps!(next_step_ids:)
 
       recursively_hide_additional_steps!(
         next_step_ids: next_steps.map { |next_step|
-          next_step.additional_step_rule&.fetch("question_identifier", nil)
+          next_step.additional_step_rules&.fetch("question_identifier", nil)
         }.flatten.compact
       )
     end
   end
 
   def recursively_show_additional_steps!(current_step:, next_step_ids:)
-    return unless current_step.answer && current_step.additional_step_rule
+    return unless current_step.answer && current_step.additional_step_rules
 
     if next_step_ids
-      return unless matching_answer?(a: current_step.additional_step_rule["required_answer"], b: current_step.answer.response)
+      return unless matching_answer?(a: current_step.additional_step_rules["required_answer"], b: current_step.answer.response)
 
       next_steps = journey_steps.where(contentful_id: next_step_ids)
       next_steps.update_all(hidden: false)
@@ -79,7 +79,7 @@ def recursively_show_additional_steps!(current_step:, next_step_ids:)
       next_steps.map { |next_step|
         recursively_show_additional_steps!(
           current_step: next_step,
-          next_step_ids: next_step.additional_step_rule&.fetch("question_identifier", nil)
+          next_step_ids: next_step.additional_step_rules&.fetch("question_identifier", nil)
         )
       }
     end
diff --git a/db/migrate/20210223102716_change_additional_step_rule_name.rb b/db/migrate/20210223102716_change_additional_step_rule_name.rb
new file mode 100644
index 000000000..6aae0970b
--- /dev/null
+++ b/db/migrate/20210223102716_change_additional_step_rule_name.rb
@@ -0,0 +1,5 @@
+class ChangeAdditionalStepRuleName < ActiveRecord::Migration[6.1]
+  def change
+    rename_column :steps, :additional_step_rule, :additional_step_rules
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 350791f2e..5e30a6f13 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_02_17_145518) do
+ActiveRecord::Schema.define(version: 2021_02_23_102716) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -97,7 +97,7 @@
     t.jsonb "raw", null: false
     t.jsonb "options"
     t.boolean "hidden", default: false
-    t.jsonb "additional_step_rule"
+    t.jsonb "additional_step_rules"
     t.index ["journey_id"], name: "index_steps_on_journey_id"
   end
 
diff --git a/spec/factories/step.rb b/spec/factories/step.rb
index 28c4e19e6..64be8868a 100644
--- a/spec/factories/step.rb
+++ b/spec/factories/step.rb
@@ -5,6 +5,7 @@
     contentful_id { SecureRandom.hex }
     raw { |attrs| {"sys": {"id" => attrs["contentful_id"]}} }
     hidden { false }
+    additional_step_rules { nil }
 
     association :journey, factory: :journey
 
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index c84546e86..4c891af62 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -18,7 +18,7 @@
         expect(step.contentful_type).to eq("radios")
         expect(step.options).to eq([{"value" => "Catering"}, {"value" => "Cleaning"}])
         expect(step.hidden).to eq(false)
-        expect(step.additional_step_rule).to eq(nil)
+        expect(step.additional_step_rules).to eq(nil)
         expect(step.raw).to eq(
           "fields" => {
             "helpText" => "Tell us which service you need.",
@@ -159,7 +159,7 @@
           journey: journey, contentful_entry: fake_entry
         ).call
 
-        expect(step.additional_step_rule).to eql(
+        expect(step.additional_step_rules).to eql(
           {
             "required_answer" => "School expert",
             "question_identifier" => ["hidden-field-that-shows-an-additional-question"]
diff --git a/spec/services/toggle_additional_steps_spec.rb b/spec/services/toggle_additional_steps_spec.rb
index 6afe1f26d..2b6f18fd5 100644
--- a/spec/services/toggle_additional_steps_spec.rb
+++ b/spec/services/toggle_additional_steps_spec.rb
@@ -4,20 +4,20 @@
   describe "#call" do
     let(:journey) { create(:journey) }
 
-    context "when the additional_step_rule field is nil" do
+    context "when the additional_step_rules field is nil" do
       it "returns nil" do
         step = build(:step)
         expect(described_class.new(step: step).call).to eq(nil)
       end
     end
 
-    context "when the additional_step_rule exists" do
+    context "when the additional_step_rules exists" do
       context "when the answers match" do
         it "only shows the additional steps within the same journey" do
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]})
+            additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]})
           create(:radio_answer, step: step, response: "Red")
 
           another_step_to_show = create(:step,
@@ -41,7 +41,7 @@
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rule: {
+            additional_step_rules: {
               "required_answer" => "Red",
               "question_identifier" => ["123", "456"]
             })
@@ -76,7 +76,7 @@
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]})
+              additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]})
             create(:radio_answer, step: step, response: "Red")
 
             step_to_show = create(:step,
@@ -96,7 +96,7 @@
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rule: {"required_answer" => "RED", "question_identifier" => ["123"]})
+              additional_step_rules: {"required_answer" => "RED", "question_identifier" => ["123"]})
             create(:radio_answer, step: step, response: "red")
 
             step_to_show = create(:step,
@@ -111,12 +111,12 @@
           end
         end
 
-        context "when the referenced step also has an additional_step_rule rule" do
+        context "when the referenced step also has an additional_step_rules rule" do
           it "shows both connected questions" do
             first_step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]},
+              additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]},
               hidden: false)
             create(:radio_answer, step: first_step, response: "Red")
 
@@ -124,7 +124,7 @@
               :radio,
               journey: journey,
               contentful_id: "123",
-              additional_step_rule: {"required_answer" => "Blue", "question_identifier" => ["456"]},
+              additional_step_rules: {"required_answer" => "Blue", "question_identifier" => ["456"]},
               hidden: true)
             create(:radio_answer, step: second_step, response: "Blue")
 
@@ -147,7 +147,7 @@
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]})
+            additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]})
           create(:radio_answer, step: step, response: "Blue")
 
           step_to_show = create(:step,
@@ -165,7 +165,7 @@
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rule: {
+            additional_step_rules: {
               "required_answer" => "Red",
               "question_identifier" => ["123", "456"]
             })
@@ -200,7 +200,7 @@
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rule: {"required_answer" => "RED", "question_identifier" => ["123"]})
+              additional_step_rules: {"required_answer" => "RED", "question_identifier" => ["123"]})
             create(:radio_answer, step: step, response: "red")
 
             step_to_show = create(:step,
@@ -215,12 +215,12 @@
           end
         end
 
-        context "when the referenced step also has an additional_step_rule rule" do
+        context "when the referenced step also has an additional_step_rules rule" do
           it "hides both connected questions" do
             first_step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]},
+              additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]},
               hidden: false)
             create(:radio_answer, step: first_step, response: "Changed from red")
 
@@ -228,7 +228,7 @@
               :radio,
               journey: journey,
               contentful_id: "123",
-              additional_step_rule: {"required_answer" => "Blue", "question_identifier" => ["456"]},
+              additional_step_rules: {"required_answer" => "Blue", "question_identifier" => ["456"]},
               hidden: false)
             create(:radio_answer, step: second_step, response: "Blue")
 
@@ -251,7 +251,7 @@
           step = create(:step,
             :checkbox_answers,
             journey: journey,
-            additional_step_rule: {"required_answer" => "Red", "question_identifier" => ["123"]})
+            additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]})
           create(:checkbox_answers, step: step, response: ["Blue", "Red"])
 
           step_to_show = create(:step,

From 946aea0210255c41cc4f1804c6d1bc0d8d9c20b6 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 24 Feb 2021 14:21:02 +0000
Subject: [PATCH 115/249] Rename existing fixture files for clearer
 alternatives

.. to be added, such as show-multiple-..
---
 spec/features/visitors/anyone_can_complete_a_journey_spec.rb    | 2 +-
 spec/features/visitors/anyone_can_edit_their_answers_spec.rb    | 2 +-
 ...ditional-question.json => show-one-additional-question.json} | 2 +-
 ...n-section.json => show-one-additional-question-section.json} | 2 +-
 ...ditional-question.json => show-one-additional-question.json} | 2 +-
 spec/services/create_journey_step_spec.rb                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename spec/fixtures/contentful/categories/{show-additional-question.json => show-one-additional-question.json} (94%)
 rename spec/fixtures/contentful/sections/{show-additional-question-section.json => show-one-additional-question-section.json} (96%)
 rename spec/fixtures/contentful/steps/{show-additional-question.json => show-one-additional-question.json} (97%)

diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index b61dd1ab6..3aa7fa1d3 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -210,7 +210,7 @@
 
     context "when Contentful entry includes a 'show additional question' rule" do
       scenario "additional questions are shown" do
-        start_journey_from_category_and_go_to_question(category: "show-additional-question.json")
+        start_journey_from_category_and_go_to_question(category: "show-one-additional-question.json")
 
         choose("School expert")
         click_on(I18n.t("generic.button.next"))
diff --git a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
index e7f3bd812..4c8fccbeb 100644
--- a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
+++ b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
@@ -93,7 +93,7 @@
 
   context "when Contentful entry includes a 'show additional question' rule" do
     scenario "an additional question is shown" do
-      start_journey_from_category_and_go_to_question(category: "show-additional-question.json")
+      start_journey_from_category_and_go_to_question(category: "show-one-additional-question.json")
 
       choose("School expert")
       click_on(I18n.t("generic.button.next"))
diff --git a/spec/fixtures/contentful/categories/show-additional-question.json b/spec/fixtures/contentful/categories/show-one-additional-question.json
similarity index 94%
rename from spec/fixtures/contentful/categories/show-additional-question.json
rename to spec/fixtures/contentful/categories/show-one-additional-question.json
index 201416b74..464032c73 100644
--- a/spec/fixtures/contentful/categories/show-additional-question.json
+++ b/spec/fixtures/contentful/categories/show-one-additional-question.json
@@ -35,7 +35,7 @@
             "sys": {
                 "type": "Link",
                 "linkType": "Entry",
-                "id": "show-additional-question-section"
+                "id": "show-one-additional-question-section"
             }
           }
         ],
diff --git a/spec/fixtures/contentful/sections/show-additional-question-section.json b/spec/fixtures/contentful/sections/show-one-additional-question-section.json
similarity index 96%
rename from spec/fixtures/contentful/sections/show-additional-question-section.json
rename to spec/fixtures/contentful/sections/show-one-additional-question-section.json
index 5e6353c96..e907521ad 100644
--- a/spec/fixtures/contentful/sections/show-additional-question-section.json
+++ b/spec/fixtures/contentful/sections/show-one-additional-question-section.json
@@ -35,7 +35,7 @@
                 "sys": {
                     "type": "Link",
                     "linkType": "Entry",
-                    "id": "show-additional-question"
+                    "id": "show-one-additional-question"
                 }
             },
             {
diff --git a/spec/fixtures/contentful/steps/show-additional-question.json b/spec/fixtures/contentful/steps/show-one-additional-question.json
similarity index 97%
rename from spec/fixtures/contentful/steps/show-additional-question.json
rename to spec/fixtures/contentful/steps/show-one-additional-question.json
index 794b164b3..f9928af9b 100644
--- a/spec/fixtures/contentful/steps/show-additional-question.json
+++ b/spec/fixtures/contentful/steps/show-one-additional-question.json
@@ -7,7 +7,7 @@
                 "id": "rwl7tyzv9sys"
             }
         },
-        "id": "show-additional-question",
+        "id": "show-one-additional-question",
         "type": "Entry",
         "createdAt": "2020-11-04T12:28:24.460Z",
         "updatedAt": "2021-02-09T11:28:12.031Z",
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index 4c891af62..b3e69d1bd 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -152,7 +152,7 @@
       it "stores the rule as JSON" do
         journey = create(:journey, :catering)
         fake_entry = fake_contentful_step(
-          contentful_fixture_filename: "steps/show-additional-question.json"
+          contentful_fixture_filename: "steps/show-one-additional-question.json"
         )
 
         step, _answer = described_class.new(

From 939299fd3097d614f215e1a93d8f6ff277cdbee1 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 24 Feb 2021 14:21:49 +0000
Subject: [PATCH 116/249] Toggling additional questions checks multiple rules

Before this change there could only be a single additional question rule. Allowing the user to specify at most one question to show based on at most one matching answer.

This changes extends the existing logic to allow forking. Now we can define multiple rules which allow the user to show _either_ question A or question B based on an existing answer.

We have to continue to ensure that all further connected steps to A or B are recursively shown or hidden as per the change in answer.

We start to pass around an array of step objects rather than ids as we now need to check each 'next_step_id' to make sure it qualifies as a matching next step.
---
 CHANGELOG.md                                  |  1 +
 app/services/toggle_additional_steps.rb       | 62 ++++++++++++------
 ...eld-that-shows-an-additional-question.json | 10 +--
 .../show-multiple-additional-questions.json   | 64 +++++++++++++++++++
 .../steps/show-one-additional-question.json   | 10 +--
 spec/services/create_journey_step_spec.rb     |  4 +-
 spec/services/toggle_additional_steps_spec.rb | 28 ++++----
 7 files changed, 134 insertions(+), 45 deletions(-)
 create mode 100644 spec/fixtures/contentful/steps/show-multiple-additional-questions.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b8148e27..deaf02c1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - users can be asked extended checkbox questions which ask for further information
 - markdown in help text fields is now parsed into HTML
 - show and hide more than one additional question at a time
+- users can be presenting with forking/branching question chains based on any one answer
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index 8e92ed7fc..1a42ba2c4 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -27,11 +27,23 @@ def additional_step_rules
   end
 
   def additional_step_ids
-    additional_step_rules["question_identifier"]
+    additional_step_rules.map { |rule|
+      rule["question_identifier"]
+    }.flatten
   end
 
-  def additional_step
-    journey_steps.find_by(contentful_id: additional_step_ids)
+  def additional_steps_to_show
+    matching_next_step_ids = step.additional_step_rules.map { |rule|
+      rule.fetch("question_identifier", nil) if step.answer && matching_answer?(a: rule["required_answer"], b: step.answer.response)
+    }.flatten
+    journey_steps.where(contentful_id: matching_next_step_ids)
+  end
+
+  def additional_steps_to_hide
+    non_matching_next_step_ids = step.additional_step_rules.map { |rule|
+      rule.fetch("question_identifier", nil) unless matching_answer?(a: rule["required_answer"], b: step.answer.response)
+    }.flatten
+    journey_steps.where(contentful_id: non_matching_next_step_ids)
   end
 
   def matching_answer?(a:, b:)
@@ -45,41 +57,49 @@ def matching_answer?(a:, b:)
   end
 
   def check_to_show_additional_steps!
-    recursively_show_additional_steps!(current_step: step, next_step_ids: additional_step_ids)
+    recursively_show_additional_steps!(current_step: step, next_steps: additional_steps_to_show)
   end
 
   def check_to_hide_additional_steps!
-    return if matching_answer?(a: step.additional_step_rules["required_answer"], b: step.answer.response)
-
-    recursively_hide_additional_steps!(next_step_ids: additional_step_ids)
+    recursively_hide_additional_steps!(next_steps: additional_steps_to_hide)
   end
 
-  def recursively_hide_additional_steps!(next_step_ids:)
-    if next_step_ids.compact.present?
-      next_steps = journey_steps.where(contentful_id: next_step_ids)
+  def recursively_hide_additional_steps!(next_steps:)
+    if next_steps
       next_steps.update_all(hidden: true)
 
-      recursively_hide_additional_steps!(
-        next_step_ids: next_steps.map { |next_step|
-          next_step.additional_step_rules&.fetch("question_identifier", nil)
-        }.flatten.compact
-      )
+      next_steps.map { |next_step|
+        next unless next_step.additional_step_rules
+
+        all_next_step_ids = next_step.additional_step_rules.map { |rule|
+          rule.fetch("question_identifier", nil)
+        }
+        all_next_steps = journey_steps.where(contentful_id: all_next_step_ids)
+
+        recursively_hide_additional_steps!(
+          next_steps: all_next_steps
+        )
+      }
     end
   end
 
-  def recursively_show_additional_steps!(current_step:, next_step_ids:)
+  def recursively_show_additional_steps!(current_step:, next_steps:)
     return unless current_step.answer && current_step.additional_step_rules
 
-    if next_step_ids
-      return unless matching_answer?(a: current_step.additional_step_rules["required_answer"], b: current_step.answer.response)
-
-      next_steps = journey_steps.where(contentful_id: next_step_ids)
+    if next_steps
       next_steps.update_all(hidden: false)
 
       next_steps.map { |next_step|
+        next unless next_step.additional_step_rules
+
+        matching_next_step_ids = next_step.additional_step_rules.map { |rule|
+          rule.fetch("question_identifier", nil) if next_step.answer && matching_answer?(a: rule["required_answer"], b: next_step.answer.response)
+        }
+        matching_next_steps = journey_steps.where(contentful_id: matching_next_step_ids)
+
         recursively_show_additional_steps!(
           current_step: next_step,
-          next_step_ids: next_step.additional_step_rules&.fetch("question_identifier", nil)
+          next_steps: matching_next_steps
         )
       }
     end
diff --git a/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json b/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
index ce8d04862..4972b87ce 100644
--- a/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
+++ b/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
@@ -42,9 +42,11 @@
             }
         ],
         "alwaysShowTheUser": false,
-        "showAdditionalQuestion": {
-            "required_answer": "Red",
-            "question_identifier": ["hidden-field"]
-        }
+        "showAdditionalQuestion": [
+          {
+              "required_answer": "Red",
+              "question_identifier": ["hidden-field"]
+          }
+        ]
     }
 }
diff --git a/spec/fixtures/contentful/steps/show-multiple-additional-questions.json b/spec/fixtures/contentful/steps/show-multiple-additional-questions.json
new file mode 100644
index 000000000..71c90f2dd
--- /dev/null
+++ b/spec/fixtures/contentful/steps/show-multiple-additional-questions.json
@@ -0,0 +1,64 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "show-additional-question",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "What support do you have available?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "School expert",
+                "display_further_information": true,
+                "further_information_help_text": "Explain why this is the case"
+            },
+            {
+                "value": "External expert"
+            },
+            {
+                "value": "None"
+            }
+        ],
+        "showAdditionalQuestion": [
+          {
+              "required_answer": "Yes",
+              "question_identifier": [
+                  "ZoOchclnfw6tPZ0xfYL0h"
+              ]
+          },
+          {
+              "required_answer": "No",
+              "question_identifier": [
+                  "wSeEY4HlESoDJSUsE2wJQ"
+              ]
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/show-one-additional-question.json b/spec/fixtures/contentful/steps/show-one-additional-question.json
index f9928af9b..9433c2eda 100644
--- a/spec/fixtures/contentful/steps/show-one-additional-question.json
+++ b/spec/fixtures/contentful/steps/show-one-additional-question.json
@@ -46,9 +46,11 @@
                 "value": "None"
             }
         ],
-        "showAdditionalQuestion": {
-            "required_answer": "School expert",
-            "question_identifier": ["hidden-field-that-shows-an-additional-question"]
-        }
+        "showAdditionalQuestion": [
+          {
+              "required_answer": "School expert",
+              "question_identifier": ["hidden-field-that-shows-an-additional-question"]
+          }
+        ]
     }
 }
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index b3e69d1bd..61b95ba07 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -159,12 +159,12 @@
           journey: journey, contentful_entry: fake_entry
         ).call
 
-        expect(step.additional_step_rules).to eql(
+        expect(step.additional_step_rules).to eql([
           {
             "required_answer" => "School expert",
             "question_identifier" => ["hidden-field-that-shows-an-additional-question"]
           }
-        )
+        ])
       end
     end
 
diff --git a/spec/services/toggle_additional_steps_spec.rb b/spec/services/toggle_additional_steps_spec.rb
index 2b6f18fd5..c52e2970a 100644
--- a/spec/services/toggle_additional_steps_spec.rb
+++ b/spec/services/toggle_additional_steps_spec.rb
@@ -17,7 +17,7 @@
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]})
+            additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}])
           create(:radio_answer, step: step, response: "Red")
 
           another_step_to_show = create(:step,
@@ -41,10 +41,10 @@
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rules: {
+            additional_step_rules: [{
               "required_answer" => "Red",
               "question_identifier" => ["123", "456"]
-            })
+            }])
           create(:radio_answer, step: step, response: "Red")
 
           first_additional_step_to_show = create(:step,
@@ -76,7 +76,7 @@
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]})
+              additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}])
             create(:radio_answer, step: step, response: "Red")
 
             step_to_show = create(:step,
@@ -96,7 +96,7 @@
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rules: {"required_answer" => "RED", "question_identifier" => ["123"]})
+              additional_step_rules: [{"required_answer" => "RED", "question_identifier" => ["123"]}])
             create(:radio_answer, step: step, response: "red")
 
             step_to_show = create(:step,
@@ -116,7 +116,7 @@
             first_step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]},
+              additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}],
               hidden: false)
             create(:radio_answer, step: first_step, response: "Red")
 
@@ -124,7 +124,7 @@
               :radio,
               journey: journey,
               contentful_id: "123",
-              additional_step_rules: {"required_answer" => "Blue", "question_identifier" => ["456"]},
+              additional_step_rules: [{"required_answer" => "Blue", "question_identifier" => ["456"]}],
               hidden: true)
             create(:radio_answer, step: second_step, response: "Blue")
 
@@ -147,7 +147,7 @@
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]})
+            additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}])
           create(:radio_answer, step: step, response: "Blue")
 
           step_to_show = create(:step,
@@ -165,10 +165,10 @@
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rules: {
+            additional_step_rules: [{
               "required_answer" => "Red",
               "question_identifier" => ["123", "456"]
-            })
+            }])
           create(:radio_answer, step: step, response: "NOT Red")
 
           first_additional_step_to_hide = create(:step,
@@ -200,7 +200,7 @@
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rules: {"required_answer" => "RED", "question_identifier" => ["123"]})
+              additional_step_rules: [{"required_answer" => "RED", "question_identifier" => ["123"]}])
             create(:radio_answer, step: step, response: "red")
 
             step_to_show = create(:step,
@@ -220,7 +220,7 @@
             first_step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]},
+              additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}],
               hidden: false)
             create(:radio_answer, step: first_step, response: "Changed from red")
 
@@ -228,7 +228,7 @@
               :radio,
               journey: journey,
               contentful_id: "123",
-              additional_step_rules: {"required_answer" => "Blue", "question_identifier" => ["456"]},
+              additional_step_rules: [{"required_answer" => "Blue", "question_identifier" => ["456"]}],
               hidden: false)
             create(:radio_answer, step: second_step, response: "Blue")
 
@@ -251,7 +251,7 @@
           step = create(:step,
             :checkbox_answers,
             journey: journey,
-            additional_step_rules: {"required_answer" => "Red", "question_identifier" => ["123"]})
+            additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}])
           create(:checkbox_answers, step: step, response: ["Blue", "Red"])
 
           step_to_show = create(:step,

From 769b7cdcc6745ec97da69423dd72c98e44c85f1e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Feb 2021 10:48:20 +0000
Subject: [PATCH 117/249] Pluralise expected contentful field for question ids

This is now an array of identifiers so for clarity should be pluralised for accuracy and readability.
---
 app/services/toggle_additional_steps.rb       | 10 ++++----
 ...eld-that-shows-an-additional-question.json |  2 +-
 .../show-multiple-additional-questions.json   |  4 ++--
 .../steps/show-one-additional-question.json   |  2 +-
 spec/services/create_journey_step_spec.rb     |  2 +-
 spec/services/toggle_additional_steps_spec.rb | 24 +++++++++----------
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index 1a42ba2c4..9ce42d71f 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -28,20 +28,20 @@ def additional_step_rules
 
   def additional_step_ids
     additional_step_rules.map { |rule|
-      rule["question_identifier"]
+      rule["question_identifiers"]
     }.flatten
   end
 
   def additional_steps_to_show
     matching_next_step_ids = step.additional_step_rules.map { |rule|
-      rule.fetch("question_identifier", nil) if step.answer && matching_answer?(a: rule["required_answer"], b: step.answer.response)
+      rule.fetch("question_identifiers", nil) if step.answer && matching_answer?(a: rule["required_answer"], b: step.answer.response)
     }.flatten
     journey_steps.where(contentful_id: matching_next_step_ids)
   end
 
   def additional_steps_to_hide
     non_matching_next_step_ids = step.additional_step_rules.map { |rule|
-      rule.fetch("question_identifier", nil) unless matching_answer?(a: rule["required_answer"], b: step.answer.response)
+      rule.fetch("question_identifiers", nil) unless matching_answer?(a: rule["required_answer"], b: step.answer.response)
     }.flatten
     journey_steps.where(contentful_id: non_matching_next_step_ids)
   end
@@ -72,7 +72,7 @@ def recursively_hide_additional_steps!(next_steps:)
         next unless next_step.additional_step_rules
 
         all_next_step_ids = next_step.additional_step_rules.map { |rule|
-          rule.fetch("question_identifier", nil)
+          rule.fetch("question_identifiers", nil)
         }
         all_next_steps = journey_steps.where(contentful_id: all_next_step_ids)
 
@@ -93,7 +93,7 @@ def recursively_show_additional_steps!(current_step:, next_steps:)
         next unless next_step.additional_step_rules
 
         matching_next_step_ids = next_step.additional_step_rules.map { |rule|
-          rule.fetch("question_identifier", nil) if next_step.answer && matching_answer?(a: rule["required_answer"], b: next_step.answer.response)
+          rule.fetch("question_identifiers", nil) if next_step.answer && matching_answer?(a: rule["required_answer"], b: next_step.answer.response)
         }
         matching_next_steps = journey_steps.where(contentful_id: matching_next_step_ids)
 
diff --git a/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json b/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
index 4972b87ce..4932d7b39 100644
--- a/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
+++ b/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
@@ -45,7 +45,7 @@
         "showAdditionalQuestion": [
           {
               "required_answer": "Red",
-              "question_identifier": ["hidden-field"]
+              "question_identifiers": ["hidden-field"]
           }
         ]
     }
diff --git a/spec/fixtures/contentful/steps/show-multiple-additional-questions.json b/spec/fixtures/contentful/steps/show-multiple-additional-questions.json
index 71c90f2dd..2111c774d 100644
--- a/spec/fixtures/contentful/steps/show-multiple-additional-questions.json
+++ b/spec/fixtures/contentful/steps/show-multiple-additional-questions.json
@@ -49,13 +49,13 @@
         "showAdditionalQuestion": [
           {
               "required_answer": "Yes",
-              "question_identifier": [
+              "question_identifiers": [
                   "ZoOchclnfw6tPZ0xfYL0h"
               ]
           },
           {
               "required_answer": "No",
-              "question_identifier": [
+              "question_identifiers": [
                   "wSeEY4HlESoDJSUsE2wJQ"
               ]
           }
diff --git a/spec/fixtures/contentful/steps/show-one-additional-question.json b/spec/fixtures/contentful/steps/show-one-additional-question.json
index 9433c2eda..6ccd9f224 100644
--- a/spec/fixtures/contentful/steps/show-one-additional-question.json
+++ b/spec/fixtures/contentful/steps/show-one-additional-question.json
@@ -49,7 +49,7 @@
         "showAdditionalQuestion": [
           {
               "required_answer": "School expert",
-              "question_identifier": ["hidden-field-that-shows-an-additional-question"]
+              "question_identifiers": ["hidden-field-that-shows-an-additional-question"]
           }
         ]
     }
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index 61b95ba07..af614bd9b 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -162,7 +162,7 @@
         expect(step.additional_step_rules).to eql([
           {
             "required_answer" => "School expert",
-            "question_identifier" => ["hidden-field-that-shows-an-additional-question"]
+            "question_identifiers" => ["hidden-field-that-shows-an-additional-question"]
           }
         ])
       end
diff --git a/spec/services/toggle_additional_steps_spec.rb b/spec/services/toggle_additional_steps_spec.rb
index c52e2970a..0b23e72b9 100644
--- a/spec/services/toggle_additional_steps_spec.rb
+++ b/spec/services/toggle_additional_steps_spec.rb
@@ -17,7 +17,7 @@
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}])
+            additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}])
           create(:radio_answer, step: step, response: "Red")
 
           another_step_to_show = create(:step,
@@ -43,7 +43,7 @@
             journey: journey,
             additional_step_rules: [{
               "required_answer" => "Red",
-              "question_identifier" => ["123", "456"]
+              "question_identifiers" => ["123", "456"]
             }])
           create(:radio_answer, step: step, response: "Red")
 
@@ -76,7 +76,7 @@
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}])
+              additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}])
             create(:radio_answer, step: step, response: "Red")
 
             step_to_show = create(:step,
@@ -96,7 +96,7 @@
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rules: [{"required_answer" => "RED", "question_identifier" => ["123"]}])
+              additional_step_rules: [{"required_answer" => "RED", "question_identifiers" => ["123"]}])
             create(:radio_answer, step: step, response: "red")
 
             step_to_show = create(:step,
@@ -116,7 +116,7 @@
             first_step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}],
+              additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}],
               hidden: false)
             create(:radio_answer, step: first_step, response: "Red")
 
@@ -124,7 +124,7 @@
               :radio,
               journey: journey,
               contentful_id: "123",
-              additional_step_rules: [{"required_answer" => "Blue", "question_identifier" => ["456"]}],
+              additional_step_rules: [{"required_answer" => "Blue", "question_identifiers" => ["456"]}],
               hidden: true)
             create(:radio_answer, step: second_step, response: "Blue")
 
@@ -147,7 +147,7 @@
           step = create(:step,
             :radio,
             journey: journey,
-            additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}])
+            additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}])
           create(:radio_answer, step: step, response: "Blue")
 
           step_to_show = create(:step,
@@ -167,7 +167,7 @@
             journey: journey,
             additional_step_rules: [{
               "required_answer" => "Red",
-              "question_identifier" => ["123", "456"]
+              "question_identifiers" => ["123", "456"]
             }])
           create(:radio_answer, step: step, response: "NOT Red")
 
@@ -200,7 +200,7 @@
             step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rules: [{"required_answer" => "RED", "question_identifier" => ["123"]}])
+              additional_step_rules: [{"required_answer" => "RED", "question_identifiers" => ["123"]}])
             create(:radio_answer, step: step, response: "red")
 
             step_to_show = create(:step,
@@ -220,7 +220,7 @@
             first_step = create(:step,
               :radio,
               journey: journey,
-              additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}],
+              additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}],
               hidden: false)
             create(:radio_answer, step: first_step, response: "Changed from red")
 
@@ -228,7 +228,7 @@
               :radio,
               journey: journey,
               contentful_id: "123",
-              additional_step_rules: [{"required_answer" => "Blue", "question_identifier" => ["456"]}],
+              additional_step_rules: [{"required_answer" => "Blue", "question_identifiers" => ["456"]}],
               hidden: false)
             create(:radio_answer, step: second_step, response: "Blue")
 
@@ -251,7 +251,7 @@
           step = create(:step,
             :checkbox_answers,
             journey: journey,
-            additional_step_rules: [{"required_answer" => "Red", "question_identifier" => ["123"]}])
+            additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}])
           create(:checkbox_answers, step: step, response: ["Blue", "Red"])
 
           step_to_show = create(:step,

From 361b9a5aa747f1c3a6d73775cadd94be0408c386 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Feb 2021 11:06:02 +0000
Subject: [PATCH 118/249] Remove redundant methods

---
 app/services/toggle_additional_steps.rb | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index 9ce42d71f..e21f11b3b 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -8,16 +8,12 @@ def initialize(step:)
   def call
     return unless additional_step_rules
 
-    check_to_show_additional_steps!
-    check_to_hide_additional_steps!
+    recursively_show_additional_steps!(current_step: step, next_steps: additional_steps_to_show(step: step))
+    recursively_hide_additional_steps!(next_steps: additional_steps_to_hide)
   end
 
   private
 
-  def answer
-    step.answer
-  end
-
   def journey_steps
     @journey_steps ||= journey.steps
   end
@@ -56,14 +52,6 @@ def matching_answer?(a:, b:)
     end
   end
 
-  def check_to_show_additional_steps!
-    recursively_show_additional_steps!(current_step: step, next_steps: additional_steps_to_show)
-  end
-
-  def check_to_hide_additional_steps!
-    recursively_hide_additional_steps!(next_steps: additional_steps_to_hide)
-  end
-
   def recursively_hide_additional_steps!(next_steps:)
     if next_steps
       next_steps.update_all(hidden: true)

From 046d1dca18b79f16d4eca92cc6862ed363636384 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Feb 2021 11:10:38 +0000
Subject: [PATCH 119/249] Refactor duplication for showing the next additional
 steps

* We can't do the same thing for the hiding additional steps because the logic is different. One the first run through we only want to hide the next steps if they don't match the current answer. If they don't, we then want to hide them all regardless of further comparison.
---
 app/services/toggle_additional_steps.rb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index e21f11b3b..c0758571e 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -28,7 +28,7 @@ def additional_step_ids
     }.flatten
   end
 
-  def additional_steps_to_show
+  def additional_steps_to_show(step:)
     matching_next_step_ids = step.additional_step_rules.map { |rule|
       rule.fetch("question_identifiers", nil) if step.answer && matching_answer?(a: rule["required_answer"], b: step.answer.response)
     }.flatten
@@ -80,14 +80,9 @@ def recursively_show_additional_steps!(current_step:, next_steps:)
       next_steps.map { |next_step|
         next unless next_step.additional_step_rules
 
-        matching_next_step_ids = next_step.additional_step_rules.map { |rule|
-          rule.fetch("question_identifiers", nil) if next_step.answer && matching_answer?(a: rule["required_answer"], b: next_step.answer.response)
-        }
-        matching_next_steps = journey_steps.where(contentful_id: matching_next_step_ids)
-
         recursively_show_additional_steps!(
           current_step: next_step,
-          next_steps: matching_next_steps
+          next_steps: additional_steps_to_show(step: next_step)
         )
       }
     end

From 853c341b6769e4ccc8d67b72b7666046ee2f305c Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 24 Feb 2021 12:21:58 +0000
Subject: [PATCH 120/249] Fix test inconsistency

Steps and answers should match. We only expect a radio answer for a radio step.
---
 spec/services/get_answers_for_steps_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index b350cc3e8..823db0622 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -70,7 +70,7 @@
       it "does not try to prepare that answer in the result" do
         journey = create(:journey)
         answerable_step = create(:step, :radio, journey: journey)
-        _answer = create(:short_text_answer, step: answerable_step)
+        _answer = create(:radio_answer, step: answerable_step)
         unanswerable_step = create(:step, :radio, journey: journey)
 
         result = described_class.new(visible_steps: [answerable_step]).call

From a2b5d1d5437d2210199b8b660195ff013a8f9d99 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 24 Feb 2021 12:23:11 +0000
Subject: [PATCH 121/249] Refactor Step.answer to reduce redundant DB queries

Instead of trying each association in order we are more selective about the query we expect to make. This changes the method from making up to 7 database queries (if the step is currency) to always being at most 1 query.
---
 app/models/step.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/models/step.rb b/app/models/step.rb
index 2b3f51073..a44cc6e95 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -14,13 +14,15 @@ class Step < ApplicationRecord
 
   def answer
     @answer ||=
-      radio_answer ||
-      short_text_answer ||
-      long_text_answer ||
-      single_date_answer ||
-      checkbox_answers ||
-      number_answer ||
-      currency_answer
+      case contentful_type
+      when "radios" then radio_answer
+      when "short_text" then short_text_answer
+      when "long_text" then long_text_answer
+      when "single_date" then single_date_answer
+      when "checkboxes" then checkbox_answers
+      when "number" then number_answer
+      when "currency" then currency_answer
+      end
   end
 
   def primary_call_to_action_text

From 977cb130e8910810c05bfdb844ff8301f50a40a1 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 24 Feb 2021 11:01:13 +0000
Subject: [PATCH 122/249] CI uses the single script/test script

As we follow the "One script to rule them all" pattern we should use the script/test as a central definition for how to test the application.
---
 .github/workflows/continuous-integration.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 821bbe6c4..da57487dc 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -16,4 +16,4 @@ jobs:
       - name: Build
         run: docker-compose -f docker-compose.ci.yml build
       - name: Test
-        run: docker-compose -f docker-compose.ci.yml run --rm test bundle exec rake
+        run: docker-compose -f docker-compose.ci.yml run --rm test script/test

From 0ba7d24dd23ff13f375fecaaede2ce3d1bfdf955 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 24 Feb 2021 11:03:24 +0000
Subject: [PATCH 123/249] Test script always runs brakeman security checks

This was accidentally removed from as a GitHub action [1] in reworking CI to use Docker. Instead of adding another Docker Compose run command, we define the testing steps independent of how your environment is built for wider compatibility.

[1] https://github.com/dxw/rails-template/blob/5d9ff5d82e1c30934788ca7b4f3ea7e718f79e06/.github/workflows/continuous-integration.yml#L39
---
 script/test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/test b/script/test
index 183f44149..92dd1c595 100755
--- a/script/test
+++ b/script/test
@@ -6,3 +6,4 @@
 set -e
 
 bundle exec rake
+bundle exec brakeman -o /dev/stdout

From ec47ac755409c271d844972f9e3ff872a2c7da62 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 24 Feb 2021 11:50:39 +0000
Subject: [PATCH 124/249] Refactor specification template rendering to avoid
 duplicate effort

---
 app/controllers/journeys_controller.rb | 4 ++--
 app/views/journeys/show.html.erb       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 855ce35f4..ce2a39164 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -40,12 +40,12 @@ def show
     )
 
     @answers = GetAnswersForSteps.new(visible_steps: @visible_steps).call
-    specification_html = @specification_template.render(@answers)
+    @specification_html = @specification_template.render(@answers)
 
     respond_to do |format|
       format.html
       format.docx do
-        render docx: "specification.docx", content: specification_html, layout: "specficiation"
+        render docx: "specification.docx", content: @specification_html, layout: "specficiation"
       end
     end
   end
diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index a807b73ad..2f9f6d784 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -25,4 +25,4 @@
   </div>
 <% end %>
 <%= link_to "Download (.docx)", journey_path(@journey, format: :docx), class: "govuk-button" %>
-<%= @specification_template.render(@answers).html_safe %>
+<%= @specification_html.html_safe %>

From e421e07526572303a87096cd3f41c1f6adf8f1de Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 24 Feb 2021 12:01:40 +0000
Subject: [PATCH 125/249] Ignore weak Brakeman warning on XSS

This alert is warning us about this line `@specification_html.html_safe`

The `specification_html` is being sourced from Contentful and is indeed being rendered to the page directly without any escaping or sanitising.

I am ignoring this alert as we trust Contentful to feed data directly into the serivce. There is a risk that the login for Contentful could be compromised and the specification template could be made to render malicious code to the user.

This ignore file was generated automatically using the `brakeman -I` flag.
---
 config/brakeman.ignore | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 config/brakeman.ignore

diff --git a/config/brakeman.ignore b/config/brakeman.ignore
new file mode 100644
index 000000000..5d7fd657f
--- /dev/null
+++ b/config/brakeman.ignore
@@ -0,0 +1,37 @@
+{
+  "ignored_warnings": [
+    {
+      "warning_type": "Cross-Site Scripting",
+      "warning_code": 2,
+      "fingerprint": "cf9010da503c2276ed17469cdc002d84afdc182b5e87adae78716ab10c2eb928",
+      "check_name": "CrossSiteScripting",
+      "message": "Unescaped model attribute",
+      "file": "app/views/journeys/show.html.erb",
+      "line": 28,
+      "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
+      "code": "Liquid::Template.parse(Journey.find(journey_id).liquid_template, :error_mode => :strict).render(GetAnswersForSteps.new(:visible_steps => Journey.find(journey_id).visible_steps.includes([:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers, :number_answer, :currency_answer])).call)",
+      "render_path": [
+        {
+          "type": "controller",
+          "class": "JourneysController",
+          "method": "show",
+          "line": 46,
+          "file": "app/controllers/journeys_controller.rb",
+          "rendered": {
+            "name": "journeys/show",
+            "file": "app/views/journeys/show.html.erb"
+          }
+        }
+      ],
+      "location": {
+        "type": "template",
+        "template": "journeys/show"
+      },
+      "user_input": "Journey.find(journey_id).liquid_template",
+      "confidence": "Weak",
+      "note": ""
+    }
+  ],
+  "updated": "2021-02-24 11:55:12 +0000",
+  "brakeman_version": "5.0.0"
+}

From f2b869c34e6c9051384a588d89cf722b1ecf2ed5 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 24 Feb 2021 15:09:09 +0000
Subject: [PATCH 126/249] Remove redundant layout option for spec download

We noticed a typo but on inspection this value isn't used and there's no associated view called `specfication.x` to change.
---
 app/controllers/journeys_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index ce2a39164..fa5bfa610 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -45,7 +45,7 @@ def show
     respond_to do |format|
       format.html
       format.docx do
-        render docx: "specification.docx", content: @specification_html, layout: "specficiation"
+        render docx: "specification.docx", content: @specification_html
       end
     end
   end

From 031716d59ab570420e870e796c3e62658482c0ee Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Tue, 23 Feb 2021 15:47:16 +0000
Subject: [PATCH 127/249] Create an extended further information text box
 option for radio answers

Providing a larger text box option helps to explicitly convey to the
user that they have more space for their written answers.
---
 CHANGELOG.md                                  |  1 +
 app/views/steps/radios.html.erb               | 10 ++--
 .../anyone_can_complete_a_journey_spec.rb     | 29 +++++++++++
 .../extended-long-answer-radio-question.json  | 44 ++++++++++++++++
 .../extended-long-answer-radio-section.json   | 43 ++++++++++++++++
 .../extended-long-answer-radio-question.json  | 51 +++++++++++++++++++
 6 files changed, 173 insertions(+), 5 deletions(-)
 create mode 100644 spec/fixtures/contentful/categories/extended-long-answer-radio-question.json
 create mode 100644 spec/fixtures/contentful/sections/extended-long-answer-radio-section.json
 create mode 100644 spec/fixtures/contentful/steps/extended-long-answer-radio-question.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index deaf02c1b..37882d5e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - markdown in help text fields is now parsed into HTML
 - show and hide more than one additional question at a time
 - users can be presenting with forking/branching question chains based on any one answer
+- create an extended further information text box option for radio answers
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/views/steps/radios.html.erb b/app/views/steps/radios.html.erb
index 4c7db701c..8a91d8734 100644
--- a/app/views/steps/radios.html.erb
+++ b/app/views/steps/radios.html.erb
@@ -8,13 +8,13 @@
     <% end %>
 
     <% @step.options.each do |option| %>
-      <% if option["display_further_information"] == true %>
         <%= f.govuk_radio_button :response, option["value"].downcase, label: { text: option["value"] }, hint: { text: option["help_text"] } do %>
-          <%= f.govuk_text_area :further_information, rows: 1, label: { text: option["further_information_help_text"] } %>
+          <% if option["display_further_information"] == "single" || option["display_further_information"] == true %>
+            <%= f.govuk_text_field :further_information, label: { text: option["further_information_help_text"] } %>
+          <% elsif option["display_further_information"] == "long" %>
+            <%= f.govuk_text_area :further_information, rows: 6, label: { text: option["further_information_help_text"] } %>
+          <% end %>
         <% end %>
-      <% else %>
-        <%= f.govuk_radio_button :response, option["value"].downcase, label: { text: option["value"] }, hint: { text: option["help_text"] } %>
-      <% end %>
     <% end %>
   <% end %>
 <% end %>
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 3aa7fa1d3..7dbfae7b0 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -206,6 +206,35 @@
             .to eql("The school needs the kitchen cleaned once a day")
         end
       end
+
+      context "when extended question is of type single" do
+        scenario "a single text field is displayed" do
+          start_journey_from_category_and_go_to_question(category: "extended-radio-question.json")
+
+          choose("Catering")
+
+          expect(page).to have_selector("input#answer-further-information-field")
+        end
+      end
+
+      context "when extended question is of type long" do
+        scenario "a long text area is displayed" do
+          start_journey_from_category_and_go_to_question(category: "extended-long-answer-radio-question.json")
+
+          choose("Catering")
+
+          expect(page).to have_selector("textarea#answer-further-information-field")
+        end
+      end
+
+      context "when there is no extended question" do
+        scenario "no extra text field is displayed" do
+          start_journey_from_category_and_go_to_question(category: "radio-question.json")
+
+          expect(page).to_not have_selector("textarea#answer-further-information-field")
+          expect(page).to_not have_selector("input#answer-further-information-field")
+        end
+      end
     end
 
     context "when Contentful entry includes a 'show additional question' rule" do
diff --git a/spec/fixtures/contentful/categories/extended-long-answer-radio-question.json b/spec/fixtures/contentful/categories/extended-long-answer-radio-question.json
new file mode 100644
index 000000000..26317406c
--- /dev/null
+++ b/spec/fixtures/contentful/categories/extended-long-answer-radio-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "extended-long-answer-radio-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>{{answer_extended-radio-question}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/extended-long-answer-radio-section.json b/spec/fixtures/contentful/sections/extended-long-answer-radio-section.json
new file mode 100644
index 000000000..08f4d4555
--- /dev/null
+++ b/spec/fixtures/contentful/sections/extended-long-answer-radio-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-long-answer-radio-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "extended-long-answer-radio-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/extended-long-answer-radio-question.json b/spec/fixtures/contentful/steps/extended-long-answer-radio-question.json
new file mode 100644
index 000000000..0e5839d4a
--- /dev/null
+++ b/spec/fixtures/contentful/steps/extended-long-answer-radio-question.json
@@ -0,0 +1,51 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "jspwts36h1os"
+            }
+        },
+        "id": "extended-long-answer-radio-question",
+        "type": "Entry",
+        "createdAt": "2020-09-07T10:56:40.585Z",
+        "updatedAt": "2020-09-14T22:16:54.633Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 7,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/which-service",
+        "title": "Which service do you need?",
+        "helpText": "Tell us which service you need.",
+        "type": "radios",
+        "extendedOptions": [
+          {
+              "value": "Catering",
+              "help_text": "",
+              "display_further_information": "long",
+              "further_information_help_text": "Briefly describe why you need catering"
+          },
+          {
+              "value": "Cleaning",
+              "help_text": "All interior areas of the school only",
+              "display_further_information": false,
+              "further_information_help_text": "Briefly describe why you need cleaning"
+          }
+        ]
+    }
+}

From 58f1424ff2dd17d7c1bb5b545ea5176c19c83b1f Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Wed, 24 Feb 2021 15:45:27 +0000
Subject: [PATCH 128/249] Create extended further information text box option
 for checkbox answers

---
 CHANGELOG.md                                  |  1 +
 app/views/steps/checkboxes.html.erb           | 21 +++++---
 .../anyone_can_complete_a_journey_spec.rb     | 29 +++++++++++
 ...ended-long-answer-checkboxes-question.json | 44 +++++++++++++++++
 ...tended-long-answer-checkboxes-section.json | 43 ++++++++++++++++
 ...ended-long-answer-checkboxes-question.json | 49 +++++++++++++++++++
 6 files changed, 179 insertions(+), 8 deletions(-)
 create mode 100644 spec/fixtures/contentful/categories/extended-long-answer-checkboxes-question.json
 create mode 100644 spec/fixtures/contentful/sections/extended-long-answer-checkboxes-section.json
 create mode 100644 spec/fixtures/contentful/steps/extended-long-answer-checkboxes-question.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37882d5e0..431fe34fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - show and hide more than one additional question at a time
 - users can be presenting with forking/branching question chains based on any one answer
 - create an extended further information text box option for radio answers
+- create extended further information text box option for checkbox answers
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index a7e86c0e0..022d0312c 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -9,15 +9,20 @@
     <% @step.options.each do |option| %>
       <% machine_value = option["value"].tr(" ", "_").downcase %>
 
-      <% if option["display_further_information"] == true %>
-        <% f.object = monkey_patch_form_object_with_further_information_field(form_object: f.object, associated_choice: machine_value) %>
-        <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
-          <%= f.govuk_text_field "#{machine_value}_further_information",
-            label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
+      <% f.object = monkey_patch_form_object_with_further_information_field(form_object: f.object, associated_choice: machine_value) %>
+        <% if option["display_further_information"] == true || option["display_further_information"] == "single" %>
+          <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
+            <%= f.govuk_text_field "#{machine_value}_further_information",
+              label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
+          <% end %>
+        <% elsif option["display_further_information"] == "long" %>
+          <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
+            <%= f.govuk_text_area "#{machine_value}_further_information", rows: 6,
+              label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
+          <% end %>
+        <% else %>
+          <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } %>
         <% end %>
-      <% else %>
-        <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } %>
-      <% end %>
     <% end %>
   <% end %>
 <% end %>
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 7dbfae7b0..5f6898abd 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -187,6 +187,35 @@
             .to eql("A second piece of further information")
         end
       end
+
+      context "when extended question is of type single" do
+        scenario "a single text field is displayed" do
+          start_journey_from_category_and_go_to_question(category: "extended-checkboxes-question.json")
+
+          check("Yes")
+
+          expect(page).to have_selector("input#answer-yes-further-information-field")
+        end
+      end
+
+      context "when extended question is of type long" do
+        scenario "a long text area is displayed" do
+          start_journey_from_category_and_go_to_question(category: "extended-long-answer-checkboxes-question.json")
+
+          check("Yes")
+
+          expect(page).to have_selector("textarea#answer-yes-further-information-field")
+        end
+      end
+
+      context "when there is no extended question" do
+        scenario "no extra text field is displayed" do
+          start_journey_from_category_and_go_to_question(category: "checkboxes-question.json")
+
+          expect(page).to_not have_selector("textarea#answer-yes-further-information-field")
+          expect(page).to_not have_selector("input#answer-yes-further-information-field")
+        end
+      end
     end
 
     context "when Contentful entry is of type radios" do
diff --git a/spec/fixtures/contentful/categories/extended-long-answer-checkboxes-question.json b/spec/fixtures/contentful/categories/extended-long-answer-checkboxes-question.json
new file mode 100644
index 000000000..43d81a8ec
--- /dev/null
+++ b/spec/fixtures/contentful/categories/extended-long-answer-checkboxes-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "extended-long-answer-checkboxes-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/extended-long-answer-checkboxes-section.json b/spec/fixtures/contentful/sections/extended-long-answer-checkboxes-section.json
new file mode 100644
index 000000000..e364a8487
--- /dev/null
+++ b/spec/fixtures/contentful/sections/extended-long-answer-checkboxes-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-long-answer-checkboxes-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "extended-long-answer-checkboxes-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/extended-long-answer-checkboxes-question.json b/spec/fixtures/contentful/steps/extended-long-answer-checkboxes-question.json
new file mode 100644
index 000000000..44d4b3635
--- /dev/null
+++ b/spec/fixtures/contentful/steps/extended-long-answer-checkboxes-question.json
@@ -0,0 +1,49 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-long-answer-checkboxes-question",
+        "type": "Entry",
+        "createdAt": "2021-02-17T14:09:56.405Z",
+        "updatedAt": "2021-02-17T14:38:07.806Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/extended-checkboxes",
+        "type": "checkboxes",
+        "title": "Extended checkboxes",
+        "extendedOptions": [
+            {
+                "value": "Yes",
+                "display_further_information": "long",
+                "further_information_help_text": "You should tell us more"
+            },
+            {
+                "value": "No",
+                "display_further_information": "long",
+                "further_information_help_text": "You should tell us more"
+            }
+        ],
+        "alwaysShowTheUser": true
+    }
+}

From 8977acd36192e03bb03e9d56baab9bb32f45d9d5 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 24 Feb 2021 17:13:10 +0000
Subject: [PATCH 129/249] Checkbox answers are now human readable in a spec

Our test didn't have an accurate case for how we are storing answers. We store a machine readable `morning_break` in the `response` field (so we can reliably set field labels etc). Our test set the database value as "Morning break" which is close but let through this bug where all values are formatted in the machine readable format, rather than a human readable one.

We now strip the underscores from the value if it as multiple words during presentation.
---
 app/presenters/checkboxes_answer_presenter.rb       | 5 ++++-
 spec/presenters/checkboxes_answer_presenter_spec.rb | 2 +-
 spec/services/get_answers_for_steps_spec.rb         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/presenters/checkboxes_answer_presenter.rb b/app/presenters/checkboxes_answer_presenter.rb
index 5da1e066a..85021eb8d 100644
--- a/app/presenters/checkboxes_answer_presenter.rb
+++ b/app/presenters/checkboxes_answer_presenter.rb
@@ -1,5 +1,8 @@
 class CheckboxesAnswerPresenter < SimpleDelegator
   def response
-    super.reject(&:blank?).map(&:capitalize).join(", ")
+    super.reject(&:blank?).map { |answer|
+      answer.tr!("_", " ")
+      answer.capitalize!
+    }.join(", ")
   end
 end
diff --git a/spec/presenters/checkboxes_answer_presenter_spec.rb b/spec/presenters/checkboxes_answer_presenter_spec.rb
index 0bfae9a7f..04a066df0 100644
--- a/spec/presenters/checkboxes_answer_presenter_spec.rb
+++ b/spec/presenters/checkboxes_answer_presenter_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe CheckboxesAnswerPresenter do
   describe "#response" do
     it "returns all none nil values, capitalised as a comma separated string" do
-      step = build(:checkbox_answers, response: ["yes", "no", "morning break", ""])
+      step = build(:checkbox_answers, response: ["yes", "no", "morning_break", ""])
       presenter = described_class.new(step)
       expect(presenter.response).to eq("Yes, No, Morning break")
     end
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index 823db0622..8f75e3da0 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -44,7 +44,7 @@
     end
 
     context "when the answer is of type checkbox_answers" do
-      it_behaves_like "returns the answer in a hash", :checkbox_answers, CheckboxesAnswerPresenter, "Foo, Bar"
+      it_behaves_like "returns the answer in a hash", :checkbox_answers, CheckboxesAnswerPresenter, ["Foo", "Bar"]
     end
 
     context "when a step does not have an answer" do

From 34388d44491c27d97849fcdb88b1fec86051fdfc Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Thu, 25 Feb 2021 11:00:08 +0000
Subject: [PATCH 130/249] Update warning message for an incomplete
 specification

This warning message has been changed to help be more explicit in it's
messaging.
---
 config/locales/en.yml                                           | 2 +-
 .../anyone_can_see_their_catering_specification_spec.rb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2644f44d6..eead7f270 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -53,7 +53,7 @@ en:
   journey:
     specification:
       header: "Your specification"
-      warning: "There are incomplete tasks, this specification is not ready for use."
+      warning: "You have not completed all the tasks. There may be information missing from your specification."
   task_list:
     status:
       not_started: Not started
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
index 82054ea41..20ad6deed 100644
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
@@ -41,7 +41,7 @@
 
       # Don't answer any questions to create a in progress spec
 
-      expect(page).to have_content("There are incomplete tasks, this specification is not ready for use.")
+      expect(page).to have_content("You have not completed all the tasks. There may be information missing from your specification.")
     end
   end
 end

From 2f6230506bcc20722a6fcb52c1fa60d490d92748 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Feb 2021 11:03:56 +0000
Subject: [PATCH 131/249] Bump webmock from 3.11.2 to 3.11.3

Bumps [webmock](https://github.com/bblimke/webmock) from 3.11.2 to 3.11.3.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.11.2...v3.11.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9809bca84..8ac8f1abd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -344,7 +344,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.11.2)
+    webmock (3.11.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

From 735a3ff1461e823d62931acc9ef54e17a7467857 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 25 Feb 2021 16:11:53 +0000
Subject: [PATCH 132/249] Radio questions can be configured to show an OR
 separator

This option can technically be used on all radio options but the approach here is to allow the content team to specify on what value it should appear, rather than trying to ensure there is only 1 in the backend
---
 CHANGELOG.md                                  |  1 +
 app/views/steps/radios.html.erb               |  3 ++
 .../anyone_can_complete_a_journey_spec.rb     | 15 ++++++
 .../radio-question-with-separator.json        | 44 +++++++++++++++++
 .../radio-with-separator-section.json         | 43 +++++++++++++++++
 .../steps/radio-with-separator-question.json  | 47 +++++++++++++++++++
 6 files changed, 153 insertions(+)
 create mode 100644 spec/fixtures/contentful/categories/radio-question-with-separator.json
 create mode 100644 spec/fixtures/contentful/sections/radio-with-separator-section.json
 create mode 100644 spec/fixtures/contentful/steps/radio-with-separator-question.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 431fe34fd..608b7879a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - users can be presenting with forking/branching question chains based on any one answer
 - create an extended further information text box option for radio answers
 - create extended further information text box option for checkbox answers
+- radio questions can be configured with an "or" separator
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/views/steps/radios.html.erb b/app/views/steps/radios.html.erb
index 8a91d8734..6d57d4b2f 100644
--- a/app/views/steps/radios.html.erb
+++ b/app/views/steps/radios.html.erb
@@ -8,6 +8,9 @@
     <% end %>
 
     <% @step.options.each do |option| %>
+      <% if option.fetch("separated_by_or", nil) == true %>
+        <div class="govuk-radios__divider">or</div>
+      <% end %>
         <%= f.govuk_radio_button :response, option["value"].downcase, label: { text: option["value"] }, hint: { text: option["help_text"] } do %>
           <% if option["display_further_information"] == "single" || option["display_further_information"] == true %>
             <%= f.govuk_text_field :further_information, label: { text: option["further_information_help_text"] } %>
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 5f6898abd..44855eae4 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -264,6 +264,21 @@
           expect(page).to_not have_selector("input#answer-further-information-field")
         end
       end
+
+      context "when an 'or separator' has been configured" do
+        scenario "shows an or separator" do
+          start_journey_from_category_and_go_to_question(category: "radio-question-with-separator.json")
+
+          expect(page).to have_selector("div.govuk-radios__divider")
+          within("div.govuk-radios__divider") do
+            expect(page).to have_content("or")
+          end
+
+          # Check that the "Or" separator appears in the correct position
+          expect(page.body.index("Catering") > page.body.index("or")).to eq(true)
+          expect(page.body.index("or") < page.body.index("Cleaning")).to eq(true)
+        end
+      end
     end
 
     context "when Contentful entry includes a 'show additional question' rule" do
diff --git a/spec/fixtures/contentful/categories/radio-question-with-separator.json b/spec/fixtures/contentful/categories/radio-question-with-separator.json
new file mode 100644
index 000000000..182428791
--- /dev/null
+++ b/spec/fixtures/contentful/categories/radio-question-with-separator.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-with-separator-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/radio-with-separator-section.json b/spec/fixtures/contentful/sections/radio-with-separator-section.json
new file mode 100644
index 000000000..216461309
--- /dev/null
+++ b/spec/fixtures/contentful/sections/radio-with-separator-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "radio-with-separator-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "radio-with-separator-question"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/radio-with-separator-question.json b/spec/fixtures/contentful/steps/radio-with-separator-question.json
new file mode 100644
index 000000000..3bbc22ade
--- /dev/null
+++ b/spec/fixtures/contentful/steps/radio-with-separator-question.json
@@ -0,0 +1,47 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "jspwts36h1os"
+            }
+        },
+        "id": "radio-with-separator-question",
+        "type": "Entry",
+        "createdAt": "2020-09-07T10:56:40.585Z",
+        "updatedAt": "2020-09-14T22:16:54.633Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 7,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/which-service",
+        "title": "Which service do you need?",
+        "helpText": "Tell us which service you need.",
+        "type": "radios",
+        "extendedOptions": [
+          {
+              "value": "Catering"
+          },
+          {
+              "value": "Cleaning",
+              "separated_by_or": true
+          }
+        ],
+        "alwaysShowTheUser": true
+    }
+}

From 305552e7238a930661694e7ccd82e625b5dbd57d Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 25 Feb 2021 17:43:13 +0000
Subject: [PATCH 133/249] Checkboxes can have their options separated by an OR

Though the user need was for this to only work with radio questions, the mechanism to provide this for radios is the same as checkboxes. The same Contentful `options` field is used and we provide guidance in the form of help text within contentful as to what attributes are useable. Given this is easily supported now, we add this for checkboxes too as a nice to have.
---
 app/views/steps/checkboxes.html.erb | 30 ++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index 022d0312c..bee2bc31e 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -8,21 +8,25 @@
 
     <% @step.options.each do |option| %>
       <% machine_value = option["value"].tr(" ", "_").downcase %>
-
+      <% if option.fetch("separated_by_or", nil) == true %>
+        <div class="govuk-radios__divider">or</div>
+      <% end %>
+      
       <% f.object = monkey_patch_form_object_with_further_information_field(form_object: f.object, associated_choice: machine_value) %>
-        <% if option["display_further_information"] == true || option["display_further_information"] == "single" %>
-          <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
-            <%= f.govuk_text_field "#{machine_value}_further_information",
-              label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
-          <% end %>
-        <% elsif option["display_further_information"] == "long" %>
-          <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
-            <%= f.govuk_text_area "#{machine_value}_further_information", rows: 6,
-              label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
-          <% end %>
-        <% else %>
-          <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } %>
+
+      <% if option["display_further_information"] == true || option["display_further_information"] == "single" %>
+        <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
+          <%= f.govuk_text_field "#{machine_value}_further_information",
+            label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
+        <% end %>
+      <% elsif option["display_further_information"] == "long" %>
+        <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
+          <%= f.govuk_text_area "#{machine_value}_further_information", rows: 6,
+            label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
         <% end %>
+      <% else %>
+        <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } %>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>

From 1b5e12d5313722c9abb7beca4a4ea9391dfe518a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Feb 2021 11:03:28 +0000
Subject: [PATCH 134/249] Bump webmock from 3.11.3 to 3.12.0

Bumps [webmock](https://github.com/bblimke/webmock) from 3.11.3 to 3.12.0.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.11.3...v3.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8ac8f1abd..3a51963cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -344,7 +344,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.11.3)
+    webmock (3.12.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

From 7088acc779de72960eaa3d30f5d4b3a43b9d16ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Feb 2021 11:03:52 +0000
Subject: [PATCH 135/249] Bump bullet from 6.1.3 to 6.1.4

Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.3 to 6.1.4.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.3...6.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8ac8f1abd..c9328e37d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
       msgpack (~> 1.0)
     brakeman (5.0.0)
     builder (3.2.4)
-    bullet (6.1.3)
+    bullet (6.1.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -184,7 +184,7 @@ GEM
     mini_portile2 (2.5.0)
     mini_racer (0.3.1)
       libv8 (~> 8.4.255)
-    minitest (5.14.3)
+    minitest (5.14.4)
     mock_redis (0.27.3)
       ruby2_keywords
     msgpack (1.4.2)
@@ -338,7 +338,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (2.0.0)
-    uniform_notifier (1.13.2)
+    uniform_notifier (1.14.0)
     web-console (4.1.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)

From 072448b770cca69be9054b7a1f5b505448148c1d Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 25 Feb 2021 17:00:17 +0000
Subject: [PATCH 136/249] Fix page jump for radio questions without further
 info
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the radio question does NOT have a further_information of any sorts then when the user selects an option, the radio elements will jump slightly on the page.

This is caused by a new HTML element being added by the gem when `f.govuk_radio_button` is passed an empty block. In order to avoid this jump, we default back to the old (slightly repetitive) version of the code that has an else condition that uses this method without passing any block. This fixes the issue.

>  block (Block) — Any supplied HTML will be wrapped in a conditional container and only revealed when the radio button is picked [1]

[1] https://www.rubydoc.info/gems/govuk_design_system_formbuilder/GOVUKDesignSystemFormBuilder/Builder#govuk_radio_button-instance_method
---
 app/views/steps/radios.html.erb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/views/steps/radios.html.erb b/app/views/steps/radios.html.erb
index 6d57d4b2f..f99e47b9d 100644
--- a/app/views/steps/radios.html.erb
+++ b/app/views/steps/radios.html.erb
@@ -11,6 +11,7 @@
       <% if option.fetch("separated_by_or", nil) == true %>
         <div class="govuk-radios__divider">or</div>
       <% end %>
+      <% if option["display_further_information"] %>
         <%= f.govuk_radio_button :response, option["value"].downcase, label: { text: option["value"] }, hint: { text: option["help_text"] } do %>
           <% if option["display_further_information"] == "single" || option["display_further_information"] == true %>
             <%= f.govuk_text_field :further_information, label: { text: option["further_information_help_text"] } %>
@@ -18,6 +19,10 @@
             <%= f.govuk_text_area :further_information, rows: 6, label: { text: option["further_information_help_text"] } %>
           <% end %>
         <% end %>
+      <% else %>
+        <!-- We have to include this if there is no block given, selecting an option causes a page jump as a conditional element is toggled by the form builder -->
+        <%= f.govuk_radio_button :response, option["value"].downcase, label: { text: option["value"] }, hint: { text: option["help_text"] } %>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>

From c40759d086c4fcd078fa8da0872da62e34004737 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 25 Feb 2021 11:38:51 +0000
Subject: [PATCH 137/249] Radio answer responses no longer include further info

We are changing the way we are making the `further_information` data available to the specification template.

Instead of automatically interpolating the `response` together with the `further_information` (separated by a hyphen), we are going to make them both available to the Liquid template as individual variables and allow the content team to choose how they are presented.

The first step of this work is to make the response field for Radio answers exclude it's further information.
---
 app/presenters/radio_answer_presenter.rb               |  4 +---
 ...anyone_can_see_their_catering_specification_spec.rb |  4 ++--
 spec/presenters/radio_answer_presenter_spec.rb         | 10 +---------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/presenters/radio_answer_presenter.rb b/app/presenters/radio_answer_presenter.rb
index 854044543..ab4797c79 100644
--- a/app/presenters/radio_answer_presenter.rb
+++ b/app/presenters/radio_answer_presenter.rb
@@ -1,7 +1,5 @@
 class RadioAnswerPresenter < SimpleDelegator
   def response
-    return super.capitalize if further_information.blank?
-
-    "#{super.capitalize} - #{further_information}"
+    super.capitalize
   end
 end
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
index 20ad6deed..8561c4205 100644
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
@@ -15,7 +15,7 @@
     end
   end
 
-  scenario "renders responses that need extra formatting" do
+  scenario "renders radio responses that have futher information" do
     stub_contentful_category(fixture_filename: "extended-radio-question.json")
     visit root_path
     click_on(I18n.t("generic.button.start"))
@@ -29,7 +29,7 @@
     expect(page).to have_content(I18n.t("journey.specification.header"))
 
     within("article#specification") do
-      expect(page).to have_content("Catering - The school needs the kitchen cleaned once a day")
+      expect(page).to have_content("Catering")
     end
   end
 
diff --git a/spec/presenters/radio_answer_presenter_spec.rb b/spec/presenters/radio_answer_presenter_spec.rb
index edb83426d..fa44a65df 100644
--- a/spec/presenters/radio_answer_presenter_spec.rb
+++ b/spec/presenters/radio_answer_presenter_spec.rb
@@ -3,17 +3,9 @@
 RSpec.describe RadioAnswerPresenter do
   describe "#response" do
     it "returns the option chosen" do
-      step = build(:radio_answer, response: "Yes", further_information: "")
+      step = build(:radio_answer, response: "Yes", further_information: "Extra info")
       presenter = described_class.new(step)
       expect(presenter.response).to eq("Yes")
     end
-
-    context "when further information is provided" do
-      it "returns the option chosen and the further information" do
-        step = build(:radio_answer, response: "Yes", further_information: "This is really important")
-        presenter = described_class.new(step)
-        expect(presenter.response).to eq("Yes - This is really important")
-      end
-    end
   end
 end

From e36fb03fecc82e5b9a06e373170184e1d8fbd9bb Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 25 Feb 2021 11:58:13 +0000
Subject: [PATCH 138/249] Specification can choose to show radio further
 information

The choice of an array to house this hash was made because the same pattern will be used to deliver checkbox answers, of which there may be multiple further_information values to consider.

Some questions don't have a `further_information` field so we have to guard against the other types.
---
 CHANGELOG.md                                  |  1 +
 app/services/get_answers_for_steps.rb         |  9 ++++++++
 ...n_see_their_catering_specification_spec.rb |  1 +
 .../categories/extended-radio-question.json   |  2 +-
 spec/services/get_answers_for_steps_spec.rb   | 22 +++++++++++++++++++
 5 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 608b7879a..5121c6424 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - create an extended further information text box option for radio answers
 - create extended further information text box option for checkbox answers
 - radio questions can be configured with an "or" separator
+- specification can show further information for radio answers
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/services/get_answers_for_steps.rb b/app/services/get_answers_for_steps.rb
index 4eb8e46ca..c22f5db8c 100644
--- a/app/services/get_answers_for_steps.rb
+++ b/app/services/get_answers_for_steps.rb
@@ -21,6 +21,15 @@ def call
       else raise UnexpectedAnswer.new("Trying to present an unknown type of answer: #{step.answer.class.name}")
       end
 
+      if answer.respond_to?(:further_information)
+        hash["extended_answer_#{step.contentful_id}"] = [
+          {
+            "response" => answer.response,
+            "further_information" => answer.further_information
+          }
+        ]
+      end
+
       hash["answer_#{step.contentful_id}"] = answer.response.to_s
     }
   end
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
index 8561c4205..c2acc8789 100644
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
@@ -30,6 +30,7 @@
 
     within("article#specification") do
       expect(page).to have_content("Catering")
+      expect(page).to have_content("The school needs the kitchen cleaned once a day")
     end
   end
 
diff --git a/spec/fixtures/contentful/categories/extended-radio-question.json b/spec/fixtures/contentful/categories/extended-radio-question.json
index c99e658f5..7d7c676d2 100644
--- a/spec/fixtures/contentful/categories/extended-radio-question.json
+++ b/spec/fixtures/contentful/categories/extended-radio-question.json
@@ -39,6 +39,6 @@
             }
           }
         ],
-        "specification_template": "<article id='specification'><h1>{{answer_extended-radio-question}}</h1></article>"
+        "specification_template": "<article id='specification'><h1>{{answer_extended-radio-question}}</h1><ul>{% for extended_answer in extended_answer_extended-radio-question %}<li>{{ extended_answer['response'] }}</li><li>{{ extended_answer['further_information'] }}</li>{% endfor %}</ul></article>"
     }
 }
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index 8f75e3da0..ffcb41a57 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -41,6 +41,28 @@
 
     context "when the answer is of type radio_answer" do
       it_behaves_like "returns the answer in a hash", :radio_answer, RadioAnswerPresenter, "Catering"
+
+      context "when the answer has further_information" do
+        it "also includes an extended_answer hash in the response" do
+          answer = create(:radio_answer,
+            response: "yes",
+            further_information: "More yes info")
+          result = described_class.new(visible_steps: [answer.step]).call
+          expect(result).to include(
+            {"answer_#{answer.step.contentful_id}" => "Yes"}
+          )
+          expect(result).to include(
+            {
+              "extended_answer_#{answer.step.contentful_id}" => [
+                {
+                  "response" => "Yes",
+                  "further_information" => "More yes info"
+                }
+              ]
+            }
+          )
+        end
+      end
     end
 
     context "when the answer is of type checkbox_answers" do

From 86fa34deec421effe9c6e59d286ae18c4f8cca0e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 25 Feb 2021 12:14:47 +0000
Subject: [PATCH 139/249] Specification can choose to show checkbox further
 information

If there has a Hash of `further_information` (currently Checkboxes) we will create multiple hashes so that the Liquid template can loop through each to access the further information.
---
 CHANGELOG.md                                  |  1 +
 app/services/get_answers_for_steps.rb         | 21 ++++++++++-----
 ...n_see_their_catering_specification_spec.rb | 24 +++++++++++++++++
 .../extended-checkboxes-question.json         |  2 +-
 spec/services/get_answers_for_steps_spec.rb   | 26 +++++++++++++++++++
 5 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5121c6424..cc2b27abf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - create extended further information text box option for checkbox answers
 - radio questions can be configured with an "or" separator
 - specification can show further information for radio answers
+- specification can show further information for checkbox answers
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/services/get_answers_for_steps.rb b/app/services/get_answers_for_steps.rb
index c22f5db8c..2fccef671 100644
--- a/app/services/get_answers_for_steps.rb
+++ b/app/services/get_answers_for_steps.rb
@@ -22,12 +22,21 @@ def call
       end
 
       if answer.respond_to?(:further_information)
-        hash["extended_answer_#{step.contentful_id}"] = [
-          {
-            "response" => answer.response,
-            "further_information" => answer.further_information
-          }
-        ]
+        hash["extended_answer_#{step.contentful_id}"] = if answer.further_information.is_a?(Hash)
+          answer.further_information.each_pair.each_with_object([]) do |(key, value), array|
+            array << {
+              "response" => key.gsub("_further_information", "").capitalize,
+              "further_information" => value
+            }
+          end
+        else
+          [
+            {
+              "response" => answer.response,
+              "further_information" => answer.further_information
+            }
+          ]
+        end
       end
 
       hash["answer_#{step.contentful_id}"] = answer.response.to_s
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
index c2acc8789..9d4db2699 100644
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
@@ -34,6 +34,30 @@
     end
   end
 
+  scenario "renders checkbox responses that have further information" do
+    stub_contentful_category(fixture_filename: "extended-checkboxes-question.json")
+    visit root_path
+    click_on(I18n.t("generic.button.start"))
+
+    click_first_link_in_task_list
+
+    check("Yes")
+    fill_in "answer[yes_further_information]", with: "More info for yes"
+    check("No")
+    fill_in "answer[no_further_information]", with: "More info for no"
+
+    click_on(I18n.t("generic.button.next"))
+
+    expect(page).to have_content(I18n.t("journey.specification.header"))
+
+    within("article#specification") do
+      expect(page).to have_content("Yes")
+      expect(page).to have_content("More info for yes")
+      expect(page).to have_content("No")
+      expect(page).to have_content("More info for no")
+    end
+  end
+
   context "when the spec is incomplete" do
     it "warns the user that the contents are in a partially completed state" do
       stub_contentful_category(fixture_filename: "extended-radio-question.json")
diff --git a/spec/fixtures/contentful/categories/extended-checkboxes-question.json b/spec/fixtures/contentful/categories/extended-checkboxes-question.json
index 294928cac..1c66f8d39 100644
--- a/spec/fixtures/contentful/categories/extended-checkboxes-question.json
+++ b/spec/fixtures/contentful/categories/extended-checkboxes-question.json
@@ -39,6 +39,6 @@
             }
           }
         ],
-        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1><p>{{answer_extended-checkboxes-question}}</p><ul>{% for extended_answer in extended_answer_extended-checkboxes-question %}<li>{{ extended_answer['response'] }}</li><li>{{ extended_answer['further_information'] }}</li>{% endfor %}</ul></article>"
     }
 }
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index ffcb41a57..6bf20602f 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -67,6 +67,32 @@
 
     context "when the answer is of type checkbox_answers" do
       it_behaves_like "returns the answer in a hash", :checkbox_answers, CheckboxesAnswerPresenter, ["Foo", "Bar"]
+
+      context "when the answer has further_information" do
+        it "includes those values as distinct variables in the response" do
+          answer = create(:checkbox_answers,
+            response: ["yes", "no"],
+            further_information: {
+              "yes_further_information" => "More yes info",
+              "no_further_information" => "More no info"
+            })
+          result = described_class.new(visible_steps: [answer.step]).call
+          expect(result).to include(
+            {
+              "extended_answer_#{answer.step.contentful_id}" => [
+                {
+                  "response" => "Yes",
+                  "further_information" => "More yes info"
+                },
+                {
+                  "response" => "No",
+                  "further_information" => "More no info"
+                }
+              ]
+            }
+          )
+        end
+      end
     end
 
     context "when a step does not have an answer" do

From fd5a78c4ecd47253dcb66373e83e2ecc3bb4605b Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 25 Feb 2021 12:43:09 +0000
Subject: [PATCH 140/249] Translate further info keys from machine to human
 readable

Use a helper to define the way we translate these variables in one place.

We need to initially translate them into machine readable so we can use their values in the view. We want to render `name="answer[no_thank_you_further_information]"` in HTML for a given answer rather than `name="answer[No thank you]"`.

We may need to extend this logic further to handle commas, brackets and other characters that might behave unexpectedly.
---
 app/helpers/answer_helper.rb                | 11 +++++++++++
 app/presenters/radio_answer_presenter.rb    |  4 +++-
 app/services/get_answers_for_steps.rb       |  5 ++++-
 app/views/steps/checkboxes.html.erb         |  2 +-
 spec/helpers/answer_helper_spec.rb          | 17 +++++++++++++++++
 spec/services/get_answers_for_steps_spec.rb | 16 ++++++++--------
 6 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 app/helpers/answer_helper.rb
 create mode 100644 spec/helpers/answer_helper_spec.rb

diff --git a/app/helpers/answer_helper.rb b/app/helpers/answer_helper.rb
new file mode 100644
index 000000000..b5e3f897f
--- /dev/null
+++ b/app/helpers/answer_helper.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module AnswerHelper
+  def human_readable_option(string:)
+    string.tr("_", " ").capitalize
+  end
+
+  def machine_readable_option(string:)
+    string.tr(" ", "_").downcase
+  end
+end
diff --git a/app/presenters/radio_answer_presenter.rb b/app/presenters/radio_answer_presenter.rb
index ab4797c79..46e88f249 100644
--- a/app/presenters/radio_answer_presenter.rb
+++ b/app/presenters/radio_answer_presenter.rb
@@ -1,5 +1,7 @@
 class RadioAnswerPresenter < SimpleDelegator
+  include AnswerHelper
+
   def response
-    super.capitalize
+    human_readable_option(string: super)
   end
 end
diff --git a/app/services/get_answers_for_steps.rb b/app/services/get_answers_for_steps.rb
index 2fccef671..bcd21bdc1 100644
--- a/app/services/get_answers_for_steps.rb
+++ b/app/services/get_answers_for_steps.rb
@@ -1,6 +1,8 @@
 class GetAnswersForSteps
   class UnexpectedAnswer < StandardError; end
 
+  include AnswerHelper
+
   attr_accessor :visible_steps
   def initialize(visible_steps:)
     self.visible_steps = visible_steps
@@ -24,8 +26,9 @@ def call
       if answer.respond_to?(:further_information)
         hash["extended_answer_#{step.contentful_id}"] = if answer.further_information.is_a?(Hash)
           answer.further_information.each_pair.each_with_object([]) do |(key, value), array|
+            key_without_prefix = key.gsub("_further_information", "")
             array << {
-              "response" => key.gsub("_further_information", "").capitalize,
+              "response" => human_readable_option(string: key_without_prefix),
               "further_information" => value
             }
           end
diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index bee2bc31e..14bb27faf 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -7,7 +7,7 @@
     <% end %>
 
     <% @step.options.each do |option| %>
-      <% machine_value = option["value"].tr(" ", "_").downcase %>
+      <% machine_value = machine_readable_option(string: option["value"]) %>
       <% if option.fetch("separated_by_or", nil) == true %>
         <div class="govuk-radios__divider">or</div>
       <% end %>
diff --git a/spec/helpers/answer_helper_spec.rb b/spec/helpers/answer_helper_spec.rb
new file mode 100644
index 000000000..9fc91c6be
--- /dev/null
+++ b/spec/helpers/answer_helper_spec.rb
@@ -0,0 +1,17 @@
+require "rails_helper"
+
+RSpec.describe AnswerHelper, type: :helper do
+  describe "#human_readable_option" do
+    it "replaces underscores with spaces and capitalises the string" do
+      result = helper.human_readable_option(string: "a_hash_key")
+      expect(result).to eql("A hash key")
+    end
+  end
+
+  describe "#machine_readable_option" do
+    it "replaces spaces with underscores and downcases the string" do
+      result = helper.machine_readable_option(string: "A LONG key with inconsistent casing")
+      expect(result).to eql("a_long_key_with_inconsistent_casing")
+    end
+  end
+end
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index 6bf20602f..da4062796 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -45,17 +45,17 @@
       context "when the answer has further_information" do
         it "also includes an extended_answer hash in the response" do
           answer = create(:radio_answer,
-            response: "yes",
+            response: "yes please",
             further_information: "More yes info")
           result = described_class.new(visible_steps: [answer.step]).call
           expect(result).to include(
-            {"answer_#{answer.step.contentful_id}" => "Yes"}
+            {"answer_#{answer.step.contentful_id}" => "Yes please"}
           )
           expect(result).to include(
             {
               "extended_answer_#{answer.step.contentful_id}" => [
                 {
-                  "response" => "Yes",
+                  "response" => "Yes please",
                   "further_information" => "More yes info"
                 }
               ]
@@ -71,21 +71,21 @@
       context "when the answer has further_information" do
         it "includes those values as distinct variables in the response" do
           answer = create(:checkbox_answers,
-            response: ["yes", "no"],
+            response: ["I would really like this", "I would hate this"],
             further_information: {
-              "yes_further_information" => "More yes info",
-              "no_further_information" => "More no info"
+              "i_would_really_like_this_further_information" => "More yes info",
+              "i_would_hate_this_further_information" => "More no info"
             })
           result = described_class.new(visible_steps: [answer.step]).call
           expect(result).to include(
             {
               "extended_answer_#{answer.step.contentful_id}" => [
                 {
-                  "response" => "Yes",
+                  "response" => "I would really like this",
                   "further_information" => "More yes info"
                 },
                 {
-                  "response" => "No",
+                  "response" => "I would hate this",
                   "further_information" => "More no info"
                 }
               ]

From 78651b2e186c6db62450782b22fb4dd2a3cc6971 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Mar 2021 17:11:27 +0000
Subject: [PATCH 141/249] Pull request template includes Conflucence prompt

This prompt is a commented out checklist item that can be uncommented in if the type of change is applicable for documenting.

Include a link to reduce the friction of finding _where_ we need to Document and to help us check it's been done.
---
 .github/pull_request_template.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index cab7aa143..7133c9c46 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -9,3 +9,5 @@
 ### After
 
 ## Next steps
+
+<!-- - [] Document this change in [Confluence](https://dfedigital.atlassian.net/wiki/spaces/GHBFS) -->

From 9bcfa9db2a6aeb2973573905d6c8d47c3289828c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Mar 2021 11:02:38 +0000
Subject: [PATCH 142/249] Bump puma from 5.2.1 to 5.2.2

Bumps [puma](https://github.com/puma/puma) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.2.1...v5.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4ae413d6d..5f2f66324 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -201,7 +201,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.2.1)
+    puma (5.2.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.5.2)

From 265ba341f4e62215554cc51e9846ada79b349559 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 3 Mar 2021 14:25:30 +0000
Subject: [PATCH 143/249] Rename existing use of "planning" to "specifying"

When we started the service we weren't sure what the name of the journey we were building was. We assumed it was planning however this quickly became the "build a spec" journey and we didn't come back and rename.

Now we are adding a planning start page, we are renaming the existing code to make this change distinguishable from the existing language/names.
---
 CHANGELOG.md                                  |  8 ++--
 app/views/journeys/show.html.erb              |  2 +-
 app/views/pages/planning_start_page.html.erb  | 39 -------------------
 .../pages/specifying_start_page.html.erb      | 39 +++++++++++++++++++
 config/locales/en.yml                         |  2 +-
 config/routes.rb                              |  2 +-
 .../anyone_can_complete_a_journey_spec.rb     |  2 +-
 ...yone_can_see_a_planning_start_page_spec.rb | 35 -----------------
 ...can_see_a_specification_start_page_spec.rb | 35 +++++++++++++++++
 9 files changed, 82 insertions(+), 82 deletions(-)
 delete mode 100644 app/views/pages/planning_start_page.html.erb
 create mode 100644 app/views/pages/specifying_start_page.html.erb
 delete mode 100644 spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
 create mode 100644 spec/features/visitors/anyone_can_see_a_specification_start_page_spec.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc2b27abf..ce6219718 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,13 +79,13 @@ The format is based on [Keep a Changelog 1.0.0].
 ## [release-001] - 2020-11-12
 
 - address rails-template TODO
-- any user can see a start page for the planning journey
+- any user can see a start page for the specifying journey
 - use GOV.UK Frontend framework
-- users can see a basic form to start the planning journey sourced by a
+- users can see a basic form to start the specifying journey sourced by a
 Contentful fixture
-- planning form is styled as a GOV.UK form
+- specifying form is styled as a GOV.UK form
 - validate that an answer is provided to a question
-- the first planning question comes directly from Contentful
+- the first specifying question comes directly from Contentful
 - handle the exceptional case when a Contentful entry is missing
 - multiple radio questions can be answered in sequence
 - users can be asked to answer a short text question
diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index 2f9f6d784..e5e4d29b2 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -1,6 +1,6 @@
 <%= content_for :title, @journey.category.capitalize %>
 
-<h1 class="govuk-heading-xl"><%= I18n.t("planning.start_page.page_title") %></h1>
+<h1 class="govuk-heading-xl"><%= I18n.t("specifying.start_page.page_title") %></h1>
 
 <%= render "resume_journey_notice" %>
 
diff --git a/app/views/pages/planning_start_page.html.erb b/app/views/pages/planning_start_page.html.erb
deleted file mode 100644
index fa1850e93..000000000
--- a/app/views/pages/planning_start_page.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<%= content_for :title, I18n.t("planning.start_page.page_title") %>
-
-<h1 class="govuk-heading-xl"><%= I18n.t("planning.start_page.page_title") %></h1>
-
-<% I18n.t("planning.start_page.overview_body").each do |paragraph| %>
-  <p class="govuk-body"><%= paragraph %></p>
-<% end %>
-
-<h2 class="govuk-heading-l"><%= I18n.t("planning.start_page.who_for_title") %></h2>
-<p class="govuk-body"><%= I18n.t("planning.start_page.who_for_can_use_body") %></p>
-<ul class="govuk-list govuk-list--bullet"">
-  <% I18n.t("planning.start_page.who_for_can_use_list").each do |list_item| %>
-    <li><%= list_item %></li>
-  <% end %>
-</ul>
-<p class="govuk-body"><%= I18n.t("planning.start_page.who_for_cannot_use_body") %></p>
-<ul class="govuk-list govuk-list--bullet"">
-  <% I18n.t("planning.start_page.who_for_cannot_use_list").each do |list_item| %>
-    <li><%= list_item %></li>
-  <% end %>
-</ul>
-
-<h2 class="govuk-heading-l"><%= I18n.t("planning.start_page.how_service_works_title") %></h2>
-<p class="govuk-body"><%= I18n.t("planning.start_page.how_service_works_document_body") %></p>
-<ul class="govuk-list govuk-list--bullet"">
-  <% I18n.t("planning.start_page.how_service_works_document_list").each do |list_item| %>
-    <li><%= list_item %></li>
-  <% end %>
-</ul>
-<p class="govuk-body"><%= I18n.t("planning.start_page.how_service_works_themes_body") %></p>
-<ul class="govuk-list govuk-list--bullet"">
-  <% I18n.t("planning.start_page.how_service_works_themes_list").each do |list_item| %>
-    <li><%= list_item %></li>
-  <% end %>
-</ul>
-
-<p class="govuk-body"><%= I18n.t("planning.start_page.pause_and_resume_body") %></p>
-
-<%= link_to I18n.t("generic.button.start"), new_journey_path, class: "govuk-button" %>
diff --git a/app/views/pages/specifying_start_page.html.erb b/app/views/pages/specifying_start_page.html.erb
new file mode 100644
index 000000000..6391a6f00
--- /dev/null
+++ b/app/views/pages/specifying_start_page.html.erb
@@ -0,0 +1,39 @@
+<%= content_for :title, I18n.t("specifying.start_page.page_title") %>
+
+<h1 class="govuk-heading-xl"><%= I18n.t("specifying.start_page.page_title") %></h1>
+
+<% I18n.t("specifying.start_page.overview_body").each do |paragraph| %>
+  <p class="govuk-body"><%= paragraph %></p>
+<% end %>
+
+<h2 class="govuk-heading-l"><%= I18n.t("specifying.start_page.who_for_title") %></h2>
+<p class="govuk-body"><%= I18n.t("specifying.start_page.who_for_can_use_body") %></p>
+<ul class="govuk-list govuk-list--bullet"">
+  <% I18n.t("specifying.start_page.who_for_can_use_list").each do |list_item| %>
+    <li><%= list_item %></li>
+  <% end %>
+</ul>
+<p class="govuk-body"><%= I18n.t("specifying.start_page.who_for_cannot_use_body") %></p>
+<ul class="govuk-list govuk-list--bullet"">
+  <% I18n.t("specifying.start_page.who_for_cannot_use_list").each do |list_item| %>
+    <li><%= list_item %></li>
+  <% end %>
+</ul>
+
+<h2 class="govuk-heading-l"><%= I18n.t("specifying.start_page.how_service_works_title") %></h2>
+<p class="govuk-body"><%= I18n.t("specifying.start_page.how_service_works_document_body") %></p>
+<ul class="govuk-list govuk-list--bullet"">
+  <% I18n.t("specifying.start_page.how_service_works_document_list").each do |list_item| %>
+    <li><%= list_item %></li>
+  <% end %>
+</ul>
+<p class="govuk-body"><%= I18n.t("specifying.start_page.how_service_works_themes_body") %></p>
+<ul class="govuk-list govuk-list--bullet"">
+  <% I18n.t("specifying.start_page.how_service_works_themes_list").each do |list_item| %>
+    <li><%= list_item %></li>
+  <% end %>
+</ul>
+
+<p class="govuk-body"><%= I18n.t("specifying.start_page.pause_and_resume_body") %></p>
+
+<%= link_to I18n.t("generic.button.start"), new_journey_path, class: "govuk-button" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index eead7f270..81808de08 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -17,7 +17,7 @@ en:
     preview:
       tag: "preview"
       message: "This environment is only for previewing Contentful changes before publishing."
-  planning:
+  specifying:
     start_page:
       page_title: Create a specification to procure a catering service for your school
       overview_body:
diff --git a/config/routes.rb b/config/routes.rb
index af256d000..f2044ff2a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,7 @@
 
 Rails.application.routes.draw do
   get "health_check" => "application#health_check"
-  root to: "high_voltage/pages#show", id: "planning_start_page"
+  root to: "high_voltage/pages#show", id: "specifying_start_page"
 
   resource :journey_map, only: [:new]
   resources :journeys, only: [:new, :show] do
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 44855eae4..051e653ea 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -16,7 +16,7 @@
 
     click_on(I18n.t("generic.button.start"))
 
-    expect(page).to have_content(I18n.t("planning.start_page.page_title"))
+    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
     expect(page).to have_content("Which service do you need?")
     expect(page).to have_content("Not started")
   end
diff --git a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
deleted file mode 100644
index 4429056ac..000000000
--- a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "rails_helper"
-
-feature "Users can see a start page for planning their purchase" do
-  scenario "Start page content is shown on the root path" do
-    visit root_path
-
-    expect(page).to have_content(I18n.t("planning.start_page.page_title"))
-
-    I18n.t("planning.start_page.overview_body").each do |paragraph|
-      expect(page).to have_content(paragraph)
-    end
-
-    expect(page).to have_content(I18n.t("planning.start_page.who_for_title"))
-    expect(page).to have_content(I18n.t("planning.start_page.who_for_can_use_body"))
-    I18n.t("planning.start_page.who_for_can_use_list").each do |list_item|
-      expect(page).to have_content(list_item)
-    end
-    expect(page).to have_content(I18n.t("planning.start_page.who_for_cannot_use_body"))
-    I18n.t("planning.start_page.who_for_cannot_use_list").each do |list_item|
-      expect(page).to have_content(list_item)
-    end
-
-    expect(page).to have_content(I18n.t("planning.start_page.how_service_works_title"))
-    expect(page).to have_content(I18n.t("planning.start_page.how_service_works_document_body"))
-    I18n.t("planning.start_page.how_service_works_document_list").each do |list_item|
-      expect(page).to have_content(list_item)
-    end
-    expect(page).to have_content(I18n.t("planning.start_page.how_service_works_themes_body"))
-    I18n.t("planning.start_page.how_service_works_themes_list").each do |list_item|
-      expect(page).to have_content(list_item)
-    end
-
-    expect(page).to have_content(I18n.t("planning.start_page.pause_and_resume_body"))
-  end
-end
diff --git a/spec/features/visitors/anyone_can_see_a_specification_start_page_spec.rb b/spec/features/visitors/anyone_can_see_a_specification_start_page_spec.rb
new file mode 100644
index 000000000..2635a60b4
--- /dev/null
+++ b/spec/features/visitors/anyone_can_see_a_specification_start_page_spec.rb
@@ -0,0 +1,35 @@
+require "rails_helper"
+
+feature "Users can see a start page for specifying their purchase" do
+  scenario "Start page content is shown on the root path" do
+    visit root_path
+
+    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+
+    I18n.t("specifying.start_page.overview_body").each do |paragraph|
+      expect(page).to have_content(paragraph)
+    end
+
+    expect(page).to have_content(I18n.t("specifying.start_page.who_for_title"))
+    expect(page).to have_content(I18n.t("specifying.start_page.who_for_can_use_body"))
+    I18n.t("specifying.start_page.who_for_can_use_list").each do |list_item|
+      expect(page).to have_content(list_item)
+    end
+    expect(page).to have_content(I18n.t("specifying.start_page.who_for_cannot_use_body"))
+    I18n.t("specifying.start_page.who_for_cannot_use_list").each do |list_item|
+      expect(page).to have_content(list_item)
+    end
+
+    expect(page).to have_content(I18n.t("specifying.start_page.how_service_works_title"))
+    expect(page).to have_content(I18n.t("specifying.start_page.how_service_works_document_body"))
+    I18n.t("specifying.start_page.how_service_works_document_list").each do |list_item|
+      expect(page).to have_content(list_item)
+    end
+    expect(page).to have_content(I18n.t("specifying.start_page.how_service_works_themes_body"))
+    I18n.t("specifying.start_page.how_service_works_themes_list").each do |list_item|
+      expect(page).to have_content(list_item)
+    end
+
+    expect(page).to have_content(I18n.t("specifying.start_page.pause_and_resume_body"))
+  end
+end

From ab05896650c2de73283966bc2c32f99c7512b53d Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 3 Mar 2021 15:56:19 +0000
Subject: [PATCH 144/249] Planning start page added as a static page

---
 app/views/pages/planning_start_page.html.erb  | 283 ++++++++++++++++++
 config/locales/en.yml                         |   3 +
 config/routes.rb                              |   2 +
 ...yone_can_see_a_planning_start_page_spec.rb |  44 +++
 4 files changed, 332 insertions(+)
 create mode 100644 app/views/pages/planning_start_page.html.erb
 create mode 100644 spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb

diff --git a/app/views/pages/planning_start_page.html.erb b/app/views/pages/planning_start_page.html.erb
new file mode 100644
index 000000000..fa39c7648
--- /dev/null
+++ b/app/views/pages/planning_start_page.html.erb
@@ -0,0 +1,283 @@
+<%= content_for :title, I18n.t("planning.start_page.page_title") %>
+
+<h1 class="govuk-heading-xl"><%= I18n.t("planning.start_page.page_title") %></h1>
+
+<p class="govuk-body">How to procure a catering contract for your school.</p>
+
+<div class="govuk-accordion" data-module="govuk-accordion" id="accordion-default">
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          Before you start
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-1" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-1">
+      <p class="govuk-body">A catering contract typically takes between 3 to 6 months to complete.</p>
+
+      <p class="govuk-body">If you have an existing contract, you will need to find out the:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>end date</li>
+        <li>notice period</li>
+      </ul>
+
+      <p class="govuk-body">This will help you to plan when to start your procurement. It's best to start a new contract:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>at the beginning of the academic year</li>
+        <li>after long school holiday, for example, Christmas or Easter</li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          Ways to procure a catering contract
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-2" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-1">
+      <p class="govuk-body">A catering contract is a high value procurement. We generally say high is over 40,000.</p>
+      <p class="govuk-body">You must run your own buying process, inviting suppliers to submit bids for the work.</p>
+      <p class="govuk-body">If you estimate that the contract is likely to be close to or over £189,330 you may have to <a href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/buying-things-that-are-over-the-eu-procurement-threshold" class="govuk-link">run a compliant buying process</a> because it exceeds the procurement thresholds.</p>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          Rules, regulations and requirements
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-3" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-1">
+      <p class="govuk-body">You'll need to be aware of some of the rules, regulations and requirements that can apply to a catering contract.</p>
+
+      <h3 class="govuk-heading-m">Standards for school food</h3>
+
+      <p class="govuk-body">Your school must comply with <a href="https://www.gov.uk/government/publications/standards-for-school-food-in-england" class="govuk-link">Standards for school food in England</a>.</p>
+
+      <h3 class="govuk-heading-m">Procurement threshold rules</h3>
+      <p class="govuk-body">If, over the lifetime of your contract, the value of your provision is over the <a href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/buying-things-that-are-over-the-eu-procurement-threshold" class="govuk-link">procurement threshold</a>, you'll need to advertise a contract notice on the <a href="https://www.gov.uk/find-tender" class="govuk-link">Find a Tender</a> service.</p>
+
+      <h3 class="govuk-heading-m">TUPE and LGPS (Local Government Pension Scheme)</h3>
+
+      <p class="govuk-body">Consider whether <a href="https://www.gov.uk/guidance/staff-transfers-public-service-pension-schemes" class="govuk-link">TUPE</a> and LGPS will apply, especially if you're looking to outsource or come away from your local authority for the first time.</p>
+      <p class="govuk-body">When you give notice of termination to your current provider, you should also request details of any staff that will be subject to TUPE transfer.</p>
+      <p class="govuk-body">This anonymised information should include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>salary details</li>
+        <li>terms conditions</li>
+        <li>pension details</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Disclosure and Barring Service (DBS) checks</h3>
+      <p class="govuk-body">You'll need confirmation from suppliers that they've had the relevant DBS checks.</p>
+      <p class="govuk-body">It's your responsibility to check that everyone involved in the catering contract is DBS checked.</p>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          In-house catering
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-4" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-4">
+      <p class="govuk-body">Running the service in-house is another option. You may want to consider whether this is right for your school before you procure a contract. There are benefits and challenges to running the service yourself.</p>
+      <h3 class="govuk-heading-m">Benefits</h3>
+      <p class="govuk-body">You might be able to:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>increase uptake of school meals</li>
+        <li>negotiate better prices from suppliers</li>
+        <li>increase food quality</li>
+        <li>respond quicker if your equipment is broken or faulty</li>
+        <li>develop staff skills through bespoke training</li>
+        <li>generate income by offering your catering services to other schools or nurseries</li>
+        <li>be in control of your expenditure</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Staff training</h3>
+      <p class="govuk-body">Consider how you will provide initial training on:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>food specifications</li>
+        <li>menu building</li>
+        <li>health and safety</li>
+        <li>food hygiene</li>
+        <li>food preparation skills</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Costs and spending</h3>
+      <p class="govuk-body">You should fully understand your costings so you can:</p>
+      <ul class="govuk-list govuk-list--bullet">
+      <li>plan for increased spending, for example, staffing, equipment, food and utilities</li>
+      <li>plan for maintenance of equipment</li>
+      <li>avoid expensive budgeting errors</li>
+      <li>keep staff up to date with legislation and regulations by allowing time and money for on-going training</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Managing demand</h3>
+      <p class="govuk-body">You should:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>get regular feedback from parents, pupils and governors</li>
+        <li>check you have enough dining space to accommodate increased demand</li>
+      </ul>
+
+
+      <h3 class="govuk-heading-m">TUPE and LGPS</h3>
+      <p class="govuk-body">If you're moving away from a local authority, you'll need to obtain TUPE and LGPS information.</p>
+      <p class="govuk-body">There may be time frames around when the local authority is obliged to release this information.</p>
+      <p class="govuk-body">These time frames can cause delays and further expense if you award the contract without having the details.</p>
+
+      <h3 class="govuk-heading-m">Invite your local authority to tender</h3>
+      <p class="govuk-body">Invite your local authority to tender and involve them in the process. This way the TUPE and LGPS information must be provided during their bidding process.</p>
+
+      <h3 class="govuk-heading-m">Disclosure and Barring Service (DBS) checks</h3>
+      <p class="govuk-body">It's your responsibility to check that everyone involved in the catering contract is DBS checked.</p>
+
+      <h3 class="govuk-heading-m">Equipment and maintenance</h3>
+      <p class="govuk-body">Find out:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>what equipment the current provider may be repossess</li>
+        <li>which maintenance contracts your provider covers</li>
+        <li>whether maintenance checks are up to date</li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          Starting a procurement process
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-5" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-4">
+      <h3 class="govuk-heading-m">Who to involve</h3>
+
+      <p class="govuk-body">Make sure the headteacher and school governors have agreed to go ahead with procuring a new catering contract before you start.</p>
+      <p class="govuk-body">Throughout the process you should talk to:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>school governors</li>
+        <li>senior leadership team</li>
+        <li>staff involved in school catering</li>
+      </ul>
+
+      <p class="govuk-body">Try to:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>keep staff informed</li>
+        <li>address any concerns the staff may have</li>
+        <li>be aware that staff may wish to contact their union</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Talk to other schools</h3>
+      <p class="govuk-body">You may find it helpful to:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>ask other schools if they’re looking to renew their catering contract</li>
+        <li>negotiate bulk deals and discounts with suppliers</li>
+      </ul>
+      <p class="govuk-body">This may help you to get better value and spread the workload with other schools.</p>
+
+      <h3 class="govuk-heading-m">Get feedback about supplier</h3>
+      <p class="govuk-body">When selecting the suppliers, you may want to talk to other schools they serve and get feedback on the service they offer.</p>
+
+      <h3 class="govuk-heading-m">Supplier samples</h3>
+      <p class="govuk-body">You may want to ask potential suppliers to produce sample meals for you to try as this will form part of your specification and tender requirements</p>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          Writing your requirements
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-6" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-4">
+      <p class="govuk-body">This is the document that you give to suppliers explaining what you want to buy, sometimes called a specification.</p>
+
+      <p class="govuk-body">It should tell potential suppliers what you need so that they can decide if they want to bid for the contract.</p>
+
+      <p class="govuk-body"><a href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/writing-a-specification" class="govuk-link">Read about how to write a specification</a></p>
+
+
+      <p class="govuk-body">Below are some of the things that you should include. You can also <a href="../start">use our tool to create a specification</a>.</p>
+
+
+      <h3 class="govuk-heading-m">Objectives</h3>
+      <p class="govuk-body">Your objectives are important because it helps a supplier to decide whether they are a good fit for your school. Include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>your mission statement</li>
+        <li>goals your school has</li>
+        <li>policies that relate to catering</li>
+        <li>objectives that relates to social value</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Contract management</h3>
+      <p class="govuk-body">Set out how you expect the contract to be managed to ensure a good working relationship. Include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>your requirements on how the contract should be managed, such as any review meetings, how to monitor performance or costs, how complaints are managed and so on</li>
+        <li>what operational overheads the supplier will cover</li>
+        <li>any staff that the supplier will need to provide, and staff that need to be transferred</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Service parameters</h3>
+      <p class="govuk-body">Tell suppliers what service you want them to provide and who for. Include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>when you want the service to start</li>
+        <li>current services types, and times they are provided</li>
+        <li>customer numbers</li>
+        <li>free school meal numbers</li>
+        <li>the services you would like the supplier to provide</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Menu and ordering</h3>
+      <p class="govuk-body">Give suppliers some information about the food you would like them to serve and how it should be ordered and paid for. Include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>any requirements for the food served</li>
+        <li>ingredients or allergens to be avoided</li>
+        <li>ordering and payment systems you have, or would like to be provided</li>
+        <li>who is responsible for any dinner money debt</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Facilities</h3>
+      <p class="govuk-body">Outline the spaces and equipment that you have available for use. Include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>the condition of any kitchens and if they are ready for service</li>
+        <li>equipment available to a supplier</li>
+        <li>a description of the dining areas</li>
+        <li>who sets up and clears away before and after service</li>
+        <li>cleaning responsibilities</li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          What to do next
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-6" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-4">
+      <p class="govuk-body">Once you have your specification, you will need to decide if you will be using the open or restricted procedure.</p>
+      <p class="govuk-body">You can then prepare your invitation to tender.</p>
+      <p class="govuk-body">Find out what the next steps are if you are:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li><a href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/buying-high-value-things-under-the-eu-procurement-threshold" class="govuk-link">under the procurement threshold</a></li>
+        <li><a href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/buying-things-that-are-over-the-eu-procurement-threshold" class="govuk-link">over the procurement threshold</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+<h2 class="govuk-heading-m">Where to get help</h2>
+<p class="govuk-body">See where to <a href="https://www.gov.uk/guidance/buying-for-schools/get-help-with-buying-for-schools" class="govuk-link">get help with buying for schools</a> if you need it.</p>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 81808de08..c1dca41a9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -17,6 +17,9 @@ en:
     preview:
       tag: "preview"
       message: "This environment is only for previewing Contentful changes before publishing."
+  planning:
+    start_page:
+      page_title: "Catering services"
   specifying:
     start_page:
       page_title: Create a specification to procure a catering service for your school
diff --git a/config/routes.rb b/config/routes.rb
index f2044ff2a..4611b9586 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,6 +4,8 @@
   get "health_check" => "application#health_check"
   root to: "high_voltage/pages#show", id: "specifying_start_page"
 
+  get "planning" => "high_voltage/pages#show", "id" => "planning_start_page"
+
   resource :journey_map, only: [:new]
   resources :journeys, only: [:new, :show] do
     resources :steps, only: [:new, :show, :edit] do
diff --git a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
new file mode 100644
index 000000000..6ba2737b3
--- /dev/null
+++ b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
@@ -0,0 +1,44 @@
+require "rails_helper"
+
+feature "Users can see a start page for planning their purchase" do
+  scenario "Start page content is shown on the root path" do
+    visit root_path
+
+    click_on("procuring a new catering service for a school")
+
+    expect(page).to have_content("Catering services")
+    expect(page).to have_content("How to procure a catering contract for your school.")
+
+    expect(page).to have_content("Before you start")
+    page.find(:xpath, "//*[contains(text(),'Before you start')]").click
+    expect(page).to have_content("A catering contract typically takes between 3 to 6 months to complete.")
+
+    expect(page).to have_content("Ways to procure a catering contract")
+    page.find(:xpath, "//*[contains(text(),'Ways to procure a catering contract')]").click
+    expect(page).to have_content("A catering contract is a high value procurement. We generally say high is over 40,000.")
+
+    expect(page).to have_content("Rules, regulations and requirements")
+    page.find(:xpath, "//*[contains(text(),'Rules, regulations and requirements')]").click
+    expect(page).to have_content("You'll need to be aware of some of the rules, regulations and requirements that can apply to a catering contract.")
+
+    expect(page).to have_content("In-house catering")
+    page.find(:xpath, "//*[contains(text(),'In-house catering')]").click
+    expect(page).to have_content("Running the service in-house is another option. You may want to consider whether this is right for your school before you procure a contract. There are benefits and challenges to running the service yourself.")
+
+    expect(page).to have_content("Starting a procurement process")
+    page.find(:xpath, "//*[contains(text(),'Starting a procurement process')]").click
+    expect(page).to have_content("Who to involve")
+
+    expect(page).to have_content("Writing your requirements")
+    page.find(:xpath, "//*[contains(text(),'Writing your requirements')]").click
+    expect(page).to have_content("This is the document that you give to suppliers explaining what you want to buy, sometimes called a specification.")
+
+    expect(page).to have_content("What to do next")
+    page.find(:xpath, "//*[contains(text(),'What to do next')]").click
+    expect(page).to have_content("Once you have your specification, you will need to decide if you will be using the open or restricted procedure.")
+
+    expect(page).to have_content("Where to get help")
+    expect(page).to have_content("See where to get help with buying for schools if you need it.")
+    expect(page).to have_link("get help with buying for schools", href: "https://www.gov.uk/guidance/buying-for-schools/get-help-with-buying-for-schools")
+  end
+end

From bc9f44c0048244d3db329c14e0222c034252d58e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 3 Mar 2021 15:57:49 +0000
Subject: [PATCH 145/249] Start page now links to a new static planning
 guidance page

* An existing bullet point now includes a link so we have to allow I18n to render HTML and also we break down the testing into more explicit tests for that list so we can check the link is present
---
 app/views/pages/specifying_start_page.html.erb           | 2 +-
 config/locales/en.yml                                    | 2 +-
 .../anyone_can_see_a_specification_start_page_spec.rb    | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/pages/specifying_start_page.html.erb b/app/views/pages/specifying_start_page.html.erb
index 6391a6f00..bf10a49d0 100644
--- a/app/views/pages/specifying_start_page.html.erb
+++ b/app/views/pages/specifying_start_page.html.erb
@@ -10,7 +10,7 @@
 <p class="govuk-body"><%= I18n.t("specifying.start_page.who_for_can_use_body") %></p>
 <ul class="govuk-list govuk-list--bullet"">
   <% I18n.t("specifying.start_page.who_for_can_use_list").each do |list_item| %>
-    <li><%= list_item %></li>
+    <li><%= list_item.html_safe %></li>
   <% end %>
 </ul>
 <p class="govuk-body"><%= I18n.t("specifying.start_page.who_for_cannot_use_body") %></p>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c1dca41a9..32c3d9562 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -28,7 +28,7 @@ en:
       who_for_title: Who this service is for
       who_for_can_use_body: "You can use this service if you:"
       who_for_can_use_list:
-        - are responsible for procuring a new catering service for a school
+        - are responsible for <a href="/planning" class="govuk-link">procuring a new catering service for a school</a>
         - are procuring for one school – either a local authority maintained school or an academy in a single or multi-academy trust
         - intend to run your own procurement process or choose a supplier from a framework – read more about the different procurement routes you can take
       who_for_cannot_use_body: "You currently cannot use this service to create a specification for any of the following:"
diff --git a/spec/features/visitors/anyone_can_see_a_specification_start_page_spec.rb b/spec/features/visitors/anyone_can_see_a_specification_start_page_spec.rb
index 2635a60b4..88c26bd27 100644
--- a/spec/features/visitors/anyone_can_see_a_specification_start_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_a_specification_start_page_spec.rb
@@ -12,9 +12,12 @@
 
     expect(page).to have_content(I18n.t("specifying.start_page.who_for_title"))
     expect(page).to have_content(I18n.t("specifying.start_page.who_for_can_use_body"))
-    I18n.t("specifying.start_page.who_for_can_use_list").each do |list_item|
-      expect(page).to have_content(list_item)
-    end
+
+    expect(page).to have_content("are responsible for procuring a new catering service for a school")
+    expect(page).to have_link("procuring a new catering service", href: "/planning")
+    expect(page).to have_content(I18n.t("specifying.start_page.who_for_can_use_list")[1])
+    expect(page).to have_content(I18n.t("specifying.start_page.who_for_can_use_list")[2])
+
     expect(page).to have_content(I18n.t("specifying.start_page.who_for_cannot_use_body"))
     I18n.t("specifying.start_page.who_for_cannot_use_list").each do |list_item|
       expect(page).to have_content(list_item)

From 2d97b4d75c17a5a790f317e53b31223ef9365bf3 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 3 Mar 2021 16:00:53 +0000
Subject: [PATCH 146/249] Planning page readers can navigate back to the home
 page

---
 app/views/pages/planning_start_page.html.erb         |  1 +
 .../anyone_can_see_a_planning_start_page_spec.rb     | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/app/views/pages/planning_start_page.html.erb b/app/views/pages/planning_start_page.html.erb
index fa39c7648..d483bfba6 100644
--- a/app/views/pages/planning_start_page.html.erb
+++ b/app/views/pages/planning_start_page.html.erb
@@ -1,4 +1,5 @@
 <%= content_for :title, I18n.t("planning.start_page.page_title") %>
+<%= link_to "Back", root_path, class: "govuk-back-link" %>
 
 <h1 class="govuk-heading-xl"><%= I18n.t("planning.start_page.page_title") %></h1>
 
diff --git a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
index 6ba2737b3..e587ce0ff 100644
--- a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
@@ -41,4 +41,16 @@
     expect(page).to have_content("See where to get help with buying for schools if you need it.")
     expect(page).to have_link("get help with buying for schools", href: "https://www.gov.uk/guidance/buying-for-schools/get-help-with-buying-for-schools")
   end
+
+  scenario "can navigate back to the home page" do
+    visit root_path
+
+    click_on("procuring a new catering service for a school")
+
+    expect(page).to have_content(I18n.t("planning.start_page.page_title"))
+
+    click_on("Back")
+
+    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+  end
 end

From a84ed60d504cbd04cd7ee5d883dd653e340b7f58 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 1 Mar 2021 15:26:00 +0000
Subject: [PATCH 147/249] Update Step factory with missing optional field for
 completeness

---
 spec/factories/step.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/factories/step.rb b/spec/factories/step.rb
index 64be8868a..68864aa63 100644
--- a/spec/factories/step.rb
+++ b/spec/factories/step.rb
@@ -6,6 +6,7 @@
     raw { |attrs| {"sys": {"id" => attrs["contentful_id"]}} }
     hidden { false }
     additional_step_rules { nil }
+    primary_call_to_action_text { nil }
 
     association :journey, factory: :journey
 

From c3d077a85e2ead03d7bc07e7ef0583957b97f64e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 1 Mar 2021 15:28:58 +0000
Subject: [PATCH 148/249] Steps can be marked as skippable

We need the ability to turn off mandatory validation in order to allow a user to explicitly answer a question by choosing none of the answers. This marks the question as "complete" and distinguishes it from a question that simply hasn't been answered yet and which requires attention.

We are going to use the presence or omission of text to infer if it is skippable or not. A missing skip text means it isn't a skippable question. This removes the need for 2 fields, one as a boolean and another for the text.
---
 app/models/step.rb                                 |  4 ++++
 db/migrate/20210301151653_add_skippable_to_step.rb |  5 +++++
 db/schema.rb                                       |  3 ++-
 spec/factories/step.rb                             |  1 +
 spec/models/step_spec.rb                           | 14 ++++++++++++++
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20210301151653_add_skippable_to_step.rb

diff --git a/app/models/step.rb b/app/models/step.rb
index a44cc6e95..2ee714bcc 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -29,4 +29,8 @@ def primary_call_to_action_text
     return I18n.t("generic.button.next") unless super.present?
     super
   end
+
+  def skippable?
+    skip_call_to_action_text.present?
+  end
 end
diff --git a/db/migrate/20210301151653_add_skippable_to_step.rb b/db/migrate/20210301151653_add_skippable_to_step.rb
new file mode 100644
index 000000000..e74a1fa3b
--- /dev/null
+++ b/db/migrate/20210301151653_add_skippable_to_step.rb
@@ -0,0 +1,5 @@
+class AddSkippableToStep < ActiveRecord::Migration[6.1]
+  def change
+    add_column :steps, :skip_call_to_action_text, :string, default: nil
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5e30a6f13..a68f7dac0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_02_23_102716) do
+ActiveRecord::Schema.define(version: 2021_03_01_151653) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -98,6 +98,7 @@
     t.jsonb "options"
     t.boolean "hidden", default: false
     t.jsonb "additional_step_rules"
+    t.string "skip_call_to_action_text"
     t.index ["journey_id"], name: "index_steps_on_journey_id"
   end
 
diff --git a/spec/factories/step.rb b/spec/factories/step.rb
index 68864aa63..c2d75527f 100644
--- a/spec/factories/step.rb
+++ b/spec/factories/step.rb
@@ -7,6 +7,7 @@
     hidden { false }
     additional_step_rules { nil }
     primary_call_to_action_text { nil }
+    skip_call_to_action_text { nil }
 
     association :journey, factory: :journey
 
diff --git a/spec/models/step_spec.rb b/spec/models/step_spec.rb
index 77a164794..22206faa5 100644
--- a/spec/models/step_spec.rb
+++ b/spec/models/step_spec.rb
@@ -77,6 +77,20 @@
     end
   end
 
+  describe "#skippable?" do
+    it "returns true if there is skip_call_to_action_text" do
+      step = build(:step, skip_call_to_action_text: "None of the above")
+      result = step.skippable?
+      expect(result).to eq(true)
+    end
+
+    it "returns false if there is NOT skip_call_to_action_text" do
+      step = build(:step, skip_call_to_action_text: nil)
+      result = step.skippable?
+      expect(result).to eq(false)
+    end
+  end
+
   describe "#options" do
     # TODO: This will need updating when options are set on the step with the new format
     it "returns a hash of options" do

From 0e84a35df4fe9cb23483c5621835a98cc05cac08 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 1 Mar 2021 15:47:28 +0000
Subject: [PATCH 149/249] Creating a step will save the content for the skip
 button

---
 app/services/create_journey_step.rb           |  6 +++
 .../skippable-checkboxes-question.json        | 44 +++++++++++++++++++
 .../skippable-checkboxes-section.json         | 43 ++++++++++++++++++
 .../steps/skippable-checkboxes-question.json  | 43 ++++++++++++++++++
 spec/services/create_journey_step_spec.rb     | 15 +++++++
 spec/support/contentful_helpers.rb            |  1 +
 6 files changed, 152 insertions(+)
 create mode 100644 spec/fixtures/contentful/categories/skippable-checkboxes-question.json
 create mode 100644 spec/fixtures/contentful/sections/skippable-checkboxes-section.json
 create mode 100644 spec/fixtures/contentful/steps/skippable-checkboxes-question.json

diff --git a/app/services/create_journey_step.rb b/app/services/create_journey_step.rb
index be26b5839..b2354254d 100644
--- a/app/services/create_journey_step.rb
+++ b/app/services/create_journey_step.rb
@@ -41,6 +41,7 @@ def call
       contentful_type: step_type,
       options: options,
       primary_call_to_action_text: primary_call_to_action_text,
+      skip_call_to_action_text: skip_call_to_action_text,
       hidden: hidden,
       additional_step_rules: additional_step_rules,
       raw: raw,
@@ -102,6 +103,11 @@ def primary_call_to_action_text
     contentful_entry.primary_call_to_action
   end
 
+  def skip_call_to_action_text
+    return nil unless contentful_entry.respond_to?(:skip_call_to_action)
+    contentful_entry.skip_call_to_action
+  end
+
   def hidden
     return false unless contentful_entry.respond_to?(:always_show_the_user)
     return false if contentful_entry.always_show_the_user.nil?
diff --git a/spec/fixtures/contentful/categories/skippable-checkboxes-question.json b/spec/fixtures/contentful/categories/skippable-checkboxes-question.json
new file mode 100644
index 000000000..8765718ca
--- /dev/null
+++ b/spec/fixtures/contentful/categories/skippable-checkboxes-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "skippable-checkboxes-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/sections/skippable-checkboxes-section.json b/spec/fixtures/contentful/sections/skippable-checkboxes-section.json
new file mode 100644
index 000000000..27cb9fb5f
--- /dev/null
+++ b/spec/fixtures/contentful/sections/skippable-checkboxes-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "skippable-checkboxes-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "skippable-checkboxes-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/skippable-checkboxes-question.json b/spec/fixtures/contentful/steps/skippable-checkboxes-question.json
new file mode 100644
index 000000000..63196cd94
--- /dev/null
+++ b/spec/fixtures/contentful/steps/skippable-checkboxes-question.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "skippable-checkboxes-question",
+        "type": "Entry",
+        "createdAt": "2020-12-09T11:53:52.744Z",
+        "updatedAt": "2020-12-09T11:53:52.744Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/everyday-services",
+        "type": "checkboxes",
+        "title": "Everyday services that are required and need to be considered",
+        "extendedOptions": [
+          { "value": "Breakfast" },
+          { "value": "Morning break" },
+          { "value": "Lunch" },
+          { "value": "Dinner" }
+        ],
+        "skipCallToAction": "None of the above"
+    }
+}
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index af614bd9b..b13bbe57f 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -133,6 +133,21 @@
       end
     end
 
+    context "when no 'skipCallToAction' is provided" do
+      it "default copy is used for the button" do
+        journey = create(:journey, :catering)
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/skippable-checkboxes-question.json"
+        )
+
+        step, _answer = described_class.new(
+          journey: journey, contentful_entry: fake_entry
+        ).call
+
+        expect(step.skip_call_to_action_text).to eq("None of the above")
+      end
+    end
+
     context "when no 'alwaysShowTheUser' is provided" do
       it "default hidden to true" do
         journey = create(:journey, :catering)
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index ea33e3cee..b1edab7c0 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -147,6 +147,7 @@ def fake_contentful_step(contentful_fixture_filename:)
       type: hash_response.dig("fields", "type"),
       next: double(id: hash_response.dig("fields", "next", "sys", "id")),
       primary_call_to_action: hash_response.dig("fields", "primaryCallToAction"),
+      skip_call_to_action: hash_response.dig("fields", "skipCallToAction"),
       always_show_the_user: hash_response.dig("fields", "alwaysShowTheUser"),
       show_additional_question: hash_response.dig("fields", "showAdditionalQuestion"),
       raw: hash_response,

From 01eec84d8d3c27506dbcbb9d62d177b4d92351c1 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 1 Mar 2021 16:41:38 +0000
Subject: [PATCH 150/249] Checkbox answers are only required if the parent step
 isn't skippable

Users may need to explicitly state that their answer is "none of the above". We are going to do this by adding a skip button that ignores any checkbox selections, this change facilitates that.

With the radio pattern (given only 1 choice can be made) an additional "Other" option can be presented naturally.
---
 app/models/checkbox_answers.rb       |  4 +++-
 spec/models/checkbox_answers_spec.rb | 21 +++++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/models/checkbox_answers.rb b/app/models/checkbox_answers.rb
index c93e5b78d..4c857ea24 100644
--- a/app/models/checkbox_answers.rb
+++ b/app/models/checkbox_answers.rb
@@ -2,7 +2,9 @@ class CheckboxAnswers < ActiveRecord::Base
   self.implicit_order_column = "created_at"
   belongs_to :step
 
-  validates :response, presence: true
+  validates :response,
+    presence: true,
+    unless: proc { |answer| answer.step.skippable? && answer.skipped }
 
   def response=(args)
     return if args.blank?
diff --git a/spec/models/checkbox_answers_spec.rb b/spec/models/checkbox_answers_spec.rb
index e2bf38f8e..d0d77cba1 100644
--- a/spec/models/checkbox_answers_spec.rb
+++ b/spec/models/checkbox_answers_spec.rb
@@ -1,7 +1,10 @@
 require "rails_helper"
 
 RSpec.describe CheckboxAnswers, type: :model do
-  it { should belong_to(:step) }
+  it "should belong_to a step" do
+    association = described_class.reflect_on_association(:step)
+    expect(association.macro).to eq(:belongs_to)
+  end
 
   describe "#response" do
     it "returns an array of strings" do
@@ -11,7 +14,21 @@
   end
 
   describe "validations" do
-    it { is_expected.to validate_presence_of(:response) }
+    it "is not valid if there is no response" do
+      answer = build(:checkbox_answers, response: [])
+      expect(answer).not_to be_valid
+    end
+
+    context "when the step is skippable" do
+      it "does not validate the presence of the response" do
+        skippable_step = create(:step, :checkbox_answers, skip_call_to_action_text: "None of the above")
+        answer = build(:checkbox_answers, step: skippable_step, response: "")
+
+        answer.save
+
+        expect(answer.persisted?).to be true
+      end
+    end
   end
 
   describe "#response=" do

From f61e15bef5fa7c3f0bd970c7315ad6738762d0aa Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 2 Mar 2021 11:55:12 +0000
Subject: [PATCH 151/249] Checkbox answers can be completed without selecting a
 given option

The content team can control whether a question is skippable by providing button content. If found, we will show an additional secondary button at the bottom of the list of options.

This could not be a link as it would always be a GET request, rather than POST.

If a skip occurs we forcefully update the answer with an empty set of params, undoing any previous choices in the case of an update.

We could extend this to all question types but it isn't needed right now and checkboxes is the only skippable question type. In future, should this be needed we could push the responsibility down into SaveAnswer after tidying up how we are sending different parameters for the different `params` too.
---
 CHANGELOG.md                                    |  1 +
 app/controllers/answers_controller.rb           |  6 ++++++
 app/views/steps/checkboxes.html.erb             |  7 +++++++
 .../anyone_can_complete_a_journey_spec.rb       | 17 +++++++++++++++++
 4 files changed, 31 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce6219718..4db827c45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - radio questions can be configured with an "or" separator
 - specification can show further information for radio answers
 - specification can show further information for checkbox answers
+- checkbox answers can be completed without choosing a given answer
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index eff0b8089..7f32222e9 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -53,6 +53,8 @@ def answer_params
   end
 
   def checkbox_params
+    return {skipped: true, response: nil, further_information: nil} if skip_answer?
+
     answer_params = params.require(:answer)
 
     if @step.options
@@ -74,4 +76,8 @@ def date_params
     date_hash = {day: answer["response(3i)"], month: answer["response(2i)"], year: answer["response(1i)"]}
     {response: format_date(date_hash)}
   end
+
+  def skip_answer?
+    params.fetch("skip", false)
+  end
 end
diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index 14bb27faf..dcf944aae 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -29,4 +29,11 @@
       <% end %>
     <% end %>
   <% end %>
+
+  <% if @step_presenter.skippable? %>
+    <div class="govuk-radios__divider">or</div>
+    <div class="govuk-form-group">
+      <%= f.button @step_presenter.skip_call_to_action_text, type: "submit", name: "skip", value: "true", class: "govuk-button govuk-button--secondary" %>
+    </div>
+  <% end %>
 <% end %>
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 051e653ea..22f3cc507 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -302,6 +302,23 @@
     end
   end
 
+  context "when the question is skippable" do
+    scenario "allows the user to not select an answer" do
+      start_journey_from_category_and_go_to_question(category: "skippable-checkboxes-question.json")
+
+      check("Lunch")
+      click_on("None of the above")
+
+      within(".app-task-list") do
+        expect(page).to have_content("Complete")
+      end
+
+      click_first_link_in_task_list
+
+      expect(page).not_to have_checked_field("Lunch")
+    end
+  end
+
   context "when the Contentful model is of type staticContent" do
     context "when Contentful entry is of type paragraphs" do
       scenario "the content is not displayed in the task list" do

From 22adfe8845a0396e2258b7dee09e42c9711a5a8d Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 4 Mar 2021 17:40:41 +0000
Subject: [PATCH 152/249] Checkbox answers remember if they've been skipped

Currently we infer "completed" but which questions have an associated answer object. We can be more explicit about this for readability and future scoping.

Now that answers know if they are being marked as skipped, we can use
this information to turn validation back on for one case. When a user
doesn't choose a checkbox option OR the skip button, we _still_ want
them to make one of those two selections. We can now show a validation
error when this happens.
---
 db/migrate/20210302110746_add_skipped_to_checkbox_answers.rb | 5 +++++
 db/schema.rb                                                 | 3 ++-
 spec/factories/answer.rb                                     | 1 +
 spec/features/visitors/anyone_can_complete_a_journey_spec.rb | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20210302110746_add_skipped_to_checkbox_answers.rb

diff --git a/db/migrate/20210302110746_add_skipped_to_checkbox_answers.rb b/db/migrate/20210302110746_add_skipped_to_checkbox_answers.rb
new file mode 100644
index 000000000..3b5c13256
--- /dev/null
+++ b/db/migrate/20210302110746_add_skipped_to_checkbox_answers.rb
@@ -0,0 +1,5 @@
+class AddSkippedToCheckboxAnswers < ActiveRecord::Migration[6.1]
+  def change
+    add_column :checkbox_answers, :skipped, :boolean, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a68f7dac0..26e771c99 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_03_01_151653) do
+ActiveRecord::Schema.define(version: 2021_03_02_110746) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -23,6 +23,7 @@
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.jsonb "further_information"
+    t.boolean "skipped", default: false
     t.index ["step_id"], name: "index_checkbox_answers_on_step_id"
   end
 
diff --git a/spec/factories/answer.rb b/spec/factories/answer.rb
index 1ca6d54e2..378dd3ea4 100644
--- a/spec/factories/answer.rb
+++ b/spec/factories/answer.rb
@@ -28,6 +28,7 @@
     association :step, factory: :step, options: [{"value" => "Breakfast"}, {"value" => "Lunch"}], contentful_type: "checkboxes", contentful_model: "question"
 
     response { ["breakfast", "lunch", ""] }
+    skipped { false }
   end
 
   factory :number_answer do
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 22f3cc507..dbb352d88 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -316,6 +316,8 @@
       click_first_link_in_task_list
 
       expect(page).not_to have_checked_field("Lunch")
+
+      expect(CheckboxAnswers.last.skipped).to be true
     end
   end
 

From 955862d067891275c81da0785a5e3a9497cfbad0 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 4 Mar 2021 17:40:53 +0000
Subject: [PATCH 153/249] A checkbox answer is still required unless it is
 skipped

The user must now make a choice between one of the options and clicking the skip button. They can no longer click "continue" or "update", they must make a decision.

The form error doesn't wrap all the way down to the "or" and skip button form group. This would be nice to have but I can't see a way to easily do this without hacking the form builder gem to wrap multiple form groups if present. Hopefully this will work for the few cases where skipping is needed.
---
 spec/features/visitors/anyone_can_complete_a_journey_spec.rb | 3 +++
 spec/models/checkbox_answers_spec.rb                         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index dbb352d88..f4d92af1d 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -306,6 +306,9 @@
     scenario "allows the user to not select an answer" do
       start_journey_from_category_and_go_to_question(category: "skippable-checkboxes-question.json")
 
+      click_on(I18n.t("generic.button.next"))
+      expect(page).to have_content("can't be blank")
+
       check("Lunch")
       click_on("None of the above")
 
diff --git a/spec/models/checkbox_answers_spec.rb b/spec/models/checkbox_answers_spec.rb
index d0d77cba1..a8571ad42 100644
--- a/spec/models/checkbox_answers_spec.rb
+++ b/spec/models/checkbox_answers_spec.rb
@@ -22,7 +22,7 @@
     context "when the step is skippable" do
       it "does not validate the presence of the response" do
         skippable_step = create(:step, :checkbox_answers, skip_call_to_action_text: "None of the above")
-        answer = build(:checkbox_answers, step: skippable_step, response: "")
+        answer = build(:checkbox_answers, step: skippable_step, response: "", skipped: true)
 
         answer.save
 

From d7ede7e61f8c62f6168ec578a3e2c6b23fd65005 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Mar 2021 11:02:52 +0000
Subject: [PATCH 154/249] Bump standard from 0.13.0 to 1.0.1

Bumps [standard](https://github.com/testdouble/standard) from 0.13.0 to 1.0.1.
- [Release notes](https://github.com/testdouble/standard/releases)
- [Changelog](https://github.com/testdouble/standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testdouble/standard/compare/v0.13.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5f2f66324..e985674ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -244,7 +244,7 @@ GEM
     redis (4.2.5)
     redis-namespace (1.8.1)
       redis (>= 3.0.4)
-    regexp_parser (2.0.3)
+    regexp_parser (2.1.1)
     rexml (3.2.4)
     rollbar (3.1.2)
     rspec-core (3.10.1)
@@ -264,7 +264,7 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.1)
-    rubocop (1.10.0)
+    rubocop (1.11.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -275,7 +275,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
-    rubocop-performance (1.9.2)
+    rubocop-performance (1.10.1)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
@@ -322,9 +322,9 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    standard (0.13.0)
-      rubocop (= 1.10.0)
-      rubocop-performance (= 1.9.2)
+    standard (1.0.1)
+      rubocop (= 1.11.0)
+      rubocop-performance (= 1.10.1)
     thor (1.1.0)
     tilt (2.0.10)
     turbolinks (5.2.1)

From 7c2d9ffc2b833c9e725af0771a776bf2410a4101 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 8 Mar 2021 10:24:33 +0000
Subject: [PATCH 155/249] Planning page links back to the start page correctly

---
 CHANGELOG.md                                                    | 1 +
 app/views/pages/planning_start_page.html.erb                    | 2 +-
 .../visitors/anyone_can_see_a_planning_start_page_spec.rb       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4db827c45..9d3a42591 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - specification can show further information for radio answers
 - specification can show further information for checkbox answers
 - checkbox answers can be completed without choosing a given answer
+- fix planning page link back to the service
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/views/pages/planning_start_page.html.erb b/app/views/pages/planning_start_page.html.erb
index d483bfba6..0800b5259 100644
--- a/app/views/pages/planning_start_page.html.erb
+++ b/app/views/pages/planning_start_page.html.erb
@@ -209,7 +209,7 @@
       <p class="govuk-body"><a href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/writing-a-specification" class="govuk-link">Read about how to write a specification</a></p>
 
 
-      <p class="govuk-body">Below are some of the things that you should include. You can also <a href="../start">use our tool to create a specification</a>.</p>
+      <p class="govuk-body">Below are some of the things that you should include. You can also <%= link_to "use our tool to create a specification", root_path, class: "govuk-link" %>.</p>
 
 
       <h3 class="govuk-heading-m">Objectives</h3>
diff --git a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
index e587ce0ff..7c660b400 100644
--- a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
@@ -32,6 +32,7 @@
     expect(page).to have_content("Writing your requirements")
     page.find(:xpath, "//*[contains(text(),'Writing your requirements')]").click
     expect(page).to have_content("This is the document that you give to suppliers explaining what you want to buy, sometimes called a specification.")
+    expect(page).to have_link("use our tool to create a specification", href: root_path)
 
     expect(page).to have_content("What to do next")
     page.find(:xpath, "//*[contains(text(),'What to do next')]").click

From 43e69bbee0c46469503c07e89fc2f56e7f428338 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Mar 2021 11:03:01 +0000
Subject: [PATCH 156/249] Bump standard from 1.0.1 to 1.0.4

Bumps [standard](https://github.com/testdouble/standard) from 1.0.1 to 1.0.4.
- [Release notes](https://github.com/testdouble/standard/releases)
- [Changelog](https://github.com/testdouble/standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testdouble/standard/compare/v1.0.1...v1.0.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e985674ab..3c6142827 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -322,7 +322,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    standard (1.0.1)
+    standard (1.0.4)
       rubocop (= 1.11.0)
       rubocop-performance (= 1.10.1)
     thor (1.1.0)

From cd85a2ba50ee44b32b61d7cdd3f0a850535a82fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Mar 2021 11:03:23 +0000
Subject: [PATCH 157/249] Bump rspec-rails from 4.0.2 to 4.1.0

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 4.0.2 to 4.1.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.2...v4.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e985674ab..29ce25b34 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -252,10 +252,10 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.0.2)
+    rspec-rails (4.1.0)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
@@ -263,7 +263,7 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.1)
+    rspec-support (3.10.2)
     rubocop (1.11.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)

From e36b76acf147a592fb38784f203ee3f54db1e9e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Mar 2021 11:03:38 +0000
Subject: [PATCH 158/249] Bump climate_control from 0.2.0 to 1.0.0

Bumps [climate_control](https://github.com/thoughtbot/climate_control) from 0.2.0 to 1.0.0.
- [Release notes](https://github.com/thoughtbot/climate_control/releases)
- [Changelog](https://github.com/thoughtbot/climate_control/blob/main/NEWS)
- [Commits](https://github.com/thoughtbot/climate_control/commits/v1.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e985674ab..954aa080f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,7 +85,7 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     childprocess (3.0.0)
-    climate_control (0.2.0)
+    climate_control (1.0.0)
     coderay (1.1.3)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)

From 62b95561b6e5af7a141d638d5c7e12467f29682f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Mar 2021 11:03:54 +0000
Subject: [PATCH 159/249] Bump webmock from 3.12.0 to 3.12.1

Bumps [webmock](https://github.com/bblimke/webmock) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.12.0...v3.12.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e985674ab..0ea27cd18 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -344,7 +344,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.12.0)
+    webmock (3.12.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

From 698ccd12dbfd521d28ca741fbe84d3b989b4e669 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Mar 2021 11:03:31 +0000
Subject: [PATCH 160/249] Bump rspec-rails from 4.1.0 to 5.0.0

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 4.1.0 to 5.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.1.0...v5.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ffe433720..f7259127a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -255,10 +255,10 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.1.0)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
+    rspec-rails (5.0.0)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
       rspec-core (~> 3.10)
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)

From 243c2d58c89aca287ba02980bf2b752d3a5b0091 Mon Sep 17 00:00:00 2001
From: Chris Wright <chris@dxw.com>
Date: Mon, 8 Mar 2021 17:00:55 +0000
Subject: [PATCH 161/249] Terraform Cloud Foundry GPaas

* Adds a Terraform backend using S3
* Adds the `cloudfoundry` provider
* Adds intial Readme for Terraform usage
---
 .gitignore                                    |  9 +++++
 ...e-on-gpaas-cloud-foundry-with-terraform.md | 26 +++++++++++++
 terraform/app/.terraform-version              |  1 +
 terraform/app/.terraform.lock.hcl             | 23 ++++++++++++
 terraform/app/README.md                       | 37 +++++++++++++++++++
 terraform/app/backend.tf                      |  7 ++++
 terraform/app/providers.tf                    | 12 ++++++
 7 files changed, 115 insertions(+)
 create mode 100644 doc/architecture/decisions/0009-create-infrastructure-on-gpaas-cloud-foundry-with-terraform.md
 create mode 100644 terraform/app/.terraform-version
 create mode 100644 terraform/app/.terraform.lock.hcl
 create mode 100644 terraform/app/README.md
 create mode 100644 terraform/app/backend.tf
 create mode 100644 terraform/app/providers.tf

diff --git a/.gitignore b/.gitignore
index 6e6fe3e48..e944baf96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,12 @@ config/master.key
 .env.*
 !.env.example
 !.env.test
+
+# Terraform files
+**/.terraform/*
+*.tfstate
+*.tfstate.*
+crash.log
+*.tfvars
+.terraformrc
+terraform.rc
diff --git a/doc/architecture/decisions/0009-create-infrastructure-on-gpaas-cloud-foundry-with-terraform.md b/doc/architecture/decisions/0009-create-infrastructure-on-gpaas-cloud-foundry-with-terraform.md
new file mode 100644
index 000000000..9eaf1ae1e
--- /dev/null
+++ b/doc/architecture/decisions/0009-create-infrastructure-on-gpaas-cloud-foundry-with-terraform.md
@@ -0,0 +1,26 @@
+# 9. Create infrastructure on GPaas Cloud Foundry with Terraform
+
+Date: 2021-03-09
+
+## Status
+
+Accepted
+
+## Context
+
+The early beta was originally hosted on dxw's Heroku to get delivering quickly whilst access to GPaaS could be set up.
+
+Access to GPaaS with approved billing has now been confirmed so we are migrating the service to its longer term home.
+
+## Decision
+
+- Move the service from Heroku to GPaaS for all environments except the ephemeral pull request review environments.
+- Use Terraform to define the infrastructure as code.
+
+
+## Consequences
+
+- the service will be easier to maintain in the long term if it is grouped with the rest of DfE's digital services inside GPaaS
+- the service will need to be Terraformed as other DfE digital services
+- as there are no real users of the service there is less risk to migrating the service now rather than later
+- the pull request environments will no longer have strong parity with the live service on an infrastructure level. This can be changed in future if we have move time to also the approach taken by Teaching Vacancies
diff --git a/terraform/app/.terraform-version b/terraform/app/.terraform-version
new file mode 100644
index 000000000..c24a39598
--- /dev/null
+++ b/terraform/app/.terraform-version
@@ -0,0 +1 @@
+0.14.7
diff --git a/terraform/app/.terraform.lock.hcl b/terraform/app/.terraform.lock.hcl
new file mode 100644
index 000000000..84a3c0caf
--- /dev/null
+++ b/terraform/app/.terraform.lock.hcl
@@ -0,0 +1,23 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/cloudfoundry-community/cloudfoundry" {
+  version     = "0.13.0"
+  constraints = "~> 0.13.0"
+  hashes = [
+    "h1:WzvlwIg0cANtlL1banQ4EUetkR7vKMElXDFx/ZXhkAk=",
+    "zh:146277a9fb306f5c10cb385dce356f16174762f6e799456638e5981b8fc9fcde",
+    "zh:254fe911a61acae7352f7f91d2e706db975481124cbb2fa8fce8b367b8becebe",
+    "zh:4b71ab53089b869d9689f44e5c869c83446d6754ccfa9587ae297c62a2070aa5",
+    "zh:51cbc92b6ed5640464633bc37323835a1f3a0888bf98b747ff5736360aa15b7f",
+    "zh:61f40fe915c2b2fe545c0e7d7373ccd49e7af8c4557c8657e1b76b6cd67cb640",
+    "zh:66186073b2086097a2b9ebd902530d8417c5cc17c6d8262991172b2a1309eae4",
+    "zh:a759ec60b39f34e200e7d0da043f8f72a9a39dc091828e9290f683e4129619f4",
+    "zh:acecf99eb8a4a9ccfe1e9ce630b56e9d9117d665aecb3dc81050d438630d0c01",
+    "zh:ae1c826b5f84eb87f2fa23505a7c536a782d41eb5080f22e86cb7302fee1d8b4",
+    "zh:b3b7daed0065cc66d88c53692f6539fb77e6ddf30fd154765a6f8e9b3c1df384",
+    "zh:c53c7848eca19f3e7b9bb30d808d3484f371c1c47a03bcc2e736fba3454f8327",
+    "zh:e7cf68083d5d655794613b30cc52e8995c8672b424c6b5c4e9cf915fe2b539d7",
+    "zh:ece9ae93c194866d3365057e731c3571bde825b8558c5e8c4d9e12c1f624cd86",
+  ]
+}
diff --git a/terraform/app/README.md b/terraform/app/README.md
new file mode 100644
index 000000000..64dbb77b8
--- /dev/null
+++ b/terraform/app/README.md
@@ -0,0 +1,37 @@
+# Terraform Deployment
+
+We use terraform to create the services needed by the application and to deploy the application itself.
+
+We use terraform workspaces to keep the terraform state seperate for each environment.
+
+At the time of writing, we store our state in an s3 bucket on the PaaS in the `sct-research` space. This is planned to move to a new space, `sct-terraform`.
+
+### Setup
+
+- go to the application `/terraform` directory
+- install [tfenv](https://github.com/tfutils/tfenv)
+- run `tfenv install` to install the vesion of terraform specified in `.terraform-version`
+- ask the tech lead for access to the service within DfE's central GPaaS account
+- set the `cloudfoundry` provider credentials (GPaas username/password):
+```
+$ export CF_USER="username"
+$ export CF_PASSWORD="password"
+```
+- get the terraform state S3 Bucket AWS credentials
+```
+$ cf target -s sct-research
+$ cf service-key terraform-state terraform-state-key
+{
+ "aws_access_key_id": "AWS_ACCESS_KEY",
+ "aws_region": "AWS_REGION",
+ "aws_secret_access_key": "AWS_SECRET_ACCESS_KEY",
+ "bucket_name": "BUCKET_NAME",
+ "deploy_env": ""
+}
+```
+- set the AWS credentials:
+```
+$ export AWS_REGION=aws_region
+$ export AWS_ACCESS_KEY_ID=aws_access_key_id
+$ export AWS_SECRET_ACCESS_KEY=aws_secret_access_key
+```
diff --git a/terraform/app/backend.tf b/terraform/app/backend.tf
new file mode 100644
index 000000000..b8186b3ce
--- /dev/null
+++ b/terraform/app/backend.tf
@@ -0,0 +1,7 @@
+terraform {
+  backend "s3" {
+    bucket = "paas-s3-broker-prod-lon-b2db1a0a-5a37-488b-858f-5e850ff4fdfb"
+    key    = "terraform"
+    region = "eu-west-2"
+  }
+}
diff --git a/terraform/app/providers.tf b/terraform/app/providers.tf
new file mode 100644
index 000000000..61d50b88e
--- /dev/null
+++ b/terraform/app/providers.tf
@@ -0,0 +1,12 @@
+provider "cloudfoundry" {
+  api_url = "https://api.london.cloud.service.gov.uk"
+}
+
+terraform {
+  required_providers {
+    cloudfoundry = {
+      source  = "cloudfoundry-community/cloudfoundry"
+      version = "~> 0.13.0"
+    }
+  }
+}

From 8d468be0dcd6c06cb1a41aaaa7393f0c285e0daf Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 8 Mar 2021 12:16:21 +0000
Subject: [PATCH 162/249] Checkbox answers are not automatically joined by a
 comma

Instead of performing this operation in Rails, we leave the presentational logic to Contentful.

The same logic can be achieved by defining the following in the `specification_template`:

```
{{ options | join: ", " }}
```

This enables the user to present the options in different ways. Not only as a single paragraph but as a list of options.
---
 CHANGELOG.md                                        | 1 +
 app/presenters/checkboxes_answer_presenter.rb       | 5 +----
 spec/presenters/checkboxes_answer_presenter_spec.rb | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d3a42591..b238c3233 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - specification can show further information for checkbox answers
 - checkbox answers can be completed without choosing a given answer
 - fix planning page link back to the service
+- checkbox answers are not automatically joined by commas for the specification
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/presenters/checkboxes_answer_presenter.rb b/app/presenters/checkboxes_answer_presenter.rb
index 85021eb8d..682e54a10 100644
--- a/app/presenters/checkboxes_answer_presenter.rb
+++ b/app/presenters/checkboxes_answer_presenter.rb
@@ -1,8 +1,5 @@
 class CheckboxesAnswerPresenter < SimpleDelegator
   def response
-    super.reject(&:blank?).map { |answer|
-      answer.tr!("_", " ")
-      answer.capitalize!
-    }.join(", ")
+    super.reject(&:blank?)
   end
 end
diff --git a/spec/presenters/checkboxes_answer_presenter_spec.rb b/spec/presenters/checkboxes_answer_presenter_spec.rb
index 04a066df0..50835f18f 100644
--- a/spec/presenters/checkboxes_answer_presenter_spec.rb
+++ b/spec/presenters/checkboxes_answer_presenter_spec.rb
@@ -2,10 +2,10 @@
 
 RSpec.describe CheckboxesAnswerPresenter do
   describe "#response" do
-    it "returns all none nil values, capitalised as a comma separated string" do
-      step = build(:checkbox_answers, response: ["yes", "no", "morning_break", ""])
+    it "returns all none nil values as an array" do
+      step = build(:checkbox_answers, response: ["Yes", "No", "Morning break", ""])
       presenter = described_class.new(step)
-      expect(presenter.response).to eq("Yes, No, Morning break")
+      expect(presenter.response).to eq(["Yes", "No", "Morning break"])
     end
   end
 end

From 518bece87b78752ae1d9047a69cb5ce8e5cac585 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 8 Mar 2021 16:16:56 +0000
Subject: [PATCH 163/249] Checkbox answers are give to the spec builder as a
 hash

Instead of only returning a string response for Liquid to use for each answer, we extend the functionality by returning a hash instead.

We continue to include the stringified value and we start to extend by adding new fields like `skipped` so the content team can determine if an answer is blank OR was skipped in an explicit way.

We have many hops to migrate each presenter so the `to_param` method has been added to each presenter and each will take a similar approach until all answers return a hash.

Once this migration has been completed the `extended_answer_x` variables will be made redundant and removed. To keep tests green for now, they remain.
---
 app/presenters/checkboxes_answer_presenter.rb | 29 ++++++++
 app/presenters/currency_answer_presenter.rb   |  4 ++
 app/presenters/long_text_answer_presenter.rb  |  4 ++
 app/presenters/number_answer_presenter.rb     |  3 +
 app/presenters/radio_answer_presenter.rb      |  4 ++
 app/presenters/short_text_answer_presenter.rb |  3 +
 .../single_date_answer_presenter.rb           |  4 ++
 app/services/get_answers_for_steps.rb         |  2 +-
 ...n_see_their_catering_specification_spec.rb |  4 +-
 .../checkboxes_answer_presenter_spec.rb       | 60 +++++++++++++++++
 spec/services/get_answers_for_steps_spec.rb   | 67 +++++++++++++------
 11 files changed, 162 insertions(+), 22 deletions(-)

diff --git a/app/presenters/checkboxes_answer_presenter.rb b/app/presenters/checkboxes_answer_presenter.rb
index 682e54a10..df89b65de 100644
--- a/app/presenters/checkboxes_answer_presenter.rb
+++ b/app/presenters/checkboxes_answer_presenter.rb
@@ -2,4 +2,33 @@ class CheckboxesAnswerPresenter < SimpleDelegator
   def response
     super.reject(&:blank?)
   end
+
+  def to_param
+    {
+      response: response,
+      skipped: skipped,
+      selected_answers: selected_answers
+    }
+  end
+
+  private def concatenated_response
+    return nil if response.empty?
+
+    response.join(", ")
+  end
+
+  private def selected_answers
+    return [] if response.empty?
+
+    response.each_with_object([]) do |human_readable_choice, array|
+      machine_readable_key = human_readable_choice.parameterize.to_sym
+      matching_further_information = further_information&.fetch("#{machine_readable_key}_further_information", nil)
+
+      array << {
+        machine_value: machine_readable_key,
+        human_value: human_readable_choice,
+        further_information: matching_further_information
+      }
+    end
+  end
 end
diff --git a/app/presenters/currency_answer_presenter.rb b/app/presenters/currency_answer_presenter.rb
index c1c13c8cc..05f3309eb 100644
--- a/app/presenters/currency_answer_presenter.rb
+++ b/app/presenters/currency_answer_presenter.rb
@@ -4,4 +4,8 @@ class CurrencyAnswerPresenter < SimpleDelegator
   def response
     number_to_currency(super, unit: "£", precision: 2)
   end
+
+  def to_param
+    response
+  end
 end
diff --git a/app/presenters/long_text_answer_presenter.rb b/app/presenters/long_text_answer_presenter.rb
index e16c61fb0..dd82b8573 100644
--- a/app/presenters/long_text_answer_presenter.rb
+++ b/app/presenters/long_text_answer_presenter.rb
@@ -4,4 +4,8 @@ class LongTextAnswerPresenter < SimpleDelegator
   def response
     simple_format(super)
   end
+
+  def to_param
+    response
+  end
 end
diff --git a/app/presenters/number_answer_presenter.rb b/app/presenters/number_answer_presenter.rb
index e7629c70b..b18d36e46 100644
--- a/app/presenters/number_answer_presenter.rb
+++ b/app/presenters/number_answer_presenter.rb
@@ -1,2 +1,5 @@
 class NumberAnswerPresenter < SimpleDelegator
+  def to_param
+    response
+  end
 end
diff --git a/app/presenters/radio_answer_presenter.rb b/app/presenters/radio_answer_presenter.rb
index 46e88f249..1708bedde 100644
--- a/app/presenters/radio_answer_presenter.rb
+++ b/app/presenters/radio_answer_presenter.rb
@@ -4,4 +4,8 @@ class RadioAnswerPresenter < SimpleDelegator
   def response
     human_readable_option(string: super)
   end
+
+  def to_param
+    response
+  end
 end
diff --git a/app/presenters/short_text_answer_presenter.rb b/app/presenters/short_text_answer_presenter.rb
index fa5bb3496..4f370d30a 100644
--- a/app/presenters/short_text_answer_presenter.rb
+++ b/app/presenters/short_text_answer_presenter.rb
@@ -1,2 +1,5 @@
 class ShortTextAnswerPresenter < SimpleDelegator
+  def to_param
+    response
+  end
 end
diff --git a/app/presenters/single_date_answer_presenter.rb b/app/presenters/single_date_answer_presenter.rb
index 1bd0942d7..d443dfc1d 100644
--- a/app/presenters/single_date_answer_presenter.rb
+++ b/app/presenters/single_date_answer_presenter.rb
@@ -2,4 +2,8 @@ class SingleDateAnswerPresenter < SimpleDelegator
   def response
     I18n.l(super)
   end
+
+  def to_param
+    response
+  end
 end
diff --git a/app/services/get_answers_for_steps.rb b/app/services/get_answers_for_steps.rb
index bcd21bdc1..2cae7dab9 100644
--- a/app/services/get_answers_for_steps.rb
+++ b/app/services/get_answers_for_steps.rb
@@ -42,7 +42,7 @@ def call
         end
       end
 
-      hash["answer_#{step.contentful_id}"] = answer.response.to_s
+      hash["answer_#{step.contentful_id}"] = answer.to_param
     }
   end
 end
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
index 9d4db2699..f3065bc3a 100644
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
@@ -51,9 +51,9 @@
     expect(page).to have_content(I18n.t("journey.specification.header"))
 
     within("article#specification") do
-      expect(page).to have_content("Yes")
+      expect(page).to have_content("yes")
       expect(page).to have_content("More info for yes")
-      expect(page).to have_content("No")
+      expect(page).to have_content("no")
       expect(page).to have_content("More info for no")
     end
   end
diff --git a/spec/presenters/checkboxes_answer_presenter_spec.rb b/spec/presenters/checkboxes_answer_presenter_spec.rb
index 50835f18f..add5edd81 100644
--- a/spec/presenters/checkboxes_answer_presenter_spec.rb
+++ b/spec/presenters/checkboxes_answer_presenter_spec.rb
@@ -8,4 +8,64 @@
       expect(presenter.response).to eq(["Yes", "No", "Morning break"])
     end
   end
+
+  describe "#to_param" do
+    it "returns a hash of options" do
+      step = build(:checkbox_answers,
+        response: ["Yes", "No"],
+        skipped: false,
+        further_information: {
+          yes_further_information: "More yes info",
+          no_further_information: "More no info"
+        })
+
+      presenter = described_class.new(step)
+
+      expect(presenter.to_param).to eql({
+        response: ["Yes", "No"],
+        skipped: false,
+        concatenated_response: "Yes, No",
+        selected_answers: [
+          {
+            machine_value: :yes,
+            human_value: "Yes",
+            further_information: "More yes info"
+          },
+          {
+            machine_value: :no,
+            human_value: "No",
+            further_information: "More no info"
+          }
+        ]
+      })
+    end
+
+    context "when there is no response" do
+      it "sets the response to an empty array" do
+        step = build(:checkbox_answers, response: [])
+        presenter = described_class.new(step)
+        expect(presenter.to_param).to include({response: []})
+      end
+
+      it "sets the concatenated_response to an array with an empty hash" do
+        step = build(:checkbox_answers, response: [])
+        presenter = described_class.new(step)
+        expect(presenter.to_param).to include({selected_answers: []})
+      end
+
+      it "sets the concatenated_response to a nil" do
+        step = build(:checkbox_answers, response: [])
+        presenter = described_class.new(step)
+        expect(presenter.to_param).to include({concatenated_response: nil})
+      end
+    end
+
+    context "when the answer is skipped" do
+      it "sets the skipped value to true" do
+        step = build(:checkbox_answers, skipped: true)
+        presenter = described_class.new(step)
+        expect(presenter.to_param).to include({skipped: true})
+      end
+    end
+  end
 end
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index da4062796..cb775d71e 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -5,7 +5,9 @@
     answer = create(factory_name, response: response)
     result = described_class.new(visible_steps: [answer.step]).call
     expect(result).to include(
-      {"answer_#{answer.step.contentful_id}" => presenter.new(answer).response}
+      {
+        "answer_#{answer.step.contentful_id}" => presenter.new(answer).to_param
+      }
     )
   end
 end
@@ -66,31 +68,58 @@
     end
 
     context "when the answer is of type checkbox_answers" do
-      it_behaves_like "returns the answer in a hash", :checkbox_answers, CheckboxesAnswerPresenter, ["Foo", "Bar"]
+      it "returns the answer information in a hash" do
+        answer = create(:checkbox_answers,
+          response: ["Foo", "Bar"],
+          skipped: false,
+          further_information: {"foo_further_information" => "More yes info"})
+
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: ["Foo", "Bar"],
+            skipped: false,
+            selected_answers: [
+              {
+                machine_value: :foo,
+                human_value: "Foo",
+                further_information: "More yes info"
+              },
+              {
+                machine_value: :bar,
+                human_value: "Bar",
+                further_information: nil
+              }
+            ]
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
 
-      context "when the answer has further_information" do
-        it "includes those values as distinct variables in the response" do
+      context "when there is no further_information at all" do
+        it "returns no further_information in selected_answers" do
           answer = create(:checkbox_answers,
-            response: ["I would really like this", "I would hate this"],
-            further_information: {
-              "i_would_really_like_this_further_information" => "More yes info",
-              "i_would_hate_this_further_information" => "More no info"
-            })
+            response: ["Foo"],
+            skipped: false,
+            further_information: nil)
+
           result = described_class.new(visible_steps: [answer.step]).call
-          expect(result).to include(
-            {
-              "extended_answer_#{answer.step.contentful_id}" => [
-                {
-                  "response" => "I would really like this",
-                  "further_information" => "More yes info"
-                },
+          assertion = {
+            "answer_#{answer.step.contentful_id}" => {
+              response: ["Foo"],
+              skipped: false,
+              selected_answers: [
                 {
-                  "response" => "I would hate this",
-                  "further_information" => "More no info"
+                  machine_value: :foo,
+                  human_value: "Foo",
+                  further_information: nil
                 }
               ]
             }
-          )
+          }
+
+          expect(result).to match(a_hash_including(assertion))
         end
       end
     end

From e0b17dc7a86e18c4d79c0d8af7d46241ce4194bf Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 8 Mar 2021 17:35:37 +0000
Subject: [PATCH 164/249] Checkbox answers return a concatenated string of
 options

Given that the Liquid `contain` method cannot be called on a value that is of type Array, we decide to do extra lifting on the server side to reduce the logic needed in Contentful.

https://shopify.github.io/liquid/basics/operators/

Before this change an additional `assign` and `join` would be needed before any `contains` could be used. This is a lot for the user to remember if they want to present a comma separated string instead of iterating through an array of options, if they wanted to present a list:

```
  {% assign selections = answer_7p7URWwZbkjqqzo3E0k1v4 | join: ", " %}
  {% if selections contains "extra" %}
    <p>when there is an answer but no selection was made, this should show</p>
   {% endif %}
```

We expose a new option called `concatenated_response` in our new hash of options.
---
 app/presenters/checkboxes_answer_presenter.rb | 1 +
 spec/services/get_answers_for_steps_spec.rb   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/presenters/checkboxes_answer_presenter.rb b/app/presenters/checkboxes_answer_presenter.rb
index df89b65de..ebea864d5 100644
--- a/app/presenters/checkboxes_answer_presenter.rb
+++ b/app/presenters/checkboxes_answer_presenter.rb
@@ -6,6 +6,7 @@ def response
   def to_param
     {
       response: response,
+      concatenated_response: concatenated_response,
       skipped: skipped,
       selected_answers: selected_answers
     }
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index cb775d71e..45b8c1816 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -78,6 +78,7 @@
         assertion = {
           "answer_#{answer.step.contentful_id}" => {
             response: ["Foo", "Bar"],
+            concatenated_response: "Foo, Bar",
             skipped: false,
             selected_answers: [
               {
@@ -108,6 +109,7 @@
           assertion = {
             "answer_#{answer.step.contentful_id}" => {
               response: ["Foo"],
+              concatenated_response: "Foo",
               skipped: false,
               selected_answers: [
                 {

From e6febb486cd36df7b43863c67c08c81e00355555 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 8 Mar 2021 17:34:49 +0000
Subject: [PATCH 165/249] RadioAnswer presenter returns a hash or values

In following with the migration away from the @extended_answer variable and to the @answer variable that is a single combined hash.
---
 app/presenters/radio_answer_presenter.rb      |  5 ++++-
 .../presenters/radio_answer_presenter_spec.rb | 15 +++++++++++++++
 spec/services/get_answers_for_steps_spec.rb   | 19 +++++++++++++++----
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/app/presenters/radio_answer_presenter.rb b/app/presenters/radio_answer_presenter.rb
index 1708bedde..89323663d 100644
--- a/app/presenters/radio_answer_presenter.rb
+++ b/app/presenters/radio_answer_presenter.rb
@@ -6,6 +6,9 @@ def response
   end
 
   def to_param
-    response
+    {
+      response: response,
+      further_information: further_information
+    }
   end
 end
diff --git a/spec/presenters/radio_answer_presenter_spec.rb b/spec/presenters/radio_answer_presenter_spec.rb
index fa44a65df..12ac46967 100644
--- a/spec/presenters/radio_answer_presenter_spec.rb
+++ b/spec/presenters/radio_answer_presenter_spec.rb
@@ -8,4 +8,19 @@
       expect(presenter.response).to eq("Yes")
     end
   end
+
+  describe "#to_param" do
+    it "returns a hash of radio_answer" do
+      step = build(:radio_answer,
+        response: "Yes",
+        further_information: "More yes info")
+
+      presenter = described_class.new(step)
+
+      expect(presenter.to_param).to eql({
+        response: "Yes",
+        further_information: "More yes info"
+      })
+    end
+  end
 end
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index 45b8c1816..a935cf17b 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -42,7 +42,21 @@
     end
 
     context "when the answer is of type radio_answer" do
-      it_behaves_like "returns the answer in a hash", :radio_answer, RadioAnswerPresenter, "Catering"
+      it "returns the answer information in a hash" do
+        answer = create(:radio_answer,
+          response: "Yes please",
+          further_information: nil)
+
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "Yes please",
+            further_information: nil
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
 
       context "when the answer has further_information" do
         it "also includes an extended_answer hash in the response" do
@@ -50,9 +64,6 @@
             response: "yes please",
             further_information: "More yes info")
           result = described_class.new(visible_steps: [answer.step]).call
-          expect(result).to include(
-            {"answer_#{answer.step.contentful_id}" => "Yes please"}
-          )
           expect(result).to include(
             {
               "extended_answer_#{answer.step.contentful_id}" => [

From 5f5f8253a5ad8d3040b11d26d2c050b5d6d4fd13 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 9 Mar 2021 10:32:39 +0000
Subject: [PATCH 166/249] SingleDateAnswer presenter returns a hash or values

In following with the migration away from the @extended_answer variable and to the @answer variable that is a single combined hash.
---
 app/presenters/single_date_answer_presenter.rb      |  4 +++-
 .../presenters/single_date_answer_presenter_spec.rb |  8 ++++++++
 spec/services/get_answers_for_steps_spec.rb         | 13 ++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/presenters/single_date_answer_presenter.rb b/app/presenters/single_date_answer_presenter.rb
index d443dfc1d..4a69c2c5d 100644
--- a/app/presenters/single_date_answer_presenter.rb
+++ b/app/presenters/single_date_answer_presenter.rb
@@ -4,6 +4,8 @@ def response
   end
 
   def to_param
-    response
+    {
+      response: response
+    }
   end
 end
diff --git a/spec/presenters/single_date_answer_presenter_spec.rb b/spec/presenters/single_date_answer_presenter_spec.rb
index 5e0771fb3..cfe91ba54 100644
--- a/spec/presenters/single_date_answer_presenter_spec.rb
+++ b/spec/presenters/single_date_answer_presenter_spec.rb
@@ -8,4 +8,12 @@
       expect(presenter.response).to eq("30 Dec 2000")
     end
   end
+
+  describe "#to_param" do
+    it "returns a hash of single_date_answer" do
+      step = build(:single_date_answer, response: Date.new(2000, 12, 30))
+      presenter = described_class.new(step)
+      expect(presenter.to_param).to eql({response: "30 Dec 2000"})
+    end
+  end
 end
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index a935cf17b..4cb1fbcd9 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -38,7 +38,18 @@
     end
 
     context "when the answer is of type single_date_answer" do
-      it_behaves_like "returns the answer in a hash", :single_date_answer, SingleDateAnswerPresenter, "12 Jan 2020"
+      it "returns the answer information in a hash" do
+        answer = create(:single_date_answer, response: Date.new(2000, 12, 30))
+
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "30 Dec 2000"
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
     end
 
     context "when the answer is of type radio_answer" do

From 911bae72ebffdf1fc9bbc3fa1662c9e8adb0da92 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 9 Mar 2021 10:42:14 +0000
Subject: [PATCH 167/249] LongTextAnswer presenter returns a hash or values

In following with the migration away from the @extended_answer variable and to the @answer variable that is a single combined hash.
---
 app/presenters/long_text_answer_presenter.rb       |  4 +++-
 spec/presenters/long_text_answer_presenter_spec.rb |  8 ++++++++
 spec/services/get_answers_for_steps_spec.rb        | 12 +++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/presenters/long_text_answer_presenter.rb b/app/presenters/long_text_answer_presenter.rb
index dd82b8573..f09fd1e01 100644
--- a/app/presenters/long_text_answer_presenter.rb
+++ b/app/presenters/long_text_answer_presenter.rb
@@ -6,6 +6,8 @@ def response
   end
 
   def to_param
-    response
+    {
+      response: response
+    }
   end
 end
diff --git a/spec/presenters/long_text_answer_presenter_spec.rb b/spec/presenters/long_text_answer_presenter_spec.rb
index dce4bfa99..1df73f7c2 100644
--- a/spec/presenters/long_text_answer_presenter_spec.rb
+++ b/spec/presenters/long_text_answer_presenter_spec.rb
@@ -16,4 +16,12 @@
       end
     end
   end
+
+  describe "#to_param" do
+    it "returns a hash of long_text_answer" do
+      step = build(:long_text_answer, response: "First line\r\nSecond line")
+      presenter = described_class.new(step)
+      expect(presenter.to_param).to eql({response: "<p>First line\n<br />Second line</p>"})
+    end
+  end
 end
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index 4cb1fbcd9..9b3180991 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -34,7 +34,17 @@
     end
 
     context "when the answer is of type long_text_answer" do
-      it_behaves_like "returns the answer in a hash", :long_text_answer, LongTextAnswerPresenter, "<p>Red Blue Yellow</p>"
+      it "returns the answer information in a hash" do
+        answer = create(:long_text_answer, response: "Red\r\n\r\n\r\nBlue")
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "<p>Red</p>\n\n<p>Blue</p>"
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
     end
 
     context "when the answer is of type single_date_answer" do

From 91a9152dd17849176623e0522f5dacbe44480189 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 9 Mar 2021 10:45:56 +0000
Subject: [PATCH 168/249] ShortTextAnswer presenter returns a hash or values

In following with the migration away from the @extended_answer variable and to the @answer variable that is a single combined hash.

Remove the now unused shared example
---
 app/presenters/short_text_answer_presenter.rb |  4 ++-
 .../short_text_answer_presenter_spec.rb       |  8 ++++++
 spec/services/get_answers_for_steps_spec.rb   | 28 +++++++++----------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/app/presenters/short_text_answer_presenter.rb b/app/presenters/short_text_answer_presenter.rb
index 4f370d30a..86701d522 100644
--- a/app/presenters/short_text_answer_presenter.rb
+++ b/app/presenters/short_text_answer_presenter.rb
@@ -1,5 +1,7 @@
 class ShortTextAnswerPresenter < SimpleDelegator
   def to_param
-    response
+    {
+      response: response
+    }
   end
 end
diff --git a/spec/presenters/short_text_answer_presenter_spec.rb b/spec/presenters/short_text_answer_presenter_spec.rb
index 69c223f25..45ee3970a 100644
--- a/spec/presenters/short_text_answer_presenter_spec.rb
+++ b/spec/presenters/short_text_answer_presenter_spec.rb
@@ -8,4 +8,12 @@
       expect(presenter.response).to eq("A little of text")
     end
   end
+
+  describe "#to_param" do
+    it "returns a hash of short_text_answer" do
+      step = build(:short_text_answer, response: "Red")
+      presenter = described_class.new(step)
+      expect(presenter.to_param).to eql({response: "Red"})
+    end
+  end
 end
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index 9b3180991..18980136b 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -1,17 +1,5 @@
 require "rails_helper"
 
-RSpec.shared_examples "returns the answer in a hash" do |factory_name, presenter, response|
-  it "returns the response for a #{factory_name} in the result" do
-    answer = create(factory_name, response: response)
-    result = described_class.new(visible_steps: [answer.step]).call
-    expect(result).to include(
-      {
-        "answer_#{answer.step.contentful_id}" => presenter.new(answer).to_param
-      }
-    )
-  end
-end
-
 RSpec.describe GetAnswersForSteps do
   describe "#call" do
     it "only returns answers for the given journey" do
@@ -22,15 +10,25 @@
 
       expect(result).to be_a(Hash)
       expect(result).to include(
-        {"answer_#{relevant_answer.step.contentful_id}" => "Red"}
+        {"answer_#{relevant_answer.step.contentful_id}" => {response: "Red"}}
       )
       expect(result).not_to include(
-        {"answer_#{irrelevant_answer.step.contentful_id}" => "Blue"}
+        {"answer_#{irrelevant_answer.step.contentful_id}" => {response: "Blue"}}
       )
     end
 
     context "when the answer is of type short_text_answer" do
-      it_behaves_like "returns the answer in a hash", :short_text_answer, ShortTextAnswerPresenter, "Red"
+      it "returns the answer information in a hash" do
+        answer = create(:short_text_answer, response: "Red")
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "Red"
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
     end
 
     context "when the answer is of type long_text_answer" do

From 5624ee1d2e5f605c8203c2df9cfa3ee15db9e49d Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 9 Mar 2021 14:36:20 +0000
Subject: [PATCH 169/249] CurrencyAnswer presenter returns a hash or values

In following with the migration away from the @extended_answer variable and to the @answer variable that is a single combined hash.
---
 app/presenters/currency_answer_presenter.rb       |  4 +++-
 spec/presenters/currency_answer_presenter_spec.rb |  8 ++++++++
 spec/services/get_answers_for_steps_spec.rb       | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/presenters/currency_answer_presenter.rb b/app/presenters/currency_answer_presenter.rb
index 05f3309eb..a3f175828 100644
--- a/app/presenters/currency_answer_presenter.rb
+++ b/app/presenters/currency_answer_presenter.rb
@@ -6,6 +6,8 @@ def response
   end
 
   def to_param
-    response
+    {
+      response: response
+    }
   end
 end
diff --git a/spec/presenters/currency_answer_presenter_spec.rb b/spec/presenters/currency_answer_presenter_spec.rb
index bbfc1e113..44f889be5 100644
--- a/spec/presenters/currency_answer_presenter_spec.rb
+++ b/spec/presenters/currency_answer_presenter_spec.rb
@@ -8,4 +8,12 @@
       expect(presenter.response).to eq("£1,000.01")
     end
   end
+
+  describe "#to_param" do
+    it "returns a hash of currency_answer" do
+      step = build(:currency_answer, response: 100.00)
+      presenter = described_class.new(step)
+      expect(presenter.to_param).to eql({response: "£100.00"})
+    end
+  end
 end
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index 18980136b..64f914a22 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -97,6 +97,21 @@
       end
     end
 
+    context "when the answer is of type currency_answer" do
+      it "returns the answer information in a hash" do
+        answer = create(:currency_answer, response: 100.01)
+
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "£100.01"
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
+    end
+
     context "when the answer is of type checkbox_answers" do
       it "returns the answer information in a hash" do
         answer = create(:checkbox_answers,

From f38ae2dc5522285e6864b09203018830e61c92d0 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 9 Mar 2021 14:42:05 +0000
Subject: [PATCH 170/249] Number presenter returns the number as a string

---
 app/presenters/number_answer_presenter.rb       | 4 ++++
 spec/presenters/number_answer_presenter_spec.rb | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/presenters/number_answer_presenter.rb b/app/presenters/number_answer_presenter.rb
index b18d36e46..894ae94d1 100644
--- a/app/presenters/number_answer_presenter.rb
+++ b/app/presenters/number_answer_presenter.rb
@@ -1,4 +1,8 @@
 class NumberAnswerPresenter < SimpleDelegator
+  def response
+    super.to_s
+  end
+  
   def to_param
     response
   end
diff --git a/spec/presenters/number_answer_presenter_spec.rb b/spec/presenters/number_answer_presenter_spec.rb
index 479903566..096795526 100644
--- a/spec/presenters/number_answer_presenter_spec.rb
+++ b/spec/presenters/number_answer_presenter_spec.rb
@@ -2,10 +2,12 @@
 
 RSpec.describe NumberAnswerPresenter do
   describe "#response" do
-    it "returns the response" do
+    it "returns the response as a string" do
       step = build(:number_answer, response: 100)
       presenter = described_class.new(step)
-      expect(presenter.response).to eq(100)
+      expect(presenter.response).to eq("100")
+    end
+  end
     end
   end
 end

From be98ca5d22ebc88922e5c663eb326eb1d994473f Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 9 Mar 2021 14:42:20 +0000
Subject: [PATCH 171/249] NumberAnswer presenter returns a hash or values

In following with the migration away from the @extended_answer variable and to the @answer variable that is a single combined hash.
---
 app/presenters/number_answer_presenter.rb       |  6 ++++--
 spec/presenters/number_answer_presenter_spec.rb |  6 ++++++
 spec/services/get_answers_for_steps_spec.rb     | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/presenters/number_answer_presenter.rb b/app/presenters/number_answer_presenter.rb
index 894ae94d1..bfc596819 100644
--- a/app/presenters/number_answer_presenter.rb
+++ b/app/presenters/number_answer_presenter.rb
@@ -2,8 +2,10 @@ class NumberAnswerPresenter < SimpleDelegator
   def response
     super.to_s
   end
-  
+
   def to_param
-    response
+    {
+      response: response
+    }
   end
 end
diff --git a/spec/presenters/number_answer_presenter_spec.rb b/spec/presenters/number_answer_presenter_spec.rb
index 096795526..32af5c4cd 100644
--- a/spec/presenters/number_answer_presenter_spec.rb
+++ b/spec/presenters/number_answer_presenter_spec.rb
@@ -8,6 +8,12 @@
       expect(presenter.response).to eq("100")
     end
   end
+
+  describe "#to_param" do
+    it "returns a hash of number_answer" do
+      step = build(:number_answer, response: 1)
+      presenter = described_class.new(step)
+      expect(presenter.to_param).to eql({response: "1"})
     end
   end
 end
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index 64f914a22..84629c5a2 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -112,6 +112,21 @@
       end
     end
 
+    context "when the answer is of type number_answer" do
+      it "returns the answer information in a hash" do
+        answer = create(:number_answer, response: 2)
+
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "2"
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
+    end
+
     context "when the answer is of type checkbox_answers" do
       it "returns the answer information in a hash" do
         answer = create(:checkbox_answers,

From 84f6f0ee18bf73491d4c4b3468280e29479aa194 Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Tue, 9 Mar 2021 16:42:31 +0000
Subject: [PATCH 172/249] Checkbox and radio answers store the human readable
 choice

This fixes a problem where branching required the content user to pass
in a machine readable value.
---
 app/views/steps/checkboxes.html.erb                       | 8 ++++----
 app/views/steps/radios.html.erb                           | 4 ++--
 spec/factories/answer.rb                                  | 2 +-
 .../visitors/anyone_can_edit_their_answers_spec.rb        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index dcf944aae..be589abb2 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -11,21 +11,21 @@
       <% if option.fetch("separated_by_or", nil) == true %>
         <div class="govuk-radios__divider">or</div>
       <% end %>
-      
+
       <% f.object = monkey_patch_form_object_with_further_information_field(form_object: f.object, associated_choice: machine_value) %>
 
       <% if option["display_further_information"] == true || option["display_further_information"] == "single" %>
-        <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
+        <%= f.govuk_check_box :response, option["value"], label: { text: option["value"] } do %>
           <%= f.govuk_text_field "#{machine_value}_further_information",
             label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
         <% end %>
       <% elsif option["display_further_information"] == "long" %>
-        <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } do %>
+        <%= f.govuk_check_box :response, option["value"], label: { text: option["value"] } do %>
           <%= f.govuk_text_area "#{machine_value}_further_information", rows: 6,
             label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
         <% end %>
       <% else %>
-        <%= f.govuk_check_box :response, machine_value, label: { text: option["value"] } %>
+        <%= f.govuk_check_box :response, option["value"], label: { text: option["value"] } %>
       <% end %>
     <% end %>
   <% end %>
diff --git a/app/views/steps/radios.html.erb b/app/views/steps/radios.html.erb
index f99e47b9d..2f95767c6 100644
--- a/app/views/steps/radios.html.erb
+++ b/app/views/steps/radios.html.erb
@@ -12,7 +12,7 @@
         <div class="govuk-radios__divider">or</div>
       <% end %>
       <% if option["display_further_information"] %>
-        <%= f.govuk_radio_button :response, option["value"].downcase, label: { text: option["value"] }, hint: { text: option["help_text"] } do %>
+        <%= f.govuk_radio_button :response, option["value"], label: { text: option["value"] }, hint: { text: option["help_text"] } do %>
           <% if option["display_further_information"] == "single" || option["display_further_information"] == true %>
             <%= f.govuk_text_field :further_information, label: { text: option["further_information_help_text"] } %>
           <% elsif option["display_further_information"] == "long" %>
@@ -21,7 +21,7 @@
         <% end %>
       <% else %>
         <!-- We have to include this if there is no block given, selecting an option causes a page jump as a conditional element is toggled by the form builder -->
-        <%= f.govuk_radio_button :response, option["value"].downcase, label: { text: option["value"] }, hint: { text: option["help_text"] } %>
+        <%= f.govuk_radio_button :response, option["value"], label: { text: option["value"] }, hint: { text: option["help_text"] } %>
       <% end %>
     <% end %>
   <% end %>
diff --git a/spec/factories/answer.rb b/spec/factories/answer.rb
index 378dd3ea4..2b174a61e 100644
--- a/spec/factories/answer.rb
+++ b/spec/factories/answer.rb
@@ -27,7 +27,7 @@
   factory :checkbox_answers do
     association :step, factory: :step, options: [{"value" => "Breakfast"}, {"value" => "Lunch"}], contentful_type: "checkboxes", contentful_model: "question"
 
-    response { ["breakfast", "lunch", ""] }
+    response { ["Breakfast", "Lunch", ""] }
     skipped { false }
   end
 
diff --git a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
index 4c8fccbeb..277968f95 100644
--- a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
+++ b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
@@ -59,7 +59,7 @@
   end
 
   context "when the question is checkbox_answers" do
-    let(:answer) { create(:checkbox_answers, response: ["breakfast", "lunch", ""]) }
+    let(:answer) { create(:checkbox_answers, response: ["Breakfast", "Lunch", ""]) }
 
     scenario "The edited answer is saved" do
       visit journey_path(answer.step.journey)

From 6f78d7d448cbdf186142c69c753a78d4b0af2a0e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Mar 2021 11:03:28 +0000
Subject: [PATCH 173/249] Bump govuk_design_system_formbuilder from 2.1.9 to
 2.2.0

Bumps [govuk_design_system_formbuilder](https://github.com/DFE-Digital/govuk_design_system_formbuilder) from 2.1.9 to 2.2.0.
- [Release notes](https://github.com/DFE-Digital/govuk_design_system_formbuilder/releases)
- [Commits](https://github.com/DFE-Digital/govuk_design_system_formbuilder/compare/v2.1.9...v2.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 583642006..21232fc91 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem "bootsnap", ">= 1.1.0", require: false
 gem "climate_control"
 gem "coffee-rails", "~> 5.0"
 gem "contentful", "~> 2.15"
-gem "govuk_design_system_formbuilder", "~> 2.1"
+gem "govuk_design_system_formbuilder", "~> 2.2"
 gem "high_voltage"
 gem "htmltoword"
 gem "jbuilder", "~> 2.11"
diff --git a/Gemfile.lock b/Gemfile.lock
index ffe433720..dabed10d5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -136,7 +136,7 @@ GEM
       raabro (~> 1.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    govuk_design_system_formbuilder (2.1.9)
+    govuk_design_system_formbuilder (2.2.0)
       actionview (>= 5.2)
       activemodel (>= 5.2)
       activesupport (>= 5.2)
@@ -372,7 +372,7 @@ DEPENDENCIES
   dotenv-rails
   factory_bot_rails
   faker
-  govuk_design_system_formbuilder (~> 2.1)
+  govuk_design_system_formbuilder (~> 2.2)
   high_voltage
   htmltoword
   jbuilder (~> 2.11)

From a979b6fe3a512b56694551442c716e4dd15f8f1c Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 10 Mar 2021 11:45:59 +0000
Subject: [PATCH 174/249] Fix skipping answers so that previous choices are
 removed

The previous version of this code `answer.assign_attributes({:response=>nil})` does not change the response column. Probably because at a database level a column with the type Array cannot be set to nil so the update is ignored.

Setting this to an emprt array `[]` has the same result, nothing changes.

The only way I found to remove the old choices is to set an empty string in the array.
---
 app/controllers/answers_controller.rb                       | 2 +-
 .../features/visitors/anyone_can_complete_a_journey_spec.rb | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 7f32222e9..7079cefe6 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -53,7 +53,7 @@ def answer_params
   end
 
   def checkbox_params
-    return {skipped: true, response: nil, further_information: nil} if skip_answer?
+    return {skipped: true, response: [""], further_information: nil} if skip_answer?
 
     answer_params = params.require(:answer)
 
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index f4d92af1d..8dbbcc6df 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -310,6 +310,11 @@
       expect(page).to have_content("can't be blank")
 
       check("Lunch")
+      check("Dinner")
+      click_on(I18n.t("generic.button.next"))
+
+      click_first_link_in_task_list
+
       click_on("None of the above")
 
       within(".app-task-list") do
@@ -319,7 +324,6 @@
       click_first_link_in_task_list
 
       expect(page).not_to have_checked_field("Lunch")
-
       expect(CheckboxAnswers.last.skipped).to be true
     end
   end

From ce25034c8a7ced17368a37ad123c96f3f0c539bb Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Wed, 10 Mar 2021 12:33:25 +0000
Subject: [PATCH 175/249] Radio further information fields no longer
 auto-generates it's own label

...when one is not provided
---
 app/views/steps/radios.html.erb                             | 4 ++--
 .../features/visitors/anyone_can_complete_a_journey_spec.rb | 6 ++++++
 spec/fixtures/contentful/steps/extended-radio-question.json | 3 +--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/views/steps/radios.html.erb b/app/views/steps/radios.html.erb
index 2f95767c6..ee4ac688e 100644
--- a/app/views/steps/radios.html.erb
+++ b/app/views/steps/radios.html.erb
@@ -14,9 +14,9 @@
       <% if option["display_further_information"] %>
         <%= f.govuk_radio_button :response, option["value"], label: { text: option["value"] }, hint: { text: option["help_text"] } do %>
           <% if option["display_further_information"] == "single" || option["display_further_information"] == true %>
-            <%= f.govuk_text_field :further_information, label: { text: option["further_information_help_text"] } %>
+            <%= f.govuk_text_field :further_information, label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
           <% elsif option["display_further_information"] == "long" %>
-            <%= f.govuk_text_area :further_information, rows: 6, label: { text: option["further_information_help_text"] } %>
+            <%= f.govuk_text_area :further_information, rows: 6, label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
           <% end %>
         <% end %>
       <% else %>
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index f4d92af1d..d6be86224 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -224,6 +224,12 @@
           start_journey_from_category_and_go_to_question(category: "extended-radio-question.json")
 
           choose("Catering")
+
+          expect(page).not_to have_content("No_further_information") # It should not create a label when one isn't specified
+          within("span.govuk-visually-hidden") do
+            expect(page).to have_content("Optional further information") # Default the hidden label to something understandable for screen readers
+          end
+
           fill_in "answer[further_information]", with: "The school needs the kitchen cleaned once a day"
 
           click_on(I18n.t("generic.button.next"))
diff --git a/spec/fixtures/contentful/steps/extended-radio-question.json b/spec/fixtures/contentful/steps/extended-radio-question.json
index d564b8899..519697a02 100644
--- a/spec/fixtures/contentful/steps/extended-radio-question.json
+++ b/spec/fixtures/contentful/steps/extended-radio-question.json
@@ -37,8 +37,7 @@
           {
               "value": "Catering",
               "help_text": "",
-              "display_further_information": true,
-              "further_information_help_text": "Briefly describe why you need catering"
+              "display_further_information": true
           },
           {
               "value": "Cleaning",

From f0f760dece02dab537b76c48baf187831b10ce7e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 9 Mar 2021 15:28:18 +0000
Subject: [PATCH 176/249] Remove @extended_answer variables used by the spec

Now that the @answer variables have a has structure with all the further information included, these aren't needed.

Use hash with_indifference_access so that Liquid can use the `["key"]` syntax. Using symbols `[:key]` breaks the liquid parser.

In the fixture we include a specification_template that includes a subtle difference. We are using both syntaxes for accessing the hash. The more traditional `["key"]` and the dot syntax `.key`, just to ensure we have test coverage for both.
---
 CHANGELOG.md                                  |  1 +
 app/services/get_answers_for_steps.rb         | 21 +-------------
 .../extended-checkboxes-question.json         |  2 +-
 spec/services/get_answers_for_steps_spec.rb   | 29 +++++--------------
 4 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b238c3233..fa39d23cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - checkbox answers can be completed without choosing a given answer
 - fix planning page link back to the service
 - checkbox answers are not automatically joined by commas for the specification
+- answer data is all available through the single `answer_x` convention, this has replaced `extended_answer_x` which has now been removed
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/services/get_answers_for_steps.rb b/app/services/get_answers_for_steps.rb
index 2cae7dab9..5b25111ab 100644
--- a/app/services/get_answers_for_steps.rb
+++ b/app/services/get_answers_for_steps.rb
@@ -23,26 +23,7 @@ def call
       else raise UnexpectedAnswer.new("Trying to present an unknown type of answer: #{step.answer.class.name}")
       end
 
-      if answer.respond_to?(:further_information)
-        hash["extended_answer_#{step.contentful_id}"] = if answer.further_information.is_a?(Hash)
-          answer.further_information.each_pair.each_with_object([]) do |(key, value), array|
-            key_without_prefix = key.gsub("_further_information", "")
-            array << {
-              "response" => human_readable_option(string: key_without_prefix),
-              "further_information" => value
-            }
-          end
-        else
-          [
-            {
-              "response" => answer.response,
-              "further_information" => answer.further_information
-            }
-          ]
-        end
-      end
-
-      hash["answer_#{step.contentful_id}"] = answer.to_param
+      hash["answer_#{step.contentful_id}"] = answer.to_param.with_indifferent_access
     }
   end
 end
diff --git a/spec/fixtures/contentful/categories/extended-checkboxes-question.json b/spec/fixtures/contentful/categories/extended-checkboxes-question.json
index 1c66f8d39..a96872ddf 100644
--- a/spec/fixtures/contentful/categories/extended-checkboxes-question.json
+++ b/spec/fixtures/contentful/categories/extended-checkboxes-question.json
@@ -39,6 +39,6 @@
             }
           }
         ],
-        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1><p>{{answer_extended-checkboxes-question}}</p><ul>{% for extended_answer in extended_answer_extended-checkboxes-question %}<li>{{ extended_answer['response'] }}</li><li>{{ extended_answer['further_information'] }}</li>{% endfor %}</ul></article>"
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1><ul>{% for checkbox_answer in answer_extended-checkboxes-question['selected_answers'] %}<li>{{ checkbox_answer['human_value'] }}</li><li>{{ checkbox_answer.further_information }}</li>{% endfor %}</ul></article>"
     }
 }
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index 84629c5a2..e6af62a30 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -17,6 +17,12 @@
       )
     end
 
+    it "returns a hash with_indifferent_access so Liquid can use the string syntax for access" do
+      answer = create(:short_text_answer, response: "Red")
+      result = described_class.new(visible_steps: [answer.step]).call
+      expect(result).to include({"answer_#{answer.step.contentful_id}" => {"response" => "Red"}})
+    end
+
     context "when the answer is of type short_text_answer" do
       it "returns the answer information in a hash" do
         answer = create(:short_text_answer, response: "Red")
@@ -64,37 +70,18 @@
       it "returns the answer information in a hash" do
         answer = create(:radio_answer,
           response: "Yes please",
-          further_information: nil)
+          further_information: "More yes info")
 
         result = described_class.new(visible_steps: [answer.step]).call
         assertion = {
           "answer_#{answer.step.contentful_id}" => {
             response: "Yes please",
-            further_information: nil
+            further_information: "More yes info"
           }
         }
 
         expect(result).to match(a_hash_including(assertion))
       end
-
-      context "when the answer has further_information" do
-        it "also includes an extended_answer hash in the response" do
-          answer = create(:radio_answer,
-            response: "yes please",
-            further_information: "More yes info")
-          result = described_class.new(visible_steps: [answer.step]).call
-          expect(result).to include(
-            {
-              "extended_answer_#{answer.step.contentful_id}" => [
-                {
-                  "response" => "Yes please",
-                  "further_information" => "More yes info"
-                }
-              ]
-            }
-          )
-        end
-      end
     end
 
     context "when the answer is of type currency_answer" do

From ef79475f9a60f87e75f14f6f3a6dad78903236da Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 9 Mar 2021 15:47:59 +0000
Subject: [PATCH 177/249] CheckboxAnswers that are skipped can be identified in
 the spec

---
 CHANGELOG.md                                         |  1 +
 ...yone_can_see_their_catering_specification_spec.rb | 12 ++++++++++++
 .../categories/skippable-checkboxes-question.json    |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa39d23cf..f31507a71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - fix planning page link back to the service
 - checkbox answers are not automatically joined by commas for the specification
 - answer data is all available through the single `answer_x` convention, this has replaced `extended_answer_x` which has now been removed
+- checkbox answers that are skipped can be identified in the specification
 
 ## [release-005] - 2021-1-19
 
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
index f3065bc3a..2746c15fe 100644
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
@@ -58,6 +58,18 @@
     end
   end
 
+  scenario "questions that are skipped can be identified" do
+    stub_contentful_category(fixture_filename: "skippable-checkboxes-question.json")
+    visit root_path
+    click_on(I18n.t("generic.button.start"))
+
+    click_first_link_in_task_list
+
+    click_on("None of the above")
+
+    expect(page).to have_content("Skipped question detected")
+  end
+
   context "when the spec is incomplete" do
     it "warns the user that the contents are in a partially completed state" do
       stub_contentful_category(fixture_filename: "extended-radio-question.json")
diff --git a/spec/fixtures/contentful/categories/skippable-checkboxes-question.json b/spec/fixtures/contentful/categories/skippable-checkboxes-question.json
index 8765718ca..e6ff784a2 100644
--- a/spec/fixtures/contentful/categories/skippable-checkboxes-question.json
+++ b/spec/fixtures/contentful/categories/skippable-checkboxes-question.json
@@ -39,6 +39,6 @@
             }
           }
         ],
-        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1>{% if answer_skippable-checkboxes-question['skipped'] == true %}Skipped question detected{% endif %}</article>"
     }
 }

From 6575d4ab3b62feef37234a4dcb483f3b57133807 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 9 Mar 2021 17:39:10 +0000
Subject: [PATCH 178/249] Multiple answers can unlock the same branching
 question

This change fixes a bug where one question with branching logic could not unlock the same question baed on more than one required answer.

For example, if question A should show question B if the answer was "Blue" **or** question B if the answer was "Red". The rules would be iterated through one at a time, the first rule would correctly unlock the first question, but the second rule would incorrectly hide it again (straight away). The behaviour we want is: if any rule matches we show it and it stays shown until updated again.

We can achieve this by simply switching the order of how we show and hide all rules. If we go through all the hides first we can never have the case where we re-hide a question that was shown in the current toggle action.
---
 CHANGELOG.md                                  |  1 +
 app/services/toggle_additional_steps.rb       |  2 +-
 spec/services/toggle_additional_steps_spec.rb | 23 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f31507a71..0aa0def52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - checkbox answers are not automatically joined by commas for the specification
 - answer data is all available through the single `answer_x` convention, this has replaced `extended_answer_x` which has now been removed
 - checkbox answers that are skipped can be identified in the specification
+- fix branching so multiple rules can show the same question
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index c0758571e..ff9c7351d 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -8,8 +8,8 @@ def initialize(step:)
   def call
     return unless additional_step_rules
 
-    recursively_show_additional_steps!(current_step: step, next_steps: additional_steps_to_show(step: step))
     recursively_hide_additional_steps!(next_steps: additional_steps_to_hide)
+    recursively_show_additional_steps!(current_step: step, next_steps: additional_steps_to_show(step: step))
   end
 
   private
diff --git a/spec/services/toggle_additional_steps_spec.rb b/spec/services/toggle_additional_steps_spec.rb
index 0b23e72b9..788a25b08 100644
--- a/spec/services/toggle_additional_steps_spec.rb
+++ b/spec/services/toggle_additional_steps_spec.rb
@@ -142,6 +142,29 @@
         end
       end
 
+      context "when a branching question is shown based on more than on matching answer" do
+        it "continues to show the next step (rather than hiding it again when it doesn't match the second rule)" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rules: [
+              {"required_answer" => "red", "question_identifiers" => ["123"]},
+              {"required_answer" => "blue", "question_identifiers" => ["123"]}
+            ])
+          create(:radio_answer, step: step, response: "red")
+
+          step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: true)
+
+          described_class.new(step: step).call
+
+          expect(step_to_show.reload.hidden).to eq(false)
+        end
+      end
+
       context "when the answers DO NOT match" do
         it "updates the referenced step's hidden field to true" do
           step = create(:step,

From 48d42676d5ef5e68f80ee2cdb9f7d0b39d55b9a5 Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Wed, 10 Mar 2021 15:28:08 +0000
Subject: [PATCH 179/249] Machine_readable_option filters out characters using
 parameterize

---
 app/helpers/answer_helper.rb       | 2 +-
 spec/helpers/answer_helper_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/answer_helper.rb b/app/helpers/answer_helper.rb
index b5e3f897f..62eb143ba 100644
--- a/app/helpers/answer_helper.rb
+++ b/app/helpers/answer_helper.rb
@@ -6,6 +6,6 @@ def human_readable_option(string:)
   end
 
   def machine_readable_option(string:)
-    string.tr(" ", "_").downcase
+    string.parameterize(separator: "_")
   end
 end
diff --git a/spec/helpers/answer_helper_spec.rb b/spec/helpers/answer_helper_spec.rb
index 9fc91c6be..0c6639dc9 100644
--- a/spec/helpers/answer_helper_spec.rb
+++ b/spec/helpers/answer_helper_spec.rb
@@ -9,8 +9,8 @@
   end
 
   describe "#machine_readable_option" do
-    it "replaces spaces with underscores and downcases the string" do
-      result = helper.machine_readable_option(string: "A LONG key with inconsistent casing")
+    it "replaces spaces with underscores, removes special characters and downcases the string" do
+      result = helper.machine_readable_option(string: "A LONG key with inconsistent casing &*()%$")
       expect(result).to eql("a_long_key_with_inconsistent_casing")
     end
   end

From 005fcd03c9c3ea32fe7e73e83aaaaea25a5f4e2e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 11 Mar 2021 12:04:34 +0000
Subject: [PATCH 180/249] Prevent sensitive files that may be comitted by
 accident

This was a recent learning from a dxw incident review to protect contributors from accidentally committing files that include sensitive information to GitHub.
---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index e944baf96..4dc8a45f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,3 +102,9 @@ crash.log
 *.tfvars
 .terraformrc
 terraform.rc
+
+# Data dumps (might lead to accidental data breach)
+*.dump
+*.sql
+*.csv
+*.xls

From 14f49b6f0d312ad555a50f6a20acf3e9818a0408 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 10 Mar 2021 16:46:32 +0000
Subject: [PATCH 181/249] A specification lives on it's own page

---
 CHANGELOG.md                                  |  1 +
 app/controllers/journeys_controller.rb        | 14 -------
 app/controllers/specifications_controller.rb  | 37 +++++++++++++++++++
 app/views/journeys/show.html.erb              | 14 +------
 app/views/specifications/show.html.erb        | 14 +++++++
 config/brakeman.ignore                        | 20 +++++-----
 config/locales/en.yml                         |  1 +
 config/routes.rb                              |  1 +
 ...nload_their_catering_specification_spec.rb |  1 +
 ...n_see_their_catering_specification_spec.rb |  5 +++
 10 files changed, 71 insertions(+), 37 deletions(-)
 create mode 100644 app/controllers/specifications_controller.rb
 create mode 100644 app/views/specifications/show.html.erb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aa0def52..d934babc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - answer data is all available through the single `answer_x` convention, this has replaced `extended_answer_x` which has now been removed
 - checkbox answers that are skipped can be identified in the specification
 - fix branching so multiple rules can show the same question
+- the specification lives on it's own page, separate to the task list
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index fa5bfa610..ff15d9452 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -34,20 +34,6 @@ def show
       :currency_answer
     ])
     @step_presenters = @visible_steps.map { |step| StepPresenter.new(step) }
-
-    @specification_template = Liquid::Template.parse(
-      @journey.liquid_template, error_mode: :strict
-    )
-
-    @answers = GetAnswersForSteps.new(visible_steps: @visible_steps).call
-    @specification_html = @specification_template.render(@answers)
-
-    respond_to do |format|
-      format.html
-      format.docx do
-        render docx: "specification.docx", content: @specification_html
-      end
-    end
   end
 
   private
diff --git a/app/controllers/specifications_controller.rb b/app/controllers/specifications_controller.rb
new file mode 100644
index 000000000..686ecb438
--- /dev/null
+++ b/app/controllers/specifications_controller.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class SpecificationsController < ApplicationController
+  def show
+    @journey = Journey.find(journey_id)
+    @visible_steps = @journey.visible_steps.includes([
+      :radio_answer,
+      :short_text_answer,
+      :long_text_answer,
+      :single_date_answer,
+      :checkbox_answers,
+      :number_answer,
+      :currency_answer
+    ])
+    @step_presenters = @visible_steps.map { |step| StepPresenter.new(step) }
+
+    @specification_template = Liquid::Template.parse(
+      @journey.liquid_template, error_mode: :strict
+    )
+
+    @answers = GetAnswersForSteps.new(visible_steps: @visible_steps).call
+    @specification_html = @specification_template.render(@answers)
+
+    respond_to do |format|
+      format.html
+      format.docx do
+        render docx: "specification.docx", content: @specification_html
+      end
+    end
+  end
+
+  private
+
+  def journey_id
+    params[:journey_id]
+  end
+end
diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index e5e4d29b2..a78b2c24c 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -5,7 +5,6 @@
 <%= render "resume_journey_notice" %>
 
 <ol class="app-task-list">
-
   <% section_group_with_steps(journey: @journey, steps: @step_presenters).each do |grouping| %>
     <h2 class="app-task-list__section"><%= grouping["title"] %></h2>
     <li>
@@ -14,15 +13,4 @@
   <% end %>
 </ol>
 
-<h1 class="govuk-heading-l"><%= I18n.t("journey.specification.header") %></h1>
-<% unless @journey.all_steps_completed? %>
-  <div class="govuk-warning-text">
-    <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
-    <strong class="govuk-warning-text__text">
-      <span class="govuk-warning-text__assistive">Warning</span>
-      <%= I18n.t("journey.specification.warning") %>
-    </strong>
-  </div>
-<% end %>
-<%= link_to "Download (.docx)", journey_path(@journey, format: :docx), class: "govuk-button" %>
-<%= @specification_html.html_safe %>
+<%= link_to I18n.t("journey.specification.button"), journey_specification_path(@journey), class: "govuk-button" %>
diff --git a/app/views/specifications/show.html.erb b/app/views/specifications/show.html.erb
new file mode 100644
index 000000000..bfc68637d
--- /dev/null
+++ b/app/views/specifications/show.html.erb
@@ -0,0 +1,14 @@
+<%= content_for :title, @journey.category.capitalize %>
+
+<h1 class="govuk-heading-xl"><%= I18n.t("journey.specification.header") %></h1>
+<% unless @journey.all_steps_completed? %>
+  <div class="govuk-warning-text">
+    <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
+    <strong class="govuk-warning-text__text">
+      <span class="govuk-warning-text__assistive">Warning</span>
+      <%= I18n.t("journey.specification.warning") %>
+    </strong>
+  </div>
+<% end %>
+<%= link_to "Download (.docx)", journey_specification_path(@journey, format: :docx), class: "govuk-button" %>
+<%= @specification_html.html_safe %>
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index 5d7fd657f..db7ac14a0 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -3,35 +3,35 @@
     {
       "warning_type": "Cross-Site Scripting",
       "warning_code": 2,
-      "fingerprint": "cf9010da503c2276ed17469cdc002d84afdc182b5e87adae78716ab10c2eb928",
+      "fingerprint": "9e0249e5929623c7ab1fd850ad5e15b49356e4a7ab235bc0373e98998bd3b321",
       "check_name": "CrossSiteScripting",
       "message": "Unescaped model attribute",
-      "file": "app/views/journeys/show.html.erb",
-      "line": 28,
+      "file": "app/views/specifications/show.html.erb",
+      "line": 15,
       "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
       "code": "Liquid::Template.parse(Journey.find(journey_id).liquid_template, :error_mode => :strict).render(GetAnswersForSteps.new(:visible_steps => Journey.find(journey_id).visible_steps.includes([:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers, :number_answer, :currency_answer])).call)",
       "render_path": [
         {
           "type": "controller",
-          "class": "JourneysController",
+          "class": "SpecificationsController",
           "method": "show",
-          "line": 46,
-          "file": "app/controllers/journeys_controller.rb",
+          "line": 25,
+          "file": "app/controllers/specifications_controller.rb",
           "rendered": {
-            "name": "journeys/show",
-            "file": "app/views/journeys/show.html.erb"
+            "name": "specifications/show",
+            "file": "app/views/specifications/show.html.erb"
           }
         }
       ],
       "location": {
         "type": "template",
-        "template": "journeys/show"
+        "template": "specifications/show"
       },
       "user_input": "Journey.find(journey_id).liquid_template",
       "confidence": "Weak",
       "note": ""
     }
   ],
-  "updated": "2021-02-24 11:55:12 +0000",
+  "updated": "2021-03-11 12:09:01 +0000",
   "brakeman_version": "5.0.0"
 }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 32c3d9562..9ffa0f286 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -57,6 +57,7 @@ en:
     specification:
       header: "Your specification"
       warning: "You have not completed all the tasks. There may be information missing from your specification."
+      button: "View your specification"
   task_list:
     status:
       not_started: Not started
diff --git a/config/routes.rb b/config/routes.rb
index 4611b9586..0cb716cf6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -8,6 +8,7 @@
 
   resource :journey_map, only: [:new]
   resources :journeys, only: [:new, :show] do
+    resource :specification, only: [:show]
     resources :steps, only: [:new, :show, :edit] do
       resources :answers, only: [:create, :update]
     end
diff --git a/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
index e5b2a9d0f..40c77a72b 100644
--- a/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
@@ -5,6 +5,7 @@
     choose("Catering")
 
     click_on(I18n.t("generic.button.next"))
+    click_on(I18n.t("journey.specification.button"))
 
     expect(page).to have_content(I18n.t("journey.specification.header"))
 
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
index 2746c15fe..c3f8b734c 100644
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
@@ -4,6 +4,7 @@
 
     choose("Catering")
     click_on(I18n.t("generic.button.next"))
+    click_on(I18n.t("journey.specification.button"))
 
     expect(page).to have_content(I18n.t("journey.specification.header"))
 
@@ -25,6 +26,7 @@
     choose("Catering")
     fill_in "answer[further_information]", with: "The school needs the kitchen cleaned once a day"
     click_on(I18n.t("generic.button.next"))
+    click_on(I18n.t("journey.specification.button"))
 
     expect(page).to have_content(I18n.t("journey.specification.header"))
 
@@ -47,6 +49,7 @@
     fill_in "answer[no_further_information]", with: "More info for no"
 
     click_on(I18n.t("generic.button.next"))
+    click_on(I18n.t("journey.specification.button"))
 
     expect(page).to have_content(I18n.t("journey.specification.header"))
 
@@ -66,6 +69,7 @@
     click_first_link_in_task_list
 
     click_on("None of the above")
+    click_on(I18n.t("journey.specification.button"))
 
     expect(page).to have_content("Skipped question detected")
   end
@@ -78,6 +82,7 @@
 
       # Don't answer any questions to create a in progress spec
 
+      click_on(I18n.t("journey.specification.button"))
       expect(page).to have_content("You have not completed all the tasks. There may be information missing from your specification.")
     end
   end

From c2d0f0c4152733250e541d9ff8cf80ef42f5427e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 10 Mar 2021 17:27:12 +0000
Subject: [PATCH 182/249] Internationalise existing back button copy for reuse

---
 app/views/pages/planning_start_page.html.erb                    | 2 +-
 config/locales/en.yml                                           | 1 +
 .../visitors/anyone_can_see_a_planning_start_page_spec.rb       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/pages/planning_start_page.html.erb b/app/views/pages/planning_start_page.html.erb
index 0800b5259..dca08cdab 100644
--- a/app/views/pages/planning_start_page.html.erb
+++ b/app/views/pages/planning_start_page.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :title, I18n.t("planning.start_page.page_title") %>
-<%= link_to "Back", root_path, class: "govuk-back-link" %>
+<%= link_to I18n.t("generic.button.back"), root_path, class: "govuk-back-link" %>
 
 <h1 class="govuk-heading-xl"><%= I18n.t("planning.start_page.page_title") %></h1>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9ffa0f286..8504bab22 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -6,6 +6,7 @@ en:
       default: "%-d %b %Y"
   generic:
     button:
+      back: "Back"
       start: "Start"
       next: "Continue"
       change_answer: "Change"
diff --git a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
index 7c660b400..c9fb749f4 100644
--- a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
+++ b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
@@ -50,7 +50,7 @@
 
     expect(page).to have_content(I18n.t("planning.start_page.page_title"))
 
-    click_on("Back")
+    click_on(I18n.t("generic.button.back"))
 
     expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
   end

From fc8e61a1fe83f344f558f28ea8d603c4eb69b583 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 10 Mar 2021 17:29:04 +0000
Subject: [PATCH 183/249] Specification page links back to the task list

Copy the back button we use on the planning start page.
---
 app/views/specifications/show.html.erb                |  1 +
 ...nyone_can_see_their_catering_specification_spec.rb | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/views/specifications/show.html.erb b/app/views/specifications/show.html.erb
index bfc68637d..ff9b21e21 100644
--- a/app/views/specifications/show.html.erb
+++ b/app/views/specifications/show.html.erb
@@ -1,4 +1,5 @@
 <%= content_for :title, @journey.category.capitalize %>
+<%= link_to I18n.t("generic.button.back"), journey_path(@journey), class: "govuk-back-link" %>
 
 <h1 class="govuk-heading-xl"><%= I18n.t("journey.specification.header") %></h1>
 <% unless @journey.all_steps_completed? %>
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
index c3f8b734c..90da28c79 100644
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
@@ -16,6 +16,17 @@
     end
   end
 
+  scenario "navigates back to the task list" do
+    stub_contentful_category(fixture_filename: "extended-radio-question.json")
+    visit root_path
+    click_on(I18n.t("generic.button.start"))
+
+    click_on(I18n.t("journey.specification.button"))
+
+    click_on(I18n.t("generic.button.back"))
+    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+  end
+
   scenario "renders radio responses that have futher information" do
     stub_contentful_category(fixture_filename: "extended-radio-question.json")
     visit root_path

From 90063aba5aab7e0100a3e1eda43f1447f1525d75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:04:06 +0000
Subject: [PATCH 184/249] Bump faker from 2.16.0 to 2.17.0

Bumps [faker](https://github.com/faker-ruby/faker) from 2.16.0 to 2.17.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.16.0...v2.17.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3e8df6eaf..a8c3711f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,7 +125,7 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    faker (2.16.0)
+    faker (2.17.0)
       i18n (>= 1.6, < 2)
     ffi (1.14.2)
     ffi-compiler (1.0.1)

From b3b8341120dd38e0c9bf13be4e32dad078896d32 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 15 Mar 2021 10:56:15 +0000
Subject: [PATCH 185/249] Further information info for fields with special
 characters can be saved

Before this change our whitelisting for dynamic further information fields returned this:

```
[:yes_further_information, :no_further_information, :"other,_please_specify_further_information"]
```

The parameters returned from the form for the 'other' option here no longer matched and so was therefore being ignored:

```
"other_please_specify_further_information"=>"Other information"
```

We use the same `machine_readable_option` method that is used in the form so the keys should always match in future.
---
 CHANGELOG.md                                           |  1 +
 app/controllers/answers_controller.rb                  |  4 +++-
 .../visitors/anyone_can_complete_a_journey_spec.rb     | 10 +++++++++-
 .../contentful/steps/extended-checkboxes-question.json |  5 +++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d934babc9..39d17f551 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - checkbox answers that are skipped can be identified in the specification
 - fix branching so multiple rules can show the same question
 - the specification lives on it's own page, separate to the task list
+- fix checkbox questions where further information couldn't be saved for an option that included a special character
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 7079cefe6..3665e41e5 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -2,6 +2,7 @@
 
 class AnswersController < ApplicationController
   include DateHelper
+  include AnswerHelper
 
   def create
     @journey = Journey.find(journey_id)
@@ -59,7 +60,8 @@ def checkbox_params
 
     if @step.options
       allowed_further_information_keys = @step.options.map { |option|
-        "#{option["value"].tr(" ", "_").downcase}_further_information".to_sym
+        key = machine_readable_option(string: option["value"])
+        "#{key}_further_information".to_sym
       }
     end
 
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 6a631c6df..84c04ddc2 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -168,12 +168,16 @@
           fill_in "answer[yes_further_information]", with: "The first piece of further information"
 
           check("No")
-          expect(page).not_to have_content("No_further_information") # It should not create a label which one isn't specified
+          expect(page).not_to have_content("No_further_information") # It should not create a label when text for one isn't provided
           within("span.govuk-visually-hidden") do
             expect(page).to have_content("Optional further information") # Default the hidden label to something understandable for screen readers
           end
           fill_in "answer[no_further_information]", with: "A second piece of further information"
 
+          # We are testing a value that includes a comma
+          check("Other, please specify")
+          fill_in "answer[other_please_specify_further_information]", with: "Other information"
+
           click_on(I18n.t("generic.button.next"))
 
           click_first_link_in_task_list
@@ -185,6 +189,10 @@
           expect(page).to have_checked_field("No")
           expect(find_field("answer-no-further-information-field").value)
             .to eql("A second piece of further information")
+
+          expect(page).to have_checked_field("Other, please specify")
+          expect(find_field("answer-other-please-specify-further-information-field").value)
+            .to eql("Other information")
         end
       end
 
diff --git a/spec/fixtures/contentful/steps/extended-checkboxes-question.json b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
index 72a2b7e64..00cf863e1 100644
--- a/spec/fixtures/contentful/steps/extended-checkboxes-question.json
+++ b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
@@ -41,6 +41,11 @@
             {
                 "value": "No",
                 "display_further_information": true
+            },
+            {
+                "value": "Other, please specify",
+                "further_information_help_text": "Tell us all about it",
+                "display_further_information": true
             }
         ],
         "alwaysShowTheUser": true

From e1a8c626db2b4a96c81044d236c965fe8b82b700 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 11 Mar 2021 17:39:09 +0000
Subject: [PATCH 186/249] Branches can be hidden when the node includes
 multiple rules

Before this change any branches that had child nodes with had a _single_ rule worked fine.

When any child node had _more than one_ rule then we got a `TypeError: can't cast Array` [1].

This was happening because `journey_steps.where(contentful_id: [["8"]])` returns an object called `Step::ActiveRecord_AssociationRelation` which is automatically presented as an array of objects.

The problem comes when a second ID is passed and `flatten` isn't used: `journey_steps.where(contentful_id: [["8"], ["9"]])`. This code only returns a `Step::ActiveRecord_AssociationRelation` object and doesn't present itself as an array of steps. This fails to query for steps but doesn't explode. We see the problem when we then call `.update` upon it.

[1] https://rollbar.com/dxw/dfe-buy-for-your-school/items/91/?item_page=0&item_count=100&#traceback
---
 app/services/toggle_additional_steps.rb       |  2 +-
 spec/services/toggle_additional_steps_spec.rb | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
index ff9c7351d..f4eed2766 100644
--- a/app/services/toggle_additional_steps.rb
+++ b/app/services/toggle_additional_steps.rb
@@ -61,7 +61,7 @@ def recursively_hide_additional_steps!(next_steps:)
 
         all_next_step_ids = next_step.additional_step_rules.map { |rule|
           rule.fetch("question_identifiers", nil)
-        }
+        }.flatten
         all_next_steps = journey_steps.where(contentful_id: all_next_step_ids)
 
         recursively_hide_additional_steps!(
diff --git a/spec/services/toggle_additional_steps_spec.rb b/spec/services/toggle_additional_steps_spec.rb
index 788a25b08..b8af60be1 100644
--- a/spec/services/toggle_additional_steps_spec.rb
+++ b/spec/services/toggle_additional_steps_spec.rb
@@ -142,6 +142,51 @@
         end
       end
 
+      context "when a branching question has multiple branches itself" do
+        it "should hide itself and all connected branches" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rules: [
+              {"required_answer" => "Red", "question_identifiers" => ["123"]},
+              {"required_answer" => "Blue", "question_identifiers" => ["456"]}
+            ],
+            hidden: false)
+
+          create(:radio_answer, step: step, response: "Blue")
+
+          first_step_to_hide = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            additional_step_rules: [
+              {"required_answer" => "Yellow", "question_identifiers" => ["8"]},
+              {"required_answer" => "Green", "question_identifiers" => ["9"]}
+            ],
+            hidden: false)
+
+          second_step_to_hide = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "8",
+            additional_step_rules: [],
+            hidden: false)
+
+          third_step_to_hide = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "9",
+            additional_step_rules: [],
+            hidden: false)
+
+          described_class.new(step: step).call
+
+          expect(first_step_to_hide.reload.hidden).to eq(true)
+          expect(second_step_to_hide.reload.hidden).to eq(true)
+          expect(third_step_to_hide.reload.hidden).to eq(true)
+        end
+      end
+
       context "when a branching question is shown based on more than on matching answer" do
         it "continues to show the next step (rather than hiding it again when it doesn't match the second rule)" do
           step = create(:step,

From ae83224b169996ae961ae062db607172b9142874 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Wed, 24 Feb 2021 15:21:03 +0000
Subject: [PATCH 187/249] Move rendering the specification to a service object

Previously, all rendering work for the specification was done in the
journey controller. This moves the job of combining the template and the
answers into a rendered output into a new service object, which gives us
clearer separation of what is responsible for the rendering.

This paves the way for making the docx output different to the web
output, for example by adding warning messages.

Updates Brakeman ignore file to account for the .html_safe operation now
happening in the service object.
---
 app/controllers/specifications_controller.rb |  8 ++++----
 app/services/specification_renderer.rb       | 12 ++++++++++++
 config/brakeman.ignore                       |  6 +++---
 spec/services/specification_renderer_spec.rb | 15 +++++++++++++++
 4 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 app/services/specification_renderer.rb
 create mode 100644 spec/services/specification_renderer_spec.rb

diff --git a/app/controllers/specifications_controller.rb b/app/controllers/specifications_controller.rb
index 686ecb438..df3e00014 100644
--- a/app/controllers/specifications_controller.rb
+++ b/app/controllers/specifications_controller.rb
@@ -14,12 +14,12 @@ def show
     ])
     @step_presenters = @visible_steps.map { |step| StepPresenter.new(step) }
 
-    @specification_template = Liquid::Template.parse(
-      @journey.liquid_template, error_mode: :strict
+    specification_renderer = SpecificationRenderer.new(
+      template: @journey.liquid_template,
+      answers: GetAnswersForSteps.new(visible_steps: @visible_steps).call
     )
 
-    @answers = GetAnswersForSteps.new(visible_steps: @visible_steps).call
-    @specification_html = @specification_template.render(@answers)
+    @specification_html = specification_renderer.to_html
 
     respond_to do |format|
       format.html
diff --git a/app/services/specification_renderer.rb b/app/services/specification_renderer.rb
new file mode 100644
index 000000000..b8ac4e646
--- /dev/null
+++ b/app/services/specification_renderer.rb
@@ -0,0 +1,12 @@
+class SpecificationRenderer
+  def initialize(template:, answers:)
+    @template = Liquid::Template.parse(
+      template, error_mode: :strict
+    )
+    @answers = answers
+  end
+
+  def to_html
+    @template.render(@answers).html_safe
+  end
+end
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index db7ac14a0..60563a7c4 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -3,13 +3,13 @@
     {
       "warning_type": "Cross-Site Scripting",
       "warning_code": 2,
-      "fingerprint": "9e0249e5929623c7ab1fd850ad5e15b49356e4a7ab235bc0373e98998bd3b321",
+      "fingerprint": "3863b51add0146069c24410ec1bfc99015d680679d275ce49f27cc22b6dc8f9e",
       "check_name": "CrossSiteScripting",
       "message": "Unescaped model attribute",
       "file": "app/views/specifications/show.html.erb",
       "line": 15,
       "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
-      "code": "Liquid::Template.parse(Journey.find(journey_id).liquid_template, :error_mode => :strict).render(GetAnswersForSteps.new(:visible_steps => Journey.find(journey_id).visible_steps.includes([:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers, :number_answer, :currency_answer])).call)",
+      "code": "SpecificationRenderer.new(:template => Journey.find(journey_id).liquid_template, :answers => GetAnswersForSteps.new(:visible_steps => Journey.find(journey_id).visible_steps.includes([:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers, :number_answer, :currency_answer])).call).to_html",
       "render_path": [
         {
           "type": "controller",
@@ -32,6 +32,6 @@
       "note": ""
     }
   ],
-  "updated": "2021-03-11 12:09:01 +0000",
+  "updated": "2021-03-15 12:25:24 +0000",
   "brakeman_version": "5.0.0"
 }
diff --git a/spec/services/specification_renderer_spec.rb b/spec/services/specification_renderer_spec.rb
new file mode 100644
index 000000000..5c531e65c
--- /dev/null
+++ b/spec/services/specification_renderer_spec.rb
@@ -0,0 +1,15 @@
+require "rails_helper"
+
+RSpec.describe SpecificationRenderer do
+  describe "#to_html" do
+    it "renders a HTML representation of a template given specific answers" do
+      renderer = described_class.new(
+        template: '<p>HTML paragraph rendering a variable: "{{ variable_name }}"</p>',
+        answers: {
+          "variable_name" => "variable value"
+        }
+      )
+      expect(renderer.to_html).to eql('<p>HTML paragraph rendering a variable: "variable value"</p>')
+    end
+  end
+end

From dde64ffccb53efed265b2610e4889eab0fb8f978 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 15 Mar 2021 16:39:46 +0000
Subject: [PATCH 188/249] Further info for variables with special chars is
 available to the spec

Looks like the application of the `parameterize` method didn't touch enough places and our test suite had holes in it for keys that had special characters.

The test case covers an exact case from live.

We reuse the `AnswerHelper` and this time check that `parameterize` is no longer defined in the rest of the code base.
---
 CHANGELOG.md                                  |  1 +
 app/presenters/checkboxes_answer_presenter.rb |  4 +++-
 .../checkboxes_answer_presenter_spec.rb       | 21 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39d17f551..64629c970 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - fix branching so multiple rules can show the same question
 - the specification lives on it's own page, separate to the task list
 - fix checkbox questions where further information couldn't be saved for an option that included a special character
+- further information for options that include special characters is now available to the specification
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/presenters/checkboxes_answer_presenter.rb b/app/presenters/checkboxes_answer_presenter.rb
index ebea864d5..091f90052 100644
--- a/app/presenters/checkboxes_answer_presenter.rb
+++ b/app/presenters/checkboxes_answer_presenter.rb
@@ -1,4 +1,6 @@
 class CheckboxesAnswerPresenter < SimpleDelegator
+  include AnswerHelper
+
   def response
     super.reject(&:blank?)
   end
@@ -22,7 +24,7 @@ def to_param
     return [] if response.empty?
 
     response.each_with_object([]) do |human_readable_choice, array|
-      machine_readable_key = human_readable_choice.parameterize.to_sym
+      machine_readable_key = machine_readable_option(string: human_readable_choice).to_sym
       matching_further_information = further_information&.fetch("#{machine_readable_key}_further_information", nil)
 
       array << {
diff --git a/spec/presenters/checkboxes_answer_presenter_spec.rb b/spec/presenters/checkboxes_answer_presenter_spec.rb
index add5edd81..61eaa00b9 100644
--- a/spec/presenters/checkboxes_answer_presenter_spec.rb
+++ b/spec/presenters/checkboxes_answer_presenter_spec.rb
@@ -67,5 +67,26 @@
         expect(presenter.to_param).to include({skipped: true})
       end
     end
+
+    context "when the option includes special characters" do
+      it "the further_information is correctly returned" do
+        step = build(:checkbox_answers,
+          response: ["Other, please specify"],
+          further_information: {"other_please_specify_further_information": "Sinks and stuff"})
+        presenter = described_class.new(step)
+        expect(presenter.to_param).to eql({
+          response: ["Other, please specify"],
+          skipped: false,
+          concatenated_response: "Other, please specify",
+          selected_answers: [
+            {
+              machine_value: :other_please_specify,
+              human_value: "Other, please specify",
+              further_information: "Sinks and stuff"
+            }
+          ]
+        })
+      end
+    end
   end
 end

From 2aaf4978a0eb15ed11b94b7cd0217458cae178fe Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 16 Mar 2021 10:00:27 +0000
Subject: [PATCH 189/249] Specification document includes an incomplete warning

The way this feature is tested is not the preferred option but it's the only option I could make work given I don't think I can download the word file and open it for inspection with Capybara.

Option 1 would be as above, we download the actual file and inspect the contents. This doesn't work. The closest I can get is to inspect the `page.body` and I get the whole structure of the word doc which is built using XML in _binary_. Attempts to `unpack` this failed. Eg: ,`"PK\x03\x04\x14\x00\x00\x00\b\x00\xD8^oR\xDFB\xF3w\x84\x01\x00\x00\x7F\x06\x00\x00\x13\x00\x00\x00[Content_Types].xml`

Option 2 would be to assert that the controller calls `render` with the `content` value that is expected. This would be close enough to assert that Rails was at least attempting to render the right content, via the htmltoword gem behind the scenes. The following successully asserts that the right value is passed but then fails as render is recieved twice, once with the args and then again with the binary blob. Even with `and_call_original`:

```
expect_any_instance_of(SpecificationsController)
.to receive(:render)
.with(hash_including(content: "<article id='specification'><h1>Liquid </h1></article>"))
.and_call_original
```

Option 3 is what we have. We assert that the gem that creates the content receives create with the expected HTML. What's not ideal is that there is no assertion that it's the response that's rendered to the user. We haven't got complete coverage and confidence isn't high.
---
 CHANGELOG.md                                  |  1 +
 app/controllers/specifications_controller.rb  |  4 +-
 app/services/specification_renderer.rb        |  8 +++
 config/locales/en.yml                         |  4 ++
 ...nload_their_catering_specification_spec.rb | 56 +++++++++++++++----
 spec/services/specification_renderer_spec.rb  | 30 ++++++++++
 6 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64629c970..30d6368de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - the specification lives on it's own page, separate to the task list
 - fix checkbox questions where further information couldn't be saved for an option that included a special character
 - further information for options that include special characters is now available to the specification
+- incomplete specification documents include a warning within the document as well as the file name
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/specifications_controller.rb b/app/controllers/specifications_controller.rb
index df3e00014..efc727bc0 100644
--- a/app/controllers/specifications_controller.rb
+++ b/app/controllers/specifications_controller.rb
@@ -24,7 +24,9 @@ def show
     respond_to do |format|
       format.html
       format.docx do
-        render docx: "specification.docx", content: @specification_html
+        document_html = specification_renderer.to_document_html(journey_complete: @journey.all_steps_completed?)
+
+        render docx: "specification.docx", content: document_html
       end
     end
   end
diff --git a/app/services/specification_renderer.rb b/app/services/specification_renderer.rb
index b8ac4e646..4bc38fc55 100644
--- a/app/services/specification_renderer.rb
+++ b/app/services/specification_renderer.rb
@@ -9,4 +9,12 @@ def initialize(template:, answers:)
   def to_html
     @template.render(@answers).html_safe
   end
+
+  def to_document_html(journey_complete:)
+    document_html = @template.render(@answers)
+    unless journey_complete
+      document_html.prepend(I18n.t("journey.specification.download.warning.incomplete"))
+    end
+    document_html
+  end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8504bab22..a9f7a9969 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -59,6 +59,10 @@ en:
       header: "Your specification"
       warning: "You have not completed all the tasks. There may be information missing from your specification."
       button: "View your specification"
+      download:
+        warning:
+          incomplete: "<article id='warning'><p></b>You have not completed all the tasks in Create a specification. There may be information missing from your specification.</b></p></article>"
+  specification:
   task_list:
     status:
       not_started: Not started
diff --git a/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
index 40c77a72b..d310023d7 100644
--- a/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
@@ -1,19 +1,53 @@
 feature "Users can see their catering specification" do
-  scenario "HTML" do
-    start_journey_from_category_and_go_to_question(category: "category-with-liquid-template.json")
+  context "when the journey has been completed" do
+    scenario "HTML" do
+      start_journey_from_category_and_go_to_question(category: "category-with-liquid-template.json")
 
-    choose("Catering")
+      common_specification_html = "<article id='specification'><h1>Liquid </h1></article>"
+      expect(Htmltoword::Document)
+        .to receive(:create)
+        .with(common_specification_html, nil, false)
+        .and_call_original
 
-    click_on(I18n.t("generic.button.next"))
-    click_on(I18n.t("journey.specification.button"))
+      choose("Catering")
 
-    expect(page).to have_content(I18n.t("journey.specification.header"))
+      click_on(I18n.t("generic.button.next"))
 
-    click_on("Download (.docx)")
+      click_on(I18n.t("journey.specification.button"))
 
-    expect(page.response_headers["Content-Type"]).to eql("application/vnd.openxmlformats-officedocument.wordprocessingml.document")
-    header = page.response_headers["Content-Disposition"]
-    expect(header).to match(/^attachment/)
-    expect(header).to match(/filename="specification.docx"/)
+      expect(page).to have_content(I18n.t("journey.specification.header"))
+
+      click_on("Download (.docx)")
+
+      expect(page.response_headers["Content-Type"]).to eql("application/vnd.openxmlformats-officedocument.wordprocessingml.document")
+      header = page.response_headers["Content-Disposition"]
+      expect(header).to match(/^attachment/)
+      expect(header).to match(/filename="specification.docx"/)
+    end
+  end
+
+  context "when the journey has not yet been completed" do
+    scenario "includes an incomple warning" do
+      stub_contentful_category(
+        fixture_filename: "category-with-liquid-template.json"
+      )
+
+      visit root_path
+      click_on(I18n.t("generic.button.start"))
+
+      # Omit answering a question to simulate an incomplete spec
+
+      click_on(I18n.t("journey.specification.button"))
+
+      warning_html = I18n.t("journey.specification.download.warning.incomplete")
+      common_specification_html = "<article id='specification'><h1>Liquid </h1></article>"
+      expect(page).not_to have_content(Nokogiri::HTML(warning_html).text)
+      expect(Htmltoword::Document)
+        .to receive(:create)
+        .with(common_specification_html.prepend(warning_html), nil, false)
+        .and_call_original
+
+      click_on("Download (.docx)")
+    end
   end
 end
diff --git a/spec/services/specification_renderer_spec.rb b/spec/services/specification_renderer_spec.rb
index 5c531e65c..9c9665be3 100644
--- a/spec/services/specification_renderer_spec.rb
+++ b/spec/services/specification_renderer_spec.rb
@@ -12,4 +12,34 @@
       expect(renderer.to_html).to eql('<p>HTML paragraph rendering a variable: "variable value"</p>')
     end
   end
+
+  describe "#to_document_html" do
+    context "when the journey is complete" do
+      it "renders HTML for use in rendering a docx file" do
+        renderer = described_class.new(
+          template: '<p>HTML paragraph rendering a variable: "{{ variable_name }}"</p>',
+          answers: {
+            "variable_name" => "variable value"
+          }
+        )
+        expect(renderer.to_document_html(journey_complete: true))
+          .to eql('<p>HTML paragraph rendering a variable: "variable value"</p>')
+      end
+    end
+
+    context "when the journey is NOT complete" do
+      it "renders HTML with an extra warning for use in rendering a docx file" do
+        renderer = described_class.new(
+          template: '<p>HTML paragraph rendering a variable: "{{ variable_name }}"</p>',
+          answers: {
+            "variable_name" => "variable value"
+          }
+        )
+        warning_html = I18n.t("journey.specification.download.warning.incomplete")
+        common_html = '<p>HTML paragraph rendering a variable: "variable value"</p>'
+        expect(renderer.to_document_html(journey_complete: false))
+          .to eql(warning_html + common_html)
+      end
+    end
+  end
 end

From 16fe966bfaa97bc882c71a25ddc2b7ba1c58e28c Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 15 Mar 2021 16:23:30 +0000
Subject: [PATCH 190/249] Spec file may include incomplete in the file name

---
 app/controllers/specifications_controller.rb                   | 3 ++-
 .../anyone_can_download_their_catering_specification_spec.rb   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/specifications_controller.rb b/app/controllers/specifications_controller.rb
index efc727bc0..0dff8d6ea 100644
--- a/app/controllers/specifications_controller.rb
+++ b/app/controllers/specifications_controller.rb
@@ -24,9 +24,10 @@ def show
     respond_to do |format|
       format.html
       format.docx do
+        file_name = @journey.all_steps_completed? ? "specification.docx" : "specification-incomplete.docx"
         document_html = specification_renderer.to_document_html(journey_complete: @journey.all_steps_completed?)
 
-        render docx: "specification.docx", content: document_html
+        render docx: file_name, content: document_html
       end
     end
   end
diff --git a/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
index d310023d7..b3a4af1d9 100644
--- a/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
@@ -48,6 +48,8 @@
         .and_call_original
 
       click_on("Download (.docx)")
+
+      expect(page.response_headers["Content-Disposition"]).to match(/filename="specification-incomplete.docx"/)
     end
   end
 end

From d38e80c5843b7ec69be0ab012fd6da7e63c47a78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Mar 2021 11:02:48 +0000
Subject: [PATCH 191/249] Bump sidekiq from 6.1.3 to 6.2.0

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.3 to 6.2.0.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.1.3...v6.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 21232fc91..4c230db44 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem "redis-namespace"
 gem "rollbar"
 gem "rails", "~> 6.1.3"
 gem "sass-rails", "~> 6.0"
-gem "sidekiq", "~> 6.1"
+gem "sidekiq", "~> 6.2"
 gem "sidekiq-cron", "~> 1.2"
 gem "turbolinks", "~> 5"
 gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
diff --git a/Gemfile.lock b/Gemfile.lock
index a8c3711f2..a1315802c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -296,7 +296,7 @@ GEM
       rubyzip (>= 1.2.2)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
-    sidekiq (6.1.3)
+    sidekiq (6.2.0)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -395,7 +395,7 @@ DEPENDENCIES
   sass-rails (~> 6.0)
   selenium-webdriver
   shoulda-matchers
-  sidekiq (~> 6.1)
+  sidekiq (~> 6.2)
   sidekiq-cron (~> 1.2)
   simplecov
   spring

From eb32abe8cec0fcc97c4a68f4120057f88f6fdbc8 Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Thu, 11 Mar 2021 17:22:58 +0000
Subject: [PATCH 192/249] Users return to same place in task list after
 answering a question

---
 CHANGELOG.md                                      |  1 +
 app/controllers/answers_controller.rb             |  4 ++--
 app/views/journeys/_step_list.html.erb            |  2 +-
 .../anyone_can_complete_a_journey_spec.rb         | 15 +++++++++++++++
 .../anyone_can_edit_their_answers_spec.rb         | 13 +++++++++++++
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30d6368de..457718dbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - fix checkbox questions where further information couldn't be saved for an option that included a special character
 - further information for options that include special characters is now available to the specification
 - incomplete specification documents include a warning within the document as well as the file name
+- users return to the same place in the task list after answering a question
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 3665e41e5..518537f0a 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -17,7 +17,7 @@ def create
     @answer = result.object
 
     if result.success?
-      redirect_to journey_path(@journey)
+      redirect_to journey_path(@journey, anchor: @step.id)
     else
       render "steps/#{@step.contentful_type}", locals: {layout: "steps/new_form_wrapper"}
     end
@@ -33,7 +33,7 @@ def update
     @answer = result.object
 
     if result.success?
-      redirect_to journey_path(@journey)
+      redirect_to journey_path(@journey, anchor: @step.id)
     else
       render "steps/#{@step.contentful_type}", locals: {layout: "steps/edit_form_wrapper"}
     end
diff --git a/app/views/journeys/_step_list.html.erb b/app/views/journeys/_step_list.html.erb
index 06c812421..318223bed 100644
--- a/app/views/journeys/_step_list.html.erb
+++ b/app/views/journeys/_step_list.html.erb
@@ -1,7 +1,7 @@
 <ul class="app-task-list__items">
   <% steps.each do |step| %>
     <% if step.question? %>
-    <li class="app-task-list__item">
+    <li class="app-task-list__item", id="<%= step.id %>">
       <% if step.answer %>
         <span class="app-task-list__task-name">
           <%= link_to step.title, edit_journey_step_path(journey, step), class: "govuk-link", 'aria-describedby': step.id + "-status"%>
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 84c04ddc2..809b392eb 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -446,4 +446,19 @@
       expect(page).to have_content(I18n.t("errors.specification_template_invalid.page_body"))
     end
   end
+
+  context "when a user answers a question" do
+    scenario "the user is returned to the same place in the task list " do
+      start_journey_from_category_and_go_to_question(category: "long-text-question.json")
+      journey = Journey.last
+
+      fill_in "answer[response]", with: "This is my long answer"
+
+      click_on(I18n.t("generic.button.next"))
+
+      answer = LongTextAnswer.last
+
+      expect(page).to have_current_path(journey_url(journey, anchor: answer.step.id), url: true)
+    end
+  end
 end
diff --git a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
index 277968f95..23bcc41d7 100644
--- a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
+++ b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
@@ -125,4 +125,17 @@
       expect(page).to have_content("You should NOT be able to see this question?")
     end
   end
+  context "when a user edits an answer" do
+    scenario "the user is returned to the same place in the task list " do
+      visit journey_path(answer.step.journey)
+
+      click_on(answer.step.title)
+
+      fill_in "answer[response]", with: "email@example.com"
+
+      click_on(I18n.t("generic.button.update"))
+
+      expect(page).to have_current_path(journey_url(answer.step.journey, anchor: answer.step.id), url: true)
+    end
+  end
 end

From bfa8f9d4f5e277184bfd4987614bb383e67c4e7d Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 16 Mar 2021 11:28:39 +0000
Subject: [PATCH 193/249] Rename checkbox_params to further_information_params

To support multiple radio options on the same question with expanded
answers, rename this function so it's clear that it handles all cases
with further information.

Co-authored-by: Nick Jackson <nick@dxw.com>
---
 app/controllers/answers_controller.rb | 16 +++++++++++-----
 app/services/save_answer.rb           |  6 +++---
 spec/services/save_answer_spec.rb     |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 518537f0a..a5c786106 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -12,8 +12,11 @@ def create
     @answer = AnswerFactory.new(step: @step).call
     @answer.step = @step
 
-    result = SaveAnswer.new(answer: @answer)
-      .call(checkbox_params: checkbox_params, answer_params: answer_params, date_params: date_params)
+    result = SaveAnswer.new(answer: @answer).call(
+      further_information_params: further_information_params,
+      answer_params: answer_params,
+      date_params: date_params
+    )
     @answer = result.object
 
     if result.success?
@@ -28,8 +31,11 @@ def update
     @step = Step.find(step_id)
     @step_presenter = StepPresenter.new(@step)
 
-    result = SaveAnswer.new(answer: @step.answer)
-      .call(checkbox_params: checkbox_params, answer_params: answer_params, date_params: date_params)
+    result = SaveAnswer.new(answer: @step.answer).call(
+      further_information_params: further_information_params,
+      answer_params: answer_params,
+      date_params: date_params
+    )
     @answer = result.object
 
     if result.success?
@@ -53,7 +59,7 @@ def answer_params
     params.require(:answer).permit(:response, :further_information)
   end
 
-  def checkbox_params
+  def further_information_params
     return {skipped: true, response: [""], further_information: nil} if skip_answer?
 
     answer_params = params.require(:answer)
diff --git a/app/services/save_answer.rb b/app/services/save_answer.rb
index 341a9276a..63fe5b1dc 100644
--- a/app/services/save_answer.rb
+++ b/app/services/save_answer.rb
@@ -5,12 +5,12 @@ def initialize(answer:)
     self.step = answer.step
   end
 
-  def call(answer_params: {}, checkbox_params: {}, date_params: {})
+  def call(answer_params: {}, further_information_params: {}, date_params: {})
     result = Result.new(false, answer)
 
     case step.contentful_type
-    when "checkboxes"
-      answer.assign_attributes(checkbox_params)
+    when "checkboxes", "radio"
+      answer.assign_attributes(further_information_params)
     when "single_date"
       answer.assign_attributes(date_params)
     else
diff --git a/spec/services/save_answer_spec.rb b/spec/services/save_answer_spec.rb
index 57fedd07c..086e81576 100644
--- a/spec/services/save_answer_spec.rb
+++ b/spec/services/save_answer_spec.rb
@@ -27,7 +27,7 @@
         answer = create(:checkbox_answers)
         params = ActionController::Parameters.new(response: ["A", "B"]).permit!
 
-        result = described_class.new(answer: answer).call(checkbox_params: params)
+        result = described_class.new(answer: answer).call(further_information_params: params)
 
         expect(result.success?).to eql(true)
         expect(result.object.response).to eql(["A", "B"])

From a8f7335c06106dd15868599715d3e6be1ab974bb Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 16 Mar 2021 14:09:55 +0000
Subject: [PATCH 194/249] RadioAnswers can store multiple further info and
 present only..

.. the one that's related to the users choice

We use the existing pattern for checkboxes to store the further_information as a jsonb value. This allows us to manage it as a hash. We apply the same AnswerHelpers to set and read the dynamic further_informatiion fields.

This choice will also store further_information values given to other radio options should the user change their mind. Whilst this is not the need, we see some small benefit to being able to replay back past values for convenience. The presenter plays a key part in only presenting the chosen option to the specification.

Co-authored-by: Nick Jackson <nick@dxw.com>
---
 CHANGELOG.md                                  |  1 +
 app/controllers/answers_controller.rb         |  2 +-
 app/presenters/radio_answer_presenter.rb      |  5 ++++
 app/services/save_answer.rb                   |  2 +-
 app/views/steps/radios.html.erb               |  8 ++++--
 ...r_information_to_json_for_radio_answers.rb | 27 +++++++++++++++++++
 db/schema.rb                                  |  4 +--
 .../anyone_can_complete_a_journey_spec.rb     | 13 +++++----
 ...n_see_their_catering_specification_spec.rb |  2 +-
 .../presenters/radio_answer_presenter_spec.rb |  6 +++--
 spec/services/get_answers_for_steps_spec.rb   |  2 +-
 11 files changed, 55 insertions(+), 17 deletions(-)
 create mode 100644 db/migrate/20210316114040_change_further_information_to_json_for_radio_answers.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 457718dbb..67da83e80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - further information for options that include special characters is now available to the specification
 - incomplete specification documents include a warning within the document as well as the file name
 - users return to the same place in the task list after answering a question
+- fix extended radio questions so that further_information can be remembered when it can be provided through multiple fields
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index a5c786106..e6b53cc99 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -74,7 +74,7 @@ def further_information_params
     further_information_params = answer_params.permit(*allowed_further_information_keys)
     further_information = further_information_params.to_hash
 
-    all_params = answer_params.permit(response: [])
+    all_params = answer_params.permit(:response, response: [])
     all_params[:further_information] = further_information
     all_params
   end
diff --git a/app/presenters/radio_answer_presenter.rb b/app/presenters/radio_answer_presenter.rb
index 89323663d..2d86b7556 100644
--- a/app/presenters/radio_answer_presenter.rb
+++ b/app/presenters/radio_answer_presenter.rb
@@ -11,4 +11,9 @@ def to_param
       further_information: further_information
     }
   end
+
+  def further_information
+    return unless super
+    super["#{machine_readable_option(string: response)}_further_information"]
+  end
 end
diff --git a/app/services/save_answer.rb b/app/services/save_answer.rb
index 63fe5b1dc..925fdb24c 100644
--- a/app/services/save_answer.rb
+++ b/app/services/save_answer.rb
@@ -9,7 +9,7 @@ def call(answer_params: {}, further_information_params: {}, date_params: {})
     result = Result.new(false, answer)
 
     case step.contentful_type
-    when "checkboxes", "radio"
+    when "checkboxes", "radios"
       answer.assign_attributes(further_information_params)
     when "single_date"
       answer.assign_attributes(date_params)
diff --git a/app/views/steps/radios.html.erb b/app/views/steps/radios.html.erb
index ee4ac688e..61865e7c6 100644
--- a/app/views/steps/radios.html.erb
+++ b/app/views/steps/radios.html.erb
@@ -8,15 +8,19 @@
     <% end %>
 
     <% @step.options.each do |option| %>
+      <% machine_value = machine_readable_option(string: option["value"]) %>
+
+      <% f.object = monkey_patch_form_object_with_further_information_field(form_object: f.object, associated_choice: machine_value) %>
+
       <% if option.fetch("separated_by_or", nil) == true %>
         <div class="govuk-radios__divider">or</div>
       <% end %>
       <% if option["display_further_information"] %>
         <%= f.govuk_radio_button :response, option["value"], label: { text: option["value"] }, hint: { text: option["help_text"] } do %>
           <% if option["display_further_information"] == "single" || option["display_further_information"] == true %>
-            <%= f.govuk_text_field :further_information, label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
+            <%= f.govuk_text_field "#{machine_value}_further_information", label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
           <% elsif option["display_further_information"] == "long" %>
-            <%= f.govuk_text_area :further_information, rows: 6, label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
+            <%= f.govuk_text_area "#{machine_value}_further_information", rows: 6, label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
           <% end %>
         <% end %>
       <% else %>
diff --git a/db/migrate/20210316114040_change_further_information_to_json_for_radio_answers.rb b/db/migrate/20210316114040_change_further_information_to_json_for_radio_answers.rb
new file mode 100644
index 000000000..b46dd8d32
--- /dev/null
+++ b/db/migrate/20210316114040_change_further_information_to_json_for_radio_answers.rb
@@ -0,0 +1,27 @@
+class ChangeFurtherInformationToJsonForRadioAnswers < ActiveRecord::Migration[6.1]
+  def up
+    add_column :radio_answers, :further_information_jsonb, :jsonb
+    ActiveRecord::Base.transaction do
+      RadioAnswer.all.map do |radio|
+        machine_value = radio.response.parameterize(separator: "_")
+        hash = {machine_value => radio.further_information}
+        radio.update(further_information_jsonb: hash)
+      end
+    end
+    remove_column :radio_answers, :further_information
+    rename_column :radio_answers, :further_information_jsonb, :further_information
+  end
+
+  def down
+    add_column :radio_answers, :further_information_string, :string
+    ActiveRecord::Base.transaction do
+      RadioAnswer.all.map do |radio|
+        machine_value = radio.response.parameterize(separator: "_")
+        matching_further_information = radio.further_information[machine_value]
+        radio.update(further_information_string: matching_further_information)
+      end
+    end
+    remove_column :radio_answers, :further_information
+    rename_column :radio_answers, :further_information_string, :further_information
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 26e771c99..345014fc4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_03_02_110746) do
+ActiveRecord::Schema.define(version: 2021_03_16_114040) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -64,7 +64,7 @@
     t.string "response", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.text "further_information"
+    t.jsonb "further_information"
     t.index ["step_id"], name: "index_radio_answers_on_step_id"
   end
 
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 809b392eb..1b87c663b 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -232,20 +232,19 @@
           start_journey_from_category_and_go_to_question(category: "extended-radio-question.json")
 
           choose("Catering")
-
           expect(page).not_to have_content("No_further_information") # It should not create a label when one isn't specified
           within("span.govuk-visually-hidden") do
             expect(page).to have_content("Optional further information") # Default the hidden label to something understandable for screen readers
           end
 
-          fill_in "answer[further_information]", with: "The school needs the kitchen cleaned once a day"
+          fill_in "answer[catering_further_information]", with: "The school needs the kitchen cleaned once a day"
 
           click_on(I18n.t("generic.button.next"))
 
           click_first_link_in_task_list
 
           expect(page).to have_checked_field("Catering")
-          expect(find_field("answer-further-information-field").value)
+          expect(find_field("answer-catering-further-information-field").value)
             .to eql("The school needs the kitchen cleaned once a day")
         end
       end
@@ -256,7 +255,7 @@
 
           choose("Catering")
 
-          expect(page).to have_selector("input#answer-further-information-field")
+          expect(page).to have_selector("input#answer-catering-further-information-field")
         end
       end
 
@@ -266,7 +265,7 @@
 
           choose("Catering")
 
-          expect(page).to have_selector("textarea#answer-further-information-field")
+          expect(page).to have_selector("textarea#answer-catering-further-information-field")
         end
       end
 
@@ -274,8 +273,8 @@
         scenario "no extra text field is displayed" do
           start_journey_from_category_and_go_to_question(category: "radio-question.json")
 
-          expect(page).to_not have_selector("textarea#answer-further-information-field")
-          expect(page).to_not have_selector("input#answer-further-information-field")
+          expect(page).to_not have_selector("textarea#answer-catering-further-information-field")
+          expect(page).to_not have_selector("input#answer-catering-further-information-field")
         end
       end
 
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
index 90da28c79..07eb0295e 100644
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
@@ -35,7 +35,7 @@
     click_first_link_in_task_list
 
     choose("Catering")
-    fill_in "answer[further_information]", with: "The school needs the kitchen cleaned once a day"
+    fill_in "answer[catering_further_information]", with: "The school needs the kitchen cleaned once a day"
     click_on(I18n.t("generic.button.next"))
     click_on(I18n.t("journey.specification.button"))
 
diff --git a/spec/presenters/radio_answer_presenter_spec.rb b/spec/presenters/radio_answer_presenter_spec.rb
index 12ac46967..f5b85daa1 100644
--- a/spec/presenters/radio_answer_presenter_spec.rb
+++ b/spec/presenters/radio_answer_presenter_spec.rb
@@ -3,7 +3,9 @@
 RSpec.describe RadioAnswerPresenter do
   describe "#response" do
     it "returns the option chosen" do
-      step = build(:radio_answer, response: "Yes", further_information: "Extra info")
+      step = build(:radio_answer,
+        response: "Yes",
+        further_information: {yes_further_information: "More yes info"})
       presenter = described_class.new(step)
       expect(presenter.response).to eq("Yes")
     end
@@ -13,7 +15,7 @@
     it "returns a hash of radio_answer" do
       step = build(:radio_answer,
         response: "Yes",
-        further_information: "More yes info")
+        further_information: {yes_further_information: "More yes info"})
 
       presenter = described_class.new(step)
 
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
index e6af62a30..096b61533 100644
--- a/spec/services/get_answers_for_steps_spec.rb
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -70,7 +70,7 @@
       it "returns the answer information in a hash" do
         answer = create(:radio_answer,
           response: "Yes please",
-          further_information: "More yes info")
+          further_information: {yes_please_further_information: "More yes info"})
 
         result = described_class.new(visible_steps: [answer.step]).call
         assertion = {

From 68a359dfe9bcfca17b994a5466064ea52fc4f66d Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 17 Mar 2021 11:44:38 +0000
Subject: [PATCH 195/249] Add MIT License

DfE work in the open and MIT is the default license [1]

[1] https://github.com/DFE-Digital/technical-guidance/blob/master/source/documentation/standards/licencing-software-or-code.html.md.erb#L15
---
 LICENCE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 LICENCE

diff --git a/LICENCE b/LICENCE
new file mode 100644
index 000000000..afbb37ee8
--- /dev/null
+++ b/LICENCE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Crown Copyright (Department for Education)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From eb28731bf28a420d635887c5e9e863d57347594e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 17 Mar 2021 16:39:16 +0000
Subject: [PATCH 196/249] Flash messages can be shown as notification banners

---
 CHANGELOG.md                           |  1 +
 app/views/layouts/_messages.html.erb   | 15 +++++++++++----
 app/views/layouts/application.html.erb |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67da83e80..9e81bc248 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - incomplete specification documents include a warning within the document as well as the file name
 - users return to the same place in the task list after answering a question
 - fix extended radio questions so that further_information can be remembered when it can be provided through multiple fields
+- flash messages can be shown in notification banners
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/views/layouts/_messages.html.erb b/app/views/layouts/_messages.html.erb
index 8ec714104..1abeb640b 100644
--- a/app/views/layouts/_messages.html.erb
+++ b/app/views/layouts/_messages.html.erb
@@ -1,9 +1,16 @@
-<% # Rails flash messages styled for Bootstrap 4.0 %>
 <% flash.each do |name, msg| %>
   <% if msg.is_a?(String) %>
-    <div class="alert alert-<%= name.to_s == "notice" ? "success" : "danger" %>" role="alert">
-      <button aria-hidden="true" class="close" data-dismiss="alert" type="button">&times;</button>
-      <%= content_tag :div, msg, id: "flash_#{name}" %>
+    <div class="govuk-notification-banner govuk-notification-banner--<%= name %>" role="alert" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner">
+      <div class="govuk-notification-banner__header">
+        <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title">
+          <%= name.capitalize %>
+        </h2>
+      </div>
+      <div class="govuk-notification-banner__content">
+        <h3 class="govuk-notification-banner__heading">
+          <%= content_tag :div, msg, id: "flash_#{name}" %>
+        </h3>
+      </div>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1477ccbd8..84b46af37 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -67,6 +67,7 @@
         </p>
       </div>
       <main class="govuk-main-wrapper " id="main-content" role="main">
+        <%= render partial: "layouts/messages" %>
         <%= yield %>
       </main>
     </div>

From 9cfd30dba333493f2af0354d47efe541d0de949a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 11:04:27 +0000
Subject: [PATCH 197/249] Bump rspec-rails from 5.0.0 to 5.0.1

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.0.0...v5.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a1315802c..169d8e217 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -190,7 +190,7 @@ GEM
     msgpack (1.4.2)
     multi_json (1.15.0)
     nio4r (2.5.5)
-    nokogiri (1.11.1)
+    nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     parallel (1.20.1)
@@ -255,7 +255,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (5.0.0)
+    rspec-rails (5.0.1)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)

From edfba786434f7a000845876b2f36100bffe85424 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:03:46 +0000
Subject: [PATCH 198/249] Bump bootsnap from 1.7.2 to 1.7.3

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.7.2...v1.7.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a1315802c..6012f7c22 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,7 +68,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindex (0.8.1)
-    bootsnap (1.7.2)
+    bootsnap (1.7.3)
       msgpack (~> 1.0)
     brakeman (5.0.0)
     builder (3.2.4)

From 18ba30849ed1c2395d289d58adfaf610e0afa68a Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Thu, 18 Mar 2021 17:01:38 +0000
Subject: [PATCH 199/249] Fix checkbox answer to save choices after previously
 skipping

The skipped value was being set to true when a checkbox question was
skipped, but the opposite case didn't set it to false. This meant that
once a question had been skipped once it would never become not skipped.

This commit adds setting skipped to false in further_information_params
for checkbox questions.
---
 CHANGELOG.md                                  |  1 +
 app/controllers/answers_controller.rb         |  5 +++++
 .../anyone_can_complete_a_journey_spec.rb     | 20 +++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e81bc248..772148729 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - users return to the same place in the task list after answering a question
 - fix extended radio questions so that further_information can be remembered when it can be provided through multiple fields
 - flash messages can be shown in notification banners
+- fix checkbox answer to save choices after previously skipping
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index e6b53cc99..c9e269cfb 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -76,6 +76,11 @@ def further_information_params
 
     all_params = answer_params.permit(:response, response: [])
     all_params[:further_information] = further_information
+
+    if @step.contentful_type == "checkboxes"
+      all_params[:skipped] = false
+    end
+
     all_params
   end
 
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
index 1b87c663b..91f665f89 100644
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
@@ -339,6 +339,26 @@
       expect(page).not_to have_checked_field("Lunch")
       expect(CheckboxAnswers.last.skipped).to be true
     end
+
+    context "when the question has already been skipped" do
+      scenario "selecting an answer marks the question as not being skipped" do
+        start_journey_from_category_and_go_to_question(category: "skippable-checkboxes-question.json")
+
+        click_on("None of the above")
+
+        within(".app-task-list") do
+          expect(page).to have_content("Complete")
+        end
+
+        click_first_link_in_task_list
+
+        check("Lunch")
+        check("Dinner")
+        click_on(I18n.t("generic.button.update"))
+
+        expect(CheckboxAnswers.last.skipped).to be false
+      end
+    end
   end
 
   context "when the Contentful model is of type staticContent" do

From 5a5c6ba3238f0211a07605d88259a7443af6ee79 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 22 Mar 2021 17:26:45 +0000
Subject: [PATCH 200/249] dotenv initialiser runs first to guard

* Rails runs it's initialisers in alphabetical order.
* Dotenv does something special in that it gives a meaningul error message to a dev if they are missing an expected environment variable (helping them avoid hunting around to understand and obscure error)

If another initialiser is added that runs before dotenv, dotenv will not be guarding against it. This change attempts to better proect this by adding an underscore prefix to ask Rails to run it first.
---
 config/initializers/{dotenv.rb => _dotenv.rb} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename config/initializers/{dotenv.rb => _dotenv.rb} (100%)

diff --git a/config/initializers/dotenv.rb b/config/initializers/_dotenv.rb
similarity index 100%
rename from config/initializers/dotenv.rb
rename to config/initializers/_dotenv.rb

From 0cfb86e111abfc7a47f5e6257fc6013e7f791af1 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 17 Mar 2021 17:42:52 +0000
Subject: [PATCH 201/249] Refactor by moving feature tests that only users
 should see

Before we make any code changes to restrict this behaviour to only school buying professionals we reorganise these test files.

The file names no longer need to be prefixed with "anyone_" now a folder is used. The also all had "can" which can be removed so we're left with a verb to start the name of each test which seems more readable.
---
 .../complete_a_journey_spec.rb}                                   | 0
 .../download_their_catering_specification_spec.rb}                | 0
 .../edit_their_answers_spec.rb}                                   | 0
 .../preview_a_journey_step_spec.rb}                               | 0
 .../resume_a_journey_spec.rb}                                     | 0
 .../see_the_map_of_journey_steps_page_spec.rb}                    | 0
 .../see_their_catering_specification_spec.rb}                     | 0
 .../view_a_list_of_tasks_spec.rb}                                 | 0
 ...ck_to_home_page_spec.rb => navigate_back_to_home_page_spec.rb} | 0
 ...nning_start_page_spec.rb => see_a_planning_start_page_spec.rb} | 0
 ..._start_page_spec.rb => see_a_specification_start_page_spec.rb} | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 rename spec/features/{visitors/anyone_can_complete_a_journey_spec.rb => school_buying_professionals/complete_a_journey_spec.rb} (100%)
 rename spec/features/{visitors/anyone_can_download_their_catering_specification_spec.rb => school_buying_professionals/download_their_catering_specification_spec.rb} (100%)
 rename spec/features/{visitors/anyone_can_edit_their_answers_spec.rb => school_buying_professionals/edit_their_answers_spec.rb} (100%)
 rename spec/features/{visitors/anyone_can_preview_a_journey_step_spec.rb => school_buying_professionals/preview_a_journey_step_spec.rb} (100%)
 rename spec/features/{visitors/anyone_can_resume_a_journey_spec.rb => school_buying_professionals/resume_a_journey_spec.rb} (100%)
 rename spec/features/{visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb => school_buying_professionals/see_the_map_of_journey_steps_page_spec.rb} (100%)
 rename spec/features/{visitors/anyone_can_see_their_catering_specification_spec.rb => school_buying_professionals/see_their_catering_specification_spec.rb} (100%)
 rename spec/features/{visitors/anyone_can_view_a_list_of_tasks_spec.rb => school_buying_professionals/view_a_list_of_tasks_spec.rb} (100%)
 rename spec/features/visitors/{anyone_navigate_back_to_home_page_spec.rb => navigate_back_to_home_page_spec.rb} (100%)
 rename spec/features/visitors/{anyone_can_see_a_planning_start_page_spec.rb => see_a_planning_start_page_spec.rb} (100%)
 rename spec/features/visitors/{anyone_can_see_a_specification_start_page_spec.rb => see_a_specification_start_page_spec.rb} (100%)

diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/school_buying_professionals/complete_a_journey_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_can_complete_a_journey_spec.rb
rename to spec/features/school_buying_professionals/complete_a_journey_spec.rb
diff --git a/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb b/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
rename to spec/features/school_buying_professionals/download_their_catering_specification_spec.rb
diff --git a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb b/spec/features/school_buying_professionals/edit_their_answers_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_can_edit_their_answers_spec.rb
rename to spec/features/school_buying_professionals/edit_their_answers_spec.rb
diff --git a/spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb b/spec/features/school_buying_professionals/preview_a_journey_step_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_can_preview_a_journey_step_spec.rb
rename to spec/features/school_buying_professionals/preview_a_journey_step_spec.rb
diff --git a/spec/features/visitors/anyone_can_resume_a_journey_spec.rb b/spec/features/school_buying_professionals/resume_a_journey_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_can_resume_a_journey_spec.rb
rename to spec/features/school_buying_professionals/resume_a_journey_spec.rb
diff --git a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb b/spec/features/school_buying_professionals/see_the_map_of_journey_steps_page_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
rename to spec/features/school_buying_professionals/see_the_map_of_journey_steps_page_spec.rb
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
rename to spec/features/school_buying_professionals/see_their_catering_specification_spec.rb
diff --git a/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb b/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
rename to spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
diff --git a/spec/features/visitors/anyone_navigate_back_to_home_page_spec.rb b/spec/features/visitors/navigate_back_to_home_page_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_navigate_back_to_home_page_spec.rb
rename to spec/features/visitors/navigate_back_to_home_page_spec.rb
diff --git a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb b/spec/features/visitors/see_a_planning_start_page_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
rename to spec/features/visitors/see_a_planning_start_page_spec.rb
diff --git a/spec/features/visitors/anyone_can_see_a_specification_start_page_spec.rb b/spec/features/visitors/see_a_specification_start_page_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_can_see_a_specification_start_page_spec.rb
rename to spec/features/visitors/see_a_specification_start_page_spec.rb

From ec954b000a06d00a64ee62a69f0c0e7c434e3154 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 22 Mar 2021 15:00:46 +0000
Subject: [PATCH 202/249] Refactor README to make room for new docs

---
 README.md                             | 76 ++-------------------------
 doc/getting-started.md                | 58 ++++++++++++++++++++
 doc/managing-environment-variables.md | 10 ++++
 3 files changed, 71 insertions(+), 73 deletions(-)
 create mode 100644 doc/getting-started.md
 create mode 100644 doc/managing-environment-variables.md

diff --git a/README.md b/README.md
index 8459fcf2e..6099b7b55 100644
--- a/README.md
+++ b/README.md
@@ -2,64 +2,9 @@
 
 A service to help school buying professionals create tender documents that comply with the relevant government policy. These tender documents can then be used to start a procurement process saving schools time and money.
 
-## Getting started
-
-1. [Install Docker for Mac](https://docs.docker.com/docker-for-mac/install/)
-1. copy `/.env.example` into `/.env.development.local`.
-
-  Our intention is that the example should include enough to get the application started quickly. If this is not the case, please ask another developer for a copy of their `/.env.development.local` file.
-
-1. `script/server`
-1. Visit http://localhost:3000
-
-## Running the tests
-
-### The whole test suite
-
-* Using Docker has high parity, you don't have to install any dependencies but it takes longer to run (~20 seconds):
-
-    ```bash
-    docker-compose -f docker-compose.test.yml run --rm test bundle exec rake
-    ```
-* Without Docker is faster (~5 seconds) but has lower parity and you will need to install local dependencies on your machine first:
-
-    ```bash
-    brew install postgres
-    brew services start postgres
-    brew install redis
-    brew services start redis
-    createuser postgres --super
-    rbenv install 2.6.6 && rbenv local 2.6.6
-    gem install bundle && bundle
-    RAILS_ENV=test rake db:setup
-    ```
-    ```ruby
-    script/test
-    ```
-
-### RSpec only
-
-```
-bundle exec rspec spec/*
-```
-
-## Starting a Rails console
-
-```
-script/console
-```
-
-## Running Brakeman
-
-Run [Brakeman](https://brakemanscanner.org/) to highlight any security vulnerabilities:
-```bash
-brakeman
-```
-
-To pipe the results to a file:
-```bash
-brakeman -o report.text
-```
+1. [Getting started](/doc/getting-started.md)
+1. [Release process](/doc/release-process.md)
+1. [Managing environment variables](/doc/managing-environment-variables.md)
 
 ## Making changes
 
@@ -67,27 +12,12 @@ When making a change, update the [changelog](CHANGELOG.md) using the
 [Keep a Changelog 1.0.0](https://keepachangelog.com/en/1.0.0/) format. Pull
 requests should not be merged before any relevant updates are made.
 
-## Releasing changes
-
-When making a new release, follow the [release process](doc/release-process.md).
-
 ## Architecture decision records
 
 We use ADRs to document architectural decisions that we make. They can be found
 in doc/architecture/decisions and contributed to with the
 [adr-tools](https://github.com/npryce/adr-tools).
 
-## Managing environment variables
-
-We use [Dotenv](https://github.com/bkeepers/dotenv) to manage our environment variables locally.
-
-The repository will include safe defaults for development in `/.env.example` and for test in `/.env.test`. We use 'example' instead of 'development' (from the Dotenv docs) to be consistent with current dxw conventions and to make it more explicit that these values are not to be committed.
-
-To manage sensitive environment variables:
-
-1. Add the new key and safe default value to the `/.env.example` file eg. `ROLLBAR_TOKEN=ROLLBAR_TOKEN`
-2. Add the new key and real value to your local `/.env.development.local` file, which should never be checked into Git. This file will look something like `ROLLBAR_TOKEN=123456789`
-
 ## Access
 
 TODO: Where can people find the service and the different environments?
diff --git a/doc/getting-started.md b/doc/getting-started.md
new file mode 100644
index 000000000..239cde62c
--- /dev/null
+++ b/doc/getting-started.md
@@ -0,0 +1,58 @@
+# Getting started
+
+1. [Install Docker for Mac](https://docs.docker.com/docker-for-mac/install/)
+1. copy `/.env.example` into `/.env.development.local`.
+
+  Our intention is that the example should include enough to get the application started quickly. If this is not the case, please ask another developer for a copy of their `/.env.development.local` file.
+
+1. `script/server`
+1. Visit http://localhost:3000
+
+## Running the tests
+
+### The whole test suite
+
+* Using Docker has high parity, you don't have to install any dependencies but it takes longer to run (~20 seconds):
+
+    ```bash
+    docker-compose -f docker-compose.test.yml run --rm test bundle exec rake
+    ```
+* Without Docker is faster (~5 seconds) but has lower parity and you will need to install local dependencies on your machine first:
+
+    ```bash
+    brew install postgres
+    brew services start postgres
+    brew install redis
+    brew services start redis
+    createuser postgres --super
+    rbenv install 2.6.6 && rbenv local 2.6.6
+    gem install bundle && bundle
+    RAILS_ENV=test rake db:setup
+    ```
+    ```ruby
+    script/test
+    ```
+
+### RSpec only
+
+```
+bundle exec rspec spec/*
+```
+
+## Starting a Rails console
+
+```
+script/console
+```
+
+## Running Brakeman
+
+Run [Brakeman](https://brakemanscanner.org/) to highlight any security vulnerabilities:
+```bash
+brakeman
+```
+
+To pipe the results to a file:
+```bash
+brakeman -o report.text
+```
diff --git a/doc/managing-environment-variables.md b/doc/managing-environment-variables.md
new file mode 100644
index 000000000..2da653fb3
--- /dev/null
+++ b/doc/managing-environment-variables.md
@@ -0,0 +1,10 @@
+# Managing environment variables
+
+We use [Dotenv](https://github.com/bkeepers/dotenv) to manage our environment variables locally.
+
+The repository will include safe defaults for development in `/.env.example` and for test in `/.env.test`. We use 'example' instead of 'development' (from the Dotenv docs) to be consistent with current dxw conventions and to make it more explicit that these values are not to be committed.
+
+To manage sensitive environment variables:
+
+1. Add the new key and safe default value to the `/.env.example` file eg. `ROLLBAR_TOKEN=ROLLBAR_TOKEN`
+2. Add the new key and real value to your local `/.env.development.local` file, which should never be checked into Git. This file will look something like `ROLLBAR_TOKEN=123456789`

From 0fd2435c966a630e023aa558c0c81b18ab5b8dd7 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 22 Mar 2021 12:24:43 +0000
Subject: [PATCH 203/249] Set APPLICATION_URL so we can use URL helpers in
 classes

This change allows us to `include Rails.application.routes.url_helpers` in plain old Ruby classes in order to write things like `auth_dfe_signout_url` (which is our immediate need).

We're able to refactor 2 existing tests to remove the `url: true`.

Capybara looks to default the host to `www.example.com` (unless I can't see a piece of config?) so we make this explicit by renaming both the asset_host to the app_host.
---
 .env.example                                                 | 2 ++
 .env.test                                                    | 2 ++
 config/initializers/_dotenv.rb                               | 1 +
 config/initializers/default_url_options.rb                   | 5 +++++
 .../school_buying_professionals/complete_a_journey_spec.rb   | 2 +-
 .../school_buying_professionals/edit_their_answers_spec.rb   | 2 +-
 spec/support/capybara.rb                                     | 3 ++-
 7 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 config/initializers/default_url_options.rb

diff --git a/.env.example b/.env.example
index 7eadf1457..0d2f219e5 100644
--- a/.env.example
+++ b/.env.example
@@ -5,6 +5,8 @@
 #
 # Reference: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
 
+APPLICATION_URL=http://localhost:3000
+
 # Rollbar for application monitoring
 ROLLBAR_ACCESS_TOKEN=ROLLBAR_ACCESS_TOKEN
 ROLLBAR_ENV=development
diff --git a/.env.test b/.env.test
index 09357dba8..ba6118322 100644
--- a/.env.test
+++ b/.env.test
@@ -5,6 +5,8 @@
 #
 # Reference: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
 
+APPLICATION_URL=http://localhost:3000
+
 DATABASE_URL=postgres://postgres@localhost:5432/buy-for-your-school-test
 REDIS_URL=redis://localhost:6379
 
diff --git a/config/initializers/_dotenv.rb b/config/initializers/_dotenv.rb
index 7e353e232..aca34a326 100644
--- a/config/initializers/_dotenv.rb
+++ b/config/initializers/_dotenv.rb
@@ -2,6 +2,7 @@
 # https://github.com/bkeepers/dotenv#required-keys
 if defined?(Dotenv)
   Dotenv.require_keys(
+    "APPLICATION_URL",
     "CONTENTFUL_URL",
     "CONTENTFUL_SPACE",
     "CONTENTFUL_ENVIRONMENT",
diff --git a/config/initializers/default_url_options.rb b/config/initializers/default_url_options.rb
new file mode 100644
index 000000000..5af78743e
--- /dev/null
+++ b/config/initializers/default_url_options.rb
@@ -0,0 +1,5 @@
+uri = URI(ENV["APPLICATION_URL"])
+
+Rails.application.routes.default_url_options[:host] = uri.host
+Rails.application.routes.default_url_options[:port] = uri.port
+Rails.application.routes.default_url_options[:protocol] = uri.scheme
diff --git a/spec/features/school_buying_professionals/complete_a_journey_spec.rb b/spec/features/school_buying_professionals/complete_a_journey_spec.rb
index 91f665f89..9812ea631 100644
--- a/spec/features/school_buying_professionals/complete_a_journey_spec.rb
+++ b/spec/features/school_buying_professionals/complete_a_journey_spec.rb
@@ -477,7 +477,7 @@
 
       answer = LongTextAnswer.last
 
-      expect(page).to have_current_path(journey_url(journey, anchor: answer.step.id), url: true)
+      expect(page).to have_current_path(journey_url(journey, anchor: answer.step.id))
     end
   end
 end
diff --git a/spec/features/school_buying_professionals/edit_their_answers_spec.rb b/spec/features/school_buying_professionals/edit_their_answers_spec.rb
index 23bcc41d7..be170db30 100644
--- a/spec/features/school_buying_professionals/edit_their_answers_spec.rb
+++ b/spec/features/school_buying_professionals/edit_their_answers_spec.rb
@@ -135,7 +135,7 @@
 
       click_on(I18n.t("generic.button.update"))
 
-      expect(page).to have_current_path(journey_url(answer.step.journey, anchor: answer.step.id), url: true)
+      expect(page).to have_current_path(journey_url(answer.step.journey, anchor: answer.step.id))
     end
   end
 end
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 1c12b61dd..5bda9b575 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
-Capybara.asset_host = "http://localhost:3000"
+Capybara.app_host = "http://www.example.com:3000"
+Capybara.asset_host = "http://www.example.com"

From 52f61de00b6ef6af6763ef3dd964e8316d2482be Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 22 Mar 2021 16:23:41 +0000
Subject: [PATCH 204/249] Turn on protect_from_forgery to enable CSRF
 protection

Unsure why this wasn't already there by default. The service should only accept signed requests from itself or from whitelisted hosts.
---
 app/controllers/application_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ce505faf3..0447a3474 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,6 +3,10 @@
 class ApplicationController < ActionController::Base
   default_form_builder GOVUKDesignSystemFormBuilder::FormBuilder
 
+  before_action :authenticate_user!, except: :health_check
+
+  protect_from_forgery
+
   def health_check
     render json: {rails: "OK"}, status: :ok
   end

From 04b5f3099ac39d408d1afdc62b98ac5c2a34e820 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 22 Mar 2021 15:49:55 +0000
Subject: [PATCH 205/249] Users are redirected through DfE Sign in when they
 click Start

This work is inspired by the work done on other DfE projects. Namely Teaching Vacancies (which has since moved to Devise) and Apply for teacher training [1]

In the data we request from DSI we only ask for the `openid` scope. This means we do not receive the names, email address or any other information. This should be okay as we don't think we need any personally identifiable information from our users.

For the failing test case we want to check that if the authentication proccess fails that we present something to the user. This is unlikely to happen under normal circumstances as if a user gets their credentials wrong they'll not be redirected. This _should_ cover the case where we have misconfigured something so Rollbar is sent an error to warn the team of a potential misconfiguration.

There is a subtle oddity/difference that was neceassary to get this to work. Specifically in the callback phase of OIDC which fails with "invalid client" if we do nothing. In the Omniauth initialiser we include an additional option `client_auth_method: :client_secret_post`. This is needed so that when Rack OAuth2 (a dependency of the omniauth_openid_connect gem) gets to this point [2] then we fall into the `else` statement and add our credentials as parameters. The basic auth (:basic) doesn't work as a default for some reason and DSI gives no feedback or logging as to why this might be the case. The symbol `client_secret_post` relates to the (only) auth option selected in the DSI console in service settings, but in practice it would work with any value not present in that case statement.

[1] https://github.com/DFE-Digital/apply-for-teacher-training/blob/master/config/initializers/omniauth.rb
[2] https://github.com/nov/rack-oauth2/blob/master/lib/rack/oauth2/client.rb#L84
---
 .env.example                                  |  7 +++
 CHANGELOG.md                                  |  1 +
 Gemfile                                       |  2 +
 Gemfile.lock                                  | 47 +++++++++++++++++++
 app/controllers/sessions_controller.rb        | 25 ++++++++++
 .../pages/specifying_start_page.html.erb      |  2 +-
 app/views/sessions/failure.html.erb           |  6 +++
 config/initializers/omniauth.rb               | 27 +++++++++++
 config/locales/en.yml                         |  4 ++
 config/routes.rb                              | 11 +++++
 .../0010-use-dfe-sign-in-as-auth-provider.md  | 30 ++++++++++++
 ...nyone_can_sign_in_with_dfe_sign_in_spec.rb | 25 ++++++++++
 spec/rails_helper.rb                          |  1 +
 spec/support/journey_helpers.rb               |  2 +
 spec/support/omniauth.rb                      |  1 +
 spec/support/sign_in_helpers.rb               | 16 +++++++
 16 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/sessions_controller.rb
 create mode 100644 app/views/sessions/failure.html.erb
 create mode 100644 config/initializers/omniauth.rb
 create mode 100644 doc/architecture/decisions/0010-use-dfe-sign-in-as-auth-provider.md
 create mode 100644 spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
 create mode 100644 spec/support/omniauth.rb
 create mode 100644 spec/support/sign_in_helpers.rb

diff --git a/.env.example b/.env.example
index 0d2f219e5..955612480 100644
--- a/.env.example
+++ b/.env.example
@@ -22,3 +22,10 @@ CONTENTFUL_ACCESS_TOKEN=
 CONTENTFUL_PREVIEW_APP=false
 CONTENTFUL_ENTRY_CACHING=false
 CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID=contentful-category-entry
+
+# DfE Sign-in
+DFE_SIGN_IN_ISSUER=https://test-oidc.signin.education.gov.uk:443
+DFE_SIGN_IN_IDENTIFIER=buyforyourschool
+DFE_SIGN_IN_SECRET=
+DFE_SIGN_IN_REDIRECT_URL=http://localhost:3000/auth/dfe/callback
+DFE_SIGN_IN_ENABLED=true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 772148729..0554e1ec7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - fix extended radio questions so that further_information can be remembered when it can be provided through multiple fields
 - flash messages can be shown in notification banners
 - fix checkbox answer to save choices after previously skipping
+- users can sign in using DfE Sign-in
 
 ## [release-005] - 2021-1-19
 
diff --git a/Gemfile b/Gemfile
index 4c230db44..f3b6ba298 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,6 +16,8 @@ gem "jquery-rails"
 gem "liquid"
 gem "pg"
 gem "mini_racer"
+gem "omniauth"
+gem "omniauth_openid_connect"
 gem "puma", "~> 5.2"
 gem "redcarpet", "~> 3.5"
 gem "redis", "~> 4.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 5aea0a089..b83af685a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -62,11 +62,14 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    aes_key_wrap (1.1.0)
     ast (2.4.2)
+    attr_required (1.0.1)
     better_errors (2.9.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
+    bindata (2.4.8)
     bindex (0.8.1)
     bootsnap (1.7.3)
       msgpack (~> 1.0)
@@ -141,6 +144,7 @@ GEM
       activemodel (>= 5.2)
       activesupport (>= 5.2)
     hashdiff (1.0.1)
+    hashie (4.1.0)
     high_voltage (3.1.2)
     htmltoword (1.1.1)
       actionpack
@@ -156,6 +160,7 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
+    httpclient (2.8.3)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     jbuilder (2.11.2)
@@ -164,6 +169,10 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    json-jwt (1.13.0)
+      activesupport (>= 4.2)
+      aes_key_wrap
+      bindata
     launchy (2.5.0)
       addressable (~> 2.7)
     libv8 (8.4.255.0)
@@ -193,6 +202,23 @@ GEM
     nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
+      rack (>= 1.6.2, < 3)
+    omniauth_openid_connect (0.3.5)
+      addressable (~> 2.5)
+      omniauth (~> 1.9)
+      openid_connect (~> 1.1)
+    openid_connect (1.2.0)
+      activemodel
+      attr_required (>= 1.0.0)
+      json-jwt (>= 1.5.0)
+      rack-oauth2 (>= 1.6.1)
+      swd (>= 1.0.0)
+      tzinfo
+      validate_email
+      validate_url
+      webfinger (>= 1.0.1)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -206,6 +232,12 @@ GEM
     raabro (1.4.0)
     racc (1.5.2)
     rack (2.2.3)
+    rack-oauth2 (1.16.0)
+      activesupport
+      attr_required
+      httpclient
+      json-jwt (>= 1.11.0)
+      rack (>= 2.1.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (6.1.3)
@@ -325,6 +357,10 @@ GEM
     standard (1.0.4)
       rubocop (= 1.11.0)
       rubocop-performance (= 1.10.1)
+    swd (1.2.0)
+      activesupport (>= 3)
+      attr_required (>= 0.0.5)
+      httpclient (>= 2.4)
     thor (1.1.0)
     tilt (2.0.10)
     turbolinks (5.2.1)
@@ -339,11 +375,20 @@ GEM
     unf_ext (0.0.7.7)
     unicode-display_width (2.0.0)
     uniform_notifier (1.14.0)
+    validate_email (0.1.6)
+      activemodel (>= 3.0)
+      mail (>= 2.2.5)
+    validate_url (1.0.13)
+      activemodel (>= 3.0.0)
+      public_suffix
     web-console (4.1.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
+    webfinger (1.1.0)
+      activesupport
+      httpclient (>= 2.4)
     webmock (3.12.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -382,6 +427,8 @@ DEPENDENCIES
   listen (>= 3.0.5, < 3.5)
   mini_racer
   mock_redis
+  omniauth
+  omniauth_openid_connect
   pg
   pry
   puma (~> 5.2)
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
new file mode 100644
index 000000000..569fd35b5
--- /dev/null
+++ b/app/controllers/sessions_controller.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class SessionsController < ApplicationController
+  def new
+    # This is defined by the class name of our Omniauth strategy
+    redirect_to "/auth/dfe"
+  end
+
+  def create
+    flash[:success] = "You have signed in as DSI user: #{dfe_sign_in_uid}."
+    redirect_to new_journey_path
+  end
+
+  def failure
+    Rollbar.error("Sign in failed unexpectedly")
+  end
+
+  private def auth_hash
+    request.env["omniauth.auth"]
+  end
+
+  private def dfe_sign_in_uid
+    auth_hash["uid"]
+  end
+end
diff --git a/app/views/pages/specifying_start_page.html.erb b/app/views/pages/specifying_start_page.html.erb
index bf10a49d0..18ff0aeca 100644
--- a/app/views/pages/specifying_start_page.html.erb
+++ b/app/views/pages/specifying_start_page.html.erb
@@ -36,4 +36,4 @@
 
 <p class="govuk-body"><%= I18n.t("specifying.start_page.pause_and_resume_body") %></p>
 
-<%= link_to I18n.t("generic.button.start"), new_journey_path, class: "govuk-button" %>
+<%= link_to I18n.t("generic.button.start"), new_dfe_path, class: "govuk-button" %>
diff --git a/app/views/sessions/failure.html.erb b/app/views/sessions/failure.html.erb
new file mode 100644
index 000000000..ad22371d2
--- /dev/null
+++ b/app/views/sessions/failure.html.erb
@@ -0,0 +1,6 @@
+<%= content_for :title, I18n.t("errors.sign_in.unexpected_failure.page_title") %>
+
+<h1 class="govuk-heading-xl"><%= I18n.t("errors.sign_in.unexpected_failure.page_title") %></h1>
+<p class="govuk-body">
+  <%= I18n.t("errors.sign_in.unexpected_failure.page_body") %>
+</p>
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
new file mode 100644
index 000000000..0cb672eaf
--- /dev/null
+++ b/config/initializers/omniauth.rb
@@ -0,0 +1,27 @@
+OmniAuth.config.logger = Rails.logger
+
+dfe_sign_in_issuer_uri = URI(ENV.fetch("DFE_SIGN_IN_ISSUER", "example"))
+dfe_sign_in_identifier = ENV.fetch("DFE_SIGN_IN_IDENTIFIER", "example")
+dfe_sign_in_secret = ENV.fetch("DFE_SIGN_IN_SECRET", "example")
+dfe_sign_in_redirect_uri = ENV.fetch("DFE_SIGN_IN_REDIRECT_URL", "example")
+
+dfe_sign_in_issuer_url = "#{dfe_sign_in_issuer_uri}:#{dfe_sign_in_issuer_uri.port}" if dfe_sign_in_issuer_uri.port
+
+options = {
+  name: :dfe,
+  discovery: true,
+  response_type: :code,
+  issuer: dfe_sign_in_issuer_url,
+  scope: %i[openid],
+  client_auth_method: :client_secret_post,
+  client_options: {
+    port: dfe_sign_in_issuer_uri.port,
+    scheme: dfe_sign_in_issuer_uri.scheme,
+    host: dfe_sign_in_issuer_uri.host,
+    identifier: dfe_sign_in_identifier,
+    secret: dfe_sign_in_secret,
+    redirect_uri: dfe_sign_in_redirect_uri
+  }
+}
+
+Rails.application.config.middleware.use OmniAuth::Strategies::OpenIDConnect, options
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a9f7a9969..6db2f7036 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -92,3 +92,7 @@ en:
     specification_template_invalid:
       page_title: "An unexpected error occurred"
       page_body: "The service has had a problem trying to retrieve a working Specification template. The team have been notified of this problem and you should be able to retry shortly."
+    sign_in:
+      unexpected_failure:
+        page_title: "An unexpected error occurred"
+        page_body: "The service was unable to successfully authenticate you. The team have been notified of this problem and you should be able to retry shortly."
diff --git a/config/routes.rb b/config/routes.rb
index 0cb716cf6..5a841d0d5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,6 +6,17 @@
 
   get "planning" => "high_voltage/pages#show", "id" => "planning_start_page"
 
+  # DfE Sign In
+  resource :sessions,
+    only: %i[create new],
+    as: :dfe,
+    path: "/dfe/sessions",
+    controller: "sessions"
+
+  get "/auth/dfe/callback", to: "sessions#create"
+  get "/auth/dfe/signout", to: "sessions#destroy"
+  get "/auth/failure", to: "sessions#failure"
+
   resource :journey_map, only: [:new]
   resources :journeys, only: [:new, :show] do
     resource :specification, only: [:show]
diff --git a/doc/architecture/decisions/0010-use-dfe-sign-in-as-auth-provider.md b/doc/architecture/decisions/0010-use-dfe-sign-in-as-auth-provider.md
new file mode 100644
index 000000000..63a93ca94
--- /dev/null
+++ b/doc/architecture/decisions/0010-use-dfe-sign-in-as-auth-provider.md
@@ -0,0 +1,30 @@
+# 10. use-dfe-sign-in-as-auth-provider
+
+Date: 2021-03-22
+
+## Status
+
+Accepted
+
+## Context
+
+The service needs a way to authenticate trusted school buying professionals and to restrict the majority of access to the public.
+
+We believe a simpler password-less authentication mechanism would be all that's required. This service does not need any of the school and user information held within DfE Sign-in (DSI). DfE governance has reviewed our concern and decided this service should use DSI.
+
+There is currently no formal recommendation for a tool of choice in the technical guidance https://github.com/DFE-Digital/technical-guidance.
+
+We want a tool that provides an open and modern security standard.
+
+## Decision
+
+We are going to use DSI as our single sign-on provider using the OIDC standard.
+
+## Consequences
+
+- we think that the additional steps needed for the sign in journey will negatively affect the user experience and the ability for users to succeed first time
+- we think it will be difficult to clearly steer users who don't have a DSI account to create one first before continuing back (this will be a dead end for our service until they talk to their school approver)
+- the DSI has been in service for a couple of years now. We expect that most of our users will already have accounts on sign-in
+- DSI is being used actively by other DfE Digital services such as Claim, Apply and Teaching Vacancies. It is a core part of the DfE's service wide design and infrastructure that should be actively supported
+- in future the service may need more information that DSI can make available such as school information, using DSI already would make this easier to obtain
+- there may be advantages to the user experience for school users who use other DfE digital services. Using DSI would present a single view that may increase trust and allow them to jump between services without repeat sign ins
diff --git a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
new file mode 100644
index 000000000..cd1c7e4f0
--- /dev/null
+++ b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
@@ -0,0 +1,25 @@
+require "rails_helper"
+
+feature "Anyone can sign in with DfE Sign-in" do
+  scenario "signs in successfully" do
+    stub_contentful_category(fixture_filename: "radio-question.json")
+    user_exists_in_dfe_sign_in
+
+    user_signs_in_using_dfe_sign_in
+
+    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+  end
+
+  scenario "sign in fails" do
+    user_sign_in_attempt_fails
+
+    expect(Rollbar).to receive(:error)
+      .with("Sign in failed unexpectedly")
+      .and_call_original
+
+    user_signs_in_using_dfe_sign_in
+
+    expect(page).to have_content(I18n.t("errors.sign_in.unexpected_failure.page_title"))
+    expect(page).to have_content(I18n.t("errors.sign_in.unexpected_failure.page_body"))
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index dede3e4d0..472e21151 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -36,6 +36,7 @@
   config.include ContentfulHelpers
   config.include JourneyHelpers, type: :feature
   config.include ActiveSupport::Testing::TimeHelpers
+  config.include SignInHelpers, type: :feature
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
diff --git a/spec/support/journey_helpers.rb b/spec/support/journey_helpers.rb
index 67593d07e..dd2d8c076 100644
--- a/spec/support/journey_helpers.rb
+++ b/spec/support/journey_helpers.rb
@@ -10,6 +10,8 @@ def start_journey_from_category_and_go_to_question(category:)
       fixture_filename: category
     )
 
+    user_exists_in_dfe_sign_in
+
     visit root_path
 
     click_on(I18n.t("generic.button.start"))
diff --git a/spec/support/omniauth.rb b/spec/support/omniauth.rb
new file mode 100644
index 000000000..0b1af4052
--- /dev/null
+++ b/spec/support/omniauth.rb
@@ -0,0 +1 @@
+OmniAuth.config.test_mode = true
diff --git a/spec/support/sign_in_helpers.rb b/spec/support/sign_in_helpers.rb
new file mode 100644
index 000000000..c4c501a54
--- /dev/null
+++ b/spec/support/sign_in_helpers.rb
@@ -0,0 +1,16 @@
+module SignInHelpers
+  def user_exists_in_dfe_sign_in(dsi_uid: SecureRandom.uuid)
+    OmniAuth.config.mock_auth[:dfe] = OmniAuth::AuthHash.new(
+      uid: dsi_uid
+    )
+  end
+
+  def user_sign_in_attempt_fails(dsi_uid: SecureRandom.uuid)
+    OmniAuth.config.mock_auth[:dfe] = :invalid_credentials
+  end
+
+  def user_signs_in_using_dfe_sign_in
+    visit root_path
+    click_link I18n.t("generic.button.start")
+  end
+end

From 224bfecc4e967c7fdb68c3e681d2a6e164a9f198 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 18 Mar 2021 10:54:28 +0000
Subject: [PATCH 206/249] Add basic Users table

---
 app/models/user.rb                             | 3 +++
 db/migrate/20210318105104_create_user_table.rb | 8 ++++++++
 db/schema.rb                                   | 8 +++++++-
 spec/factories/user.rb                         | 5 +++++
 spec/models/user_spec.rb                       | 8 ++++++++
 5 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 app/models/user.rb
 create mode 100644 db/migrate/20210318105104_create_user_table.rb
 create mode 100644 spec/factories/user.rb
 create mode 100644 spec/models/user_spec.rb

diff --git a/app/models/user.rb b/app/models/user.rb
new file mode 100644
index 000000000..d8c290d61
--- /dev/null
+++ b/app/models/user.rb
@@ -0,0 +1,3 @@
+class User < ApplicationRecord
+  self.implicit_order_column = "created_at"
+end
diff --git a/db/migrate/20210318105104_create_user_table.rb b/db/migrate/20210318105104_create_user_table.rb
new file mode 100644
index 000000000..3b7b61608
--- /dev/null
+++ b/db/migrate/20210318105104_create_user_table.rb
@@ -0,0 +1,8 @@
+class CreateUserTable < ActiveRecord::Migration[6.1]
+  def change
+    create_table :users, id: :uuid do |t|
+      t.string :dfe_sign_in_uid, null: false
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 345014fc4..5a2696f1f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_03_16_114040) do
+ActiveRecord::Schema.define(version: 2021_03_18_105104) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -103,6 +103,12 @@
     t.index ["journey_id"], name: "index_steps_on_journey_id"
   end
 
+  create_table "users", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "dfe_sign_in_uid", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
   add_foreign_key "long_text_answers", "steps", on_delete: :cascade
   add_foreign_key "radio_answers", "steps", on_delete: :cascade
   add_foreign_key "short_text_answers", "steps", on_delete: :cascade
diff --git a/spec/factories/user.rb b/spec/factories/user.rb
new file mode 100644
index 000000000..4bad747aa
--- /dev/null
+++ b/spec/factories/user.rb
@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :user do
+    dfe_sign_in_uid { SecureRandom.uuid }
+  end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
new file mode 100644
index 000000000..590fe7f80
--- /dev/null
+++ b/spec/models/user_spec.rb
@@ -0,0 +1,8 @@
+require "rails_helper"
+
+RSpec.describe User, type: :model do
+  it "store the user's DfE Sign-in UID" do
+    user = build(:user, dfe_sign_in_uid: "a96ee522-2de8-4eb1-9b17-9619a310149b")
+    expect(user.dfe_sign_in_uid).to eql("a96ee522-2de8-4eb1-9b17-9619a310149b")
+  end
+end

From acd40d2b5780bf2394da42610cc013c857ffbfd3 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 18 Mar 2021 11:46:41 +0000
Subject: [PATCH 207/249] HighVoltage pages skip authentication

We follow the Override documentation to create a new controller that we can add `before_action` logic to. This allows us to skip the globally applied `before_action :authenticate_user!` applied to the `ApplicationController`, enabling users to see these pages without signing in.
---
 app/controllers/pages_controller.rb | 5 +++++
 config/routes.rb                    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 app/controllers/pages_controller.rb

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
new file mode 100644
index 000000000..0f95a026c
--- /dev/null
+++ b/app/controllers/pages_controller.rb
@@ -0,0 +1,5 @@
+class PagesController < ApplicationController
+  include HighVoltage::StaticPage
+
+  skip_before_action :authenticate_user!
+end
diff --git a/config/routes.rb b/config/routes.rb
index 5a841d0d5..b2a821c3d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,9 +2,9 @@
 
 Rails.application.routes.draw do
   get "health_check" => "application#health_check"
-  root to: "high_voltage/pages#show", id: "specifying_start_page"
+  root to: "pages#show", id: "specifying_start_page"
 
-  get "planning" => "high_voltage/pages#show", "id" => "planning_start_page"
+  get "planning" => "pages#show", "id" => "planning_start_page"
 
   # DfE Sign In
   resource :sessions,

From 2a45d9cd4ed15d96ed3269c5e09bb257d84b49c5 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 18 Mar 2021 15:28:49 +0000
Subject: [PATCH 208/249] Sign in helpers for feature and request tests

`user_signs_in_and_starts_the_journey` exercises the OpenID Connect process (with test enabled). This takes more time for the test suite but has better coverage. It's imagained that a few sign in feature tests will use this.

`user_is_signed_in ` stubs a new class so that the majority of the test suite can operate under the condition that a valid session has already been correctly provisioned. This is much faster and keeps these other tests decoupled from extra code needed to step through the sign in process.
---
 app/controllers/application_controller.rb    |  6 ++++++
 app/services/find_user_from_session.rb       | 11 +++++++++++
 spec/rails_helper.rb                         |  1 +
 spec/services/find_user_from_session_spec.rb | 14 ++++++++++++++
 spec/support/sign_in_helpers.rb              | 13 ++++++++++++-
 5 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 app/services/find_user_from_session.rb
 create mode 100644 spec/services/find_user_from_session_spec.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0447a3474..fc843f0c4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -10,4 +10,10 @@ class ApplicationController < ActionController::Base
   def health_check
     render json: {rails: "OK"}, status: :ok
   end
+
+  protected
+
+  def current_user
+    @current_user ||= FindUserFromSession.new(session_hash: session.to_hash).call.present?
+  end
 end
diff --git a/app/services/find_user_from_session.rb b/app/services/find_user_from_session.rb
new file mode 100644
index 000000000..5b907a388
--- /dev/null
+++ b/app/services/find_user_from_session.rb
@@ -0,0 +1,11 @@
+class FindUserFromSession
+  attr_accessor :session_hash
+
+  def initialize(session_hash:)
+    self.session_hash = session_hash.with_indifferent_access
+  end
+
+  def call
+    User.find_by(dfe_sign_in_uid: session_hash[:dfe_sign_in_uid])
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 472e21151..f8ca4b2c6 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -37,6 +37,7 @@
   config.include JourneyHelpers, type: :feature
   config.include ActiveSupport::Testing::TimeHelpers
   config.include SignInHelpers, type: :feature
+  config.include SignInHelpers, type: :request
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
diff --git a/spec/services/find_user_from_session_spec.rb b/spec/services/find_user_from_session_spec.rb
new file mode 100644
index 000000000..86442412e
--- /dev/null
+++ b/spec/services/find_user_from_session_spec.rb
@@ -0,0 +1,14 @@
+require "rails_helper"
+
+RSpec.describe FindUserFromSession do
+  describe "#call" do
+    context "when a user exists with this DfE Sign-in UID" do
+      it "returns the user record" do
+        user = create(:user, dfe_sign_in_uid: "03f98d51-5a93-4caa-9ff2-07faff7351d2")
+        session_hash = {"dfe_sign_in_uid" => "03f98d51-5a93-4caa-9ff2-07faff7351d2"}
+        result = described_class.new(session_hash: session_hash).call
+        expect(result).to eq(user)
+      end
+    end
+  end
+end
diff --git a/spec/support/sign_in_helpers.rb b/spec/support/sign_in_helpers.rb
index c4c501a54..f96344e40 100644
--- a/spec/support/sign_in_helpers.rb
+++ b/spec/support/sign_in_helpers.rb
@@ -9,8 +9,19 @@ def user_sign_in_attempt_fails(dsi_uid: SecureRandom.uuid)
     OmniAuth.config.mock_auth[:dfe] = :invalid_credentials
   end
 
-  def user_signs_in_using_dfe_sign_in
+  def user_starts_the_journey
     visit root_path
     click_link I18n.t("generic.button.start")
   end
+
+  def user_signs_in_and_starts_the_journey
+    user_exists_in_dfe_sign_in
+    user_starts_the_journey
+  end
+
+  def user_is_signed_in(user: anything)
+    allow_any_instance_of(FindUserFromSession)
+      .to receive(:call)
+      .and_return(user)
+  end
 end

From 9cd57f7462ee97bdc07510ed23ceceda968d024c Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 22 Mar 2021 16:24:03 +0000
Subject: [PATCH 209/249] Most existing endpoints require authentication

Public pages like the start pages, the health check and error rendering does not require authentication. Crucially the sign in end points don't require authentication either, or nobody would be able to get into a signed in state.

Use the new helper `user_starts_the_journey` to capture the steps needed to start the journey into a single method that could be chained. This has been applied across the test suite to give us a single definition. It's imagined we'll need to extend this pretty quickly as the definition of starting changes after the introduction of a dashboard.

The existing feature tests use a new helper `user_is_signed_in` to quickly stub a valid session. This keeps them fast and requiring minimum alerations to support the new authentication logic that would come before every feature test. With so many tests, making each go through the Omniauth flow and the sign in controllers would amount to a lot of wasted time. The test coverage for signing in is covered in a dedicated feature and request spec.
---
 app/controllers/application_controller.rb     |  7 ++
 app/controllers/sessions_controller.rb        |  7 ++
 .../complete_a_journey_spec.rb                |  5 +-
 ...nload_their_catering_specification_spec.rb |  5 +-
 .../edit_their_answers_spec.rb                |  2 +
 .../preview_a_journey_step_spec.rb            |  2 +
 .../resume_a_journey_spec.rb                  |  4 ++
 .../see_the_map_of_journey_steps_page_spec.rb |  2 +
 .../see_their_catering_specification_spec.rb  | 20 ++----
 .../view_a_list_of_tasks_spec.rb              | 22 +++----
 ...nyone_can_sign_in_with_dfe_sign_in_spec.rb | 15 +++--
 spec/requests/authentication_spec.rb          | 64 +++++++++++++++++++
 spec/requests/contentful_caching_spec.rb      |  1 +
 spec/requests/entry_preview_spec.rb           |  2 +
 spec/support/journey_helpers.rb               |  6 +-
 15 files changed, 124 insertions(+), 40 deletions(-)
 create mode 100644 spec/requests/authentication_spec.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fc843f0c4..3d79b401c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -16,4 +16,11 @@ def health_check
   def current_user
     @current_user ||= FindUserFromSession.new(session_hash: session.to_hash).call.present?
   end
+
+  def authenticate_user!
+    return if current_user
+
+    session.delete(:dfe_sign_in_uid)
+    redirect_to new_dfe_path
+  end
 end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 569fd35b5..4a4c9e5d0 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 class SessionsController < ApplicationController
+  skip_before_action :authenticate_user!
+
   def new
     # This is defined by the class name of our Omniauth strategy
     redirect_to "/auth/dfe"
   end
 
   def create
+    session[:dfe_sign_in_uid] = dfe_sign_in_uid
     flash[:success] = "You have signed in as DSI user: #{dfe_sign_in_uid}."
     redirect_to new_journey_path
   end
@@ -15,6 +18,10 @@ def failure
     Rollbar.error("Sign in failed unexpectedly")
   end
 
+  def destroy
+    redirect_to root_path
+  end
+
   private def auth_hash
     request.env["omniauth.auth"]
   end
diff --git a/spec/features/school_buying_professionals/complete_a_journey_spec.rb b/spec/features/school_buying_professionals/complete_a_journey_spec.rb
index 9812ea631..88eb7def7 100644
--- a/spec/features/school_buying_professionals/complete_a_journey_spec.rb
+++ b/spec/features/school_buying_professionals/complete_a_journey_spec.rb
@@ -1,6 +1,7 @@
 require "rails_helper"
 
 feature "Anyone can start a journey" do
+  before { user_is_signed_in }
   around do |example|
     ClimateControl.modify(
       CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
@@ -12,9 +13,7 @@
   scenario "Start page includes a call to action" do
     stub_contentful_category(fixture_filename: "radio-question.json")
 
-    visit root_path
-
-    click_on(I18n.t("generic.button.start"))
+    user_starts_the_journey
 
     expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
     expect(page).to have_content("Which service do you need?")
diff --git a/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb b/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb
index b3a4af1d9..0167c3f63 100644
--- a/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb
+++ b/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb
@@ -1,4 +1,6 @@
 feature "Users can see their catering specification" do
+  before { user_is_signed_in }
+
   context "when the journey has been completed" do
     scenario "HTML" do
       start_journey_from_category_and_go_to_question(category: "category-with-liquid-template.json")
@@ -32,8 +34,7 @@
         fixture_filename: "category-with-liquid-template.json"
       )
 
-      visit root_path
-      click_on(I18n.t("generic.button.start"))
+      user_starts_the_journey
 
       # Omit answering a question to simulate an incomplete spec
 
diff --git a/spec/features/school_buying_professionals/edit_their_answers_spec.rb b/spec/features/school_buying_professionals/edit_their_answers_spec.rb
index be170db30..393e98d0b 100644
--- a/spec/features/school_buying_professionals/edit_their_answers_spec.rb
+++ b/spec/features/school_buying_professionals/edit_their_answers_spec.rb
@@ -1,6 +1,8 @@
 require "rails_helper"
 
 feature "Users can edit their answers" do
+  before { user_is_signed_in }
+
   before do
     journey = answer.step.journey
     journey.update(section_groups: [
diff --git a/spec/features/school_buying_professionals/preview_a_journey_step_spec.rb b/spec/features/school_buying_professionals/preview_a_journey_step_spec.rb
index 03ebaf47e..e1e2b31d7 100644
--- a/spec/features/school_buying_professionals/preview_a_journey_step_spec.rb
+++ b/spec/features/school_buying_professionals/preview_a_journey_step_spec.rb
@@ -5,6 +5,8 @@
       fixture_filename: "steps/radio-question.json"
     )
 
+    user_is_signed_in
+
     visit preview_entry_path("radio-question")
 
     expect(page).to have_content("Which service do you need?")
diff --git a/spec/features/school_buying_professionals/resume_a_journey_spec.rb b/spec/features/school_buying_professionals/resume_a_journey_spec.rb
index 21fd57f2f..6a9556546 100644
--- a/spec/features/school_buying_professionals/resume_a_journey_spec.rb
+++ b/spec/features/school_buying_professionals/resume_a_journey_spec.rb
@@ -1,12 +1,16 @@
 require "rails_helper"
 
 feature "Users can see how to resume a journey" do
+  before { user_is_signed_in }
+
   context "on the task list" do
     let(:journey) { create(:journey) }
+
     scenario "displays the notification banner" do
       visit journey_path(journey)
       expect(page).to have_content(I18n.t("resume.notification.title"))
     end
+
     scenario "displays the journey URL" do
       visit journey_path(journey)
       expect(page).to have_content(journey_url(journey))
diff --git a/spec/features/school_buying_professionals/see_the_map_of_journey_steps_page_spec.rb b/spec/features/school_buying_professionals/see_the_map_of_journey_steps_page_spec.rb
index 5b512f35d..4365369b6 100644
--- a/spec/features/school_buying_professionals/see_the_map_of_journey_steps_page_spec.rb
+++ b/spec/features/school_buying_professionals/see_the_map_of_journey_steps_page_spec.rb
@@ -1,4 +1,6 @@
 feature "Users can see all the steps of a journey" do
+  before { user_is_signed_in }
+
   around do |example|
     ClimateControl.modify(
       CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
diff --git a/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb b/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb
index 07eb0295e..b79c6957c 100644
--- a/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb
+++ b/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb
@@ -1,4 +1,6 @@
 feature "Users can see their catering specification" do
+  before { user_is_signed_in }
+
   scenario "HTML" do
     start_journey_from_category_and_go_to_question(category: "category-with-dynamic-liquid-template.json")
 
@@ -18,8 +20,7 @@
 
   scenario "navigates back to the task list" do
     stub_contentful_category(fixture_filename: "extended-radio-question.json")
-    visit root_path
-    click_on(I18n.t("generic.button.start"))
+    user_starts_the_journey
 
     click_on(I18n.t("journey.specification.button"))
 
@@ -29,9 +30,7 @@
 
   scenario "renders radio responses that have futher information" do
     stub_contentful_category(fixture_filename: "extended-radio-question.json")
-    visit root_path
-    click_on(I18n.t("generic.button.start"))
-
+    user_starts_the_journey
     click_first_link_in_task_list
 
     choose("Catering")
@@ -49,9 +48,7 @@
 
   scenario "renders checkbox responses that have further information" do
     stub_contentful_category(fixture_filename: "extended-checkboxes-question.json")
-    visit root_path
-    click_on(I18n.t("generic.button.start"))
-
+    user_starts_the_journey
     click_first_link_in_task_list
 
     check("Yes")
@@ -74,9 +71,7 @@
 
   scenario "questions that are skipped can be identified" do
     stub_contentful_category(fixture_filename: "skippable-checkboxes-question.json")
-    visit root_path
-    click_on(I18n.t("generic.button.start"))
-
+    user_starts_the_journey
     click_first_link_in_task_list
 
     click_on("None of the above")
@@ -88,8 +83,7 @@
   context "when the spec is incomplete" do
     it "warns the user that the contents are in a partially completed state" do
       stub_contentful_category(fixture_filename: "extended-radio-question.json")
-      visit root_path
-      click_on(I18n.t("generic.button.start"))
+      user_starts_the_journey
 
       # Don't answer any questions to create a in progress spec
 
diff --git a/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb b/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
index 20f3a259b..788e79737 100644
--- a/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
+++ b/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
@@ -1,12 +1,12 @@
 require "rails_helper"
 
 feature "Users can view the task list" do
+  before { user_is_signed_in }
+
   it "tasks are grouped by their section" do
     stub_contentful_category(fixture_filename: "multiple-sections.json")
 
-    visit root_path
-
-    click_on(I18n.t("generic.button.start"))
+    user_starts_the_journey
 
     within(".app-task-list") do
       expect(page).to have_content("Section A")
@@ -25,9 +25,11 @@
   end
 
   context "When a question has been answered" do
-    before do
-      journey = answer.step.journey
-      journey.update(section_groups: [
+    scenario "The task is marked as completed" do
+      stub_contentful_category(fixture_filename: "multiple-sections.json")
+
+      answer = create(:short_text_answer, response: "answer")
+      answer.step.journey.update(section_groups: [
         {
           "order" => 0,
           "title" => "Section A",
@@ -39,10 +41,9 @@
           ]
         }
       ])
-    end
-    let(:answer) { create(:short_text_answer, response: "answer") }
 
-    scenario "The task is marked as completed" do
+      user_starts_the_journey
+
       visit journey_path(answer.step.journey)
 
       expect(page).to have_content(I18n.t("task_list.status.completed"))
@@ -52,9 +53,8 @@
   context "When a question has been hidden" do
     it "should not appear in the task list" do
       stub_contentful_category(fixture_filename: "hidden-field.json")
-      visit root_path
 
-      click_on(I18n.t("generic.button.start"))
+      user_starts_the_journey
 
       expect(page).not_to have_content("You should NOT be able to see this question")
       expect(page).to have_content("You should be able to see this question")
diff --git a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
index cd1c7e4f0..453567731 100644
--- a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
+++ b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
@@ -1,13 +1,16 @@
 require "rails_helper"
 
 feature "Anyone can sign in with DfE Sign-in" do
-  scenario "signs in successfully" do
-    stub_contentful_category(fixture_filename: "radio-question.json")
-    user_exists_in_dfe_sign_in
+  context "when the user exists in the service" do
+    scenario "signs in successfully" do
+      stub_contentful_category(fixture_filename: "radio-question.json")
+      user = create(:user)
 
-    user_signs_in_using_dfe_sign_in
+      user_exists_in_dfe_sign_in(dsi_uid: user.dfe_sign_in_uid)
+      user_starts_the_journey
 
-    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+      expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+    end
   end
 
   scenario "sign in fails" do
@@ -17,7 +20,7 @@
       .with("Sign in failed unexpectedly")
       .and_call_original
 
-    user_signs_in_using_dfe_sign_in
+    user_starts_the_journey
 
     expect(page).to have_content(I18n.t("errors.sign_in.unexpected_failure.page_title"))
     expect(page).to have_content(I18n.t("errors.sign_in.unexpected_failure.page_body"))
diff --git a/spec/requests/authentication_spec.rb b/spec/requests/authentication_spec.rb
new file mode 100644
index 000000000..1e5a50a8e
--- /dev/null
+++ b/spec/requests/authentication_spec.rb
@@ -0,0 +1,64 @@
+require "rails_helper"
+
+RSpec.describe "Authentication", type: :request do
+  describe "Endpoints that don't require authentication" do
+    it "the health_check endpoint is not authenticated" do
+      get health_check_path
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "users can access the specification start page" do
+      get root_path
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "users can access the planning guidance page" do
+      get planning_path
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "users can access the new session endpoint" do
+      get new_dfe_path
+      expect(response).to have_http_status(:found)
+    end
+
+    it "DfE Sign-in can redirect users back to the service with the callback endpoint" do
+      get auth_dfe_callback_path
+      expect(response).to have_http_status(:found)
+    end
+
+    it "DfE Sign-in can sign users out" do
+      get auth_dfe_signout_path
+      expect(response).to have_http_status(:found)
+    end
+  end
+
+  describe "Endpoints that do require authentication" do
+    it "users cannot access the new journey path" do
+      get new_journey_path
+      expect(response).to redirect_to(new_dfe_path)
+    end
+
+    it "users cannot access an existing journey" do
+      journey = create(:journey)
+      get journey_path(journey)
+      expect(response).to redirect_to(new_dfe_path)
+    end
+
+    it "users cannot edit an answer" do
+      answer = create(:radio_answer)
+      get edit_journey_step_path(answer.step.journey, answer.step)
+      expect(response).to redirect_to(new_dfe_path)
+    end
+
+    it "users cannot see the journey map" do
+      get new_journey_map_path
+      expect(response).to redirect_to(new_dfe_path)
+    end
+
+    it "users cannot see the preview endpoints" do
+      get preview_entry_path("an-entry-id")
+      expect(response).to redirect_to(new_dfe_path)
+    end
+  end
+end
diff --git a/spec/requests/contentful_caching_spec.rb b/spec/requests/contentful_caching_spec.rb
index d7eeb9424..5cfe49bae 100644
--- a/spec/requests/contentful_caching_spec.rb
+++ b/spec/requests/contentful_caching_spec.rb
@@ -1,6 +1,7 @@
 require "rails_helper"
 
 RSpec.describe "Contentful Caching", type: :request do
+  before { user_is_signed_in }
   around do |example|
     ClimateControl.modify(
       CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
diff --git a/spec/requests/entry_preview_spec.rb b/spec/requests/entry_preview_spec.rb
index 5a3ca6fea..a3d3089a5 100644
--- a/spec/requests/entry_preview_spec.rb
+++ b/spec/requests/entry_preview_spec.rb
@@ -1,6 +1,8 @@
 require "rails_helper"
 
 RSpec.describe "Entry previews", type: :request do
+  before { user_is_signed_in }
+
   it "creates a dummy journey and redirects to the question creation flow" do
     entry_id = "123"
     fake_journey = create(:journey)
diff --git a/spec/support/journey_helpers.rb b/spec/support/journey_helpers.rb
index dd2d8c076..c0bb2dc34 100644
--- a/spec/support/journey_helpers.rb
+++ b/spec/support/journey_helpers.rb
@@ -10,11 +10,7 @@ def start_journey_from_category_and_go_to_question(category:)
       fixture_filename: category
     )
 
-    user_exists_in_dfe_sign_in
-
-    visit root_path
-
-    click_on(I18n.t("generic.button.start"))
+    user_signs_in_and_starts_the_journey
 
     click_first_link_in_task_list
   end

From 70a483c419835bc0d597fa78cf3d748a1e959773 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 22 Mar 2021 16:06:22 +0000
Subject: [PATCH 210/249] An unrecognised DfE Sign-in UID will create a new
 record

Users won't be invited to our service but we can infer that a successful log in from DSI is enough to generate a new user record. This user record will then be found the next time they sign in, rather than constantly creating new user records. This should allow us to connect other records like journeys to it with integrity.
---
 app/controllers/application_controller.rb     |  7 +++-
 .../find_or_create_user_from_session.rb       | 13 +++++++
 app/services/find_user_from_session.rb        | 11 ------
 ...nyone_can_sign_in_with_dfe_sign_in_spec.rb | 36 +++++++++++++++++++
 .../find_or_create_user_from_session_spec.rb  | 31 ++++++++++++++++
 spec/services/find_user_from_session_spec.rb  | 14 --------
 spec/support/sign_in_helpers.rb               |  2 +-
 7 files changed, 87 insertions(+), 27 deletions(-)
 create mode 100644 app/services/find_or_create_user_from_session.rb
 delete mode 100644 app/services/find_user_from_session.rb
 create mode 100644 spec/services/find_or_create_user_from_session_spec.rb
 delete mode 100644 spec/services/find_user_from_session_spec.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3d79b401c..62a26cf87 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -14,7 +14,12 @@ def health_check
   protected
 
   def current_user
-    @current_user ||= FindUserFromSession.new(session_hash: session.to_hash).call.present?
+    @current_user ||= begin
+      user = FindOrCreateUserFromSession.new(session_hash: session.to_hash).call
+      return user if user.present?
+
+      false
+    end
   end
 
   def authenticate_user!
diff --git a/app/services/find_or_create_user_from_session.rb b/app/services/find_or_create_user_from_session.rb
new file mode 100644
index 000000000..a2fd369c7
--- /dev/null
+++ b/app/services/find_or_create_user_from_session.rb
@@ -0,0 +1,13 @@
+class FindOrCreateUserFromSession
+  attr_accessor :session_hash
+
+  def initialize(session_hash:)
+    self.session_hash = session_hash.with_indifferent_access
+  end
+
+  def call
+    return nil unless session_hash.key?(:dfe_sign_in_uid)
+
+    User.find_or_create_by(dfe_sign_in_uid: session_hash[:dfe_sign_in_uid])
+  end
+end
diff --git a/app/services/find_user_from_session.rb b/app/services/find_user_from_session.rb
deleted file mode 100644
index 5b907a388..000000000
--- a/app/services/find_user_from_session.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class FindUserFromSession
-  attr_accessor :session_hash
-
-  def initialize(session_hash:)
-    self.session_hash = session_hash.with_indifferent_access
-  end
-
-  def call
-    User.find_by(dfe_sign_in_uid: session_hash[:dfe_sign_in_uid])
-  end
-end
diff --git a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
index 453567731..217a9c27e 100644
--- a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
+++ b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
@@ -11,6 +11,42 @@
 
       expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
     end
+
+    scenario "can move between pages without reauthenticating by relying on session data" do
+      stub_contentful_category(fixture_filename: "radio-question.json")
+      user = create(:user)
+
+      user_exists_in_dfe_sign_in(dsi_uid: user.dfe_sign_in_uid)
+      user_starts_the_journey
+
+      expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+
+      visit root_path
+
+      # Undo the OmniAuth stub to check we don't require it again
+      OmniAuth.config.mock_auth[:dfe] = OmniAuth::AuthHash.new(foo: :bar)
+
+      answer = create(:short_text_answer)
+      visit edit_journey_step_path(answer.step.journey, answer.step)
+      expect(page).to have_content(answer.step.title)
+    end
+  end
+
+  context "when the user doesn't exist in the service" do
+    scenario "new users can sign in" do
+      stub_contentful_category(fixture_filename: "radio-question.json")
+
+      a_dsi_uid_we_have_not_seen_before = "7f2cbd01-6779-4524-acc4-0c6ef52120b5"
+
+      # Omit the creation of a fake user to simulate a user not found scenario
+
+      user_exists_in_dfe_sign_in(dsi_uid: a_dsi_uid_we_have_not_seen_before)
+      user_starts_the_journey
+
+      expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+      new_user = User.find_by(dfe_sign_in_uid: a_dsi_uid_we_have_not_seen_before)
+      expect(new_user.dfe_sign_in_uid).to eql(a_dsi_uid_we_have_not_seen_before)
+    end
   end
 
   scenario "sign in fails" do
diff --git a/spec/services/find_or_create_user_from_session_spec.rb b/spec/services/find_or_create_user_from_session_spec.rb
new file mode 100644
index 000000000..44f9007a9
--- /dev/null
+++ b/spec/services/find_or_create_user_from_session_spec.rb
@@ -0,0 +1,31 @@
+require "rails_helper"
+
+RSpec.describe FindOrCreateUserFromSession do
+  describe "#call" do
+    context "when a user exists with this DfE Sign-in UID" do
+      it "returns the user record" do
+        user = create(:user, dfe_sign_in_uid: "03f98d51-5a93-4caa-9ff2-07faff7351d2")
+        session_hash = {"dfe_sign_in_uid" => "03f98d51-5a93-4caa-9ff2-07faff7351d2"}
+        result = described_class.new(session_hash: session_hash).call
+        expect(result).to eq(user)
+      end
+    end
+
+    context "when a user doesn't exist with this DfE Sign-in UID" do
+      it "creates a new user record" do
+        session_hash = {"dfe_sign_in_uid" => "an-unknown-uuid"}
+        result = described_class.new(session_hash: session_hash).call
+        user = User.find_by(dfe_sign_in_uid: "an-unknown-uuid")
+        expect(result).to eq(user)
+      end
+    end
+
+    context "when the session_hash does not include an expected key" do
+      it "returns nil" do
+        session_hash = {"unexpected-key" => "03f98d51-5a93-4caa-9ff2-07faff7351d2"}
+        result = described_class.new(session_hash: session_hash).call
+        expect(result).to eq(nil)
+      end
+    end
+  end
+end
diff --git a/spec/services/find_user_from_session_spec.rb b/spec/services/find_user_from_session_spec.rb
deleted file mode 100644
index 86442412e..000000000
--- a/spec/services/find_user_from_session_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require "rails_helper"
-
-RSpec.describe FindUserFromSession do
-  describe "#call" do
-    context "when a user exists with this DfE Sign-in UID" do
-      it "returns the user record" do
-        user = create(:user, dfe_sign_in_uid: "03f98d51-5a93-4caa-9ff2-07faff7351d2")
-        session_hash = {"dfe_sign_in_uid" => "03f98d51-5a93-4caa-9ff2-07faff7351d2"}
-        result = described_class.new(session_hash: session_hash).call
-        expect(result).to eq(user)
-      end
-    end
-  end
-end
diff --git a/spec/support/sign_in_helpers.rb b/spec/support/sign_in_helpers.rb
index f96344e40..0dc2da0de 100644
--- a/spec/support/sign_in_helpers.rb
+++ b/spec/support/sign_in_helpers.rb
@@ -20,7 +20,7 @@ def user_signs_in_and_starts_the_journey
   end
 
   def user_is_signed_in(user: anything)
-    allow_any_instance_of(FindUserFromSession)
+    allow_any_instance_of(FindOrCreateUserFromSession)
       .to receive(:call)
       .and_return(user)
   end

From 8e70306806a59a5984c94e6bc2ff60c27ec05d97 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 22 Mar 2021 12:47:42 +0000
Subject: [PATCH 211/249] Users can sign out of the service (and DSI)

Another term for this in the OIDC standard is "Global Logout - OP Initiated Logout with Back-Channel Communication".

When the user signs out of our service:
1. logout from the app is triggered
2. we call the app logout mechanism on the end users behalf
3. we destroy the local session
4. we call the logout URL given to us for this user within DSI
5. DSI should then decide whether to trigger the logout process for the other Relying Parties

Digestable breakdown of the spec: https://medium.com/@robert.broeckelmann/openid-connect-logout-eccc73df758f
Official spec: https://openid.bitbucket.io/connect/openid-connect-backchannel-1_0.html

We ignore a Brakeman warning after reviewing it. It is true the session
is passed to an object that is then used to construct a redirect url:

```
UserSession.new(session: session).sign_out_url
```

I think this is OK to ignore because the method `sign_out_url` only
allows 2 hardcoded paths to be calculated. If the
`dfe_sign_in_sign_out_token` is present then a payload with
`auth_dfe_signout_url` is created. If not, the root_path is used. There
is no case where session data is used to decide the redirect location.
---
 CHANGELOG.md                                  |   1 +
 app/controllers/application_controller.rb     |   1 +
 app/controllers/sessions_controller.rb        |  16 ++-
 app/models/user_session.rb                    |  34 +++++
 app/views/layouts/_navigation_links.html.erb  |  10 +-
 app/views/layouts/application.html.erb        |   1 +
 config/brakeman.ignore                        |  22 ++-
 config/locales/en.yml                         |   1 +
 ...nyone_can_sign_in_with_dfe_sign_in_spec.rb |   4 +
 spec/models/user_session_spec.rb              | 132 ++++++++++++++++++
 spec/requests/authentication_spec.rb          |  43 ++++++
 spec/support/sign_in_helpers.rb               |   5 +-
 12 files changed, 260 insertions(+), 10 deletions(-)
 create mode 100644 app/models/user_session.rb
 create mode 100644 spec/models/user_session_spec.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0554e1ec7..873f2cec5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - flash messages can be shown in notification banners
 - fix checkbox answer to save choices after previously skipping
 - users can sign in using DfE Sign-in
+- users can sign out using DfE Sign-in
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 62a26cf87..29ea75dd1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -13,6 +13,7 @@ def health_check
 
   protected
 
+  helper_method :current_user
   def current_user
     @current_user ||= begin
       user = FindOrCreateUserFromSession.new(session_hash: session.to_hash).call
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 4a4c9e5d0..364723099 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -9,8 +9,9 @@ def new
   end
 
   def create
-    session[:dfe_sign_in_uid] = dfe_sign_in_uid
-    flash[:success] = "You have signed in as DSI user: #{dfe_sign_in_uid}."
+    UserSession.new(session: session)
+      .persist_successful_dfe_sign_in_claim!(omniauth_hash: auth_hash)
+
     redirect_to new_journey_path
   end
 
@@ -19,14 +20,15 @@ def failure
   end
 
   def destroy
-    redirect_to root_path
+    user_session = UserSession.new(session: session)
+    sign_out_url_copy = user_session.sign_out_url.dup
+
+    user_session.repudiate!
+
+    redirect_to sign_out_url_copy
   end
 
   private def auth_hash
     request.env["omniauth.auth"]
   end
-
-  private def dfe_sign_in_uid
-    auth_hash["uid"]
-  end
 end
diff --git a/app/models/user_session.rb b/app/models/user_session.rb
new file mode 100644
index 000000000..a9d204d20
--- /dev/null
+++ b/app/models/user_session.rb
@@ -0,0 +1,34 @@
+class UserSession
+  include Rails.application.routes.url_helpers
+
+  attr_accessor :session
+
+  def initialize(session:)
+    self.session = session
+  end
+
+  def persist_successful_dfe_sign_in_claim!(omniauth_hash:)
+    session[:dfe_sign_in_uid] = omniauth_hash.fetch("uid")
+    session[:dfe_sign_in_sign_out_token] = omniauth_hash.dig("credentials", "id_token")
+  end
+
+  def repudiate!
+    session.delete(:dfe_sign_in_uid)
+    session.delete(:dfe_sign_in_sign_out_token)
+  end
+
+  def should_be_signed_out_of_dsi?
+    session.key?(:dfe_sign_in_sign_out_token) && !session[:dfe_sign_in_sign_out_token].blank?
+  end
+
+  def sign_out_url
+    return root_path unless should_be_signed_out_of_dsi?
+
+    query = {
+      post_logout_redirect_uri: auth_dfe_signout_url,
+      id_token_hint: session[:dfe_sign_in_sign_out_token]
+    }
+
+    "#{ENV.fetch("DFE_SIGN_IN_ISSUER")}/session/end?#{query.to_query}"
+  end
+end
diff --git a/app/views/layouts/_navigation_links.html.erb b/app/views/layouts/_navigation_links.html.erb
index 548d397e5..79b7ff1a8 100644
--- a/app/views/layouts/_navigation_links.html.erb
+++ b/app/views/layouts/_navigation_links.html.erb
@@ -1 +1,9 @@
-<%# add navigation links to this file %>
+<nav class="navbar-component">
+  <ul id="navigation" class="govuk-header__navigation navbar-component__navigation", aria-label="Top level navigation">
+    <% if current_user.present? %>
+      <li class="navbar-component__navigation-item--right govuk-header__navigation-item">
+        <%= link_to I18n.t("generic.button.sign_out"), auth_dfe_signout_path, method: :delete, class: "govuk-header__link" %>
+      </li>
+    <% end %>
+  </ul>
+</nav>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 84b46af37..e9ec97acb 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -51,6 +51,7 @@
           <a class="govuk-header__link govuk-header__link--service-name" href="/">
             <%= I18n.t("app.name") %>
           </a>
+          <%= render "layouts/navigation_links" %>
         </div>
       </div>
     </header>
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index 60563a7c4..5e915be4d 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -1,5 +1,25 @@
 {
   "ignored_warnings": [
+    {
+      "warning_type": "Redirect",
+      "warning_code": 18,
+      "fingerprint": "11f128de39b52c4f17c8ac43be1a514cd57e37b172f37589d54738782abb2665",
+      "check_name": "Redirect",
+      "message": "Possible unprotected redirect",
+      "file": "app/controllers/sessions_controller.rb",
+      "line": 30,
+      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
+      "code": "redirect_to(UserSession.new(:session => (session)).sign_out_url)",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "SessionsController",
+        "method": "destroy"
+      },
+      "user_input": "UserSession.new(:session => (session)).sign_out_url",
+      "confidence": "High",
+      "note": ""
+    },
     {
       "warning_type": "Cross-Site Scripting",
       "warning_code": 2,
@@ -32,6 +52,6 @@
       "note": ""
     }
   ],
-  "updated": "2021-03-15 12:25:24 +0000",
+  "updated": "2021-03-22 16:32:31 +0000",
   "brakeman_version": "5.0.0"
 }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6db2f7036..44d5944ce 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -8,6 +8,7 @@ en:
     button:
       back: "Back"
       start: "Start"
+      sign_out: "Sign out"
       next: "Continue"
       change_answer: "Change"
       update: "Update"
diff --git a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
index 217a9c27e..092724ba4 100644
--- a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
+++ b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
@@ -10,6 +10,10 @@
       user_starts_the_journey
 
       expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+
+      within("header") do
+        expect(page).to have_content(I18n.t("generic.button.sign_out"))
+      end
     end
 
     scenario "can move between pages without reauthenticating by relying on session data" do
diff --git a/spec/models/user_session_spec.rb b/spec/models/user_session_spec.rb
new file mode 100644
index 000000000..950d3acdf
--- /dev/null
+++ b/spec/models/user_session_spec.rb
@@ -0,0 +1,132 @@
+require "rails_helper"
+
+RSpec.describe UserSession, type: :model do
+  include Rails.application.routes.url_helpers
+  let(:session) { double(ActionDispatch::Request::Session) }
+
+  describe "#persist_successful_dfe_sign_in_claim!" do
+    it "stores the DfE Sign-in UID in the session" do
+      omniauth_hash = {
+        "uid" => "123",
+        "credentials" => {
+          "id_token" => "456"
+        }
+      }
+
+      user_session = described_class.new(session: session)
+
+      expect(session).to receive(:[]=).with(:dfe_sign_in_uid, "123")
+      expect(session).to receive(:[]=).with(:dfe_sign_in_sign_out_token, "456")
+
+      user_session.persist_successful_dfe_sign_in_claim!(omniauth_hash: omniauth_hash)
+    end
+  end
+
+  describe "#repudiate!" do
+    it "removes the DfE sign in claim from the session" do
+      user_session = described_class.new(session: session)
+
+      expect(session).to receive(:delete).with(:dfe_sign_in_uid)
+      expect(session).to receive(:delete).with(:dfe_sign_in_sign_out_token)
+
+      user_session.repudiate!
+    end
+  end
+
+  describe "#should_be_signed_out_of_dsi?" do
+    it "returns true when there is a sign out token" do
+      session_with_sign_out_token = double(ActionDispatch::Request::Session)
+      allow(session_with_sign_out_token)
+        .to receive(:key?)
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return(true)
+
+      allow(session_with_sign_out_token)
+        .to receive(:[])
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return("a-long-token")
+
+      result = described_class.new(session: session_with_sign_out_token)
+        .should_be_signed_out_of_dsi?
+
+      expect(result).to eq(true)
+    end
+
+    it "returns false when the sign out token value is blank" do
+      session_with_sign_out_token = double(ActionDispatch::Request::Session)
+      allow(session_with_sign_out_token)
+        .to receive(:key?)
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return(true)
+
+      allow(session_with_sign_out_token)
+        .to receive(:[])
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return("")
+
+      result = described_class.new(session: session_with_sign_out_token)
+        .should_be_signed_out_of_dsi?
+
+      expect(result).to eq(false)
+    end
+
+    it "returns false when there is no sign out token" do
+      session_without_sign_in_token = double(ActionDispatch::Request::Session)
+      allow(session_without_sign_in_token)
+        .to receive(:key?)
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return(false)
+
+      result = described_class.new(session: session_without_sign_in_token)
+        .should_be_signed_out_of_dsi?
+
+      expect(result).to eq(false)
+    end
+  end
+
+  describe "#sign_out_url" do
+    around do |example|
+      ClimateControl.modify(
+        DFE_SIGN_IN_ISSUER: "https://test-oidc.signin.education.gov.uk:443"
+      ) do
+        example.run
+      end
+    end
+
+    it "returns a URL that can be sent to DfE Sign-in to sign the user out of their service" do
+      session_with_sign_out_token = double(ActionDispatch::Request::Session)
+
+      allow(session_with_sign_out_token)
+        .to receive(:key?)
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return(true)
+
+      allow(session_with_sign_out_token)
+        .to receive(:[])
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return("a-long-token")
+
+      user_session = described_class.new(session: session_with_sign_out_token)
+
+      result = user_session.sign_out_url
+
+      expect(result).to eq("https://test-oidc.signin.education.gov.uk:443/session/end?id_token_hint=a-long-token&post_logout_redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fauth%2Fdfe%2Fsignout")
+    end
+
+    context "when the user has no sign out token" do
+      it "redirects the user to the root path" do
+        session_without_sign_in_token = double(ActionDispatch::Request::Session)
+        allow(session_without_sign_in_token)
+          .to receive(:key?)
+          .with(:dfe_sign_in_sign_out_token)
+          .and_return(false)
+
+        user_session = described_class.new(session: session_without_sign_in_token)
+
+        result = user_session.sign_out_url
+
+        expect(result).to eql(root_path)
+      end
+    end
+  end
+end
diff --git a/spec/requests/authentication_spec.rb b/spec/requests/authentication_spec.rb
index 1e5a50a8e..6c238e818 100644
--- a/spec/requests/authentication_spec.rb
+++ b/spec/requests/authentication_spec.rb
@@ -61,4 +61,47 @@
       expect(response).to redirect_to(new_dfe_path)
     end
   end
+
+  describe "Sign out" do
+    it "asks UserSession to repudiate the user's session data" do
+      user_exists_in_dfe_sign_in
+      expect_any_instance_of(UserSession).to receive(:repudiate!)
+
+      get auth_dfe_signout_path
+
+      expect(response).to redirect_to(root_path)
+    end
+
+    context "when there is no sign out token (they are already signed out from the applications point of view)" do
+      it "redirects the user to the root path" do
+        user_exists_in_dfe_sign_in
+        allow_any_instance_of(UserSession)
+          .to receive(:should_be_signed_out_of_dsi?).and_return(false)
+
+        get auth_dfe_signout_path
+
+        expect(response).to redirect_to(root_path)
+      end
+    end
+
+    context "when there is a sign out token" do
+      around do |example|
+        ClimateControl.modify(
+          DFE_SIGN_IN_ISSUER: "https://test-oidc.signin.education.gov.uk:443"
+        ) do
+          example.run
+        end
+      end
+
+      it "redirects to DSI with the users token" do
+        user_exists_in_dfe_sign_in
+        allow_any_instance_of(UserSession)
+          .to receive(:should_be_signed_out_of_dsi?).and_return(true)
+
+        get auth_dfe_signout_path
+
+        expect(response).to redirect_to("https://test-oidc.signin.education.gov.uk:443/session/end?id_token_hint=&post_logout_redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fauth%2Fdfe%2Fsignout")
+      end
+    end
+  end
 end
diff --git a/spec/support/sign_in_helpers.rb b/spec/support/sign_in_helpers.rb
index 0dc2da0de..9d4fd6124 100644
--- a/spec/support/sign_in_helpers.rb
+++ b/spec/support/sign_in_helpers.rb
@@ -1,7 +1,10 @@
 module SignInHelpers
   def user_exists_in_dfe_sign_in(dsi_uid: SecureRandom.uuid)
     OmniAuth.config.mock_auth[:dfe] = OmniAuth::AuthHash.new(
-      uid: dsi_uid
+      uid: dsi_uid,
+      credentials: {
+        id_token: "a-long-secret-given-by-dsi-to-use-to-sign-the-user-out-of-dsi-as-a-whole"
+      }
     )
   end
 

From cd564683cb3ec7c13301c6d54a001a52c1aa18f1 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 22 Mar 2021 15:25:25 +0000
Subject: [PATCH 212/249] Document access and config for DfE Sign-in

---
 README.md          |  1 +
 doc/dfe-sign-in.md | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 doc/dfe-sign-in.md

diff --git a/README.md b/README.md
index 6099b7b55..3974d5cf8 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ A service to help school buying professionals create tender documents that compl
 1. [Getting started](/doc/getting-started.md)
 1. [Release process](/doc/release-process.md)
 1. [Managing environment variables](/doc/managing-environment-variables.md)
+1. [DfE Sign-in](/doc/dfe-sign-in.md)
 
 ## Making changes
 
diff --git a/doc/dfe-sign-in.md b/doc/dfe-sign-in.md
new file mode 100644
index 000000000..020e2dfae
--- /dev/null
+++ b/doc/dfe-sign-in.md
@@ -0,0 +1,25 @@
+# DfE Sign-in
+
+We are using DfE Sign-in as the Single Sign-on provider for this service.
+
+## Onboarding
+
+For development, with `DFE_SIGN_IN_ENABLED` set to false you do not need the following in order to start the app. You can provide _any_ value in the `UID` field to sign in.
+
+If you'd like to sign in on a live environment:
+
+1. DfE need to invite your DfE email address to the [necessary environments](#environments) that you can sign in as a regular user. We asked in [the DfE #digital-tools-support Slack channel](https://ukgovernmentdfe.slack.com/archives/CMS9V0JQL)
+2. Another DfE user that is an approver for at least one school needs to invite you. This could an existing dev on the team. [We have been using this school for staging access](https://test-services.signin.education.gov.uk/approvals/50F4A834-9314-4A66-969E-C86D03821C26/users)
+3. You should now be able to sign into the service's staging environment from this application's sign in journey
+
+## Environments
+
+This service has numerous environments and each needs to be paired and configured with a unique DfE environment.
+
+|                | Enabled      | DfE Sign-in Env                                                       | DfE manage service |
+| :------------- | :----------: | :-------------------------------------------------------------------: | :----------------: |
+|  Development   |  false       |                                                                       |                    |
+|  Staging       |  true        | [test-integration](https://test-interactions.signin.education.gov.uk) | [manage](https://test-manage.signin.education.gov.uk/services/FD39DCFC-9B60-46C4-ACDC-699A2468B46F/service-configuration)
+|  Research      |  false       |                                                                       |                    |
+|  Preview       |  false       |                                                                       |                    |
+|  Production    |  false       |                                                                       |                    |

From 9d56d1a318aedc7d35f8341f54b8e448cf014414 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 22 Mar 2021 15:40:42 +0000
Subject: [PATCH 213/249] Flag to use Omniauth in dev, instead of DSI

Inspired by this work on Apply [1]

The flow takes you to a form where you can fill in your desired DSI UID
and email, which will be returned to the app as though via a DfE Sign-in
authentication payload.

Note the :fake_callback method in the SessionsController which is just
an alias of :callback. This is necessary because the Omniauth
`development` strategy we're using mimics some real-world authentication
providers in that it POSTs back to our app. Because the POST has come
from "off-site", no CSRF token is expected.

[1] https://github.com/DFE-Digital/apply-for-teacher-training/commit/3ce79adf194378eda2e788dfff9e095ba841881f#diff-0a10c197c923aa39f522070b424c123d1a93ae9f2e36f662db5177ec617b0386L7
---
 app/controllers/sessions_controller.rb         |  2 ++
 app/views/pages/specifying_start_page.html.erb |  6 +++++-
 config/application.rb                          |  2 ++
 config/initializers/omniauth.rb                | 10 +++++++++-
 config/routes.rb                               |  1 +
 lib/dfe_sign_in.rb                             |  5 +++++
 6 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 lib/dfe_sign_in.rb

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 364723099..8cd705522 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -2,6 +2,7 @@
 
 class SessionsController < ApplicationController
   skip_before_action :authenticate_user!
+  protect_from_forgery except: :bypass_callback
 
   def new
     # This is defined by the class name of our Omniauth strategy
@@ -14,6 +15,7 @@ def create
 
     redirect_to new_journey_path
   end
+  alias_method :bypass_callback, :create
 
   def failure
     Rollbar.error("Sign in failed unexpectedly")
diff --git a/app/views/pages/specifying_start_page.html.erb b/app/views/pages/specifying_start_page.html.erb
index 18ff0aeca..9de73becc 100644
--- a/app/views/pages/specifying_start_page.html.erb
+++ b/app/views/pages/specifying_start_page.html.erb
@@ -36,4 +36,8 @@
 
 <p class="govuk-body"><%= I18n.t("specifying.start_page.pause_and_resume_body") %></p>
 
-<%= link_to I18n.t("generic.button.start"), new_dfe_path, class: "govuk-button" %>
+<% if DfESignIn.bypass? %>
+  <%= link_to "#{I18n.t("generic.button.start")} (bypass DSI)", "/auth/developer", class: "govuk-button" %>
+<% else %>
+  <%= link_to I18n.t("generic.button.start"), new_dfe_path, class: "govuk-button" %>
+<% end %>
diff --git a/config/application.rb b/config/application.rb
index 7033663f4..c9011c268 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -8,6 +8,8 @@
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
+require "./lib/dfe_sign_in"
+
 module BuyForYourSchool
   class Application < Rails::Application
     config.generators do |g|
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 0cb672eaf..aadd4aacd 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -24,4 +24,12 @@
   }
 }
 
-Rails.application.config.middleware.use OmniAuth::Strategies::OpenIDConnect, options
+if DfESignIn.bypass?
+  Rails.application.config.middleware.use OmniAuth::Builder do
+    provider :developer,
+      fields: %i[uid],
+      uid_field: :uid
+  end
+else
+  Rails.application.config.middleware.use OmniAuth::Strategies::OpenIDConnect, options
+end
diff --git a/config/routes.rb b/config/routes.rb
index b2a821c3d..364eeddea 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,6 +16,7 @@
   get "/auth/dfe/callback", to: "sessions#create"
   get "/auth/dfe/signout", to: "sessions#destroy"
   get "/auth/failure", to: "sessions#failure"
+  post "/auth/developer/callback" => "sessions#bypass_callback" if Rails.env.development?
 
   resource :journey_map, only: [:new]
   resources :journeys, only: [:new, :show] do
diff --git a/lib/dfe_sign_in.rb b/lib/dfe_sign_in.rb
new file mode 100644
index 000000000..e159425e2
--- /dev/null
+++ b/lib/dfe_sign_in.rb
@@ -0,0 +1,5 @@
+module DfESignIn
+  def self.bypass?
+    Rails.env.development? && ENV["DFE_SIGN_IN_ENABLED"] == "false"
+  end
+end

From e7ec5f4ef03b0b5d491a5c068b238959166d5e6b Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Mon, 22 Mar 2021 11:45:43 +0000
Subject: [PATCH 214/249] Add a new dashboard page

This page currently only includes a link to start a new specification.

Co-authored-by: Nick Jackson <nick@dxw.com>
---
 app/controllers/dashboard_controller.rb       |  4 +++
 app/views/dashboard/show.html.erb             | 10 ++++++
 config/locales/en.yml                         |  6 ++++
 config/routes.rb                              |  2 ++
 .../anyone_can_view_a_dashboard_spec.rb       | 32 +++++++++++++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 app/controllers/dashboard_controller.rb
 create mode 100644 app/views/dashboard/show.html.erb
 create mode 100644 spec/features/visitors/anyone_can_view_a_dashboard_spec.rb

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
new file mode 100644
index 000000000..b5083b3d0
--- /dev/null
+++ b/app/controllers/dashboard_controller.rb
@@ -0,0 +1,4 @@
+class DashboardController < ApplicationController
+  def show
+  end
+end
diff --git a/app/views/dashboard/show.html.erb b/app/views/dashboard/show.html.erb
new file mode 100644
index 000000000..e84413bfa
--- /dev/null
+++ b/app/views/dashboard/show.html.erb
@@ -0,0 +1,10 @@
+<%= content_for :title, I18n.t("dashboard.header") %>
+<%= link_to I18n.t("generic.button.back"), root_path, class: "govuk-back-link" %>
+
+<h1 class="govuk-heading-xl"><%= I18n.t("dashboard.header") %></h1>
+
+<h2 class="govuk-heading-m"><%= I18n.t("dashboard.create.header") %></h2>
+
+<p class="govuk-body"><%= I18n.t("dashboard.create.body") %></p>
+
+<%= link_to I18n.t("dashboard.create.link"), new_journey_path, class: "govuk-link" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 44d5944ce..b28258533 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -64,6 +64,12 @@ en:
         warning:
           incomplete: "<article id='warning'><p></b>You have not completed all the tasks in Create a specification. There may be information missing from your specification.</b></p></article>"
   specification:
+  dashboard:
+    header: "Specifications dashboard"
+    create:
+      header: "Create a new specification"
+      body: "Create a new specification for a catering procurement."
+      link: "Create a new specification"
   task_list:
     status:
       not_started: Not started
diff --git a/config/routes.rb b/config/routes.rb
index 364eeddea..060179e15 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -29,4 +29,6 @@
   namespace :preview do
     resources :entries, only: [:show]
   end
+
+  get "dashboard", to: "dashboard#show"
 end
diff --git a/spec/features/visitors/anyone_can_view_a_dashboard_spec.rb b/spec/features/visitors/anyone_can_view_a_dashboard_spec.rb
new file mode 100644
index 000000000..882bb0c86
--- /dev/null
+++ b/spec/features/visitors/anyone_can_view_a_dashboard_spec.rb
@@ -0,0 +1,32 @@
+require "rails_helper"
+
+feature "Anyone can view a dashboard" do
+  around do |example|
+    ClimateControl.modify(
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
+    ) do
+      example.run
+    end
+  end
+
+  scenario "Dashboard displays the title" do
+    visit dashboard_path
+
+    expect(page).to have_content(I18n.t("dashboard.header"))
+  end
+
+  scenario "Dashboard prompts user to start a new journey" do
+    stub_contentful_category(fixture_filename: "radio-question.json")
+
+    visit dashboard_path
+
+    expect(page).to have_content(I18n.t("dashboard.create.header"))
+    expect(page).to have_content(I18n.t("dashboard.create.body"))
+
+    click_on(I18n.t("dashboard.create.link"))
+
+    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+    expect(page).to have_content("Which service do you need?")
+    expect(page).to have_content("Not started")
+  end
+end

From 92006104efc641182f13216f88a2705198908ec0 Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Mon, 22 Mar 2021 12:13:45 +0000
Subject: [PATCH 215/249] Refactor tests to start journey using a helper

A lot of tests replicated the same boilerplate. Remove and replace with
a single helper, to reduce the number of test changes needed when the
process of starting a journey changes.

Co-authored-by: Nick Jackson <nick@dxw.com>
---
 .../complete_a_journey_spec.rb                 | 16 +++-------------
 ...wnload_their_catering_specification_spec.rb |  6 ++----
 .../see_their_catering_specification_spec.rb   | 18 +++++-------------
 .../view_a_dashboard_spec.rb}                  |  2 ++
 .../view_a_list_of_tasks_spec.rb               |  8 ++------
 spec/support/journey_helpers.rb                |  6 +++++-
 6 files changed, 19 insertions(+), 37 deletions(-)
 rename spec/features/{visitors/anyone_can_view_a_dashboard_spec.rb => school_buying_professionals/view_a_dashboard_spec.rb} (96%)

diff --git a/spec/features/school_buying_professionals/complete_a_journey_spec.rb b/spec/features/school_buying_professionals/complete_a_journey_spec.rb
index 88eb7def7..b54a48218 100644
--- a/spec/features/school_buying_professionals/complete_a_journey_spec.rb
+++ b/spec/features/school_buying_professionals/complete_a_journey_spec.rb
@@ -11,9 +11,7 @@
   end
 
   scenario "Start page includes a call to action" do
-    stub_contentful_category(fixture_filename: "radio-question.json")
-
-    user_starts_the_journey
+    start_journey_from_category(category: "radio-question.json")
 
     expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
     expect(page).to have_content("Which service do you need?")
@@ -363,11 +361,7 @@
   context "when the Contentful model is of type staticContent" do
     context "when Contentful entry is of type paragraphs" do
       scenario "the content is not displayed in the task list" do
-        stub_contentful_category(fixture_filename: "static-content.json")
-
-        visit root_path
-
-        click_on(I18n.t("generic.button.start"))
+        start_journey_from_category(category: "static-content.json")
 
         # We should really remove static content entirely, since it doesn't
         # appear in the task list pattern.
@@ -454,11 +448,7 @@
 
   context "when the Liquid template was invalid" do
     it "raises an error" do
-      stub_contentful_category(fixture_filename: "category-with-invalid-liquid-template.json")
-
-      visit root_path
-
-      click_on(I18n.t("generic.button.start"))
+      start_journey_from_category(category: "category-with-invalid-liquid-template.json")
 
       expect(page).to have_content(I18n.t("errors.specification_template_invalid.page_title"))
       expect(page).to have_content(I18n.t("errors.specification_template_invalid.page_body"))
diff --git a/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb b/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb
index 0167c3f63..46ab519db 100644
--- a/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb
+++ b/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb
@@ -30,12 +30,10 @@
 
   context "when the journey has not yet been completed" do
     scenario "includes an incomple warning" do
-      stub_contentful_category(
-        fixture_filename: "category-with-liquid-template.json"
+      start_journey_from_category(
+        category: "category-with-liquid-template.json"
       )
 
-      user_starts_the_journey
-
       # Omit answering a question to simulate an incomplete spec
 
       click_on(I18n.t("journey.specification.button"))
diff --git a/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb b/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb
index b79c6957c..4cecd7834 100644
--- a/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb
+++ b/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb
@@ -19,8 +19,7 @@
   end
 
   scenario "navigates back to the task list" do
-    stub_contentful_category(fixture_filename: "extended-radio-question.json")
-    user_starts_the_journey
+    start_journey_from_category(category: "extended-radio-question.json")
 
     click_on(I18n.t("journey.specification.button"))
 
@@ -29,9 +28,7 @@
   end
 
   scenario "renders radio responses that have futher information" do
-    stub_contentful_category(fixture_filename: "extended-radio-question.json")
-    user_starts_the_journey
-    click_first_link_in_task_list
+    start_journey_from_category_and_go_to_question(category: "extended-radio-question.json")
 
     choose("Catering")
     fill_in "answer[catering_further_information]", with: "The school needs the kitchen cleaned once a day"
@@ -47,9 +44,7 @@
   end
 
   scenario "renders checkbox responses that have further information" do
-    stub_contentful_category(fixture_filename: "extended-checkboxes-question.json")
-    user_starts_the_journey
-    click_first_link_in_task_list
+    start_journey_from_category_and_go_to_question(category: "extended-checkboxes-question.json")
 
     check("Yes")
     fill_in "answer[yes_further_information]", with: "More info for yes"
@@ -70,9 +65,7 @@
   end
 
   scenario "questions that are skipped can be identified" do
-    stub_contentful_category(fixture_filename: "skippable-checkboxes-question.json")
-    user_starts_the_journey
-    click_first_link_in_task_list
+    start_journey_from_category_and_go_to_question(category: "skippable-checkboxes-question.json")
 
     click_on("None of the above")
     click_on(I18n.t("journey.specification.button"))
@@ -82,8 +75,7 @@
 
   context "when the spec is incomplete" do
     it "warns the user that the contents are in a partially completed state" do
-      stub_contentful_category(fixture_filename: "extended-radio-question.json")
-      user_starts_the_journey
+      start_journey_from_category(category: "extended-radio-question.json")
 
       # Don't answer any questions to create a in progress spec
 
diff --git a/spec/features/visitors/anyone_can_view_a_dashboard_spec.rb b/spec/features/school_buying_professionals/view_a_dashboard_spec.rb
similarity index 96%
rename from spec/features/visitors/anyone_can_view_a_dashboard_spec.rb
rename to spec/features/school_buying_professionals/view_a_dashboard_spec.rb
index 882bb0c86..a3f3f451b 100644
--- a/spec/features/visitors/anyone_can_view_a_dashboard_spec.rb
+++ b/spec/features/school_buying_professionals/view_a_dashboard_spec.rb
@@ -1,6 +1,8 @@
 require "rails_helper"
 
 feature "Anyone can view a dashboard" do
+  before { user_is_signed_in }
+
   around do |example|
     ClimateControl.modify(
       CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
diff --git a/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb b/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
index 788e79737..4f3425683 100644
--- a/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
+++ b/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
@@ -4,9 +4,7 @@
   before { user_is_signed_in }
 
   it "tasks are grouped by their section" do
-    stub_contentful_category(fixture_filename: "multiple-sections.json")
-
-    user_starts_the_journey
+    start_journey_from_category(category: "multiple-sections.json")
 
     within(".app-task-list") do
       expect(page).to have_content("Section A")
@@ -52,9 +50,7 @@
 
   context "When a question has been hidden" do
     it "should not appear in the task list" do
-      stub_contentful_category(fixture_filename: "hidden-field.json")
-
-      user_starts_the_journey
+      start_journey_from_category(category: "hidden-field.json")
 
       expect(page).not_to have_content("You should NOT be able to see this question")
       expect(page).to have_content("You should be able to see this question")
diff --git a/spec/support/journey_helpers.rb b/spec/support/journey_helpers.rb
index c0bb2dc34..cce75d329 100644
--- a/spec/support/journey_helpers.rb
+++ b/spec/support/journey_helpers.rb
@@ -5,12 +5,16 @@ def click_first_link_in_task_list
     end
   end
 
-  def start_journey_from_category_and_go_to_question(category:)
+  def start_journey_from_category(category:)
     stub_contentful_category(
       fixture_filename: category
     )
 
     user_signs_in_and_starts_the_journey
+  end
+
+  def start_journey_from_category_and_go_to_question(category:)
+    start_journey_from_category(category: category)
 
     click_first_link_in_task_list
   end

From ea2f57d277a3caad10dfd5787b611ee8f5805cbf Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Mar 2021 14:24:37 +0000
Subject: [PATCH 216/249] Docker build succeeds without needing environment
 variables

APPLICATION_URL was recently added and as an initialiser causes the docker build process to fail.

There is no way to provide a real URL during the build stage since we don't know what environment the docker image will be used in. Instead we guard against this variable being unset and if it is, we do nothing, reverting back to Rails defaults.

When the container is started off this image, the initialisers should re run and have the environment variables available to set this as originally intended.
---
 config/initializers/default_url_options.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/initializers/default_url_options.rb b/config/initializers/default_url_options.rb
index 5af78743e..7c05ebeae 100644
--- a/config/initializers/default_url_options.rb
+++ b/config/initializers/default_url_options.rb
@@ -1,5 +1,7 @@
-uri = URI(ENV["APPLICATION_URL"])
+if ENV["APPLICATION_URL"]
+  uri = URI(ENV["APPLICATION_URL"])
 
-Rails.application.routes.default_url_options[:host] = uri.host
-Rails.application.routes.default_url_options[:port] = uri.port
-Rails.application.routes.default_url_options[:protocol] = uri.scheme
+  Rails.application.routes.default_url_options[:host] = uri.host
+  Rails.application.routes.default_url_options[:port] = uri.port
+  Rails.application.routes.default_url_options[:protocol] = uri.scheme
+end

From fe1943d31adf1831c60e19592720e673b19a55e8 Mon Sep 17 00:00:00 2001
From: Lorna <lorna@dxw.com>
Date: Mon, 22 Mar 2021 12:25:13 +0000
Subject: [PATCH 217/249] Users are directed to the dashboard after signing in

Previously, users would be sent to start a new journey after signing in.
They are now sent to the dashboard instead.

Co-authored-by: Nick Jackson <nick@dxw.com>
---
 CHANGELOG.md                                              | 1 +
 app/controllers/sessions_controller.rb                    | 2 +-
 app/views/journeys/show.html.erb                          | 1 +
 .../view_a_list_of_tasks_spec.rb                          | 8 ++++++++
 .../visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb  | 2 +-
 .../visitors/see_a_specification_start_page_spec.rb       | 8 ++++++++
 spec/support/sign_in_helpers.rb                           | 4 ++--
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 873f2cec5..a7b4982bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - fix checkbox answer to save choices after previously skipping
 - users can sign in using DfE Sign-in
 - users can sign out using DfE Sign-in
+- add new dashboard page with the ability to create new specifications
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 8cd705522..5e1699776 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -13,7 +13,7 @@ def create
     UserSession.new(session: session)
       .persist_successful_dfe_sign_in_claim!(omniauth_hash: auth_hash)
 
-    redirect_to new_journey_path
+    redirect_to dashboard_path
   end
   alias_method :bypass_callback, :create
 
diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index a78b2c24c..0bbbeeb89 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -1,5 +1,6 @@
 <%= content_for :title, @journey.category.capitalize %>
 
+<%= link_to I18n.t("generic.button.back"), dashboard_path, class: "govuk-back-link" %>
 <h1 class="govuk-heading-xl"><%= I18n.t("specifying.start_page.page_title") %></h1>
 
 <%= render "resume_journey_notice" %>
diff --git a/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb b/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
index 4f3425683..5007e5478 100644
--- a/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
+++ b/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
@@ -22,6 +22,14 @@
     end
   end
 
+  scenario "user can navigate back to the dashboard" do
+    start_journey_from_category(category: "extended-radio-question.json")
+
+    click_on(I18n.t("generic.button.back"))
+
+    expect(page).to have_content(I18n.t("dashboard.header"))
+  end
+
   context "When a question has been answered" do
     scenario "The task is marked as completed" do
       stub_contentful_category(fixture_filename: "multiple-sections.json")
diff --git a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
index 092724ba4..2b2b5bee9 100644
--- a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
+++ b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
@@ -60,7 +60,7 @@
       .with("Sign in failed unexpectedly")
       .and_call_original
 
-    user_starts_the_journey
+    visit dashboard_path
 
     expect(page).to have_content(I18n.t("errors.sign_in.unexpected_failure.page_title"))
     expect(page).to have_content(I18n.t("errors.sign_in.unexpected_failure.page_body"))
diff --git a/spec/features/visitors/see_a_specification_start_page_spec.rb b/spec/features/visitors/see_a_specification_start_page_spec.rb
index 88c26bd27..ee376c475 100644
--- a/spec/features/visitors/see_a_specification_start_page_spec.rb
+++ b/spec/features/visitors/see_a_specification_start_page_spec.rb
@@ -35,4 +35,12 @@
 
     expect(page).to have_content(I18n.t("specifying.start_page.pause_and_resume_body"))
   end
+
+  scenario "The start button takes the user to the dashboard" do
+    visit root_path
+
+    click_on(I18n.t("generic.button.start"))
+
+    expect(page).to have_content(I18n.t("dashboard.header"))
+  end
 end
diff --git a/spec/support/sign_in_helpers.rb b/spec/support/sign_in_helpers.rb
index 9d4fd6124..1fe107ffe 100644
--- a/spec/support/sign_in_helpers.rb
+++ b/spec/support/sign_in_helpers.rb
@@ -13,8 +13,8 @@ def user_sign_in_attempt_fails(dsi_uid: SecureRandom.uuid)
   end
 
   def user_starts_the_journey
-    visit root_path
-    click_link I18n.t("generic.button.start")
+    visit dashboard_path
+    click_link I18n.t("dashboard.create.link")
   end
 
   def user_signs_in_and_starts_the_journey

From 1b8673f1b7633071eaadf2dec4b102678615b5ee Mon Sep 17 00:00:00 2001
From: Chris Wright <chris@dxw.com>
Date: Thu, 25 Mar 2021 18:36:20 +0000
Subject: [PATCH 218/249] mimemagic update 3.8

---
 Gemfile.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b83af685a..73e3ec784 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,7 +188,8 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
+    mimemagic (0.3.8)
+      nokogiri (~> 1)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
     mini_racer (0.3.1)

From 253b2719359e63abb135bee386d522cc8341b134 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 25 Mar 2021 12:03:56 +0000
Subject: [PATCH 219/249] Extract env vars from VCAP_SERVICES

[GPaaS provides a VCAP_SERVICES environment variable which contains JSON
with information about services bound to the application](https://docs.cloudfoundry.org/buildpacks/ruby/ruby-service-bindings.html).

From the JSON we need to extract the REDIS_URL and any other environment
variables we have put into a user provided service.

This is based on the work we had done for [RODA](https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/commit/52e38600b70c22bcaffd7e17ebd51d14dccb5b4b) and [CCS RMI](
Crown-Commercial-Service/DataSubmissionServiceAPI#376) and others
---
 config/initializers/vcap_services.rb |  2 ++
 lib/vcap_parser.rb                   | 28 ++++++++++++++++
 spec/lib/vcap_parser_spec.rb         | 48 ++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 config/initializers/vcap_services.rb
 create mode 100644 lib/vcap_parser.rb
 create mode 100644 spec/lib/vcap_parser_spec.rb

diff --git a/config/initializers/vcap_services.rb b/config/initializers/vcap_services.rb
new file mode 100644
index 000000000..25276ad58
--- /dev/null
+++ b/config/initializers/vcap_services.rb
@@ -0,0 +1,2 @@
+require "vcap_parser"
+VcapParser.load_service_environment_variables!
diff --git a/lib/vcap_parser.rb b/lib/vcap_parser.rb
new file mode 100644
index 000000000..be047d9cc
--- /dev/null
+++ b/lib/vcap_parser.rb
@@ -0,0 +1,28 @@
+# Class to parse the VCAP_SERVICES environment variable.
+# Cloud Foundry provides an environment variable called VCAP_SERVICES which
+# contains JSON.
+# The JSON provides details of services bound to the application.
+# We parse this to generate environment variables to be used by Rails.
+class VcapParser
+  def self.load_service_environment_variables!
+    return if ENV["VCAP_SERVICES"].blank?
+
+    vcap_json = JSON.parse(ENV["VCAP_SERVICES"])
+    # Turn user provided service credentials into environment variables
+    vcap_json.fetch("user-provided", []).each do |service|
+      service["credentials"].each_pair do |key, value|
+        ENV[key] = value
+      end
+    end
+
+    load_redis_config(
+      vcap_json.fetch("redis", []).first
+    )
+  end
+
+  def self.load_redis_config(redis_config)
+    return unless redis_config
+    # Generate a REDIS_URL from the redis service uri
+    ENV["REDIS_URL"] = redis_config.fetch("credentials").fetch("uri")
+  end
+end
diff --git a/spec/lib/vcap_parser_spec.rb b/spec/lib/vcap_parser_spec.rb
new file mode 100644
index 000000000..c244d3f68
--- /dev/null
+++ b/spec/lib/vcap_parser_spec.rb
@@ -0,0 +1,48 @@
+require "rails_helper"
+
+RSpec.describe VcapParser do
+  describe ".load_service_environment_variables!" do
+    it "loads service level environment variables to the ENV" do
+      vcap_json = '
+        {
+           "user-provided": [
+            {
+             "credentials": {
+              "ENV1": "ENV1VALUE",
+              "ENV2": "ENV2VALUE"
+             }
+            }
+           ]
+         }
+      '
+      ClimateControl.modify VCAP_SERVICES: vcap_json do
+        VcapParser.load_service_environment_variables!
+        expect(ENV["ENV2"]).to eq("ENV2VALUE")
+      end
+    end
+
+    it "loads redis URL to the ENV" do
+      vcap_json = '
+        {
+          "redis": [
+           {
+              "credentials": {
+                "uri": "rediss://x:REDACTED@HOST:6379"
+              }
+            }
+          ]
+        }
+      '
+      ClimateControl.modify VCAP_SERVICES: vcap_json do
+        VcapParser.load_service_environment_variables!
+        expect(ENV["REDIS_URL"]).to eq("rediss://x:REDACTED@HOST:6379")
+      end
+    end
+
+    it "does not error if VCAP_SERVICES is not set" do
+      ClimateControl.modify VCAP_SERVICES: nil do
+        expect { VcapParser.load_service_environment_variables! }.to_not raise_error
+      end
+    end
+  end
+end

From 707cdd2b8c2c3150d21102286555779f54dffef3 Mon Sep 17 00:00:00 2001
From: Chris Wright <chris@dxw.com>
Date: Wed, 24 Mar 2021 16:13:46 +0000
Subject: [PATCH 220/249] Dockerfile to only copy required files

---
 Dockerfile | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f9f1aa3e9..a07a6abd3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,22 @@ RUN bundle config set no-cache "true"
 RUN bundle config set with $BUNDLE_GEM_GROUPS
 RUN bundle install --no-binstubs --retry=3 --jobs=4
 
-COPY . .
+# Copy app code (sorted by vague frequency of change for caching)
+RUN mkdir -p ${INSTALL_PATH}/log
+RUN mkdir -p ${INSTALL_PATH}/tmp
+
+COPY config.ru ${INSTALL_PATH}/config.ru
+COPY Rakefile ${INSTALL_PATH}/Rakefile
+
+COPY public ${INSTALL_PATH}/public
+COPY vendor ${INSTALL_PATH}/vendor
+COPY bin ${INSTALL_PATH}/bin
+COPY lib ${INSTALL_PATH}/lib
+COPY config ${INSTALL_PATH}/config
+COPY db ${INSTALL_PATH}/db
+COPY script ${INSTALL_PATH}/script
+COPY app ${INSTALL_PATH}/app
+# End
 
 # RELEASE STAGE #
 FROM ruby:2.6.6 AS release

From eb306d974eab5798358e47899ab8e04e09aa70c8 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Fri, 26 Mar 2021 17:13:17 +0000
Subject: [PATCH 221/249] Load REDIS_URL and other GPaaS variables before
 initialisation

* The previous implementation had the vcap_parser called in an initialiser. Rails calls these files in alphabetical order [1] which meant it was being run after the redis initialiser. Causing REDIS_URL to be missing
* The Vcap parser only needs to run in the live environment as that's the only place `ENV["VCAP_SERVICES"]` will ever exist.
* I could have numbered the files and ordered vcap before session store but this felt fragile. Someone could easily change the order without realising the consequences.

[1] https://guides.rubyonrails.org/configuring.html#using-initializer-files
---
 config/environments/production.rb    | 4 ++++
 config/initializers/vcap_services.rb | 2 --
 spec/lib/vcap_parser_spec.rb         | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 config/initializers/vcap_services.rb

diff --git a/config/environments/production.rb b/config/environments/production.rb
index d2b469d9b..4713d7a99 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Load environment variables that are created by GPaaS
+require_relative "../../lib/vcap_parser"
+VcapParser.load_service_environment_variables!
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
diff --git a/config/initializers/vcap_services.rb b/config/initializers/vcap_services.rb
deleted file mode 100644
index 25276ad58..000000000
--- a/config/initializers/vcap_services.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require "vcap_parser"
-VcapParser.load_service_environment_variables!
diff --git a/spec/lib/vcap_parser_spec.rb b/spec/lib/vcap_parser_spec.rb
index c244d3f68..d6b8f605c 100644
--- a/spec/lib/vcap_parser_spec.rb
+++ b/spec/lib/vcap_parser_spec.rb
@@ -1,4 +1,5 @@
 require "rails_helper"
+require "vcap_parser"
 
 RSpec.describe VcapParser do
   describe ".load_service_environment_variables!" do

From dd7d10e9bfa4a79a48317651f00b984608a792be Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Mar 2021 16:03:37 +0000
Subject: [PATCH 222/249] (WIP) Terraform Infrastructure

---
 .gitignore                                    |   4 +
 terraform/app/.terraform.lock.hcl             |  18 +++
 terraform/app/README.md                       |  35 ++++-
 terraform/app/data.tf                         |  20 +++
 terraform/app/locals.tf                       |  39 ++++++
 terraform/app/postgres.tf                     |  11 ++
 terraform/app/redis.tf                        |  10 ++
 terraform/app/routes.tf                       |   5 +
 terraform/app/variables.tf                    | 132 ++++++++++++++++++
 terraform/app/web-app.tf                      |  19 +++
 terraform/app/web-worker.tf                   |  18 +++
 .../preview.tfvars.example                    |   1 +
 .../preview_app_env.yml.example               |  28 ++++
 .../workspace-variables/prod.tfvars.example   |   1 +
 .../prod_app_env.yml.example                  |  28 ++++
 .../research.tfvars.example                   |   1 +
 .../research_app_env.yml.example              |  28 ++++
 .../staging.tfvars.example                    |   1 +
 .../staging_app_env.yml.example               |  28 ++++
 19 files changed, 426 insertions(+), 1 deletion(-)
 create mode 100644 terraform/app/data.tf
 create mode 100644 terraform/app/locals.tf
 create mode 100644 terraform/app/postgres.tf
 create mode 100644 terraform/app/redis.tf
 create mode 100644 terraform/app/routes.tf
 create mode 100644 terraform/app/variables.tf
 create mode 100644 terraform/app/web-app.tf
 create mode 100644 terraform/app/web-worker.tf
 create mode 100644 terraform/workspace-variables/preview.tfvars.example
 create mode 100644 terraform/workspace-variables/preview_app_env.yml.example
 create mode 100644 terraform/workspace-variables/prod.tfvars.example
 create mode 100644 terraform/workspace-variables/prod_app_env.yml.example
 create mode 100644 terraform/workspace-variables/research.tfvars.example
 create mode 100644 terraform/workspace-variables/research_app_env.yml.example
 create mode 100644 terraform/workspace-variables/staging.tfvars.example
 create mode 100644 terraform/workspace-variables/staging_app_env.yml.example

diff --git a/.gitignore b/.gitignore
index 4dc8a45f9..bdfde7431 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,3 +108,7 @@ terraform.rc
 *.sql
 *.csv
 *.xls
+
+# App env yaml files
+*_app_env.yml
+*_app_env.yaml
diff --git a/terraform/app/.terraform.lock.hcl b/terraform/app/.terraform.lock.hcl
index 84a3c0caf..1146b5921 100644
--- a/terraform/app/.terraform.lock.hcl
+++ b/terraform/app/.terraform.lock.hcl
@@ -21,3 +21,21 @@ provider "registry.terraform.io/cloudfoundry-community/cloudfoundry" {
     "zh:ece9ae93c194866d3365057e731c3571bde825b8558c5e8c4d9e12c1f624cd86",
   ]
 }
+
+provider "registry.terraform.io/hashicorp/local" {
+  version = "2.1.0"
+  hashes = [
+    "h1:KfieWtVyGWwplSoLIB5usKAUnrIkDQBkWaR5TI+4WYg=",
+    "zh:0f1ec65101fa35050978d483d6e8916664b7556800348456ff3d09454ac1eae2",
+    "zh:36e42ac19f5d68467aacf07e6adcf83c7486f2e5b5f4339e9671f68525fc87ab",
+    "zh:6db9db2a1819e77b1642ec3b5e95042b202aee8151a0256d289f2e141bf3ceb3",
+    "zh:719dfd97bb9ddce99f7d741260b8ece2682b363735c764cac83303f02386075a",
+    "zh:7598bb86e0378fd97eaa04638c1a4c75f960f62f69d3662e6d80ffa5a89847fe",
+    "zh:ad0a188b52517fec9eca393f1e2c9daea362b33ae2eb38a857b6b09949a727c1",
+    "zh:c46846c8df66a13fee6eff7dc5d528a7f868ae0dcf92d79deaac73cc297ed20c",
+    "zh:dc1a20a2eec12095d04bf6da5321f535351a594a636912361db20eb2a707ccc4",
+    "zh:e57ab4771a9d999401f6badd8b018558357d3cbdf3d33cc0c4f83e818ca8e94b",
+    "zh:ebdcde208072b4b0f8d305ebf2bfdc62c926e0717599dcf8ec2fd8c5845031c3",
+    "zh:ef34c52b68933bedd0868a13ccfd59ff1c820f299760b3c02e008dc95e2ece91",
+  ]
+}
diff --git a/terraform/app/README.md b/terraform/app/README.md
index 64dbb77b8..4751474f9 100644
--- a/terraform/app/README.md
+++ b/terraform/app/README.md
@@ -8,7 +8,7 @@ At the time of writing, we store our state in an s3 bucket on the PaaS in the `s
 
 ### Setup
 
-- go to the application `/terraform` directory
+- go to the application `/terraform/app` directory
 - install [tfenv](https://github.com/tfutils/tfenv)
 - run `tfenv install` to install the vesion of terraform specified in `.terraform-version`
 - ask the tech lead for access to the service within DfE's central GPaaS account
@@ -35,3 +35,36 @@ $ export AWS_REGION=aws_region
 $ export AWS_ACCESS_KEY_ID=aws_access_key_id
 $ export AWS_SECRET_ACCESS_KEY=aws_secret_access_key
 ```
+- initialise terraform to test the local environment:
+```
+terraform init
+```
+
+### Deploying
+
+- copy: `$PROJECT_PATH/terraform/workspace-variables/<environment>.tfvars.example`
+  to: `$PROJECT_PATH/terraform/workspace-variables/app/<environment>.tfvars`
+- copy: `$PROJECT_PATH/terraform/workspace-variables/<environment>_app_env.yml.example`
+  to: `$PROJECT_PATH/terraform/workspace-variables/app/<environment>_app_env.yml`
+- ask the Tech Lead for the environment's variables for `tfvars` and `app_env.yml` files
+- change to the relevant terraform workspace:
+```
+$ terraform workspace list
+$ terraform workspace select <environment>
+```
+- without any changes, ensure that this does not invoke any infrastructure changes:
+```
+$ terraform plan -var-file=<environment>.tfvars
+[...]
+
+No changes. Infrastructure is up-to-date.
+
+This means that Terraform did not detect any differences between your
+configuration and real physical resources that exist. As a result, no
+actions need to be performed.
+```
+- once you have modified or added any resources, deploy them:
+```
+$ terraform apply -var-file=<environment>.tfvars
+```
+- ensure a Pull Request is opened with the changes and merged in, otherwise the resources will be destroyed if terraform apply is ran elsewhere
diff --git a/terraform/app/data.tf b/terraform/app/data.tf
new file mode 100644
index 000000000..4d3cb6339
--- /dev/null
+++ b/terraform/app/data.tf
@@ -0,0 +1,20 @@
+data "cloudfoundry_org" "org" {
+  name = local.cloudfoundry_org
+}
+
+data "cloudfoundry_domain" "shared" {
+  name = local.shared_cloudfoundry_domain
+}
+
+data "cloudfoundry_service" "redis" {
+  name = "redis"
+}
+
+data "cloudfoundry_service" "postgres" {
+  name = "postgres"
+}
+
+data "cloudfoundry_space" "space" {
+  name = local.cloudfoundry_space
+  org  = data.cloudfoundry_org.org.id
+}
diff --git a/terraform/app/locals.tf b/terraform/app/locals.tf
new file mode 100644
index 000000000..4358313c1
--- /dev/null
+++ b/terraform/app/locals.tf
@@ -0,0 +1,39 @@
+locals {
+  project_name = var.project_name
+  environment  = var.environment
+
+  cloudfoundry_org           = var.cloudfoundry_org
+  cloudfoundry_space         = local.environment == "prod" ? "sct-production" : "sct-${local.environment}"
+  shared_cloudfoundry_domain = var.shared_cloudfoundry_domain
+
+  redis_class    = var.redis_class
+  redis_timeouts = var.redis_timeouts
+
+  postgres_class       = local.environment == "prod" ? var.postgres_class_prod : var.postgres_class
+  postgres_json_params = jsonencode(var.postgres_json_params)
+  postgres_timeouts    = var.postgres_timeouts
+
+  app_env_yaml_file = file("${local.environment}_app_env.yml")
+  app_env           = yamldecode(local.app_env_yaml_file)
+  domain            = "${local.project_name}-${local.environment}.${local.shared_cloudfoundry_domain}"
+  app_env_domain = {
+    "DOMAIN" = local.domain
+  }
+  app_environment = merge(
+    local.app_env_domain,
+    local.app_env,
+  )
+
+  web_app_docker_image               = var.docker_image
+  web_app_instances                  = var.web_app_instances
+  web_app_disk_quota                 = var.web_app_disk_quota
+  web_app_timeout                    = var.web_app_timeout
+  web_app_health_check_http_endpoint = var.web_app_health_check_http_endpoint
+
+  web_worker_command              = var.web_worker_command
+  web_worker_docker_image         = var.docker_image
+  web_worker_instances            = var.web_worker_instances
+  web_worker_disk_quota           = var.web_worker_disk_quota
+  web_worker_timeout              = var.web_worker_timeout
+  web_worker_health_check_timeout = var.web_worker_timeout
+}
diff --git a/terraform/app/postgres.tf b/terraform/app/postgres.tf
new file mode 100644
index 000000000..6fc854715
--- /dev/null
+++ b/terraform/app/postgres.tf
@@ -0,0 +1,11 @@
+resource "cloudfoundry_service_instance" "postgres" {
+  name         = "${local.environment}-postgres"
+  space        = data.cloudfoundry_space.space.id
+  service_plan = data.cloudfoundry_service.postgres.service_plans[local.postgres_class]
+  json_params  = local.postgres_json_params
+  timeouts {
+    create = local.postgres_timeouts.create
+    update = local.postgres_timeouts.update
+    delete = local.postgres_timeouts.delete
+  }
+}
diff --git a/terraform/app/redis.tf b/terraform/app/redis.tf
new file mode 100644
index 000000000..21425aba9
--- /dev/null
+++ b/terraform/app/redis.tf
@@ -0,0 +1,10 @@
+resource "cloudfoundry_service_instance" "redis" {
+  name         = "${local.environment}-redis"
+  space        = data.cloudfoundry_space.space.id
+  service_plan = data.cloudfoundry_service.redis.service_plans[local.redis_class]
+  timeouts {
+    create = local.redis_timeouts.create
+    update = local.redis_timeouts.update
+    delete = local.redis_timeouts.delete
+  }
+}
diff --git a/terraform/app/routes.tf b/terraform/app/routes.tf
new file mode 100644
index 000000000..301718c79
--- /dev/null
+++ b/terraform/app/routes.tf
@@ -0,0 +1,5 @@
+resource "cloudfoundry_route" "shared_route" {
+  domain   = data.cloudfoundry_domain.shared.id
+  space    = data.cloudfoundry_space.space.id
+  hostname = "${local.project_name}-${local.environment}"
+}
diff --git a/terraform/app/variables.tf b/terraform/app/variables.tf
new file mode 100644
index 000000000..5079f76a6
--- /dev/null
+++ b/terraform/app/variables.tf
@@ -0,0 +1,132 @@
+variable "environment" {
+  description = "Environment"
+  type        = string
+}
+
+variable "project_name" {
+  description = "Project name"
+  default     = "buy-for-your-school"
+  type        = string
+}
+
+variable "cloudfoundry_org" {
+  description = "CloudFoundry Org"
+  default     = "dfe"
+  type        = string
+}
+
+variable "shared_cloudfoundry_domain" {
+  description = "Shared Cloud Foundry domain"
+  default     = "london.cloudapps.digital"
+  type        = string
+}
+
+variable "redis_class" {
+  description = "Redis class"
+  default     = "tiny-5_x"
+  type        = string
+}
+
+variable "redis_timeouts" {
+  description = "Redis timeouts"
+  default = {
+    create = "2h"
+    update = "2h"
+    delete = "2h"
+  }
+  type = map(string)
+}
+
+variable "postgres_class" {
+  description = "Postgres class"
+  default     = "small-11"
+  type        = string
+}
+
+variable "postgres_class_prod" {
+  description = "Postgres class (Production environment)"
+  default     = "medium-11"
+  type        = string
+}
+
+variable "postgres_json_params" {
+  description = "Postgres json_params"
+  default = {
+    enable_extensions = [
+      "pgcrypto",
+      "plpgsql",
+    ]
+  }
+  type = map(any)
+}
+
+variable "postgres_timeouts" {
+  description = "Postgres timeouts"
+  default = {
+    create = "2h"
+    update = "2h"
+    delete = "2h"
+  }
+  type = map(string)
+}
+
+variable "docker_image" {
+  description = "Docker image"
+  default     = ""
+  type        = string
+}
+
+
+variable "web_app_instances" {
+  description = "Web app instance number"
+  default     = 2
+  type        = number
+}
+
+variable "web_app_disk_quota" {
+  description = "Web app disk quota"
+  default     = 3072
+  type        = number
+}
+
+variable "web_app_timeout" {
+  description = "Web app timeout"
+  default     = 120
+  type        = number
+}
+
+variable "web_app_health_check_http_endpoint" {
+  description = "Web app health check HTTP endpoint"
+  default     = "/health_check"
+  type        = string
+}
+
+variable "web_worker_instances" {
+  description = "Web worker instance number"
+  default     = 1
+  type        = number
+}
+
+variable "web_worker_disk_quota" {
+  description = "Web worker disk quota"
+  default     = 3072
+  type        = number
+}
+
+variable "web_worker_timeout" {
+  description = "Web worker timeout"
+  default     = 120
+  type        = number
+}
+
+variable "web_worker_health_check_timeout" {
+  description = "Web worker health check timeout"
+  default     = 10
+  type        = number
+}
+
+variable "web_worker_command" {
+  description = "Web worker command"
+  default     = "bundle exec sidekiq -C config/sidekiq.yml"
+  type        = string
+}
diff --git a/terraform/app/web-app.tf b/terraform/app/web-app.tf
new file mode 100644
index 000000000..c2401624d
--- /dev/null
+++ b/terraform/app/web-app.tf
@@ -0,0 +1,19 @@
+resource "cloudfoundry_app" "web_app" {
+  name                       = "${local.project_name}-${local.environment}"
+  space                      = data.cloudfoundry_space.space.id
+  instances                  = local.web_app_instances
+  disk_quota                 = local.web_app_disk_quota
+  timeout                    = local.web_app_timeout
+  docker_image               = local.web_app_docker_image
+  strategy                   = "blue-green-v2"
+  health_check_http_endpoint = local.web_app_health_check_http_endpoint
+
+  service_binding { service_instance = cloudfoundry_service_instance.redis.id }
+  service_binding { service_instance = cloudfoundry_service_instance.postgres.id }
+
+  environment = local.app_environment
+
+  routes {
+    route = cloudfoundry_route.shared_route.id
+  }
+}
diff --git a/terraform/app/web-worker.tf b/terraform/app/web-worker.tf
new file mode 100644
index 000000000..4fdbffa2e
--- /dev/null
+++ b/terraform/app/web-worker.tf
@@ -0,0 +1,18 @@
+resource "cloudfoundry_app" "web_worker" {
+  name                       = "${local.project_name}-worker-${local.environment}"
+  command                    = local.web_worker_command
+  space                      = data.cloudfoundry_space.space.id
+  instances                  = local.web_worker_instances
+  disk_quota                 = local.web_worker_disk_quota
+  timeout                    = local.web_worker_timeout
+  docker_image               = local.web_worker_docker_image
+  strategy                   = "blue-green-v2"
+  health_check_type          = "process"
+  health_check_timeout       = local.web_worker_health_check_timeout
+  health_check_http_endpoint = local.web_app_health_check_http_endpoint
+
+  service_binding { service_instance = cloudfoundry_service_instance.redis.id }
+  service_binding { service_instance = cloudfoundry_service_instance.postgres.id }
+
+  environment = local.app_environment
+}
diff --git a/terraform/workspace-variables/preview.tfvars.example b/terraform/workspace-variables/preview.tfvars.example
new file mode 100644
index 000000000..f4fe9bedc
--- /dev/null
+++ b/terraform/workspace-variables/preview.tfvars.example
@@ -0,0 +1 @@
+environment = "preview"
diff --git a/terraform/workspace-variables/preview_app_env.yml.example b/terraform/workspace-variables/preview_app_env.yml.example
new file mode 100644
index 000000000..6f9d71bf1
--- /dev/null
+++ b/terraform/workspace-variables/preview_app_env.yml.example
@@ -0,0 +1,28 @@
+---
+RACK_ENV: production
+RAILS_ENV: production
+SECRET_KEY_BASE: secret # rake secret
+RAILS_LOG_TO_STDOUT: enabled
+RAILS_SERVE_STATIC_FILES: enabled
+
+APPLICATION_URL:
+
+# Monitoring
+ROLLBAR_ENV: preview-paas
+ROLLBAR_ACCESS_TOKEN:
+
+# Contentful API
+CONTENTFUL_ACCESS_TOKEN:
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID:
+CONTENTFUL_ENTRY_CACHING:
+CONTENTFUL_ENTRY_CACHING_TTL:
+CONTENTFUL_ENVIRONMENT:
+CONTENTFUL_URL:
+CONTENTFUL_SPACE:
+
+# DfE Sign-in (SSO)
+DFE_SIGN_IN_ENABLED:
+DFE_SIGN_IN_IDENTIFIER:
+DFE_SIGN_IN_ISSUER:
+DFE_SIGN_IN_REDIRECT_URL:
+DFE_SIGN_IN_SECRET:
diff --git a/terraform/workspace-variables/prod.tfvars.example b/terraform/workspace-variables/prod.tfvars.example
new file mode 100644
index 000000000..23a817b17
--- /dev/null
+++ b/terraform/workspace-variables/prod.tfvars.example
@@ -0,0 +1 @@
+environment = "prod"
diff --git a/terraform/workspace-variables/prod_app_env.yml.example b/terraform/workspace-variables/prod_app_env.yml.example
new file mode 100644
index 000000000..01fe792e1
--- /dev/null
+++ b/terraform/workspace-variables/prod_app_env.yml.example
@@ -0,0 +1,28 @@
+---
+RACK_ENV: production
+RAILS_ENV: production
+SECRET_KEY_BASE: secret # rake secret
+RAILS_LOG_TO_STDOUT: enabled
+RAILS_SERVE_STATIC_FILES: enabled
+
+APPLICATION_URL:
+
+# Monitoring
+ROLLBAR_ENV: production-paas
+ROLLBAR_ACCESS_TOKEN:
+
+# Contentful API
+CONTENTFUL_ACCESS_TOKEN:
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID:
+CONTENTFUL_ENTRY_CACHING:
+CONTENTFUL_ENTRY_CACHING_TTL:
+CONTENTFUL_ENVIRONMENT:
+CONTENTFUL_URL:
+CONTENTFUL_SPACE:
+
+# DfE Sign-in (SSO)
+DFE_SIGN_IN_ENABLED:
+DFE_SIGN_IN_IDENTIFIER:
+DFE_SIGN_IN_ISSUER:
+DFE_SIGN_IN_REDIRECT_URL:
+DFE_SIGN_IN_SECRET:
diff --git a/terraform/workspace-variables/research.tfvars.example b/terraform/workspace-variables/research.tfvars.example
new file mode 100644
index 000000000..a2bf34abd
--- /dev/null
+++ b/terraform/workspace-variables/research.tfvars.example
@@ -0,0 +1 @@
+environment = "research"
diff --git a/terraform/workspace-variables/research_app_env.yml.example b/terraform/workspace-variables/research_app_env.yml.example
new file mode 100644
index 000000000..e5b9e4cfa
--- /dev/null
+++ b/terraform/workspace-variables/research_app_env.yml.example
@@ -0,0 +1,28 @@
+---
+RACK_ENV: production
+RAILS_ENV: production
+SECRET_KEY_BASE: secret # rake secret
+RAILS_LOG_TO_STDOUT: enabled
+RAILS_SERVE_STATIC_FILES: enabled
+
+APPLICATION_URL:
+
+# Monitoring
+ROLLBAR_ENV: research-paas
+ROLLBAR_ACCESS_TOKEN:
+
+# Contentful API
+CONTENTFUL_ACCESS_TOKEN:
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID:
+CONTENTFUL_ENTRY_CACHING:
+CONTENTFUL_ENTRY_CACHING_TTL:
+CONTENTFUL_ENVIRONMENT:
+CONTENTFUL_URL:
+CONTENTFUL_SPACE:
+
+# DfE Sign-in (SSO)
+DFE_SIGN_IN_ENABLED:
+DFE_SIGN_IN_IDENTIFIER:
+DFE_SIGN_IN_ISSUER:
+DFE_SIGN_IN_REDIRECT_URL:
+DFE_SIGN_IN_SECRET:
diff --git a/terraform/workspace-variables/staging.tfvars.example b/terraform/workspace-variables/staging.tfvars.example
new file mode 100644
index 000000000..b22722838
--- /dev/null
+++ b/terraform/workspace-variables/staging.tfvars.example
@@ -0,0 +1 @@
+environment = "staging"
diff --git a/terraform/workspace-variables/staging_app_env.yml.example b/terraform/workspace-variables/staging_app_env.yml.example
new file mode 100644
index 000000000..ffe09360c
--- /dev/null
+++ b/terraform/workspace-variables/staging_app_env.yml.example
@@ -0,0 +1,28 @@
+---
+RACK_ENV: production
+RAILS_ENV: production
+SECRET_KEY_BASE: secret # rake secret
+RAILS_LOG_TO_STDOUT: enabled
+RAILS_SERVE_STATIC_FILES: enabled
+
+APPLICATION_URL:
+
+# Monitoring
+ROLLBAR_ENV: staging-paas
+ROLLBAR_ACCESS_TOKEN:
+
+# Contentful API
+CONTENTFUL_ACCESS_TOKEN:
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID:
+CONTENTFUL_ENTRY_CACHING:
+CONTENTFUL_ENTRY_CACHING_TTL:
+CONTENTFUL_ENVIRONMENT:
+CONTENTFUL_URL:
+CONTENTFUL_SPACE:
+
+# DfE Sign-in (SSO)
+DFE_SIGN_IN_ENABLED:
+DFE_SIGN_IN_IDENTIFIER:
+DFE_SIGN_IN_ISSUER:
+DFE_SIGN_IN_REDIRECT_URL:
+DFE_SIGN_IN_SECRET:

From e5995913e5503230d04476292447747cb7b5e175 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 10:26:46 +0000
Subject: [PATCH 223/249] Bump rails from 6.1.3 to 6.1.3.1

Bumps [rails](https://github.com/rails/rails) from 6.1.3 to 6.1.3.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.1.3...v6.1.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 119 +++++++++++++++++++++++++--------------------------
 1 file changed, 58 insertions(+), 61 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 73e3ec784..57b635830 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,60 +1,60 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.3)
-      actionpack (= 6.1.3)
-      activesupport (= 6.1.3)
+    actioncable (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3)
-      actionpack (= 6.1.3)
-      activejob (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
+    actionmailbox (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.3)
-      actionpack (= 6.1.3)
-      actionview (= 6.1.3)
-      activejob (= 6.1.3)
-      activesupport (= 6.1.3)
+    actionmailer (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.3)
-      actionview (= 6.1.3)
-      activesupport (= 6.1.3)
+    actionpack (6.1.3.1)
+      actionview (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.3)
-      actionpack (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
+    actiontext (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.3)
-      activesupport (= 6.1.3)
+    actionview (6.1.3.1)
+      activesupport (= 6.1.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.3)
-      activesupport (= 6.1.3)
+    activejob (6.1.3.1)
+      activesupport (= 6.1.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activerecord (6.1.3)
-      activemodel (= 6.1.3)
-      activesupport (= 6.1.3)
-    activestorage (6.1.3)
-      actionpack (= 6.1.3)
-      activejob (= 6.1.3)
-      activerecord (= 6.1.3)
-      activesupport (= 6.1.3)
-      marcel (~> 0.3.1)
-      mimemagic (~> 0.3.2)
-    activesupport (6.1.3)
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activerecord (6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activestorage (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      marcel (~> 1.0.0)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -185,12 +185,9 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.0)
     method_source (1.0.0)
-    mimemagic (0.3.8)
-      nokogiri (~> 1)
-    mini_mime (1.0.2)
+    mini_mime (1.0.3)
     mini_portile2 (2.5.0)
     mini_racer (0.3.1)
       libv8 (~> 8.4.255)
@@ -199,7 +196,7 @@ GEM
       ruby2_keywords
     msgpack (1.4.2)
     multi_json (1.15.0)
-    nio4r (2.5.5)
+    nio4r (2.5.7)
     nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
@@ -241,20 +238,20 @@ GEM
       rack (>= 2.1.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.3)
-      actioncable (= 6.1.3)
-      actionmailbox (= 6.1.3)
-      actionmailer (= 6.1.3)
-      actionpack (= 6.1.3)
-      actiontext (= 6.1.3)
-      actionview (= 6.1.3)
-      activejob (= 6.1.3)
-      activemodel (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
+    rails (6.1.3.1)
+      actioncable (= 6.1.3.1)
+      actionmailbox (= 6.1.3.1)
+      actionmailer (= 6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actiontext (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.3)
+      railties (= 6.1.3.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -262,9 +259,9 @@ GEM
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rails_layout (1.0.42)
-    railties (6.1.3)
-      actionpack (= 6.1.3)
-      activesupport (= 6.1.3)
+    railties (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       method_source
       rake (>= 0.8.7)
       thor (~> 1.0)

From bb3442480a2791b55071793f93ad3f51918f1781 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Mon, 22 Mar 2021 16:54:58 +0000
Subject: [PATCH 224/249] Add index view for existing journeys

Show all existing journeys in the service, along with edit links

To identify individual journeys in the absence of user-editable metadata
we use the journey's 'created on' date.
---
 app/controllers/journeys_controller.rb        |  4 ++++
 app/views/journeys/index.html.erb             | 21 +++++++++++++++++++
 config/locales/en.yml                         |  3 +++
 config/routes.rb                              |  2 +-
 .../view_existing_journeys_spec.rb            | 20 ++++++++++++++++++
 5 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 app/views/journeys/index.html.erb
 create mode 100644 spec/features/school_buying_professionals/view_existing_journeys_spec.rb

diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index ff15d9452..2e066ede9 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -17,6 +17,10 @@ class JourneysController < ApplicationController
     render "errors/contentful_entry_not_found", status: 500
   end
 
+  def index
+    @journeys = Journey.all
+  end
+
   def new
     journey = CreateJourney.new(category_name: "catering").call
     redirect_to journey_path(journey)
diff --git a/app/views/journeys/index.html.erb b/app/views/journeys/index.html.erb
new file mode 100644
index 000000000..106a7646f
--- /dev/null
+++ b/app/views/journeys/index.html.erb
@@ -0,0 +1,21 @@
+<%= content_for :title, I18n.t("journey.index.existing.header") %>
+<%= link_to I18n.t("generic.button.back"), dashboard_path, class: "govuk-back-link" %>
+
+<h1 class="govuk-heading-xl"><%= I18n.t("journey.index.existing.header") %></h1>
+
+<table class="govuk-table">
+  <thead class="govuk-table__head">
+    <tr class="govuk-table__row">
+      <th scope="col" class="govuk-table__header">Date started</th>
+      <th scope="col" class="govuk-table__header govuk-table__cell--numeric"> </th>
+    </tr>
+  </thead>
+  <tbody class="govuk-table__body">
+    <% @journeys.each do |journey| %>
+      <tr class="govuk-table__row">
+        <td class="govuk-table__cell"><%= journey.created_at.strftime("%e %B %Y") %></td>
+        <td class="govuk-table__cell govuk-table__cell--numeric"><a href="<%= journey_path(journey) %>" class="govuk-link">Review and edit</a></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b28258533..283398724 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -56,6 +56,9 @@ en:
     errors:
       contentful_entry_not_found: "An unexpected error occurred. The starting step has been revoked by the content team."
   journey:
+    index:
+      existing:
+        header: "Existing specifications"
     specification:
       header: "Your specification"
       warning: "You have not completed all the tasks. There may be information missing from your specification."
diff --git a/config/routes.rb b/config/routes.rb
index 060179e15..cb7ebc706 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -19,7 +19,7 @@
   post "/auth/developer/callback" => "sessions#bypass_callback" if Rails.env.development?
 
   resource :journey_map, only: [:new]
-  resources :journeys, only: [:new, :show] do
+  resources :journeys, only: [:index, :new, :show] do
     resource :specification, only: [:show]
     resources :steps, only: [:new, :show, :edit] do
       resources :answers, only: [:create, :update]
diff --git a/spec/features/school_buying_professionals/view_existing_journeys_spec.rb b/spec/features/school_buying_professionals/view_existing_journeys_spec.rb
new file mode 100644
index 000000000..fda2105b8
--- /dev/null
+++ b/spec/features/school_buying_professionals/view_existing_journeys_spec.rb
@@ -0,0 +1,20 @@
+require "rails_helper"
+
+feature "Users can view their existing journeys" do
+  before { user_is_signed_in }
+
+  it "displays the page header" do
+    visit journeys_path
+    expect(page).to have_content(I18n.t("journey.index.existing.header"))
+  end
+
+  it "lists existing journeys" do
+    create(:journey, created_at: Time.local(2021, 2, 15, 12, 0, 0))
+    create(:journey, created_at: Time.local(2021, 3, 20, 12, 0, 0))
+
+    visit journeys_path
+
+    expect(page).to have_content("15 February 2021")
+    expect(page).to have_content("20 March 2021")
+  end
+end

From e3137adc7dbb42f1279b59c6d3a087a6af404c28 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@dxw.com>
Date: Tue, 23 Mar 2021 13:52:30 +0000
Subject: [PATCH 225/249] View existing specifications from the dashboard

This completes the dashboard functionality by allowing users to either
view a list of their existing specifications or to start a new one.
---
 app/views/dashboard/show.html.erb             | 24 +++++++++++++++----
 config/locales/en.yml                         |  4 ++++
 .../view_a_dashboard_spec.rb                  | 16 ++++++++++++-
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/app/views/dashboard/show.html.erb b/app/views/dashboard/show.html.erb
index e84413bfa..1aeef628f 100644
--- a/app/views/dashboard/show.html.erb
+++ b/app/views/dashboard/show.html.erb
@@ -1,10 +1,26 @@
 <%= content_for :title, I18n.t("dashboard.header") %>
 <%= link_to I18n.t("generic.button.back"), root_path, class: "govuk-back-link" %>
 
-<h1 class="govuk-heading-xl"><%= I18n.t("dashboard.header") %></h1>
+<div class="govuk-grid-row">
 
-<h2 class="govuk-heading-m"><%= I18n.t("dashboard.create.header") %></h2>
+  <div class="govuk-grid-column-two-thirds">
+      <h1 class="govuk-heading-xl"><%= I18n.t("dashboard.header") %></h1>
+  </div>
 
-<p class="govuk-body"><%= I18n.t("dashboard.create.body") %></p>
+  <div class="govuk-grid-column-one-half">
+      <h2 class="govuk-heading-m"><%= I18n.t("dashboard.existing.header") %></h2>
+      <p class="govuk-body"><%= I18n.t("dashboard.existing.body") %></p>
+      <ul class="govuk-list">
+        <li><%= link_to I18n.t("dashboard.existing.link"), journeys_path, class: "govuk-link" %></li>
+      </ul>
+  </div>
 
-<%= link_to I18n.t("dashboard.create.link"), new_journey_path, class: "govuk-link" %>
+  <div class="govuk-grid-column-one-half">
+      <h2 class="govuk-heading-m"><%= I18n.t("dashboard.create.header") %></h2>
+      <p class="govuk-body"><%= I18n.t("dashboard.create.body") %></p>
+      <ul class="govuk-list">
+        <li><a href="start_new-specification" class="govuk-link"><%= link_to I18n.t("dashboard.create.link"), new_journey_path, class: "govuk-link" %></a></li>
+      </ul>
+  </div>
+
+  </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 283398724..48f6a8fcb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -73,6 +73,10 @@ en:
       header: "Create a new specification"
       body: "Create a new specification for a catering procurement."
       link: "Create a new specification"
+    existing:
+      header: "Existing specifications"
+      body: "Continue with a draft specification, and review completed specifications."
+      link: "Existing specifications"
   task_list:
     status:
       not_started: Not started
diff --git a/spec/features/school_buying_professionals/view_a_dashboard_spec.rb b/spec/features/school_buying_professionals/view_a_dashboard_spec.rb
index a3f3f451b..34bef6cbf 100644
--- a/spec/features/school_buying_professionals/view_a_dashboard_spec.rb
+++ b/spec/features/school_buying_professionals/view_a_dashboard_spec.rb
@@ -17,7 +17,21 @@
     expect(page).to have_content(I18n.t("dashboard.header"))
   end
 
-  scenario "Dashboard prompts user to start a new journey" do
+  scenario "user can view existing specifications" do
+    create(:journey, created_at: Time.local(2021, 2, 15, 12, 0, 0))
+
+    visit dashboard_path
+
+    expect(page).to have_content(I18n.t("dashboard.existing.header"))
+    expect(page).to have_content(I18n.t("dashboard.existing.body"))
+
+    click_on(I18n.t("dashboard.existing.link"))
+
+    expect(page).to have_content(I18n.t("journey.index.existing.header"))
+    expect(page).to have_content("15 February 2021")
+  end
+
+  scenario "user can start a new specification" do
     stub_contentful_category(fixture_filename: "radio-question.json")
 
     visit dashboard_path

From e0d6d03d9c5afd65725a8ae7ae10090e15357992 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 29 Mar 2021 16:01:46 +0100
Subject: [PATCH 226/249] Journey requires a category

---
 app/models/journey.rb       | 2 +-
 spec/models/journey_spec.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/journey.rb b/app/models/journey.rb
index 024d4b76b..d8e3bc34a 100644
--- a/app/models/journey.rb
+++ b/app/models/journey.rb
@@ -3,7 +3,7 @@ class Journey < ApplicationRecord
   has_many :steps
   has_many :visible_steps, -> { where(steps: {hidden: false}) }, class_name: "Step"
 
-  validates :liquid_template, presence: true
+  validates :category, :liquid_template, presence: true
 
   def all_steps_completed?
     visible_steps.all? { |step| step.answer.present? }
diff --git a/spec/models/journey_spec.rb b/spec/models/journey_spec.rb
index 6a5ecf86f..550a82166 100644
--- a/spec/models/journey_spec.rb
+++ b/spec/models/journey_spec.rb
@@ -4,6 +4,7 @@
   it { should have_many(:steps) }
 
   describe "validations" do
+    it { is_expected.to validate_presence_of(:category) }
     it { is_expected.to validate_presence_of(:liquid_template) }
   end
 

From 65be9de80f5bb907aabd99f8df258e5f014f3b2b Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 29 Mar 2021 16:03:09 +0100
Subject: [PATCH 227/249] Creating a journey service will error if a journey
 couldn't be created

We found it was possible that the line `journey = CreateJourney.new().call` would not _always_ return a valid journey. It was possible for an invalid journey to fail the `save` and return an object that wasn't persisted. This has odd consequences that ripple down the stack.
---
 app/services/create_journey.rb       |  2 +-
 spec/services/create_journey_spec.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/services/create_journey.rb b/app/services/create_journey.rb
index 9a5ba6a01..599a106ae 100644
--- a/app/services/create_journey.rb
+++ b/app/services/create_journey.rb
@@ -14,7 +14,7 @@ def call
     )
 
     journey.section_groups = build_section_groupings(sections: sections)
-    journey.save
+    journey.save!
 
     sections.each do |section|
       question_entries = GetStepsFromSection.new(section: section).call
diff --git a/spec/services/create_journey_spec.rb b/spec/services/create_journey_spec.rb
index 1d4d68732..c096c990b 100644
--- a/spec/services/create_journey_spec.rb
+++ b/spec/services/create_journey_spec.rb
@@ -59,5 +59,19 @@
         }
       ])
     end
+
+    context "when the journey cannot be saved" do
+      it "raises an error" do
+        stub_contentful_category(
+          fixture_filename: "category-with-liquid-template.json",
+          stub_sections: true,
+          stub_steps: false
+        )
+
+        # Force a validation error by not providing a category_name
+        expect { described_class.new(category_name: nil).call }
+          .to raise_error(ActiveRecord::RecordInvalid)
+      end
+    end
   end
 end

From d5991eb9d147d95f1a5327299d263c0b0e248f7d Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 29 Mar 2021 16:10:11 +0100
Subject: [PATCH 228/249] Journeys belong to the User who created it

Co-authored-by: Lorna <lorna@dxw.com>
---
 app/controllers/journeys_controller.rb        |  2 +-
 app/models/journey.rb                         |  1 +
 app/models/user.rb                            |  2 ++
 app/services/create_journey.rb                |  8 +++++---
 ...5145645_set_up_user_journey_association.rb |  7 +++++++
 db/schema.rb                                  |  4 +++-
 spec/factories/journey.rb                     |  2 ++
 spec/services/create_journey_spec.rb          | 20 +++++++++++++++----
 spec/support/sign_in_helpers.rb               |  2 +-
 9 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20210325145645_set_up_user_journey_association.rb

diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 2e066ede9..86156109a 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -22,7 +22,7 @@ def index
   end
 
   def new
-    journey = CreateJourney.new(category_name: "catering").call
+    journey = CreateJourney.new(category_name: "catering", user: current_user).call
     redirect_to journey_path(journey)
   end
 
diff --git a/app/models/journey.rb b/app/models/journey.rb
index d8e3bc34a..fdc342671 100644
--- a/app/models/journey.rb
+++ b/app/models/journey.rb
@@ -2,6 +2,7 @@ class Journey < ApplicationRecord
   self.implicit_order_column = "created_at"
   has_many :steps
   has_many :visible_steps, -> { where(steps: {hidden: false}) }, class_name: "Step"
+  belongs_to :user
 
   validates :category, :liquid_template, presence: true
 
diff --git a/app/models/user.rb b/app/models/user.rb
index d8c290d61..3fdebdff0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,3 +1,5 @@
 class User < ApplicationRecord
   self.implicit_order_column = "created_at"
+
+  has_many :journeys
 end
diff --git a/app/services/create_journey.rb b/app/services/create_journey.rb
index 599a106ae..1011c6ae5 100644
--- a/app/services/create_journey.rb
+++ b/app/services/create_journey.rb
@@ -1,8 +1,9 @@
 class CreateJourney
-  attr_accessor :category_name
+  attr_accessor :category_name, :user
 
-  def initialize(category_name:)
+  def initialize(category_name:, user:)
     self.category_name = category_name
+    self.user = user
   end
 
   def call
@@ -10,7 +11,8 @@ def call
     sections = GetSectionsFromCategory.new(category: category).call
     journey = Journey.new(
       category: category_name,
-      liquid_template: category.specification_template
+      liquid_template: category.specification_template,
+      user: user
     )
 
     journey.section_groups = build_section_groupings(sections: sections)
diff --git a/db/migrate/20210325145645_set_up_user_journey_association.rb b/db/migrate/20210325145645_set_up_user_journey_association.rb
new file mode 100644
index 000000000..bc307a406
--- /dev/null
+++ b/db/migrate/20210325145645_set_up_user_journey_association.rb
@@ -0,0 +1,7 @@
+class SetUpUserJourneyAssociation < ActiveRecord::Migration[6.1]
+  def change
+    change_table :journeys do |t|
+      t.belongs_to :user, type: :uuid
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5a2696f1f..71b77fe97 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_03_18_105104) do
+ActiveRecord::Schema.define(version: 2021_03_25_145645) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -41,6 +41,8 @@
     t.datetime "updated_at", precision: 6, null: false
     t.jsonb "liquid_template", null: false
     t.jsonb "section_groups"
+    t.uuid "user_id"
+    t.index ["user_id"], name: "index_journeys_on_user_id"
   end
 
   create_table "long_text_answers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
diff --git a/spec/factories/journey.rb b/spec/factories/journey.rb
index fd64d133b..2ca6309be 100644
--- a/spec/factories/journey.rb
+++ b/spec/factories/journey.rb
@@ -4,6 +4,8 @@
     liquid_template { "Your answer was {{ answer_47EI2X2T5EDTpJX9WjRR9p }}" }
     section_groups { [] }
 
+    association :user, factory: :user
+
     trait :catering do
       category { "catering" }
     end
diff --git a/spec/services/create_journey_spec.rb b/spec/services/create_journey_spec.rb
index c096c990b..4fda6cdaf 100644
--- a/spec/services/create_journey_spec.rb
+++ b/spec/services/create_journey_spec.rb
@@ -15,17 +15,29 @@
         fixture_filename: "category-with-no-steps.json",
         stub_steps: false
       )
-      expect { described_class.new(category_name: "catering").call }
+      expect { described_class.new(category_name: "catering", user: build(:user)).call }
         .to change { Journey.count }.by(1)
       expect(Journey.last.category).to eql("catering")
     end
 
+    it "associates the new journey with the given user" do
+      stub_contentful_category(
+        fixture_filename: "category-with-no-steps.json",
+        stub_steps: false
+      )
+      user = create(:user)
+
+      described_class.new(category_name: "catering", user: user).call
+
+      expect(Journey.last.user).to eq(user)
+    end
+
     it "stores a copy of the Liquid template" do
       stub_contentful_category(
         fixture_filename: "category-with-liquid-template.json"
       )
 
-      described_class.new(category_name: "catering").call
+      described_class.new(category_name: "catering", user: build(:user)).call
 
       expect(Journey.last.liquid_template)
         .to eql("<article id='specification'><h1>Liquid {{templating}}</h1></article>")
@@ -36,7 +48,7 @@
         fixture_filename: "multiple-sections-and-steps.json"
       )
 
-      described_class.new(category_name: "catering").call
+      described_class.new(category_name: "catering", user: build(:user)).call
 
       journey = Journey.last
 
@@ -69,7 +81,7 @@
         )
 
         # Force a validation error by not providing a category_name
-        expect { described_class.new(category_name: nil).call }
+        expect { described_class.new(category_name: nil, user: build(:user)).call }
           .to raise_error(ActiveRecord::RecordInvalid)
       end
     end
diff --git a/spec/support/sign_in_helpers.rb b/spec/support/sign_in_helpers.rb
index 1fe107ffe..706c052ef 100644
--- a/spec/support/sign_in_helpers.rb
+++ b/spec/support/sign_in_helpers.rb
@@ -22,7 +22,7 @@ def user_signs_in_and_starts_the_journey
     user_starts_the_journey
   end
 
-  def user_is_signed_in(user: anything)
+  def user_is_signed_in(user: build(:user))
     allow_any_instance_of(FindOrCreateUserFromSession)
       .to receive(:call)
       .and_return(user)

From cfc849dd08eeddf36dc421ffb84b58bf9c01b078 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 29 Mar 2021 16:22:18 +0100
Subject: [PATCH 229/249] Users can only see their own journeys

Co-authored-by: Lorna <lorna@dxw.com>
---
 CHANGELOG.md                                  |  1 +
 app/controllers/journeys_controller.rb        |  2 +-
 app/controllers/preview/entries_controller.rb |  7 ++++-
 .../view_a_dashboard_spec.rb                  |  4 ++-
 .../view_existing_journeys_spec.rb            | 29 +++++++++++++++++--
 spec/requests/entry_preview_spec.rb           |  2 +-
 6 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7b4982bf..393805f57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - users can sign in using DfE Sign-in
 - users can sign out using DfE Sign-in
 - add new dashboard page with the ability to create new specifications
+- users can only see their past journeys from the dashboard
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 86156109a..85fefeece 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -18,7 +18,7 @@ class JourneysController < ApplicationController
   end
 
   def index
-    @journeys = Journey.all
+    @journeys = current_user.journeys
   end
 
   def new
diff --git a/app/controllers/preview/entries_controller.rb b/app/controllers/preview/entries_controller.rb
index 1f06eb262..92a660ba2 100644
--- a/app/controllers/preview/entries_controller.rb
+++ b/app/controllers/preview/entries_controller.rb
@@ -1,6 +1,11 @@
 class Preview::EntriesController < ApplicationController
   def show
-    @journey = Journey.create(category: "catering", liquid_template: "<p>N/A</p>")
+    @journey = Journey.create(
+      category: "catering",
+      user: current_user,
+      liquid_template: "<p>N/A</p>"
+    )
+
     contentful_entry = GetEntry.new(entry_id: entry_id).call
     @step = CreateJourneyStep.new(
       journey: @journey, contentful_entry: contentful_entry
diff --git a/spec/features/school_buying_professionals/view_a_dashboard_spec.rb b/spec/features/school_buying_professionals/view_a_dashboard_spec.rb
index 34bef6cbf..a55be68e5 100644
--- a/spec/features/school_buying_professionals/view_a_dashboard_spec.rb
+++ b/spec/features/school_buying_professionals/view_a_dashboard_spec.rb
@@ -18,7 +18,9 @@
   end
 
   scenario "user can view existing specifications" do
-    create(:journey, created_at: Time.local(2021, 2, 15, 12, 0, 0))
+    user = create(:user)
+    user_is_signed_in(user: user)
+    create(:journey, user: user, created_at: Time.local(2021, 2, 15, 12, 0, 0))
 
     visit dashboard_path
 
diff --git a/spec/features/school_buying_professionals/view_existing_journeys_spec.rb b/spec/features/school_buying_professionals/view_existing_journeys_spec.rb
index fda2105b8..268d77f6b 100644
--- a/spec/features/school_buying_professionals/view_existing_journeys_spec.rb
+++ b/spec/features/school_buying_professionals/view_existing_journeys_spec.rb
@@ -9,12 +9,37 @@
   end
 
   it "lists existing journeys" do
-    create(:journey, created_at: Time.local(2021, 2, 15, 12, 0, 0))
-    create(:journey, created_at: Time.local(2021, 3, 20, 12, 0, 0))
+    user = create(:user)
+    user_is_signed_in(user: user)
+    create(:journey, user: user, created_at: Time.local(2021, 2, 15, 12, 0, 0))
+    create(:journey, user: user, created_at: Time.local(2021, 3, 20, 12, 0, 0))
 
     visit journeys_path
 
     expect(page).to have_content("15 February 2021")
     expect(page).to have_content("20 March 2021")
   end
+
+  context "when the journey does not belong to the user" do
+    scenario "that journey is not shown" do
+      travel_to Time.zone.local(2021, 2, 15, 12, 0, 0)
+
+      another_user = create(:user)
+      _another_users_journey = create(:journey,
+        user: another_user,
+        created_at: Time.local(2021, 3, 20, 12, 0, 0))
+
+      signed_in_user = create(:user)
+      user_is_signed_in(user: signed_in_user)
+
+      # Start the journey which creates a journey record
+      start_journey_from_category(category: "radio-question.json")
+
+      click_on(I18n.t("generic.button.back"))
+      click_on(I18n.t("dashboard.existing.link"))
+
+      expect(page).to have_content("15 February 2021")
+      expect(page).not_to have_content("20 March 2021")
+    end
+  end
 end
diff --git a/spec/requests/entry_preview_spec.rb b/spec/requests/entry_preview_spec.rb
index a3d3089a5..8a4c99add 100644
--- a/spec/requests/entry_preview_spec.rb
+++ b/spec/requests/entry_preview_spec.rb
@@ -7,7 +7,7 @@
     entry_id = "123"
     fake_journey = create(:journey)
     expect(Journey).to receive(:create)
-      .with(category: anything, liquid_template: anything)
+      .with(category: anything, user: anything, liquid_template: anything)
       .and_return(fake_journey)
 
     fake_get_contentful_entry = instance_double(Contentful::Entry)

From 9cd7e93541e60703f5c9bbee0a2175c4a9d097a7 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 29 Mar 2021 17:23:49 +0100
Subject: [PATCH 230/249] Users can only navigate to journey content they
 belong to

---
 app/controllers/answers_controller.rb         |  2 ++
 app/controllers/application_controller.rb     | 10 +++++++
 app/controllers/journeys_controller.rb        |  2 ++
 app/controllers/specifications_controller.rb  |  2 ++
 app/controllers/steps_controller.rb           |  2 ++
 .../edit_their_answers_spec.rb                | 30 +++++++++++--------
 .../resume_a_journey_spec.rb                  |  5 ++--
 .../view_a_list_of_tasks_spec.rb              | 30 +++++++++++--------
 ...nyone_can_sign_in_with_dfe_sign_in_spec.rb | 10 +++----
 spec/requests/authorisation_spec.rb           | 28 +++++++++++++++++
 10 files changed, 87 insertions(+), 34 deletions(-)
 create mode 100644 spec/requests/authorisation_spec.rb

diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index c9e269cfb..0eaceb336 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class AnswersController < ApplicationController
+  before_action :check_user_belongs_to_journey?
+
   include DateHelper
   include AnswerHelper
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 29ea75dd1..fa5a4fd58 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -29,4 +29,14 @@ def authenticate_user!
     session.delete(:dfe_sign_in_uid)
     redirect_to new_dfe_path
   end
+
+  def current_journey
+    journey_id = params[:journey_id].present? ? params[:journey_id] : params[:id]
+    @current_journey ||= Journey.find(journey_id)
+  end
+
+  def check_user_belongs_to_journey?
+    return true if current_journey.user == current_user
+    render file: "public/404.html", status: :not_found, layout: false
+  end
 end
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 85fefeece..8d1d662e7 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class JourneysController < ApplicationController
+  before_action :check_user_belongs_to_journey?, only: %w[show]
+
   rescue_from GetCategory::InvalidLiquidSyntax do |exception|
     render "errors/specification_template_invalid", status: 500, locals: {error: exception}
   end
diff --git a/app/controllers/specifications_controller.rb b/app/controllers/specifications_controller.rb
index 0dff8d6ea..ff4c957ba 100644
--- a/app/controllers/specifications_controller.rb
+++ b/app/controllers/specifications_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SpecificationsController < ApplicationController
+  before_action :check_user_belongs_to_journey?
+
   def show
     @journey = Journey.find(journey_id)
     @visible_steps = @journey.visible_steps.includes([
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index 58a027a59..9970637d0 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class StepsController < ApplicationController
+  before_action :check_user_belongs_to_journey?
+
   def show
     @journey = Journey.find(journey_id)
 
diff --git a/spec/features/school_buying_professionals/edit_their_answers_spec.rb b/spec/features/school_buying_professionals/edit_their_answers_spec.rb
index 393e98d0b..8ca1b549d 100644
--- a/spec/features/school_buying_professionals/edit_their_answers_spec.rb
+++ b/spec/features/school_buying_professionals/edit_their_answers_spec.rb
@@ -1,22 +1,26 @@
 require "rails_helper"
 
 feature "Users can edit their answers" do
-  before { user_is_signed_in }
+  let(:user) { create(:user) }
+  before { user_is_signed_in(user: user) }
 
   before do
     journey = answer.step.journey
-    journey.update(section_groups: [
-      {
-        "order" => 0,
-        "title" => "Section A",
-        "steps" => [
-          {
-            "contentful_id" => answer.step.contentful_id,
-            "order" => 0
-          }
-        ]
-      }
-    ])
+    journey.update(
+      user: user,
+      section_groups: [
+        {
+          "order" => 0,
+          "title" => "Section A",
+          "steps" => [
+            {
+              "contentful_id" => answer.step.contentful_id,
+              "order" => 0
+            }
+          ]
+        }
+      ]
+    )
   end
   let(:answer) { create(:short_text_answer, response: "answer") }
 
diff --git a/spec/features/school_buying_professionals/resume_a_journey_spec.rb b/spec/features/school_buying_professionals/resume_a_journey_spec.rb
index 6a9556546..4c5fd4b87 100644
--- a/spec/features/school_buying_professionals/resume_a_journey_spec.rb
+++ b/spec/features/school_buying_professionals/resume_a_journey_spec.rb
@@ -1,10 +1,11 @@
 require "rails_helper"
 
 feature "Users can see how to resume a journey" do
-  before { user_is_signed_in }
+  let(:user) { create(:user) }
+  before { user_is_signed_in(user: user) }
 
   context "on the task list" do
-    let(:journey) { create(:journey) }
+    let(:journey) { create(:journey, user: user) }
 
     scenario "displays the notification banner" do
       visit journey_path(journey)
diff --git a/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb b/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
index 5007e5478..d509dcfbc 100644
--- a/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
+++ b/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
@@ -1,7 +1,8 @@
 require "rails_helper"
 
 feature "Users can view the task list" do
-  before { user_is_signed_in }
+  let(:user) { create(:user) }
+  before { user_is_signed_in(user: user) }
 
   it "tasks are grouped by their section" do
     start_journey_from_category(category: "multiple-sections.json")
@@ -35,18 +36,21 @@
       stub_contentful_category(fixture_filename: "multiple-sections.json")
 
       answer = create(:short_text_answer, response: "answer")
-      answer.step.journey.update(section_groups: [
-        {
-          "order" => 0,
-          "title" => "Section A",
-          "steps" => [
-            {
-              "contentful_id" => answer.step.contentful_id,
-              "order" => 0
-            }
-          ]
-        }
-      ])
+      answer.step.journey.update(
+        user: user,
+        section_groups: [
+          {
+            "order" => 0,
+            "title" => "Section A",
+            "steps" => [
+              {
+                "contentful_id" => answer.step.contentful_id,
+                "order" => 0
+              }
+            ]
+          }
+        ]
+      )
 
       user_starts_the_journey
 
diff --git a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
index 2b2b5bee9..95a7f73db 100644
--- a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
+++ b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
@@ -22,17 +22,15 @@
 
       user_exists_in_dfe_sign_in(dsi_uid: user.dfe_sign_in_uid)
       user_starts_the_journey
-
       expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
 
-      visit root_path
-
       # Undo the OmniAuth stub to check we don't require it again
       OmniAuth.config.mock_auth[:dfe] = OmniAuth::AuthHash.new(foo: :bar)
 
-      answer = create(:short_text_answer)
-      visit edit_journey_step_path(answer.step.journey, answer.step)
-      expect(page).to have_content(answer.step.title)
+      journey = create(:journey, user: user)
+      step = create(:step, :radio, journey: journey)
+      visit journey_step_path(journey, step)
+      expect(page).to have_content(step.title)
     end
   end
 
diff --git a/spec/requests/authorisation_spec.rb b/spec/requests/authorisation_spec.rb
new file mode 100644
index 000000000..920e9f77e
--- /dev/null
+++ b/spec/requests/authorisation_spec.rb
@@ -0,0 +1,28 @@
+require "rails_helper"
+
+RSpec.describe "Authorisation", type: :request do
+  describe "Users can only see journeys they belong to" do
+    context "when the journey IS theirs" do
+      it "returns 200" do
+        journey = create(:journey)
+        user_is_signed_in(user: journey.user)
+
+        get journey_path(journey)
+
+        expect(response).to have_http_status(:ok)
+      end
+    end
+
+    context "when the journey is NOT theirs" do
+      it "returns 404" do
+        another_user = build(:user)
+        journey = create(:journey)
+        user_is_signed_in(user: another_user)
+
+        get journey_path(journey)
+
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+  end
+end

From 9b44f32bab1ab8c561a2835bdf10a4e5621af2ec Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Mon, 29 Mar 2021 17:25:38 +0100
Subject: [PATCH 231/249] Reuse single current_journey method

---
 app/controllers/answers_controller.rb        | 4 ++--
 app/controllers/journeys_controller.rb       | 2 +-
 app/controllers/specifications_controller.rb | 2 +-
 app/controllers/steps_controller.rb          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 0eaceb336..e4526c6e9 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -7,7 +7,7 @@ class AnswersController < ApplicationController
   include AnswerHelper
 
   def create
-    @journey = Journey.find(journey_id)
+    @journey = current_journey
     @step = Step.find(step_id)
     @step_presenter = StepPresenter.new(@step)
 
@@ -29,7 +29,7 @@ def create
   end
 
   def update
-    @journey = Journey.find(journey_id)
+    @journey = current_journey
     @step = Step.find(step_id)
     @step_presenter = StepPresenter.new(@step)
 
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index 8d1d662e7..da6276b6e 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -29,7 +29,7 @@ def new
   end
 
   def show
-    @journey = Journey.find(journey_id)
+    @journey = current_journey
     @visible_steps = @journey.visible_steps.includes([
       :radio_answer,
       :short_text_answer,
diff --git a/app/controllers/specifications_controller.rb b/app/controllers/specifications_controller.rb
index ff4c957ba..3464f9d08 100644
--- a/app/controllers/specifications_controller.rb
+++ b/app/controllers/specifications_controller.rb
@@ -4,7 +4,7 @@ class SpecificationsController < ApplicationController
   before_action :check_user_belongs_to_journey?
 
   def show
-    @journey = Journey.find(journey_id)
+    @journey = current_journey
     @visible_steps = @journey.visible_steps.includes([
       :radio_answer,
       :short_text_answer,
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index 9970637d0..2e84ee991 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -4,7 +4,7 @@ class StepsController < ApplicationController
   before_action :check_user_belongs_to_journey?
 
   def show
-    @journey = Journey.find(journey_id)
+    @journey = current_journey
 
     @step = Step.find(params[:id])
     @step_presenter = StepPresenter.new(@step)
@@ -15,7 +15,7 @@ def show
   end
 
   def edit
-    @journey = Journey.find(journey_id)
+    @journey = current_journey
 
     @step = Step.find(params[:id])
     @step_presenter = StepPresenter.new(@step)

From 48c23aafad21fb0bd11cf1ebc8cce392c6675ed3 Mon Sep 17 00:00:00 2001
From: Chris Wright <chris@dxw.com>
Date: Tue, 30 Mar 2021 14:07:13 +0100
Subject: [PATCH 232/249] Deploy with GitHub actions

---
 .github/workflows/deploy.yml       |  51 ++++++++++
 script/deploy-terraform            |  50 ++++++++++
 script/docker-push-ghcr            |   9 ++
 terraform/app/generate-app-env-yml | 143 +++++++++++++++++++++++++++++
 4 files changed, 253 insertions(+)
 create mode 100644 .github/workflows/deploy.yml
 create mode 100755 script/deploy-terraform
 create mode 100755 script/docker-push-ghcr
 create mode 100755 terraform/app/generate-app-env-yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 000000000..76d089f75
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,51 @@
+name: deploy
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+
+env:
+  GHCR_USERNAME: ${{ secrets.GHCR_USERNAME }}
+  GHCR_PASSWORD: ${{ secrets.GHCR_PASSWORD }}
+  GHCR_REPO: "ghcr.io/dfe-digital/buy-for-your-school"
+  CF_USER: ${{ secrets.CF_USER }}
+  CF_PASSWORD: ${{ secrets.CF_PASSWORD }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  GITHUB_SECRETS_JSON: ${{ toJson(secrets) }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set Docker tag environment variable
+        run: echo "DOCKER_TAG=${GITHUB_RUN_ID}-${GITHUB_SHA}" >> $GITHUB_ENV
+      - name: Set Docker Image environment variable
+        run: echo "DOCKER_IMAGE=$GHCR_REPO:$DOCKER_TAG" >> $GITHUB_ENV
+      - name: Set TFVAR Docker Image environment variable
+        run: echo "TF_VAR_docker_image=$DOCKER_IMAGE" >> $GITHUB_ENV
+      - name: Build
+        run: script/docker-push-ghcr
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Deploy terraform to staging
+        env:
+          TF_VAR_environment: "staging"
+        run: |
+          script/deploy-terraform
+        if: github.ref == 'refs/heads/develop'
+      - name: Deploy terraform to prod
+        env:
+          TF_VAR_environment: "prod"
+        run: |
+          script/deploy-terraform
+        if: github.ref == 'refs/heads/main'
diff --git a/script/deploy-terraform b/script/deploy-terraform
new file mode 100755
index 000000000..4a54d4ae3
--- /dev/null
+++ b/script/deploy-terraform
@@ -0,0 +1,50 @@
+#!/bin/bash
+# script to deploy terraform
+# exit on error or if a variable is unbound
+set -eu
+
+TF_VAR_environment="${TF_VAR_environment:-}"
+
+if [ -z "$TF_VAR_environment" ]
+then
+  echo "TF_VAR_environment not set. Exiting ..."
+  exit 1
+fi
+
+# Set env_TF_VAR_ environment variables from GITHUB_SECRETS_JSON
+eval $(echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith($e + "_TF_VAR_") ) ) | keys[] as $k | "export \($k[($e + "_" | length):])=\(.[$k])"')
+
+# Disable the shellcheck check for unassigned variables. We export this var
+# in Github Actions, but Shellcheck complains because there are lowercase
+# characters in it
+
+# shellcheck disable=2154
+echo "deploying $TF_VAR_environment"
+
+cd terraform/app
+
+# Create app_env yaml file from GITHUB_SECRETS_JSON
+echo "---" > "${TF_VAR_environment}_app_env.yml"
+echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith("APP_ENV_" + $e) ) ) | keys[] as $k | "\($k[($e + "_" | length):]): \(.[$k])"' >> "${TF_VAR_environment}_app_env.yml"
+
+# deploy terraform using tfenv
+if [ ! -e ~/.tfenv ]
+then
+git clone https://github.com/tfutils/tfenv.git ~/.tfenv
+fi
+export PATH="$HOME/.tfenv/bin:$PATH"
+tfenv install
+
+# CF_PASSWORD, CF_USER, AWS_SECRET_ACCESS_KEY and AWS_ACCESS_KEY_ID
+# must be set for the following commands to run
+
+# initialise terraform
+terraform init
+
+# select the correct workspace
+terraform workspace select "$TF_VAR_environment"
+
+# apply the terraform
+terraform apply -auto-approve
+
+echo "$TF_VAR_environment has been deployed"
diff --git a/script/docker-push-ghcr b/script/docker-push-ghcr
new file mode 100755
index 000000000..184cd1944
--- /dev/null
+++ b/script/docker-push-ghcr
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# exit on failures
+set -e
+set -o pipefail
+
+echo "$GHCR_PASSWORD" | docker login ghcr.io -u "$GHCR_USERNAME" --password-stdin
+docker build --build-arg RAILS_ENV=production  -t "$GHCR_REPO:$DOCKER_TAG" .
+docker push "$GHCR_REPO:$DOCKER_TAG"
diff --git a/terraform/app/generate-app-env-yml b/terraform/app/generate-app-env-yml
new file mode 100755
index 000000000..b7e2a6ae9
--- /dev/null
+++ b/terraform/app/generate-app-env-yml
@@ -0,0 +1,143 @@
+#!/bin/bash
+
+# exit on failures
+set -e
+set -o pipefail
+
+usage() {
+  echo "Usage: $(basename "$0") [OPTIONS]" 1>&2
+  echo "  -e <APP_ENVIRONMENTS> - App environment(s) (comma deliminated)  (Required)"
+  echo "  -P <PROJECT_NAME>     - Project name                            (default: 'buy-for-your-school')"
+  echo "  -u <CF_USER>          - Cloud Foundry Username                  (default: '\$CF_USER')"
+  echo "  -p <CF_PASSWORD>      - Cloud Foundry Password                  (default: '\$CF_PASSWORD')"
+  echo "  -s <CF_SPACE>         - Cloud Foundry Space                     (default: 'sct-\$APP_ENVIRONMENT')"
+  echo "  -h                    - help"
+  exit 1
+}
+
+# if there are no arguments passed exit with usage
+if [ $# -lt 1 ];
+then
+ usage
+fi
+
+APP_ENVIRONMENTS="${APP_ENVIRONMENTS:-}"
+PROJECT_NAME="${PROJECT_NAME:-buy-for-your-school}"
+CF_USER="${CF_USER:-}"
+CF_PASSWORD="${CF_PASSWORD:-}"
+CF_SPACE="${CF_SPACE:-}"
+
+while getopts "e:P:s:u:p:h" opt; do
+  case $opt in
+    e)
+      APP_ENVIRONMENTS=$OPTARG
+      ;;
+    P)
+      PROJECT_NAME=$OPTARG
+      ;;
+    s)
+      CF_SPACE=$OPTARG
+      ;;
+    u)
+      CF_USER=$OPTARG
+      ;;
+    p)
+      CF_PASSWORD=$OPTARG
+      ;;
+    h)
+      usage
+      exit;;
+    *)
+      usage
+      exit;;
+  esac
+done
+
+if [[
+  -z "$APP_ENVIRONMENTS" ||
+  -z "$CF_USER" ||
+  -z "$CF_PASSWORD"
+]]
+then
+  usage
+fi
+
+export CF_USER
+export CF_PASSWORD
+
+CF_SPACES="$(cf curl /v3/spaces)"
+
+IFS=',' read -ra ARR_APP_ENVIRONMENTS <<< "$APP_ENVIRONMENTS"
+for APP_ENVIRONMENT in "${ARR_APP_ENVIRONMENTS[@]}"; do
+
+  if [ -z "$CF_SPACE" ]
+  then
+    if [ "$APP_ENVIRONMENT" == "prod" ]
+    then
+      CF_SPACE="sct-production"
+    else
+      CF_SPACE="sct-$APP_ENVIRONMENT"
+    fi
+  fi
+  
+  if [ "$APP_ENVIRONMENT" == "production" ]
+  then
+    APP_NAME="$PROJECT_NAME-prod"
+  else
+    APP_NAME="$PROJECT_NAME-$APP_ENVIRONMENT"
+  fi
+
+  CF_SPACE_RESOURCE="$(echo "$CF_SPACES" | jq -r --arg s "$CF_SPACE" '.resources[] | select(.name == $s)')"
+  if [ -z "$CF_SPACE_RESOURCE" ]
+  then
+    echo "Error: Space not found - '$CF_SPACE'"
+    exit 1
+  else
+    CF_SPACE_GUID="$(echo "$CF_SPACE_RESOURCE" | jq -r '.guid')"
+  fi
+
+  CF_APPS_REQUEST_ARGS=$(
+    jq -n \
+    --arg name "$APP_NAME" \
+    --arg space_guid "$CF_SPACE_GUID" \
+    '{
+      name: $name,
+      space_guids: $space_guid
+    }'
+  )
+
+  CF_APPS="$(cf curl -X GET /v3/apps -d "$CF_APPS_REQUEST_ARGS")"
+  CF_APPS_RESOURCE="$(echo "$CF_APPS" | jq -r --arg a "$APP_NAME" '.resources[] | select(.name == $a)')"
+  if [ -z "$CF_APPS_RESOURCE" ]
+  then
+    echo "Error: App not found - '$APP_NAME' in Space '$CF_SPACE'"
+    exit 1
+  else
+    CF_APP_GUID="$(echo "$CF_APPS_RESOURCE" | jq -r '.guid')"
+  fi
+  
+  APP_ENV="$(cf curl -X GET /v3/apps/"$CF_APP_GUID"/env)"
+  
+  ENVARS="$(echo "$APP_ENV" | jq -r '.environment_variables')"
+
+  if [ "$APP_ENVIRONMENT" == "production" ]
+  then
+    APP_ENV_FILE_NAME="prod_app_env.yml"
+  else
+    APP_ENV_FILE_NAME="${APP_ENVIRONMENT}_app_env.yml"
+  fi
+  
+  if [ -f "$APP_ENV_FILE_NAME" ]
+  then
+    read -r -p "File $APP_ENV_FILE_NAME exists, overwrite? (y/n): " WRITE_ENV_FILE
+  else
+    WRITE_ENV_FILE="y"
+  fi
+  
+  if [ "$WRITE_ENV_FILE" == "y" ]
+  then
+    echo "---" > "${APP_ENVIRONMENT}_app_env.yml"
+    echo "$ENVARS" | yq eval -P >> "${APP_ENVIRONMENT}_app_env.yml"
+    echo "${APP_ENVIRONMENT}_app_env.yml file created :)" 
+  fi
+done

From db4ea302408fa4570d5cb3cfc147150f5c90e81a Mon Sep 17 00:00:00 2001
From: Chris Wright <chris@dxw.com>
Date: Tue, 30 Mar 2021 16:05:51 +0100
Subject: [PATCH 233/249] Update terraform state location

---
 terraform/app/README.md  | 4 ++--
 terraform/app/backend.tf | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/terraform/app/README.md b/terraform/app/README.md
index 4751474f9..50ceedb29 100644
--- a/terraform/app/README.md
+++ b/terraform/app/README.md
@@ -4,7 +4,7 @@ We use terraform to create the services needed by the application and to deploy
 
 We use terraform workspaces to keep the terraform state seperate for each environment.
 
-At the time of writing, we store our state in an s3 bucket on the PaaS in the `sct-research` space. This is planned to move to a new space, `sct-terraform`.
+The terraform state is stored in an S3 bucket in the `sct-terraform` Cloud Foundry space
 
 ### Setup
 
@@ -19,7 +19,7 @@ $ export CF_PASSWORD="password"
 ```
 - get the terraform state S3 Bucket AWS credentials
 ```
-$ cf target -s sct-research
+$ cf target -s sct-terraform
 $ cf service-key terraform-state terraform-state-key
 {
  "aws_access_key_id": "AWS_ACCESS_KEY",
diff --git a/terraform/app/backend.tf b/terraform/app/backend.tf
index b8186b3ce..850ee177c 100644
--- a/terraform/app/backend.tf
+++ b/terraform/app/backend.tf
@@ -1,6 +1,6 @@
 terraform {
   backend "s3" {
-    bucket = "paas-s3-broker-prod-lon-b2db1a0a-5a37-488b-858f-5e850ff4fdfb"
+    bucket = "paas-s3-broker-prod-lon-04cdce2c-ebd3-4525-924e-d6ce670d2ee3"
     key    = "terraform"
     region = "eu-west-2"
   }

From ef7d621d7c0a9a24618ae4bbee5986c937f6e963 Mon Sep 17 00:00:00 2001
From: Chris Wright <chris@dxw.com>
Date: Tue, 30 Mar 2021 17:55:29 +0100
Subject: [PATCH 234/249] Add terraform plan to the deploy script

---
 script/deploy-terraform | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/script/deploy-terraform b/script/deploy-terraform
index 4a54d4ae3..5c0dd2f28 100755
--- a/script/deploy-terraform
+++ b/script/deploy-terraform
@@ -44,6 +44,9 @@ terraform init
 # select the correct workspace
 terraform workspace select "$TF_VAR_environment"
 
+# plan the terraform
+terraform plan
+
 # apply the terraform
 terraform apply -auto-approve
 

From 085395b9b2a9c85ec4f80855b9c3a18214949893 Mon Sep 17 00:00:00 2001
From: Chris Wright <chris@dxw.com>
Date: Tue, 30 Mar 2021 18:32:59 +0100
Subject: [PATCH 235/249] Pass docker image environment variable to deploy
 stage

---
 .github/workflows/deploy.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 76d089f75..cf10214e6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -19,6 +19,8 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    outputs:
+      tf_var_docker_image: ${{ steps.tf_var_docker_image.outputs.value }}
     steps:
       - name: Check out code
         uses: actions/checkout@v2
@@ -28,6 +30,9 @@ jobs:
         run: echo "DOCKER_IMAGE=$GHCR_REPO:$DOCKER_TAG" >> $GITHUB_ENV
       - name: Set TFVAR Docker Image environment variable
         run: echo "TF_VAR_docker_image=$DOCKER_IMAGE" >> $GITHUB_ENV
+      - name: Set TFVAR Docker Image output
+        id: tf_var_docker_image
+        run: echo "::set-output name=value::$TF_VAR_docker_image"
       - name: Build
         run: script/docker-push-ghcr
 
@@ -37,6 +42,8 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v2
+      - name: Set TFVAR Docker Image environment variable
+        run: echo "TF_VAR_docker_image=${{needs.build.outputs.tf_var_docker_image}}" >> $GITHUB_ENV
       - name: Deploy terraform to staging
         env:
           TF_VAR_environment: "staging"

From 598588da510a3226d2fde9b53c01cd108815250e Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 31 Mar 2021 10:35:20 +0100
Subject: [PATCH 236/249] Debug GitHub Action deployment failure

Try using the syntax found in this documentation to access the docker image name of the image we built in the previous job: https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#using-workflow-commands-to-access-toolkit-functions

An error with Github actions "Skip output 'tf_var_docker_image' since it may contain secret." points to the fact that some or all of the variable we are setting is included in `.secrets` so is being ignored. Add echo commands in to see which piece of information that contributes to the construction of `TF_VAR_docker_image` is being accidentally obfuscated.
---
 .github/workflows/deploy.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index cf10214e6..13db5de81 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -25,9 +25,15 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
       - name: Set Docker tag environment variable
-        run: echo "DOCKER_TAG=${GITHUB_RUN_ID}-${GITHUB_SHA}" >> $GITHUB_ENV
+        run: |
+          echo "DOCKER_TAG=${GITHUB_RUN_ID}-${GITHUB_SHA}" >> $GITHUB_ENV
+          echo "**** GITHUB_RUN_ID: ${GITHUB_RUN_ID}"
+          echo "**** GITHUB_SHA: ${GITHUB_SHA}"
       - name: Set Docker Image environment variable
-        run: echo "DOCKER_IMAGE=$GHCR_REPO:$DOCKER_TAG" >> $GITHUB_ENV
+        run: |
+          echo "DOCKER_IMAGE=$GHCR_REPO:$DOCKER_TAG" >> $GITHUB_ENV
+          echo "**** GHCR_REPO: ${GHCR_REPO}"
+          echo "**** DOCKER_TAG: ${DOCKER_TAG}"
       - name: Set TFVAR Docker Image environment variable
         run: echo "TF_VAR_docker_image=$DOCKER_IMAGE" >> $GITHUB_ENV
       - name: Set TFVAR Docker Image output
@@ -42,6 +48,8 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v2
+      - name: DEBUG
+        run: echo "${{steps.tf_var_docker_image.outputs.value}}"
       - name: Set TFVAR Docker Image environment variable
         run: echo "TF_VAR_docker_image=${{needs.build.outputs.tf_var_docker_image}}" >> $GITHUB_ENV
       - name: Deploy terraform to staging

From f45b603cb2adece9abca229f59f1b50815404528 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 31 Mar 2021 17:55:53 +0100
Subject: [PATCH 237/249] Debug: are environment variables set correctly?

GPaaS deploys from GitHub Actions are currently failing. When deploying the apps locally with existing environment variables, it works.

The error is an odd one to read. It looks like bundle is called to prepare the database and crashes. It seems that we might not have an RAILS_ENV, meaning no environment is loaded.

When deploying the app from GitHub Actions, it fails.

We can't read the secrets set in GitHub to verify they are correct, though I have manually renentered each one to no affect.

This change assumes there may be a problem in the script that converts the yml file to environment variables.
---
 script/deploy-terraform | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/script/deploy-terraform b/script/deploy-terraform
index 5c0dd2f28..5ef4fe4b0 100755
--- a/script/deploy-terraform
+++ b/script/deploy-terraform
@@ -27,6 +27,9 @@ cd terraform/app
 echo "---" > "${TF_VAR_environment}_app_env.yml"
 echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith("APP_ENV_" + $e) ) ) | keys[] as $k | "\($k[($e + "_" | length):]): \(.[$k])"' >> "${TF_VAR_environment}_app_env.yml"
 
+# DEBUG: Print the first line which is a safe APPLICATION_URL to verify the file is created correctly
+head -2 "${TF_VAR_environment}_app_env.yml" | tail -n +2
+
 # deploy terraform using tfenv
 if [ ! -e ~/.tfenv ]
 then

From 5b58282730f69b3c93294241db0671af3c75c166 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 31 Mar 2021 18:00:38 +0100
Subject: [PATCH 238/249] Revert "Debug GitHub Action deployment failure"

This reverts commit 598588da510a3226d2fde9b53c01cd108815250e.
---
 .github/workflows/deploy.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 13db5de81..cf10214e6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -25,15 +25,9 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
       - name: Set Docker tag environment variable
-        run: |
-          echo "DOCKER_TAG=${GITHUB_RUN_ID}-${GITHUB_SHA}" >> $GITHUB_ENV
-          echo "**** GITHUB_RUN_ID: ${GITHUB_RUN_ID}"
-          echo "**** GITHUB_SHA: ${GITHUB_SHA}"
+        run: echo "DOCKER_TAG=${GITHUB_RUN_ID}-${GITHUB_SHA}" >> $GITHUB_ENV
       - name: Set Docker Image environment variable
-        run: |
-          echo "DOCKER_IMAGE=$GHCR_REPO:$DOCKER_TAG" >> $GITHUB_ENV
-          echo "**** GHCR_REPO: ${GHCR_REPO}"
-          echo "**** DOCKER_TAG: ${DOCKER_TAG}"
+        run: echo "DOCKER_IMAGE=$GHCR_REPO:$DOCKER_TAG" >> $GITHUB_ENV
       - name: Set TFVAR Docker Image environment variable
         run: echo "TF_VAR_docker_image=$DOCKER_IMAGE" >> $GITHUB_ENV
       - name: Set TFVAR Docker Image output
@@ -48,8 +42,6 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v2
-      - name: DEBUG
-        run: echo "${{steps.tf_var_docker_image.outputs.value}}"
       - name: Set TFVAR Docker Image environment variable
         run: echo "TF_VAR_docker_image=${{needs.build.outputs.tf_var_docker_image}}" >> $GITHUB_ENV
       - name: Deploy terraform to staging

From de90ef6f472029615de1ff3473ace1cf9e5798d4 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Wed, 31 Mar 2021 19:17:17 +0100
Subject: [PATCH 239/249] Revert "Debug: are environment variables set
 correctly?"

This reverts commit f45b603cb2adece9abca229f59f1b50815404528.
---
 script/deploy-terraform | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/script/deploy-terraform b/script/deploy-terraform
index 5ef4fe4b0..5c0dd2f28 100755
--- a/script/deploy-terraform
+++ b/script/deploy-terraform
@@ -27,9 +27,6 @@ cd terraform/app
 echo "---" > "${TF_VAR_environment}_app_env.yml"
 echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith("APP_ENV_" + $e) ) ) | keys[] as $k | "\($k[($e + "_" | length):]): \(.[$k])"' >> "${TF_VAR_environment}_app_env.yml"
 
-# DEBUG: Print the first line which is a safe APPLICATION_URL to verify the file is created correctly
-head -2 "${TF_VAR_environment}_app_env.yml" | tail -n +2
-
 # deploy terraform using tfenv
 if [ ! -e ~/.tfenv ]
 then

From c9ae232db49c820bc9db4a273f2f07ba7b1a7aa6 Mon Sep 17 00:00:00 2001
From: Chris Wright <chris@dxw.com>
Date: Thu, 1 Apr 2021 09:21:16 +0100
Subject: [PATCH 240/249] Fix APP_ENV_* key truncating

---
 script/deploy-terraform | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/deploy-terraform b/script/deploy-terraform
index 5c0dd2f28..ef7cea759 100755
--- a/script/deploy-terraform
+++ b/script/deploy-terraform
@@ -25,7 +25,7 @@ cd terraform/app
 
 # Create app_env yaml file from GITHUB_SECRETS_JSON
 echo "---" > "${TF_VAR_environment}_app_env.yml"
-echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith("APP_ENV_" + $e) ) ) | keys[] as $k | "\($k[($e + "_" | length):]): \(.[$k])"' >> "${TF_VAR_environment}_app_env.yml"
+echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith("APP_ENV_" + $e) ) ) | keys[] as $k | "\($k[("APP_ENV_" + "$e" + "_" | length):]): \(.[$k])"' >> "${TF_VAR_environment}_app_env.yml"
 
 # deploy terraform using tfenv
 if [ ! -e ~/.tfenv ]

From 1d6622fd4cb376e95a9e22705692e56a2dc0975a Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 1 Apr 2021 10:16:57 +0100
Subject: [PATCH 241/249] Revert "Revert "Debug: are environment variables set
 correctly?""

This reverts commit de90ef6f472029615de1ff3473ace1cf9e5798d4.
---
 script/deploy-terraform | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/script/deploy-terraform b/script/deploy-terraform
index ef7cea759..e44c8f793 100755
--- a/script/deploy-terraform
+++ b/script/deploy-terraform
@@ -27,6 +27,9 @@ cd terraform/app
 echo "---" > "${TF_VAR_environment}_app_env.yml"
 echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith("APP_ENV_" + $e) ) ) | keys[] as $k | "\($k[("APP_ENV_" + "$e" + "_" | length):]): \(.[$k])"' >> "${TF_VAR_environment}_app_env.yml"
 
+# DEBUG: Print the first line which is a safe APPLICATION_URL to verify the file is created correctly
+head -2 "${TF_VAR_environment}_app_env.yml" | tail -n +2
+
 # deploy terraform using tfenv
 if [ ! -e ~/.tfenv ]
 then

From cf24c756fff910b8e136ec8e2b6cd7ca171266bf Mon Sep 17 00:00:00 2001
From: Chris Wright <chris@dxw.com>
Date: Thu, 1 Apr 2021 10:27:03 +0100
Subject: [PATCH 242/249] Remove quotes from jq variable

---
 script/deploy-terraform | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/deploy-terraform b/script/deploy-terraform
index e44c8f793..9030f06cc 100755
--- a/script/deploy-terraform
+++ b/script/deploy-terraform
@@ -25,7 +25,7 @@ cd terraform/app
 
 # Create app_env yaml file from GITHUB_SECRETS_JSON
 echo "---" > "${TF_VAR_environment}_app_env.yml"
-echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith("APP_ENV_" + $e) ) ) | keys[] as $k | "\($k[("APP_ENV_" + "$e" + "_" | length):]): \(.[$k])"' >> "${TF_VAR_environment}_app_env.yml"
+echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith("APP_ENV_" + $e) ) ) | keys[] as $k | "\($k[("APP_ENV_" + $e + "_" | length):]): \(.[$k])"' >> "${TF_VAR_environment}_app_env.yml"
 
 # DEBUG: Print the first line which is a safe APPLICATION_URL to verify the file is created correctly
 head -2 "${TF_VAR_environment}_app_env.yml" | tail -n +2

From c0417c61421ccec1ae7540e9e9160fb5e54aeec8 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 1 Apr 2021 11:11:57 +0100
Subject: [PATCH 243/249] Revert "Revert "Revert "Debug: are environment
 variables set correctly?"""

This reverts commit 1d6622fd4cb376e95a9e22705692e56a2dc0975a.
---
 script/deploy-terraform | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/script/deploy-terraform b/script/deploy-terraform
index 9030f06cc..31bf595ea 100755
--- a/script/deploy-terraform
+++ b/script/deploy-terraform
@@ -27,9 +27,6 @@ cd terraform/app
 echo "---" > "${TF_VAR_environment}_app_env.yml"
 echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith("APP_ENV_" + $e) ) ) | keys[] as $k | "\($k[("APP_ENV_" + $e + "_" | length):]): \(.[$k])"' >> "${TF_VAR_environment}_app_env.yml"
 
-# DEBUG: Print the first line which is a safe APPLICATION_URL to verify the file is created correctly
-head -2 "${TF_VAR_environment}_app_env.yml" | tail -n +2
-
 # deploy terraform using tfenv
 if [ ! -e ~/.tfenv ]
 then

From e82dc407a818805914b8b6604cb49f8b38d6da44 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Tue, 23 Mar 2021 11:55:14 +0000
Subject: [PATCH 244/249] New public endpoint to invalidate cached contentful
 entries

This endpoint exists so Contentful can send webhooks on update events. With this information we can make targetted cache invalidations, enabling the content team to see their changes published quickly, with a small feedback loop. The preview environment is not useful to test branching logic so the team are using staging for this type of testing.

Given the service takes a shallow copy of all entries when the user starts a journey, all existing journeys and their steps shouldn't be at risk of breaking should the cached entry is replaced with an invalid one. An invalid entry would look like one with invalid JSON within it's configuration for the advanced fields. We should probably validate entries before setting them to the cache to remove this risk, this risk is not new. Any changes to the Contentful Master environment could break journeys.

Next steps are to authenticate the endpoint so that the public can't make infinite requests to our Redis.del function. Whilst the impact of finding a valid entry ID and deleting it are minimal to none, we may become open to a denial of service against our Redis database.
---
 CHANGELOG.md                                  |  1 +
 .../api/contentful/entries_controller.rb      | 17 ++++++++++
 app/services/cache.rb                         |  4 +++
 config/routes.rb                              |  1 +
 spec/requests/cache_invalidation_spec.rb      | 22 +++++++++++++
 spec/services/cache_spec.rb                   | 33 +++++++++++++++++++
 6 files changed, 78 insertions(+)
 create mode 100644 app/controllers/api/contentful/entries_controller.rb
 create mode 100644 spec/requests/cache_invalidation_spec.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 393805f57..3b036aced 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@ The format is based on [Keep a Changelog 1.0.0].
 - users can sign out using DfE Sign-in
 - add new dashboard page with the ability to create new specifications
 - users can only see their past journeys from the dashboard
+- new API endpoint to allow Contentful to invalidate cached entries, allowing caching to stay on which prevents the app from being very slow/crashing on journey start
 
 ## [release-005] - 2021-1-19
 
diff --git a/app/controllers/api/contentful/entries_controller.rb b/app/controllers/api/contentful/entries_controller.rb
new file mode 100644
index 000000000..a791b7591
--- /dev/null
+++ b/app/controllers/api/contentful/entries_controller.rb
@@ -0,0 +1,17 @@
+class Api::Contentful::EntriesController < ApplicationController
+  skip_before_action :authenticate_user!
+  http_basic_authenticate_with name: "api", password: ENV["CONTENTFUL_WEBHOOK_API_KEY"]
+
+  def changed
+    Cache.delete(key: cache_key)
+    render json: {status: "OK"}, status: :ok
+  end
+
+  private def cache_key
+    "contentful:entry:#{changed_params["entityId"]}"
+  end
+
+  private def changed_params
+    params.permit("entityId")
+  end
+end
diff --git a/app/services/cache.rb b/app/services/cache.rb
index 685a35757..874b3fcd7 100644
--- a/app/services/cache.rb
+++ b/app/services/cache.rb
@@ -27,6 +27,10 @@ def set(key:, value:)
     redis_cache.expire(key, ttl)
   end
 
+  def self.delete(key:)
+    RedisCache.redis.del(key)
+  end
+
   def extend_ttl_on_all_entries(extension: (60 * 60 * 24))
     redis_cache.keys("contentful:entry:*").map do |key|
       previous_ttl = redis_cache.ttl(key)
diff --git a/config/routes.rb b/config/routes.rb
index cb7ebc706..ebc47537a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,6 +5,7 @@
   root to: "pages#show", id: "specifying_start_page"
 
   get "planning" => "pages#show", "id" => "planning_start_page"
+  post "/api/contentful/entry_updated" => "api/contentful/entries#changed"
 
   # DfE Sign In
   resource :sessions,
diff --git a/spec/requests/cache_invalidation_spec.rb b/spec/requests/cache_invalidation_spec.rb
new file mode 100644
index 000000000..16c3b4061
--- /dev/null
+++ b/spec/requests/cache_invalidation_spec.rb
@@ -0,0 +1,22 @@
+require "rails_helper"
+
+RSpec.describe "Cache invalidation", type: :request do
+  it "removes any matching entry ID from the cache" do
+    RedisCache.redis.set("contentful:entry:6zeSz4F4YtD66gT5SFpnSB", "a dummy value")
+
+    fake_contentful_webook_payload = {
+      "entityId": "6zeSz4F4YtD66gT5SFpnSB",
+      "spaceId": "rwl7tyzv9sys",
+      "parameters": {
+        "text": "Entity version: 62"
+      }
+    }
+
+    post "/api/contentful/entry_updated",
+      params: fake_contentful_webook_payload,
+      as: :json
+
+    expect(response).to have_http_status(:ok)
+    expect(RedisCache.redis.get("contentful:entry:6zeSz4F4YtD66gT5SFpnSB")).to eq(nil)
+  end
+end
diff --git a/spec/services/cache_spec.rb b/spec/services/cache_spec.rb
index e8c473adc..7a6c20ad3 100644
--- a/spec/services/cache_spec.rb
+++ b/spec/services/cache_spec.rb
@@ -85,6 +85,39 @@
     end
   end
 
+  describe ".delete" do
+    context "when the key exists" do
+      it "removes the key from redis and returns nil" do
+        redis = RedisCache.redis
+        allow(RedisCache).to receive(:redis).and_return(redis)
+
+        target_key = "a-key:that-exists"
+        redis.set(target_key, "a-dummy-value")
+
+        expect(redis).to receive(:del).with(target_key).and_call_original
+
+        described_class.delete(key: target_key)
+
+        expect(redis.get(target_key)).to eq(nil)
+      end
+    end
+
+    context "when the key doesn't already exist" do
+      it "returns nil" do
+        redis = RedisCache.redis
+        allow(RedisCache).to receive(:redis).and_return(redis)
+
+        target_key = "a-key:that-does-not-exist"
+
+        expect(redis).to receive(:del).with(target_key).and_call_original
+
+        described_class.delete(key: target_key)
+
+        expect(redis.get(target_key)).to eq(nil)
+      end
+    end
+  end
+
   describe "#extend_ttl_on_all_entries" do
     it "only updates redis keys associated to contentful entries" do
       cache = described_class.new(enabled: anything, ttl: anything)

From 1a57fbf4b6e6bbed3f01a6c9052cc14a249f0734 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 25 Mar 2021 10:34:26 +0000
Subject: [PATCH 245/249] API endpoint protected by basic auth

This minimum protection should protect the endpoint from being continually hit by malicious actors in case they are able to DOS the redis instance.

I haven't added "CONTENTFUL_WEBHOOK_API_KEY" to the Dotenv require keys as it isn't required to run the app, only to use this endpoint, which I can't imagine we'll ever do in dev.
---
 .env.example                             |  3 ++
 .env.test                                |  3 ++
 spec/requests/cache_invalidation_spec.rb | 38 +++++++++++++++++++++++-
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 955612480..24dd3951a 100644
--- a/.env.example
+++ b/.env.example
@@ -23,6 +23,9 @@ CONTENTFUL_PREVIEW_APP=false
 CONTENTFUL_ENTRY_CACHING=false
 CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID=contentful-category-entry
 
+# API
+CONTENTFUL_WEBHOOK_API_KEY=
+
 # DfE Sign-in
 DFE_SIGN_IN_ISSUER=https://test-oidc.signin.education.gov.uk:443
 DFE_SIGN_IN_IDENTIFIER=buyforyourschool
diff --git a/.env.test b/.env.test
index ba6118322..763f048ec 100644
--- a/.env.test
+++ b/.env.test
@@ -18,3 +18,6 @@ CONTENTFUL_ACCESS_TOKEN=123
 CONTENTFUL_PREVIEW_APP=false
 CONTENTFUL_ENTRY_CACHING=false
 CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID=contentful-category-entry
+
+# API
+CONTENTFUL_WEBHOOK_API_KEY=
diff --git a/spec/requests/cache_invalidation_spec.rb b/spec/requests/cache_invalidation_spec.rb
index 16c3b4061..4075ccab4 100644
--- a/spec/requests/cache_invalidation_spec.rb
+++ b/spec/requests/cache_invalidation_spec.rb
@@ -1,6 +1,14 @@
 require "rails_helper"
 
 RSpec.describe "Cache invalidation", type: :request do
+  around do |example|
+    ClimateControl.modify(
+      CONTENTFUL_WEBHOOK_API_KEY: "an API key"
+    ) do
+      example.run
+    end
+  end
+
   it "removes any matching entry ID from the cache" do
     RedisCache.redis.set("contentful:entry:6zeSz4F4YtD66gT5SFpnSB", "a dummy value")
 
@@ -12,11 +20,39 @@
       }
     }
 
-    post "/api/contentful/entry_updated",
+    headers = {"HTTP_AUTHORIZATION" => ActionController::HttpAuthentication::Basic
+      .encode_credentials("api", ENV["CONTENTFUL_WEBHOOK_API_KEY"])}
+
+    post "/api/contentful/entry_updated", {
       params: fake_contentful_webook_payload,
+      headers: headers,
       as: :json
+    }
 
     expect(response).to have_http_status(:ok)
     expect(RedisCache.redis.get("contentful:entry:6zeSz4F4YtD66gT5SFpnSB")).to eq(nil)
   end
+
+  context "when no basic auth was provided" do
+    it "does not delete anything from the cache and returns 401" do
+      RedisCache.redis.set("contentful:entry:6zeSz4F4YtD66gT5SFpnSB", "a dummy value")
+
+      fake_contentful_webook_payload = {
+        "entityId": "6zeSz4F4YtD66gT5SFpnSB",
+        "spaceId": "rwl7tyzv9sys",
+        "parameters": {
+          "text": "Entity version: 62"
+        }
+      }
+
+      # No basic auth
+      post "/api/contentful/entry_updated",
+        params: fake_contentful_webook_payload,
+        as: :json
+
+      expect(response).to have_http_status(:unauthorized)
+      expect(RedisCache.redis.get("contentful:entry:6zeSz4F4YtD66gT5SFpnSB"))
+        .to eq("a dummy value")
+    end
+  end
 end

From acfe52bcabd4f4df918845e831fcc81cffae0164 Mon Sep 17 00:00:00 2001
From: Chris Wright <chris@dxw.com>
Date: Thu, 1 Apr 2021 13:18:02 +0100
Subject: [PATCH 246/249] Add cdn-routes

---
 terraform/app/data.tf      | 4 ++++
 terraform/app/locals.tf    | 3 +++
 terraform/app/routes.tf    | 6 ++++++
 terraform/app/variables.tf | 6 ++++++
 terraform/app/web-app.tf   | 3 +++
 5 files changed, 22 insertions(+)

diff --git a/terraform/app/data.tf b/terraform/app/data.tf
index 4d3cb6339..90ae3d1ea 100644
--- a/terraform/app/data.tf
+++ b/terraform/app/data.tf
@@ -6,6 +6,10 @@ data "cloudfoundry_domain" "shared" {
   name = local.shared_cloudfoundry_domain
 }
 
+data "cloudfoundry_domain" "custom" {
+  name = local.custom_cloudfoundry_domain
+}
+
 data "cloudfoundry_service" "redis" {
   name = "redis"
 }
diff --git a/terraform/app/locals.tf b/terraform/app/locals.tf
index 4358313c1..6b385466c 100644
--- a/terraform/app/locals.tf
+++ b/terraform/app/locals.tf
@@ -5,6 +5,9 @@ locals {
   cloudfoundry_org           = var.cloudfoundry_org
   cloudfoundry_space         = local.environment == "prod" ? "sct-production" : "sct-${local.environment}"
   shared_cloudfoundry_domain = var.shared_cloudfoundry_domain
+  custom_cloudfoundry_domain = var.custom_cloudfoundry_domain
+
+  custom_hostname = local.environment == "prod" ? "get-help-buying-for-schools" : "${local.environment}-get-help-buying-for-schools"
 
   redis_class    = var.redis_class
   redis_timeouts = var.redis_timeouts
diff --git a/terraform/app/routes.tf b/terraform/app/routes.tf
index 301718c79..8a113c197 100644
--- a/terraform/app/routes.tf
+++ b/terraform/app/routes.tf
@@ -3,3 +3,9 @@ resource "cloudfoundry_route" "shared_route" {
   space    = data.cloudfoundry_space.space.id
   hostname = "${local.project_name}-${local.environment}"
 }
+
+resource "cloudfoundry_route" "custom_route" {
+  domain   = data.cloudfoundry_domain.custom.id
+  space    = data.cloudfoundry_space.space.id
+  hostname = local.custom_hostname
+}
diff --git a/terraform/app/variables.tf b/terraform/app/variables.tf
index 5079f76a6..2e51a5522 100644
--- a/terraform/app/variables.tf
+++ b/terraform/app/variables.tf
@@ -21,6 +21,12 @@ variable "shared_cloudfoundry_domain" {
   type        = string
 }
 
+variable "custom_cloudfoundry_domain" {
+  description = "Custom Cloud Foundry domain"
+  default     = "education.gov.uk"
+  type        = string
+}
+
 variable "redis_class" {
   description = "Redis class"
   default     = "tiny-5_x"
diff --git a/terraform/app/web-app.tf b/terraform/app/web-app.tf
index c2401624d..81179ab07 100644
--- a/terraform/app/web-app.tf
+++ b/terraform/app/web-app.tf
@@ -16,4 +16,7 @@ resource "cloudfoundry_app" "web_app" {
   routes {
     route = cloudfoundry_route.shared_route.id
   }
+  routes {
+    route = cloudfoundry_route.custom_route.id
+  }
 }

From e70756c4d3ecfdcc0d8f0be9bf3f6aa1f72d4629 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 1 Apr 2021 14:20:59 +0100
Subject: [PATCH 247/249] Sign in helper will take every user past the root
 path

Instead of starting on the dashboard_path, we follow the real user journey of hitting our landing page first.

Before this, visiting the dashbaord would redirect the user to auth/dfe with a GET request. This needed to change due to a security vulnerability to become a POST request. This redirection then becomes impossible. Despite the vulnerability, changing to visit the root_path first in most feature tests makes sense for complete end-to-end coverage.
---
 spec/support/sign_in_helpers.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/support/sign_in_helpers.rb b/spec/support/sign_in_helpers.rb
index 706c052ef..4f903547e 100644
--- a/spec/support/sign_in_helpers.rb
+++ b/spec/support/sign_in_helpers.rb
@@ -13,7 +13,8 @@ def user_sign_in_attempt_fails(dsi_uid: SecureRandom.uuid)
   end
 
   def user_starts_the_journey
-    visit dashboard_path
+    visit root_path
+    click_link I18n.t("generic.button.start")
     click_link I18n.t("dashboard.create.link")
   end
 

From 3d435798f3a73e7caf6e89c09b94945ced881c08 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 1 Apr 2021 14:28:53 +0100
Subject: [PATCH 248/249] Resolve CSRF vulnerability with Omniauth

We change the link_to to a button_to to change the sign in button from making a GET request to a POST request. The POST request will be protected by Rails CSRF protection to prevent malicious requests from signing in when they shouldn't.

https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284

Remove now unused sessions resource and redirect/link to `/auth/dfe`directly.

If a user becomes unauthenticated we change where they go. Instead of automatically taking them to the sign in page - through a GET request - we link them back to the root_path so that they may click "Sign-in" with the safe POST. This makes it safer, though slightly more inconvienent for the user. We could add flash messages in future.
---
 Gemfile                                              |  1 +
 Gemfile.lock                                         |  4 ++++
 app/controllers/application_controller.rb            |  2 +-
 app/controllers/sessions_controller.rb               |  5 -----
 app/views/pages/specifying_start_page.html.erb       |  4 ++--
 config/routes.rb                                     |  6 ------
 .../anyone_can_sign_in_with_dfe_sign_in_spec.rb      |  3 ++-
 spec/requests/authentication_spec.rb                 | 12 ++++++------
 8 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index f3b6ba298..a38027de5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,7 @@ gem "pg"
 gem "mini_racer"
 gem "omniauth"
 gem "omniauth_openid_connect"
+gem "omniauth-rails_csrf_protection"
 gem "puma", "~> 5.2"
 gem "redcarpet", "~> 3.5"
 gem "redis", "~> 4.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 57b635830..47c8f9ba6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -203,6 +203,9 @@ GEM
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
+    omniauth-rails_csrf_protection (0.1.2)
+      actionpack (>= 4.2)
+      omniauth (>= 1.3.1)
     omniauth_openid_connect (0.3.5)
       addressable (~> 2.5)
       omniauth (~> 1.9)
@@ -426,6 +429,7 @@ DEPENDENCIES
   mini_racer
   mock_redis
   omniauth
+  omniauth-rails_csrf_protection
   omniauth_openid_connect
   pg
   pry
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fa5a4fd58..89e441516 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -27,7 +27,7 @@ def authenticate_user!
     return if current_user
 
     session.delete(:dfe_sign_in_uid)
-    redirect_to new_dfe_path
+    redirect_to root_path
   end
 
   def current_journey
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 5e1699776..036fa8ae7 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -4,11 +4,6 @@ class SessionsController < ApplicationController
   skip_before_action :authenticate_user!
   protect_from_forgery except: :bypass_callback
 
-  def new
-    # This is defined by the class name of our Omniauth strategy
-    redirect_to "/auth/dfe"
-  end
-
   def create
     UserSession.new(session: session)
       .persist_successful_dfe_sign_in_claim!(omniauth_hash: auth_hash)
diff --git a/app/views/pages/specifying_start_page.html.erb b/app/views/pages/specifying_start_page.html.erb
index 9de73becc..111897048 100644
--- a/app/views/pages/specifying_start_page.html.erb
+++ b/app/views/pages/specifying_start_page.html.erb
@@ -37,7 +37,7 @@
 <p class="govuk-body"><%= I18n.t("specifying.start_page.pause_and_resume_body") %></p>
 
 <% if DfESignIn.bypass? %>
-  <%= link_to "#{I18n.t("generic.button.start")} (bypass DSI)", "/auth/developer", class: "govuk-button" %>
+  <%= button_to "#{I18n.t("generic.button.start")} (bypass DSI)", "/auth/developer", class: "govuk-button" %>
 <% else %>
-  <%= link_to I18n.t("generic.button.start"), new_dfe_path, class: "govuk-button" %>
+  <%= button_to I18n.t("generic.button.start"), "/auth/dfe", class: "govuk-button" %>
 <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index ebc47537a..5e0b32555 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -8,12 +8,6 @@
   post "/api/contentful/entry_updated" => "api/contentful/entries#changed"
 
   # DfE Sign In
-  resource :sessions,
-    only: %i[create new],
-    as: :dfe,
-    path: "/dfe/sessions",
-    controller: "sessions"
-
   get "/auth/dfe/callback", to: "sessions#create"
   get "/auth/dfe/signout", to: "sessions#destroy"
   get "/auth/failure", to: "sessions#failure"
diff --git a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
index 95a7f73db..92f7f8f6f 100644
--- a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
+++ b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
@@ -58,7 +58,8 @@
       .with("Sign in failed unexpectedly")
       .and_call_original
 
-    visit dashboard_path
+    visit root_path
+    click_button I18n.t("generic.button.start")
 
     expect(page).to have_content(I18n.t("errors.sign_in.unexpected_failure.page_title"))
     expect(page).to have_content(I18n.t("errors.sign_in.unexpected_failure.page_body"))
diff --git a/spec/requests/authentication_spec.rb b/spec/requests/authentication_spec.rb
index 6c238e818..f58d705d5 100644
--- a/spec/requests/authentication_spec.rb
+++ b/spec/requests/authentication_spec.rb
@@ -18,7 +18,7 @@
     end
 
     it "users can access the new session endpoint" do
-      get new_dfe_path
+      post "/auth/dfe"
       expect(response).to have_http_status(:found)
     end
 
@@ -36,29 +36,29 @@
   describe "Endpoints that do require authentication" do
     it "users cannot access the new journey path" do
       get new_journey_path
-      expect(response).to redirect_to(new_dfe_path)
+      expect(response).to redirect_to(root_path)
     end
 
     it "users cannot access an existing journey" do
       journey = create(:journey)
       get journey_path(journey)
-      expect(response).to redirect_to(new_dfe_path)
+      expect(response).to redirect_to(root_path)
     end
 
     it "users cannot edit an answer" do
       answer = create(:radio_answer)
       get edit_journey_step_path(answer.step.journey, answer.step)
-      expect(response).to redirect_to(new_dfe_path)
+      expect(response).to redirect_to(root_path)
     end
 
     it "users cannot see the journey map" do
       get new_journey_map_path
-      expect(response).to redirect_to(new_dfe_path)
+      expect(response).to redirect_to(root_path)
     end
 
     it "users cannot see the preview endpoints" do
       get preview_entry_path("an-entry-id")
-      expect(response).to redirect_to(new_dfe_path)
+      expect(response).to redirect_to(root_path)
     end
   end
 

From a05ae4714e6ae1b00e9d0b955dd81ffbc3207805 Mon Sep 17 00:00:00 2001
From: Tom Hipkin <tomhipkin@gmail.com>
Date: Thu, 1 Apr 2021 15:14:09 +0100
Subject: [PATCH 249/249] release-006

- specification templates are now sourced from the Contentful Category entry
- refactor how we find all journey answers into isolated service
- users are now told how they can resume a journey, and an address is provided for this
- robots.txt now excludes all journey and step pages
- steps/questions/tasks in the task lists are now grouped by Contentful Section entries
- start page now has revised copy with details on eligibility and what to expect
- The journey map is now clearer about what happens when you click a link
- The journey map now includes links to preview a step
- The journey map now displays markup to include a step's answer in the specification template
- users can answer questions which expect a number
- checkbox questions no longer alter the capitalisation of options
- fix ordering of section and step items
- users can answer questions which expect a currency
- questions can be hidden from view
- specification warning if there are incomplete tasks
- hidden questions can be shown through a new show_additional_question field for each question
- hidden questions can be rehidden again after changing the original answer
- hidden questions that were at one point answered, will be reshown with a change to an earlier question
- fix Redis connection errors on Heroku
- users can be asked extended checkbox questions which ask for further information
- markdown in help text fields is now parsed into HTML
- show and hide more than one additional question at a time
- users can be presenting with forking/branching question chains based on any one answer
- create an extended further information text box option for radio answers
- create extended further information text box option for checkbox answers
- radio questions can be configured with an "or" separator
- specification can show further information for radio answers
- specification can show further information for checkbox answers
- checkbox answers can be completed without choosing a given answer
- fix planning page link back to the service
- checkbox answers are not automatically joined by commas for the specification
- answer data is all available through the single `answer_x` convention, this has replaced `extended_answer_x` which has now been removed
- checkbox answers that are skipped can be identified in the specification
- fix branching so multiple rules can show the same question
- the specification lives on it's own page, separate to the task list
- fix checkbox questions where further information couldn't be saved for an option that included a special character
- further information for options that include special characters is now available to the specification
- incomplete specification documents include a warning within the document as well as the file name
- users return to the same place in the task list after answering a question
- fix extended radio questions so that further_information can be remembered when it can be provided through multiple fields
- flash messages can be shown in notification banners
- fix checkbox answer to save choices after previously skipping
- users can sign in using DfE Sign-in
- users can sign out using DfE Sign-in
- add new dashboard page with the ability to create new specifications
- users can only see their past journeys from the dashboard
- new API endpoint to allow Contentful to invalidate cached entries, allowing caching to stay on which prevents the app from being very slow/crashing on journey start
---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b036aced..4c99389af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog 1.0.0].
 
 ## [Unreleased]
 
+## [release-006] - 2021-04-01
+
 - specification templates are now sourced from the Contentful Category entry
 - refactor how we find all journey answers into isolated service
 - users are now told how they can resume a journey, and an address is provided for this
@@ -111,7 +113,8 @@ Contentful fixture
 - Contentful can redirect users to preview endpoints
 - users can be asked to answer a long text question
 
-[unreleased]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-005...HEAD
+[unreleased]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-006...HEAD
+[release-006]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-005...release-006
 [release-005]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-004...release-005
 [release-004]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-003...release-004
 [release-003]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-002...release-003