diff --git a/app/models/forms/bulk_upload_lettings_resume/confirm.rb b/app/models/forms/bulk_upload_lettings_resume/confirm.rb index abbece643..c109cd1b1 100644 --- a/app/models/forms/bulk_upload_lettings_resume/confirm.rb +++ b/app/models/forms/bulk_upload_lettings_resume/confirm.rb @@ -31,11 +31,16 @@ module Forms end def preflight_valid? - bulk_upload.choice != "create-fix-inline" + bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" end def preflight_redirect - page_bulk_upload_lettings_resume_path(bulk_upload, :chosen) + case bulk_upload.choice + when "create-fix-inline" + page_bulk_upload_lettings_resume_path(bulk_upload, :chosen) + when "bulk-confirm-soft-validations" + page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, :chosen) + end end end end diff --git a/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb b/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb index 2cbf15902..76ee10d17 100644 --- a/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb +++ b/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb @@ -52,11 +52,16 @@ module Forms end def preflight_valid? - bulk_upload.choice != "create-fix-inline" + bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" end def preflight_redirect - page_bulk_upload_lettings_resume_path(bulk_upload, :chosen) + case bulk_upload.choice + when "create-fix-inline" + page_bulk_upload_lettings_resume_path(bulk_upload, :chosen) + when "bulk-confirm-soft-validations" + page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, :chosen) + end end end end diff --git a/app/models/forms/bulk_upload_sales_resume/confirm.rb b/app/models/forms/bulk_upload_sales_resume/confirm.rb index c61b8329c..1211ef3f0 100644 --- a/app/models/forms/bulk_upload_sales_resume/confirm.rb +++ b/app/models/forms/bulk_upload_sales_resume/confirm.rb @@ -31,11 +31,16 @@ module Forms end def preflight_valid? - bulk_upload.choice != "create-fix-inline" + bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" end def preflight_redirect - page_bulk_upload_sales_resume_path(bulk_upload, :chosen) + case bulk_upload.choice + when "create-fix-inline" + page_bulk_upload_sales_resume_path(bulk_upload, :chosen) + when "bulk-confirm-soft-validations" + page_bulk_upload_sales_soft_validations_check_path(bulk_upload, :chosen) + end end end end diff --git a/app/models/forms/bulk_upload_sales_resume/fix_choice.rb b/app/models/forms/bulk_upload_sales_resume/fix_choice.rb index f9923b2be..fc565e2f6 100644 --- a/app/models/forms/bulk_upload_sales_resume/fix_choice.rb +++ b/app/models/forms/bulk_upload_sales_resume/fix_choice.rb @@ -52,11 +52,16 @@ module Forms end def preflight_valid? - bulk_upload.choice != "create-fix-inline" + bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" end def preflight_redirect - page_bulk_upload_sales_resume_path(bulk_upload, :chosen) + case bulk_upload.choice + when "create-fix-inline" + page_bulk_upload_sales_resume_path(bulk_upload, :chosen) + when "bulk-confirm-soft-validations" + page_bulk_upload_sales_soft_validations_check_path(bulk_upload, :chosen) + end end end end diff --git a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb index 1fc94bb1c..7ba8bbc85 100644 --- a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb +++ b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb @@ -36,7 +36,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do expect(response.headers["Cache-Control"]).to eql("no-store") end - context "and previosuly told us to fix inline" do + context "and previously told us to fix inline" do let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "create-fix-inline") } it "redirects to chosen" do @@ -45,6 +45,16 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/chosen") end end + + context "and previously told us to bulk confirm soft validations" do + let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "bulk-confirm-soft-validations") } + + it "redirects to soft validations check chosen" do + get "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice" + + expect(response).to redirect_to("/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/chosen") + end + end end describe "GET /lettings-logs/bulk-upload-resume/:ID/fix-choice?soft_errors_only=true" do @@ -105,7 +115,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do expect(response.headers["Cache-Control"]).to eql("no-store") end - context "and previosuly told us to fix inline" do + context "and previously told us to fix inline" do let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "create-fix-inline") } it "redirects to chosen" do @@ -114,6 +124,16 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/chosen") end end + + context "and previously told us to bulk confirm soft validations" do + let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "bulk-confirm-soft-validations") } + + it "redirects to soft validations check chosen" do + get "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/confirm" + + expect(response).to redirect_to("/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/chosen") + end + end end describe "PATCH /lettings-logs/bulk-upload-resume/:ID/confirm" do 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 3320dd621..0603e3d34 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 @@ -35,7 +35,7 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request expect(response.headers["Cache-Control"]).to eql("no-store") end - context "and previosuly told us to fix inline" do + context "and previously told us to fix inline" do let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "create-fix-inline") } it "redirects to resume chosen" do @@ -45,7 +45,7 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request end end - context "and previosuly told us to bulk confirm soft validations" do + context "and previously told us to bulk confirm soft validations" do let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "bulk-confirm-soft-validations") } it "redirects to soft validations check chosen" do diff --git a/spec/requests/bulk_upload_sales_resume_controller_spec.rb b/spec/requests/bulk_upload_sales_resume_controller_spec.rb index 07186420b..9c0a7112c 100644 --- a/spec/requests/bulk_upload_sales_resume_controller_spec.rb +++ b/spec/requests/bulk_upload_sales_resume_controller_spec.rb @@ -36,7 +36,7 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do expect(response.headers["Cache-Control"]).to eql("no-store") end - context "and previosuly told us to fix inline" do + context "and previously told us to fix inline" do let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "create-fix-inline") } it "redirects to chosen" do @@ -45,6 +45,16 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do expect(response).to redirect_to("/sales-logs/bulk-upload-resume/#{bulk_upload.id}/chosen") end end + + context "and previously told us to bulk confirm soft validations" do + let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "bulk-confirm-soft-validations") } + + it "redirects to soft validations check chosen" do + get "/sales-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice" + + expect(response).to redirect_to("/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/chosen") + end + end end describe "GET /sales-logs/bulk-upload-resume/:ID/fix-choice?soft_errors_only=true" do @@ -104,6 +114,16 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do expect(response.headers["Cache-Control"]).to eql("no-store") end + + context "and previously told us to bulk confirm soft validations" do + let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "bulk-confirm-soft-validations") } + + it "redirects to soft validations check chosen" do + get "/sales-logs/bulk-upload-resume/#{bulk_upload.id}/confirm" + + expect(response).to redirect_to("/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/chosen") + end + end end describe "PATCH /sales-logs/bulk-upload-resume/:ID/confirm" do 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 de548c2a6..0b496aea4 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 @@ -35,7 +35,7 @@ RSpec.describe BulkUploadSalesSoftValidationsCheckController, type: :request do expect(response.headers["Cache-Control"]).to eql("no-store") end - context "and previosuly told us to fix inline" do + context "and previously told us to fix inline" do let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "create-fix-inline") } it "redirects to resume chosen" do @@ -45,7 +45,7 @@ RSpec.describe BulkUploadSalesSoftValidationsCheckController, type: :request do end end - context "and previosuly told us to bulk confirm soft validations" do + context "and previously told us to bulk confirm soft validations" do let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "bulk-confirm-soft-validations") } it "redirects to soft validations check chosen" do