diff --git a/app/controllers/bulk_upload_lettings_soft_validations_check_controller.rb b/app/controllers/bulk_upload_lettings_soft_validations_check_controller.rb index fc1b33c26..5f9140452 100644 --- a/app/controllers/bulk_upload_lettings_soft_validations_check_controller.rb +++ b/app/controllers/bulk_upload_lettings_soft_validations_check_controller.rb @@ -28,8 +28,8 @@ private def form @form ||= case params[:page] - when "soft-errors-valid" - Forms::BulkUploadLettingsSoftValidationsCheck::SoftErrorsValid.new(form_params.merge(bulk_upload: @bulk_upload)) + when "confirm-soft-errors" + Forms::BulkUploadLettingsSoftValidationsCheck::ConfirmSoftErrors.new(form_params.merge(bulk_upload: @bulk_upload)) when "confirm" Forms::BulkUploadLettingsSoftValidationsCheck::Confirm.new(form_params.merge(bulk_upload: @bulk_upload)) else @@ -38,6 +38,6 @@ private end def form_params - params.fetch(:form, {}).permit(:soft_errors_valid) + params.fetch(:form, {}).permit(:confirm_soft_errors) end end diff --git a/app/controllers/bulk_upload_sales_soft_validations_check_controller.rb b/app/controllers/bulk_upload_sales_soft_validations_check_controller.rb index 4f1196949..6daf167f8 100644 --- a/app/controllers/bulk_upload_sales_soft_validations_check_controller.rb +++ b/app/controllers/bulk_upload_sales_soft_validations_check_controller.rb @@ -28,8 +28,8 @@ private def form @form ||= case params[:page] - when "soft-errors-valid" - Forms::BulkUploadSalesSoftValidationsCheck::SoftErrorsValid.new(form_params.merge(bulk_upload: @bulk_upload)) + when "confirm-soft-errors" + Forms::BulkUploadSalesSoftValidationsCheck::ConfirmSoftErrors.new(form_params.merge(bulk_upload: @bulk_upload)) when "confirm" Forms::BulkUploadSalesSoftValidationsCheck::Confirm.new(form_params.merge(bulk_upload: @bulk_upload)) else @@ -38,6 +38,6 @@ private end def form_params - params.fetch(:form, {}).permit(:soft_errors_valid) + params.fetch(:form, {}).permit(:confirm_soft_errors) end end diff --git a/app/mailers/bulk_upload_mailer.rb b/app/mailers/bulk_upload_mailer.rb index e017e7c48..e2b98c9b9 100644 --- a/app/mailers/bulk_upload_mailer.rb +++ b/app/mailers/bulk_upload_mailer.rb @@ -30,9 +30,9 @@ class BulkUploadMailer < NotifyMailer title = "Check your file data" description = "Some of your #{bulk_upload.year_combo} #{bulk_upload.log_type} data might not be right. Click the link below to review the potential errors, and check your file to see if the data is correct." cta_link = if bulk_upload.lettings? - bulk_upload_lettings_soft_validations_check_url(bulk_upload, page: "soft-errors-valid") + bulk_upload_lettings_soft_validations_check_url(bulk_upload, page: "confirm-soft-errors") else - bulk_upload_sales_soft_validations_check_url(bulk_upload, page: "soft-errors-valid") + bulk_upload_sales_soft_validations_check_url(bulk_upload, page: "confirm-soft-errors") end send_email( diff --git a/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb b/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb index 72c81f50e..b804d7767 100644 --- a/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb +++ b/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb @@ -12,7 +12,7 @@ module Forms end def back_path - page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, page: "soft-errors-valid") + page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, page: "confirm-soft-errors") end def next_path diff --git a/app/models/forms/bulk_upload_lettings_soft_validations_check/soft_errors_valid.rb b/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.rb similarity index 64% rename from app/models/forms/bulk_upload_lettings_soft_validations_check/soft_errors_valid.rb rename to app/models/forms/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.rb index ecb9e8cf2..cbf486a4d 100644 --- a/app/models/forms/bulk_upload_lettings_soft_validations_check/soft_errors_valid.rb +++ b/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.rb @@ -1,31 +1,31 @@ module Forms module BulkUploadLettingsSoftValidationsCheck - class SoftErrorsValid + class ConfirmSoftErrors include ActiveModel::Model include ActiveModel::Attributes include Rails.application.routes.url_helpers attribute :bulk_upload - attribute :soft_errors_valid, :string + attribute :confirm_soft_errors, :string - validates :soft_errors_valid, presence: true + validates :confirm_soft_errors, presence: true def options [ - OpenStruct.new(id: "yes", name: "Yes, some of these are errors"), - OpenStruct.new(id: "no", name: "No, all the data is correct"), + OpenStruct.new(id: "yes", name: "Yes, these fields are correct"), + OpenStruct.new(id: "no", name: "No, there are errors"), ] end def view_path - "bulk_upload_lettings_soft_validations_check/soft_errors_valid" + "bulk_upload_lettings_soft_validations_check/confirm_soft_errors" end def next_path - case soft_errors_valid - when "yes" - page_bulk_upload_lettings_resume_path(bulk_upload, page: "fix-choice", soft_errors_only: true) + case confirm_soft_errors when "no" + page_bulk_upload_lettings_resume_path(bulk_upload, page: "fix-choice", soft_errors_only: true) + when "yes" page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, page: "confirm") else raise "invalid choice" diff --git a/app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb b/app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb index e8a3b3b77..579af7e84 100644 --- a/app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb +++ b/app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb @@ -12,7 +12,7 @@ module Forms end def back_path - page_bulk_upload_sales_soft_validations_check_path(bulk_upload, page: "soft-errors-valid") + page_bulk_upload_sales_soft_validations_check_path(bulk_upload, page: "confirm-soft-errors") end def next_path diff --git a/app/models/forms/bulk_upload_sales_soft_validations_check/soft_errors_valid.rb b/app/models/forms/bulk_upload_sales_soft_validations_check/confirm_soft_errors.rb similarity index 60% rename from app/models/forms/bulk_upload_sales_soft_validations_check/soft_errors_valid.rb rename to app/models/forms/bulk_upload_sales_soft_validations_check/confirm_soft_errors.rb index b36752ba4..e6fe00495 100644 --- a/app/models/forms/bulk_upload_sales_soft_validations_check/soft_errors_valid.rb +++ b/app/models/forms/bulk_upload_sales_soft_validations_check/confirm_soft_errors.rb @@ -1,31 +1,31 @@ module Forms module BulkUploadSalesSoftValidationsCheck - class SoftErrorsValid + class ConfirmSoftErrors include ActiveModel::Model include ActiveModel::Attributes include Rails.application.routes.url_helpers attribute :bulk_upload - attribute :soft_errors_valid, :string + attribute :confirm_soft_errors, :string - validates :soft_errors_valid, presence: true + validates :confirm_soft_errors, presence: true def options [ - OpenStruct.new(id: "yes", name: "Yes, some of these are errors"), - OpenStruct.new(id: "no", name: "No, all the data is correct"), + OpenStruct.new(id: "yes", name: "Yes, these fields are correct"), + OpenStruct.new(id: "no", name: "No, there are errors"), ] end def view_path - "bulk_upload_sales_soft_validations_check/soft_errors_valid" + "bulk_upload_sales_soft_validations_check/confirm_soft_errors" end def next_path - case soft_errors_valid - when "yes" - page_bulk_upload_sales_resume_path(bulk_upload, page: "fix-choice") + case confirm_soft_errors when "no" + page_bulk_upload_sales_resume_path(bulk_upload, page: "fix-choice", soft_errors_only: true) + when "yes" page_bulk_upload_sales_soft_validations_check_path(bulk_upload, page: "confirm") else raise "invalid choice" diff --git a/app/views/bulk_upload_lettings_resume/fix_choice.html.erb b/app/views/bulk_upload_lettings_resume/fix_choice.html.erb index ac79167ea..d887ec98e 100644 --- a/app/views/bulk_upload_lettings_resume/fix_choice.html.erb +++ b/app/views/bulk_upload_lettings_resume/fix_choice.html.erb @@ -33,7 +33,7 @@
<%= f.govuk_submit %> <% if @soft_errors_only %> - <%= govuk_button_link_to "Cancel", bulk_upload_lettings_soft_validations_check_url(@bulk_upload, page: "soft-errors-valid"), secondary: true %> + <%= govuk_button_link_to "Cancel", bulk_upload_lettings_soft_validations_check_url(@bulk_upload, page: "confirm-soft-errors"), secondary: true %> <% end %>
<% end %> diff --git a/app/views/bulk_upload_lettings_soft_validations_check/soft_errors_valid.html.erb b/app/views/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.html.erb similarity index 80% rename from app/views/bulk_upload_lettings_soft_validations_check/soft_errors_valid.html.erb rename to app/views/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.html.erb index 1140140c8..fb5bde1c2 100644 --- a/app/views/bulk_upload_lettings_soft_validations_check/soft_errors_valid.html.erb +++ b/app/views/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.html.erb @@ -1,4 +1,4 @@ -<%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_soft_validations_check_path(@bulk_upload, page: "soft-errors-valid"), method: :patch do |f| %> +<%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_soft_validations_check_path(@bulk_upload, page: "confirm-soft-errors"), method: :patch do |f| %>
<%= f.govuk_error_summary %> @@ -20,11 +20,11 @@
- <%= f.govuk_collection_radio_buttons :soft_errors_valid, + <%= f.govuk_collection_radio_buttons :confirm_soft_errors, @form.options, :id, :name, - legend: { text: "Are there any errors in these fields?", size: "l" } %> + legend: { text: "Are these fields correct?", size: "l" } %> <%= f.govuk_submit %>
diff --git a/app/views/bulk_upload_sales_resume/fix_choice.html.erb b/app/views/bulk_upload_sales_resume/fix_choice.html.erb index b5cca7fa2..ad4dce814 100644 --- a/app/views/bulk_upload_sales_resume/fix_choice.html.erb +++ b/app/views/bulk_upload_sales_resume/fix_choice.html.erb @@ -33,7 +33,7 @@
<%= f.govuk_submit %> <% if @soft_errors_only %> - <%= govuk_button_link_to "Cancel", bulk_upload_sales_soft_validations_check_url(@bulk_upload, page: "soft-errors-valid"), secondary: true %> + <%= govuk_button_link_to "Cancel", bulk_upload_sales_soft_validations_check_url(@bulk_upload, page: "confirm-soft-errors"), secondary: true %> <% end %>
<% end %> diff --git a/app/views/bulk_upload_sales_soft_validations_check/soft_errors_valid.html.erb b/app/views/bulk_upload_sales_soft_validations_check/confirm_soft_errors.html.erb similarity index 80% rename from app/views/bulk_upload_sales_soft_validations_check/soft_errors_valid.html.erb rename to app/views/bulk_upload_sales_soft_validations_check/confirm_soft_errors.html.erb index 9a0d15d9e..9ed175afb 100644 --- a/app/views/bulk_upload_sales_soft_validations_check/soft_errors_valid.html.erb +++ b/app/views/bulk_upload_sales_soft_validations_check/confirm_soft_errors.html.erb @@ -1,4 +1,4 @@ -<%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_soft_validations_check_path(@bulk_upload, page: "soft-errors-valid"), method: :patch do |f| %> +<%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_soft_validations_check_path(@bulk_upload, page: "confirm-soft-errors"), method: :patch do |f| %>
<%= f.govuk_error_summary %> @@ -20,11 +20,11 @@
- <%= f.govuk_collection_radio_buttons :soft_errors_valid, + <%= f.govuk_collection_radio_buttons :confirm_soft_errors, @form.options, :id, :name, - legend: { text: "Are there any errors in these fields?", size: "l" } %> + legend: { text: "Are these fields correct?", size: "l" } %> <%= f.govuk_submit %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index eefe3c34a..e8b51678d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -71,20 +71,20 @@ en: forms/bulk_upload_lettings_resume/fix_choice: attributes: choice: - blank: You must select how would you like to fix errors + blank: Select how would you like to fix these errors inclusion: You must select one of the following options for how would like to fix errors - forms/bulk_upload_lettings_soft_validations_check/soft_errors_valid: + forms/bulk_upload_lettings_soft_validations_check/confirm_soft_errors: attributes: - soft_errors_valid: + confirm_soft_errors: blank: You must select if there are errors in these fields - forms/bulk_upload_sales_soft_validations_check/soft_errors_valid: + forms/bulk_upload_sales_soft_validations_check/confirm_soft_errors: attributes: - soft_errors_valid: + confirm_soft_errors: blank: You must select if there are errors in these fields forms/bulk_upload_sales_resume/fix_choice: attributes: choice: - blank: You must select how would you like to fix errors + blank: Select how would you like to fix these errors inclusion: You must select one of the following options for how would like to fix errors activerecord: diff --git a/spec/mailers/bulk_upload_mailer_spec.rb b/spec/mailers/bulk_upload_mailer_spec.rb index b3e047e28..ba49d50b5 100644 --- a/spec/mailers/bulk_upload_mailer_spec.rb +++ b/spec/mailers/bulk_upload_mailer_spec.rb @@ -113,7 +113,7 @@ RSpec.describe BulkUploadMailer do filename: bulk_upload.filename, upload_timestamp: bulk_upload.created_at.to_fs(:govuk_date_and_time), description: "Some of your 2022/23 lettings data might not be right. Click the link below to review the potential errors, and check your file to see if the data is correct.", - cta_link: bulk_upload_lettings_soft_validations_check_url(bulk_upload, page: "soft-errors-valid"), + cta_link: bulk_upload_lettings_soft_validations_check_url(bulk_upload, page: "confirm-soft-errors"), }, ) diff --git a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb index 85e80f96d..a8ff8d7ec 100644 --- a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb +++ b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb @@ -49,7 +49,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do expect(response).to be_successful - expect(response.body).to include("You must select") + expect(response.body).to include("Select how would you like to fix these errors") end end diff --git a/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb b/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb index 9c0bb1664..d1252b5e2 100644 --- a/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb +++ b/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb @@ -10,19 +10,19 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request sign_in user end - describe "GET /lettings-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do + describe "GET /lettings-logs/bulk-upload-soft-validations-check/:ID/confirm-soft-errors" do it "shows the soft validation errors with confirmation question" do - get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" + get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors" expect(response.body).to include("Bulk upload for lettings") expect(response.body).to include("2022/23") expect(response.body).to include("Check these 2 answers") expect(response.body).to include(bulk_upload.filename) - expect(response.body).to include("Are there any errors in these fields?") + expect(response.body).to include("Are these fields correct?") end it "shows the soft validation and lists the errors" do - get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" + get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors" expect(response.body).to include("Row #{bulk_upload_errors.first.row}") expect(response.body).to include("Tenant code") @@ -30,10 +30,10 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request end end - describe "PATCH /lettings-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do + describe "PATCH /lettings-logs/bulk-upload-soft-validations-check/:ID/confirm-soft-errors" do context "when no option selected" do it "renders error message" do - patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" + patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors" expect(response).to be_successful @@ -41,17 +41,17 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request end end - context "when yes is selected" do + context "when no is selected" do it "sends them to the fix choice page" do - patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "yes" } } + patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors", params: { form: { confirm_soft_errors: "no" } } - expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice") + expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice?soft_errors_only=true") end end - context "when no is selected" do + context "when yes is selected" do it "sends them to confirm choice" do - patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "no" } } + patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors", params: { form: { confirm_soft_errors: "yes" } } expect(response).to redirect_to("/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm") follow_redirect! diff --git a/spec/requests/bulk_upload_sales_resume_controller_spec.rb b/spec/requests/bulk_upload_sales_resume_controller_spec.rb index 409e89f3a..70b45a55d 100644 --- a/spec/requests/bulk_upload_sales_resume_controller_spec.rb +++ b/spec/requests/bulk_upload_sales_resume_controller_spec.rb @@ -49,7 +49,7 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do expect(response).to be_successful - expect(response.body).to include("You must select") + expect(response.body).to include("Select how would you like to fix these errors") end end diff --git a/spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb b/spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb index bc3a851a8..3aaa433f0 100644 --- a/spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb +++ b/spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb @@ -10,19 +10,19 @@ RSpec.describe BulkUploadSalesSoftValidationsCheckController, type: :request do sign_in user end - describe "GET /sales-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do + describe "GET /sales-logs/bulk-upload-soft-validations-check/:ID/confirm-soft-errors" do it "shows the soft validation errors with confirmation question" do - get "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" + get "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors" expect(response.body).to include("Bulk upload for sales") expect(response.body).to include("2022/23") expect(response.body).to include("Check these 2 answers") expect(response.body).to include(bulk_upload.filename) - expect(response.body).to include("Are there any errors in these fields?") + expect(response.body).to include("Are these fields correct?") end it "shows the soft validation and lists the errors" do - get "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" + get "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors" expect(response.body).to include("Row #{bulk_upload_errors.first.row}") expect(response.body).to include("Purchaser code") @@ -30,10 +30,10 @@ RSpec.describe BulkUploadSalesSoftValidationsCheckController, type: :request do end end - describe "PATCH /sales-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do + describe "PATCH /sales-logs/bulk-upload-soft-validations-check/:ID/confirm-soft-errors" do context "when no option selected" do it "renders error message" do - patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" + patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors" expect(response).to be_successful @@ -41,17 +41,17 @@ RSpec.describe BulkUploadSalesSoftValidationsCheckController, type: :request do end end - context "when yes is selected" do + context "when no is selected" do it "sends them to the fix choice page" do - patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "yes" } } + patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors", params: { form: { confirm_soft_errors: "no" } } - expect(response).to redirect_to("/sales-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice") + expect(response).to redirect_to("/sales-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice?soft_errors_only=true") end end - context "when no is selected" do + context "when yes is selected" do it "sends them to confirm choice" do - patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "no" } } + patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors", params: { form: { confirm_soft_errors: "yes" } } expect(response).to redirect_to("/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm") follow_redirect!