diff --git a/app/controllers/bulk_upload_sales_data_check_controller.rb b/app/controllers/bulk_upload_lettings_soft_validations_check_controller.rb similarity index 71% rename from app/controllers/bulk_upload_sales_data_check_controller.rb rename to app/controllers/bulk_upload_lettings_soft_validations_check_controller.rb index 3b79a98af..fc1b33c26 100644 --- a/app/controllers/bulk_upload_sales_data_check_controller.rb +++ b/app/controllers/bulk_upload_lettings_soft_validations_check_controller.rb @@ -1,4 +1,4 @@ -class BulkUploadSalesDataCheckController < ApplicationController +class BulkUploadLettingsSoftValidationsCheckController < ApplicationController include ActionView::Helpers::TextHelper before_action :authenticate_user! @@ -29,9 +29,9 @@ private def form @form ||= case params[:page] when "soft-errors-valid" - Forms::BulkUploadSalesDataCheck::SoftErrorsValid.new(form_params.merge(bulk_upload: @bulk_upload)) + Forms::BulkUploadLettingsSoftValidationsCheck::SoftErrorsValid.new(form_params.merge(bulk_upload: @bulk_upload)) when "confirm" - Forms::BulkUploadSalesDataCheck::Confirm.new(form_params.merge(bulk_upload: @bulk_upload)) + Forms::BulkUploadLettingsSoftValidationsCheck::Confirm.new(form_params.merge(bulk_upload: @bulk_upload)) else raise "invalid form" end diff --git a/app/controllers/bulk_upload_lettings_data_check_controller.rb b/app/controllers/bulk_upload_sales_soft_validations_check_controller.rb similarity index 72% rename from app/controllers/bulk_upload_lettings_data_check_controller.rb rename to app/controllers/bulk_upload_sales_soft_validations_check_controller.rb index 4975a29fb..4f1196949 100644 --- a/app/controllers/bulk_upload_lettings_data_check_controller.rb +++ b/app/controllers/bulk_upload_sales_soft_validations_check_controller.rb @@ -1,4 +1,4 @@ -class BulkUploadLettingsDataCheckController < ApplicationController +class BulkUploadSalesSoftValidationsCheckController < ApplicationController include ActionView::Helpers::TextHelper before_action :authenticate_user! @@ -29,9 +29,9 @@ private def form @form ||= case params[:page] when "soft-errors-valid" - Forms::BulkUploadLettingsDataCheck::SoftErrorsValid.new(form_params.merge(bulk_upload: @bulk_upload)) + Forms::BulkUploadSalesSoftValidationsCheck::SoftErrorsValid.new(form_params.merge(bulk_upload: @bulk_upload)) when "confirm" - Forms::BulkUploadLettingsDataCheck::Confirm.new(form_params.merge(bulk_upload: @bulk_upload)) + Forms::BulkUploadSalesSoftValidationsCheck::Confirm.new(form_params.merge(bulk_upload: @bulk_upload)) else raise "invalid form" end diff --git a/app/mailers/bulk_upload_mailer.rb b/app/mailers/bulk_upload_mailer.rb index 02cc5ddc5..7ff1dd1c3 100644 --- a/app/mailers/bulk_upload_mailer.rb +++ b/app/mailers/bulk_upload_mailer.rb @@ -29,7 +29,7 @@ class BulkUploadMailer < NotifyMailer def send_check_soft_validations_mail(bulk_upload:) 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 = bulk_upload.sales? ? bulk_upload_sales_data_check_url(bulk_upload, page: "soft-errors-valid") : bulk_upload_lettings_data_check_url(bulk_upload, page: "soft-errors-valid") + cta_link = bulk_upload.sales? ? bulk_upload_sales_check_soft_validations_url(bulk_upload, page: "soft-errors-valid") : bulk_upload_lettings_check_soft_validations_url(bulk_upload, page: "soft-errors-valid") send_email( bulk_upload.user.email, diff --git a/app/models/forms/bulk_upload_lettings_data_check/confirm.rb b/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb similarity index 69% rename from app/models/forms/bulk_upload_lettings_data_check/confirm.rb rename to app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb index 38bd0a758..72c81f50e 100644 --- a/app/models/forms/bulk_upload_lettings_data_check/confirm.rb +++ b/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb @@ -1,5 +1,5 @@ module Forms - module BulkUploadLettingsDataCheck + module BulkUploadLettingsSoftValidationsCheck class Confirm include ActiveModel::Model include ActiveModel::Attributes @@ -8,11 +8,11 @@ module Forms attribute :bulk_upload def view_path - "bulk_upload_lettings_data_check/confirm" + "bulk_upload_lettings_soft_validations_check/confirm" end def back_path - page_bulk_upload_lettings_data_check_path(bulk_upload, page: "soft-errors-valid") + page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, page: "soft-errors-valid") end def next_path diff --git a/app/models/forms/bulk_upload_lettings_data_check/soft_errors_valid.rb b/app/models/forms/bulk_upload_lettings_soft_validations_check/soft_errors_valid.rb similarity index 79% rename from app/models/forms/bulk_upload_lettings_data_check/soft_errors_valid.rb rename to app/models/forms/bulk_upload_lettings_soft_validations_check/soft_errors_valid.rb index f918784cf..b2eee2488 100644 --- a/app/models/forms/bulk_upload_lettings_data_check/soft_errors_valid.rb +++ b/app/models/forms/bulk_upload_lettings_soft_validations_check/soft_errors_valid.rb @@ -1,5 +1,5 @@ module Forms - module BulkUploadLettingsDataCheck + module BulkUploadLettingsSoftValidationsCheck class SoftErrorsValid include ActiveModel::Model include ActiveModel::Attributes @@ -18,7 +18,7 @@ module Forms end def view_path - "bulk_upload_lettings_data_check/soft_errors_valid" + "bulk_upload_lettings_soft_validations_check/soft_errors_valid" end def next_path @@ -26,7 +26,7 @@ module Forms when "yes" page_bulk_upload_lettings_resume_path(bulk_upload, page: "fix-choice") when "no" - page_bulk_upload_lettings_data_check_path(bulk_upload, page: "confirm") + page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, page: "confirm") else raise "invalid choice" end diff --git a/app/models/forms/bulk_upload_sales_data_check/confirm.rb b/app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb similarity index 70% rename from app/models/forms/bulk_upload_sales_data_check/confirm.rb rename to app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb index 033d4ee13..e8a3b3b77 100644 --- a/app/models/forms/bulk_upload_sales_data_check/confirm.rb +++ b/app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb @@ -1,5 +1,5 @@ module Forms - module BulkUploadSalesDataCheck + module BulkUploadSalesSoftValidationsCheck class Confirm include ActiveModel::Model include ActiveModel::Attributes @@ -8,11 +8,11 @@ module Forms attribute :bulk_upload def view_path - "bulk_upload_sales_data_check/confirm" + "bulk_upload_sales_soft_validations_check/confirm" end def back_path - page_bulk_upload_sales_data_check_path(bulk_upload, page: "soft-errors-valid") + page_bulk_upload_sales_soft_validations_check_path(bulk_upload, page: "soft-errors-valid") end def next_path diff --git a/app/models/forms/bulk_upload_sales_data_check/soft_errors_valid.rb b/app/models/forms/bulk_upload_sales_soft_validations_check/soft_errors_valid.rb similarity index 79% rename from app/models/forms/bulk_upload_sales_data_check/soft_errors_valid.rb rename to app/models/forms/bulk_upload_sales_soft_validations_check/soft_errors_valid.rb index 5f8631f0d..b36752ba4 100644 --- a/app/models/forms/bulk_upload_sales_data_check/soft_errors_valid.rb +++ b/app/models/forms/bulk_upload_sales_soft_validations_check/soft_errors_valid.rb @@ -1,5 +1,5 @@ module Forms - module BulkUploadSalesDataCheck + module BulkUploadSalesSoftValidationsCheck class SoftErrorsValid include ActiveModel::Model include ActiveModel::Attributes @@ -18,7 +18,7 @@ module Forms end def view_path - "bulk_upload_sales_data_check/soft_errors_valid" + "bulk_upload_sales_soft_validations_check/soft_errors_valid" end def next_path @@ -26,7 +26,7 @@ module Forms when "yes" page_bulk_upload_sales_resume_path(bulk_upload, page: "fix-choice") when "no" - page_bulk_upload_sales_data_check_path(bulk_upload, page: "confirm") + page_bulk_upload_sales_soft_validations_check_path(bulk_upload, page: "confirm") else raise "invalid choice" end diff --git a/app/views/bulk_upload_lettings_data_check/confirm.html.erb b/app/views/bulk_upload_lettings_soft_validations_check/confirm.html.erb similarity index 90% rename from app/views/bulk_upload_lettings_data_check/confirm.html.erb rename to app/views/bulk_upload_lettings_soft_validations_check/confirm.html.erb index a2c139cb9..8f29801da 100644 --- a/app/views/bulk_upload_lettings_data_check/confirm.html.erb +++ b/app/views/bulk_upload_lettings_soft_validations_check/confirm.html.erb @@ -13,7 +13,7 @@ You can not delete logs once you create them <% end %> - <%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_data_check_path(@bulk_upload, page: "confirm"), method: :patch do |f| %> + <%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_soft_validations_check_path(@bulk_upload, page: "confirm"), method: :patch do |f| %> <%= f.govuk_submit %> <%= govuk_button_link_to "Cancel", @form.back_path, secondary: true %> diff --git a/app/views/bulk_upload_lettings_data_check/soft_errors_valid.html.erb b/app/views/bulk_upload_lettings_soft_validations_check/soft_errors_valid.html.erb similarity index 92% rename from app/views/bulk_upload_lettings_data_check/soft_errors_valid.html.erb rename to app/views/bulk_upload_lettings_soft_validations_check/soft_errors_valid.html.erb index 108c39c1f..1140140c8 100644 --- a/app/views/bulk_upload_lettings_data_check/soft_errors_valid.html.erb +++ b/app/views/bulk_upload_lettings_soft_validations_check/soft_errors_valid.html.erb @@ -1,4 +1,4 @@ -<%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_data_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: "soft-errors-valid"), method: :patch do |f| %>
<%= f.govuk_error_summary %> diff --git a/app/views/bulk_upload_sales_data_check/confirm.html.erb b/app/views/bulk_upload_sales_soft_validations_check/confirm.html.erb similarity index 90% rename from app/views/bulk_upload_sales_data_check/confirm.html.erb rename to app/views/bulk_upload_sales_soft_validations_check/confirm.html.erb index b2addaf28..2eb9df34e 100644 --- a/app/views/bulk_upload_sales_data_check/confirm.html.erb +++ b/app/views/bulk_upload_sales_soft_validations_check/confirm.html.erb @@ -13,7 +13,7 @@ You can not delete logs once you create them <% end %> - <%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_data_check_path(@bulk_upload, page: "confirm"), method: :patch do |f| %> + <%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_soft_validations_check_path(@bulk_upload, page: "confirm"), method: :patch do |f| %> <%= f.govuk_submit %> <%= govuk_button_link_to "Cancel", @form.back_path, secondary: true %> diff --git a/app/views/bulk_upload_sales_data_check/soft_errors_valid.html.erb b/app/views/bulk_upload_sales_soft_validations_check/soft_errors_valid.html.erb similarity index 92% rename from app/views/bulk_upload_sales_data_check/soft_errors_valid.html.erb rename to app/views/bulk_upload_sales_soft_validations_check/soft_errors_valid.html.erb index 8d8dd85a0..9a0d15d9e 100644 --- a/app/views/bulk_upload_sales_data_check/soft_errors_valid.html.erb +++ b/app/views/bulk_upload_sales_soft_validations_check/soft_errors_valid.html.erb @@ -1,4 +1,4 @@ -<%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_data_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: "soft-errors-valid"), method: :patch do |f| %>
<%= f.govuk_error_summary %> diff --git a/config/locales/en.yml b/config/locales/en.yml index f9e860709..bb88fdce5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -73,11 +73,11 @@ en: choice: blank: You must select how would you like to fix errors inclusion: You must select one of the following options for how would like to fix errors - forms/bulk_upload_lettings_data_check/soft_errors_valid: + forms/bulk_upload_lettings_soft_validations_check/soft_errors_valid: attributes: soft_errors_valid: blank: You must select if there are errors in these fields - forms/bulk_upload_sales_data_check/soft_errors_valid: + forms/bulk_upload_sales_soft_validations_check/soft_errors_valid: attributes: soft_errors_valid: blank: You must select if there are errors in these fields diff --git a/config/routes.rb b/config/routes.rb index a36ae5721..05b0f32fd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -180,10 +180,10 @@ Rails.application.routes.draw do end end - resources :bulk_upload_lettings_data_check, path: "bulk-upload-data-check", only: %i[show update] do + resources :bulk_upload_lettings_soft_validations_check, path: "bulk-upload-soft-validations-check", only: %i[show update] do member do - get "*page", to: "bulk_upload_lettings_data_check#show", as: "page" - patch "*page", to: "bulk_upload_lettings_data_check#update" + get "*page", to: "bulk_upload_lettings_soft_validations_check#show", as: "page" + patch "*page", to: "bulk_upload_lettings_soft_validations_check#update" end end @@ -235,10 +235,10 @@ Rails.application.routes.draw do end end - resources :bulk_upload_sales_data_check, path: "bulk-upload-data-check", only: %i[show update] do + resources :bulk_upload_sales_soft_validations_check, path: "bulk-upload-soft-validations-check", only: %i[show update] do member do - get "*page", to: "bulk_upload_sales_data_check#show", as: "page" - patch "*page", to: "bulk_upload_sales_data_check#update" + get "*page", to: "bulk_upload_sales_soft_validations_check#show", as: "page" + patch "*page", to: "bulk_upload_sales_soft_validations_check#update" end end end diff --git a/spec/mailers/bulk_upload_mailer_spec.rb b/spec/mailers/bulk_upload_mailer_spec.rb index 4d1306c8b..b3e047e28 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_data_check_url(bulk_upload, page: "soft-errors-valid"), + cta_link: bulk_upload_lettings_soft_validations_check_url(bulk_upload, page: "soft-errors-valid"), }, ) diff --git a/spec/requests/bulk_upload_lettings_data_check_controller_spec.rb b/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb similarity index 67% rename from spec/requests/bulk_upload_lettings_data_check_controller_spec.rb rename to spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb index 7ac6fb3cf..9c0bb1664 100644 --- a/spec/requests/bulk_upload_lettings_data_check_controller_spec.rb +++ b/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb @@ -1,6 +1,6 @@ require "rails_helper" -RSpec.describe BulkUploadLettingsDataCheckController, type: :request do +RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request do let(:user) { create(:user) } let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:) } let(:bulk_upload_errors) { create_list(:bulk_upload_error, 2) } @@ -10,9 +10,9 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do sign_in user end - describe "GET /lettings-logs/bulk-upload-data-check/:ID/soft-errors-valid" do + describe "GET /lettings-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do it "shows the soft validation errors with confirmation question" do - get "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid" + get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" expect(response.body).to include("Bulk upload for lettings") expect(response.body).to include("2022/23") @@ -22,7 +22,7 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do end it "shows the soft validation and lists the errors" do - get "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid" + get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" expect(response.body).to include("Row #{bulk_upload_errors.first.row}") expect(response.body).to include("Tenant code") @@ -30,10 +30,10 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do end end - describe "PATCH /lettings-logs/bulk-upload-data-check/:ID/soft-errors-valid" do + describe "PATCH /lettings-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do context "when no option selected" do it "renders error message" do - patch "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid" + patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" expect(response).to be_successful @@ -43,7 +43,7 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do context "when yes is selected" do it "sends them to the fix choice page" do - patch "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "yes" } } + patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "yes" } } expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice") end @@ -51,18 +51,18 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do context "when no is selected" do it "sends them to confirm choice" do - patch "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "no" } } + patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "no" } } - expect(response).to redirect_to("/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm") + expect(response).to redirect_to("/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm") follow_redirect! expect(response.body).not_to include("You’ve successfully uploaded") end end end - describe "GET /lettings-logs/bulk-upload-data-check/:ID/confirm" do + describe "GET /lettings-logs/bulk-upload-soft-validations-check/:ID/confirm" do it "renders page" do - get "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm" + get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm" expect(response).to be_successful @@ -72,13 +72,13 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do end end - describe "PATCH /lettings-logs/bulk-upload-data-check/:ID/confirm" do + describe "PATCH /lettings-logs/bulk-upload-soft-validations-check/:ID/confirm" do let(:mock_processor) { instance_double(BulkUpload::Processor, approve_and_confirm_soft_validations: nil) } it "approves logs for creation" do allow(BulkUpload::Processor).to receive(:new).with(bulk_upload:).and_return(mock_processor) - patch "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm" + patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm" expect(mock_processor).to have_received(:approve_and_confirm_soft_validations) diff --git a/spec/requests/bulk_upload_sales_data_check_controller_spec.rb b/spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb similarity index 67% rename from spec/requests/bulk_upload_sales_data_check_controller_spec.rb rename to spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb index a9fbd64ca..bc3a851a8 100644 --- a/spec/requests/bulk_upload_sales_data_check_controller_spec.rb +++ b/spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb @@ -1,6 +1,6 @@ require "rails_helper" -RSpec.describe BulkUploadSalesDataCheckController, type: :request do +RSpec.describe BulkUploadSalesSoftValidationsCheckController, type: :request do let(:user) { create(:user) } let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:) } let(:bulk_upload_errors) { create_list(:bulk_upload_error, 2) } @@ -10,9 +10,9 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do sign_in user end - describe "GET /sales-logs/bulk-upload-data-check/:ID/soft-errors-valid" do + describe "GET /sales-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do it "shows the soft validation errors with confirmation question" do - get "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid" + get "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" expect(response.body).to include("Bulk upload for sales") expect(response.body).to include("2022/23") @@ -22,7 +22,7 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do end it "shows the soft validation and lists the errors" do - get "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid" + get "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" expect(response.body).to include("Row #{bulk_upload_errors.first.row}") expect(response.body).to include("Purchaser code") @@ -30,10 +30,10 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do end end - describe "PATCH /sales-logs/bulk-upload-data-check/:ID/soft-errors-valid" do + describe "PATCH /sales-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do context "when no option selected" do it "renders error message" do - patch "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid" + patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid" expect(response).to be_successful @@ -43,7 +43,7 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do context "when yes is selected" do it "sends them to the fix choice page" do - patch "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "yes" } } + patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "yes" } } expect(response).to redirect_to("/sales-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice") end @@ -51,18 +51,18 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do context "when no is selected" do it "sends them to confirm choice" do - patch "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "no" } } + patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "no" } } - expect(response).to redirect_to("/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm") + expect(response).to redirect_to("/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm") follow_redirect! expect(response.body).not_to include("You’ve successfully uploaded") end end end - describe "GET /sales-logs/bulk-upload-data-check/:ID/confirm" do + describe "GET /sales-logs/bulk-upload-soft-validations-check/:ID/confirm" do it "renders page" do - get "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm" + get "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm" expect(response).to be_successful @@ -72,13 +72,13 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do end end - describe "PATCH /sales-logs/bulk-upload-data-check/:ID/confirm" do + describe "PATCH /sales-logs/bulk-upload-soft-validations-check/:ID/confirm" do let(:mock_processor) { instance_double(BulkUpload::Processor, approve_and_confirm_soft_validations: nil) } it "approves logs for creation" do allow(BulkUpload::Processor).to receive(:new).with(bulk_upload:).and_return(mock_processor) - patch "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm" + patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm" expect(mock_processor).to have_received(:approve_and_confirm_soft_validations)