AP-5701: Update has_other_proceedings controller

Update the view to display the correct text if all four proceedings have been chosen. Update the controller tests to ensure it works. Record new VCR cassettes as we have to make an additional call to the LFA endpoint
ministryofjustice · Jan 31, 2025 · 9d83831 · 9d83831
1 parent acd954e
commit 9d83831
Show file tree

Hide file tree

Showing 12 changed files with 549 additions and 9 deletions.
diff --git a/app/views/providers/has_other_proceedings/show.html.erb b/app/views/providers/has_other_proceedings/show.html.erb
@@ -2,7 +2,8 @@
               url: providers_legal_aid_application_has_other_proceedings_path,
               method: :patch,
               local: true) do |form| %>
-  <%= page_template page_title: t(".page_title"), template: :basic, form: do %>
+  <% page_title_prefix = @form.remaining_proceedings.zero? ? ".no_more_proceedings" : "" %>
+  <%= page_template page_title: t("#{page_title_prefix}.page_title"), template: :basic, form: do %>
     <% if @legal_aid_application.proceedings.any? %>
       <h1 class="govuk-heading-xl"><%= t(".existing", count: pluralize(@legal_aid_application.proceedings.count, "proceeding").to_s) %></h1>
       <%= govuk_summary_list do |summary_list| %>
@@ -35,9 +36,14 @@
       <% end %>
     <% end %>
 
-    <%= form.govuk_collection_radio_buttons :has_other_proceeding, yes_no_options, :value, :label,
-                                            legend: { text: content_for(:page_title), tag: "h2", size: "m" } do %>
-      <%= govuk_inset_text(text: t(".inset")) %>
+    <% if @form.remaining_proceedings.zero? %>
+      <h2 class="govuk-heading-l"><%= content_for(:page_title) %></h2>
+      <p class="govuk-body"><%= t(".no_more_proceedings.caption") %></p>
+    <% else %>
+      <%= form.govuk_collection_radio_buttons :has_other_proceeding, yes_no_options, :value, :label,
+                                              legend: { text: content_for(:page_title), tag: "h2", size: "m" } do %>
+        <%= govuk_inset_text(text: t(".inset")) %>
+      <% end %>
     <% end %>
 
     <%= next_action_buttons(form:, show_draft: true) %>

diff --git a/config/locales/en/providers.yml b/config/locales/en/providers.yml
@@ -1727,6 +1727,9 @@ en:
         existing: You have added %{count}
         inset: You will only be shown the proceedings that can be added to the ones you have selected.
         remove: Remove
+        no_more_proceedings:
+          page_title: You have added all the allowed proceedings
+          caption: No more proceedings can be added to the ones you have chosen
     providers:
       show:
         account_number: Account number

diff --git a/..._it_s_the_lead_proceeding/sets_a_new_lead_proceeding_when_the_original_one_is_deleted.yml b/..._it_s_the_lead_proceeding/sets_a_new_lead_proceeding_when_the_original_one_is_deleted.yml
diff --git a/...gs/when_a_proceeding_is_removed/displays_the_singular_number_of_proceedings_remaining.yml b/...gs/when_a_proceeding_is_removed/displays_the_singular_number_of_proceedings_remaining.yml
diff --git a/...dings/when_a_proceeding_is_removed/leaves_the_correct_number_of_remaining_proceedings.yml b/...dings/when_a_proceeding_is_removed/leaves_the_correct_number_of_remaining_proceedings.yml
diff --git a/...lication_id/has_other_proceedings/when_a_proceeding_is_removed/removes_one_proceeding.yml b/...lication_id/has_other_proceedings/when_a_proceeding_is_removed/removes_one_proceeding.yml
diff --git a/...gs_are_removed/redirects_to_the_proceedings_type_page_if_all_proceeding_types_removed.yml b/...gs_are_removed/redirects_to_the_proceedings_type_page_if_all_proceeding_types_removed.yml
diff --git a/...oviders/_application_id/has_other_proceedings/shows_the_current_number_of_proceedings.yml b/...oviders/_application_id/has_other_proceedings/shows_the_current_number_of_proceedings.yml
diff --git a/...eedingsController/GET_/providers/_application_id/has_other_proceedings/shows_the_page.yml b/...eedingsController/GET_/providers/_application_id/has_other_proceedings/shows_the_page.yml
diff --git a/...r_proceedings/when_all_available_proceedings_have_been_added/renders_the_limited_page.yml b/...r_proceedings/when_all_available_proceedings_have_been_added/renders_the_limited_page.yml
diff --git a/...ings/when_the_provider_chose_nothing/stays_on_the_page_if_there_is_a_validation_error.yml b/...ings/when_the_provider_chose_nothing/stays_on_the_page_if_there_is_a_validation_error.yml
diff --git a/spec/requests/providers/has_other_proceedings_controller_spec.rb b/spec/requests/providers/has_other_proceedings_controller_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Providers::HasOtherProceedingsController do
+RSpec.describe Providers::HasOtherProceedingsController, :vcr do
   let(:legal_aid_application) do
     create(:legal_aid_application,
            :with_proceedings,
@@ -24,18 +24,27 @@
   end
 
   describe "GET /providers/:application_id/has_other_proceedings" do
-    before do
-      get providers_legal_aid_application_has_other_proceedings_path(legal_aid_application)
-    end
-
     it "shows the page" do
+      get providers_legal_aid_application_has_other_proceedings_path(legal_aid_application)
       expect(response).to have_http_status(:ok)
       expect(response.body).to include(I18n.t("providers.has_other_proceedings.show.page_title"))
     end
 
     it "shows the current number of proceedings" do
+      get providers_legal_aid_application_has_other_proceedings_path(legal_aid_application)
       expect(response.body).to include("You have added 2 proceedings")
     end
+
+    context "when all available proceedings have been added" do
+      before do
+        allow(LegalFramework::ProceedingTypes::All).to receive(:call).and_raise(LegalFramework::ProceedingTypes::All::NoMatchingProceedingsFoundError)
+      end
+
+      it "renders the limited page" do
+        get providers_legal_aid_application_has_other_proceedings_path(legal_aid_application)
+        expect(response.body).to include "You have added all the allowed proceedings"
+      end
+    end
   end
 
   describe "PATCH /providers/:application_id/has_other_proceedings" do