From 1e0cf7d1f5aa7e7d97399b16b2c13664581c4cfa Mon Sep 17 00:00:00 2001 From: edujackedu Date: Wed, 22 Jan 2025 15:28:31 +0000 Subject: [PATCH 1/2] Remove title and render teacher name when recording outcome --- .../teachers/record_failed_outcome/show.html.erb | 2 -- .../teachers/record_passed_outcome/show.html.erb | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/views/appropriate_bodies/teachers/record_failed_outcome/show.html.erb b/app/views/appropriate_bodies/teachers/record_failed_outcome/show.html.erb index 0ab05f13..a41c410c 100644 --- a/app/views/appropriate_bodies/teachers/record_failed_outcome/show.html.erb +++ b/app/views/appropriate_bodies/teachers/record_failed_outcome/show.html.erb @@ -1,5 +1,3 @@ -<% page_data(title: "Success") %> - <%= govuk_panel( title_text: "Success", text: "You have recorded a failing outcome for #{@teacher_name}" diff --git a/app/views/appropriate_bodies/teachers/record_passed_outcome/show.html.erb b/app/views/appropriate_bodies/teachers/record_passed_outcome/show.html.erb index cddb4f55..65d153dc 100644 --- a/app/views/appropriate_bodies/teachers/record_passed_outcome/show.html.erb +++ b/app/views/appropriate_bodies/teachers/record_passed_outcome/show.html.erb @@ -1,8 +1,6 @@ -<% page_data(title: "Success") %> - <%= govuk_panel( title_text: "Success", - text: "You have recorded a passing outcome for #{Teachers::Name.new(@teacher).full_name}" + text: "You have recorded a passing outcome for #{@teacher_name}" ) %> <%= govuk_button_link_to("Return to the homepage", ab_teachers_path, secondary: true) %> From d03ec3a4c7f43eedc9641219204596cad402aa3f Mon Sep 17 00:00:00 2001 From: edujackedu Date: Wed, 22 Jan 2025 16:24:04 +0000 Subject: [PATCH 2/2] Replace passing with pass --- .../teachers/record_passed_outcome/new.html.erb | 2 +- .../teachers/record_passed_outcome/show.html.erb | 2 +- spec/features/appropriate_bodies/record_passed_outcome_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/appropriate_bodies/teachers/record_passed_outcome/new.html.erb b/app/views/appropriate_bodies/teachers/record_passed_outcome/new.html.erb index 673a0084..ac7ab8e3 100644 --- a/app/views/appropriate_bodies/teachers/record_passed_outcome/new.html.erb +++ b/app/views/appropriate_bodies/teachers/record_passed_outcome/new.html.erb @@ -2,5 +2,5 @@ <%= form_with(model: @pending_induction_submission, url: ab_teacher_record_passed_outcome_path(@teacher), method: 'post') do |f| %> <%= render partial: 'appropriate_bodies/teachers/outcome_form', locals: { f: f } %> - <%= f.govuk_submit "Record passing outcome for #{Teachers::Name.new(@teacher).full_name}" %> + <%= f.govuk_submit "Record pass outcome for #{Teachers::Name.new(@teacher).full_name}" %> <% end %> diff --git a/app/views/appropriate_bodies/teachers/record_passed_outcome/show.html.erb b/app/views/appropriate_bodies/teachers/record_passed_outcome/show.html.erb index 65d153dc..3bebd51c 100644 --- a/app/views/appropriate_bodies/teachers/record_passed_outcome/show.html.erb +++ b/app/views/appropriate_bodies/teachers/record_passed_outcome/show.html.erb @@ -1,6 +1,6 @@ <%= govuk_panel( title_text: "Success", - text: "You have recorded a passing outcome for #{@teacher_name}" + text: "You have recorded a pass outcome for #{@teacher_name}" ) %> <%= govuk_button_link_to("Return to the homepage", ab_teachers_path, secondary: true) %> diff --git a/spec/features/appropriate_bodies/record_passed_outcome_spec.rb b/spec/features/appropriate_bodies/record_passed_outcome_spec.rb index e27343d2..91ac84f9 100644 --- a/spec/features/appropriate_bodies/record_passed_outcome_spec.rb +++ b/spec/features/appropriate_bodies/record_passed_outcome_spec.rb @@ -54,7 +54,7 @@ def and_i_enter_a_terms_value_of(number) def and_i_click_submit teacher_name = Teachers::Name.new(teacher).full_name - page.get_by_role('button', name: "Record passing outcome for #{teacher_name}").click + page.get_by_role('button', name: "Record pass outcome for #{teacher_name}").click end def then_i_should_be_on_the_success_page