rebase

app/controllers/claims/support/schools/claims/edit_claim_controller.rb

@@ -25,7 +25,7 @@ def update
         heading: t(".success"),
       }
     else
-      redirect_to rejected_claims_school_claims_path(@school)
+      redirect_to rejected_claims_support_school_claims_path(@school)
     end
   end
 

app/views/claims/schools/claims/show.html.erb

@@ -17,8 +17,8 @@
       </h1>
 
       <% if policy(@claim).submit? %>
-        <%= govuk_button_to t(".submit"), check_claims_school_claim_path(@school, @claim), method: :get %>
-      <% elsif @claim.submitted_by_id? %>
+        <%= govuk_button_link_to t(".submit"), edit_attribute_path(:declaration) %>
+      <% elsif @claim.submitted? %>
         <p class="govuk-body"><%= t(".submitted_by", name: @claim.submitted_by.full_name, date: l(@claim.submitted_on, format: :long)) %></p>
       <% end %>
 
@@ -82,7 +82,7 @@
             <% if policy(@claim).edit? %>
               <% row.with_action(
                 text: t("change"),
-                href: edit_attribute_path("mentor_training_#{mentor_training.mentor_id}".to_sym),
+                href: edit_attribute_path("mentor_training_#{ mentor_training.mentor_id}".to_sym),
                 visually_hidden_text: "Hours of training for #{mentor_training.mentor.full_name}",
                 html_attributes: { class: "govuk-link--no-visited-state" },
               ) %>

spec/components/claims/add_claim_wizard/mentor_step/disclaimer_component_spec.rb

@@ -26,7 +26,7 @@
     let(:all_school_mentors_visible) { false }
 
     it "renders a details block with information about why a mentor is missing from the list" do
-      render_inline described_class.new(mentors_form:)
+      render_inline described_class.new(mentor_step:)
 
       expect(page).to have_css(".govuk-details")
       expect(page).to have_content "If a mentor you have added is not showing in the list, they have already claimed 20 hours with #{claim.provider.name}."

spec/system/claims/schools/claims/view_claim_spec.rb

@@ -87,7 +87,7 @@ def then_i_can_then_see_the_submitted_claim_details
     expect(page).to have_content("SchoolA School")
     expect(page).to have_content("Academic year#{submitted_claim.academic_year.name}")
     expect(page).to have_content("Submitted")
-    expect(page).to have_content("Submitted by #{anne.full_name} on #{date_completed.strftime("%d %B %Y")}.")
+    expect(page).to have_content("Submitted by #{anne.full_name} on #{date_completed.strftime("%-d %B %Y")}.")
     expect(page).to have_content("Accredited providerBest Practice Network")
     expect(page).to have_content("Mentors\nBarry Garlow")
     expect(page).to have_content("Hours of training")

spec/wizards/claims/add_claim_wizard/mentor_step_spec.rb

@@ -48,7 +48,7 @@
       let(:claimable_mentors) { Claims::Mentor.where(id: mentor_1.id) }
 
       it "returns all selected mentors" do
-        expect(selected_mentors).to contain_exactly(mentor_1, mentor_2)
+        expect(selected_mentors).to contain_exactly(mentor_1)
       end
     end
   end