From 2ef740048e30782691bdae08b1506f13461d488b Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 17 Jul 2023 14:08:02 +0100 Subject: [PATCH] Add full stop after deletion messages --- app/controllers/lettings_logs_controller.rb | 2 +- app/controllers/sales_logs_controller.rb | 2 +- config/locales/en.yml | 8 ++++---- spec/features/lettings_log_spec.rb | 4 ++-- spec/features/sales_log_spec.rb | 4 ++-- spec/requests/delete_logs_controller_spec.rb | 8 ++++---- spec/requests/lettings_logs_controller_spec.rb | 2 +- spec/requests/sales_logs_controller_spec.rb | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/controllers/lettings_logs_controller.rb b/app/controllers/lettings_logs_controller.rb index b29e72b5d..64e07efcd 100644 --- a/app/controllers/lettings_logs_controller.rb +++ b/app/controllers/lettings_logs_controller.rb @@ -77,7 +77,7 @@ class LettingsLogsController < LogsController @log.discard! - redirect_to lettings_logs_path, notice: "Log #{@log.id} has been deleted" + redirect_to lettings_logs_path, notice: "Log #{@log.id} has been deleted." end def delete_confirmation diff --git a/app/controllers/sales_logs_controller.rb b/app/controllers/sales_logs_controller.rb index 7c5083265..f7c69ec87 100644 --- a/app/controllers/sales_logs_controller.rb +++ b/app/controllers/sales_logs_controller.rb @@ -51,7 +51,7 @@ class SalesLogsController < LogsController @log.discard! - redirect_to sales_logs_path, notice: "Log #{@log.id} has been deleted" + redirect_to sales_logs_path, notice: "Log #{@log.id} has been deleted." end def delete_confirmation diff --git a/config/locales/en.yml b/config/locales/en.yml index 60e56e026..f1095a615 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -180,11 +180,11 @@ en: notification: logs_deleted: - one: "%{count} log has been deleted" - other: "%{count} logs have been deleted" + one: "%{count} log has been deleted." + other: "%{count} logs have been deleted." duplicate_logs_deleted: - one: "%{log_ids} has been deleted" - other: "%{log_ids} have been deleted" + one: "%{log_ids} has been deleted." + other: "%{log_ids} have been deleted." validations: organisation: diff --git a/spec/features/lettings_log_spec.rb b/spec/features/lettings_log_spec.rb index d34c73dd1..fd26b4efe 100644 --- a/spec/features/lettings_log_spec.rb +++ b/spec/features/lettings_log_spec.rb @@ -409,7 +409,7 @@ RSpec.describe "Lettings Log Features" do duplicate_log.reload expect(duplicate_log.deleted?).to be true expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") - expect(page).to have_content("Log #{duplicate_log.id} has been deleted") + expect(page).to have_content("Log #{duplicate_log.id} has been deleted.") expect(page).to have_current_path("/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}") expect(page).not_to have_content("These logs are duplicates") expect(page).not_to have_link("Keep this log and delete duplicates") @@ -433,7 +433,7 @@ RSpec.describe "Lettings Log Features" do lettings_log.reload expect(lettings_log.status).to eq("deleted") expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") - expect(page).to have_content("Log #{lettings_log.id} has been deleted") + expect(page).to have_content("Log #{lettings_log.id} has been deleted.") expect(page).to have_current_path("/lettings-logs/#{duplicate_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}") expect(page).not_to have_content("These logs are duplicates") expect(page).not_to have_link("Keep this log and delete duplicates") diff --git a/spec/features/sales_log_spec.rb b/spec/features/sales_log_spec.rb index 186dad51d..55c742ecb 100644 --- a/spec/features/sales_log_spec.rb +++ b/spec/features/sales_log_spec.rb @@ -160,7 +160,7 @@ RSpec.describe "Sales Log Features" do duplicate_log.reload expect(duplicate_log.deleted?).to be true expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") - expect(page).to have_content("Log #{duplicate_log.id} has been deleted") + expect(page).to have_content("Log #{duplicate_log.id} has been deleted.") expect(page).to have_current_path("/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}") expect(page).not_to have_content("These logs are duplicates") expect(page).not_to have_link("Keep this log and delete duplicates") @@ -184,7 +184,7 @@ RSpec.describe "Sales Log Features" do sales_log.reload expect(sales_log.status).to eq("deleted") expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") - expect(page).to have_content("Log #{sales_log.id} has been deleted") + expect(page).to have_content("Log #{sales_log.id} has been deleted.") expect(page).to have_current_path("/sales-logs/#{duplicate_log.id}/duplicate-logs?original_log_id=#{sales_log.id}") expect(page).not_to have_content("These logs are duplicates") expect(page).not_to have_link("Keep this log and delete duplicates") diff --git a/spec/requests/delete_logs_controller_spec.rb b/spec/requests/delete_logs_controller_spec.rb index 9a90a9d87..5d3f703bf 100644 --- a/spec/requests/delete_logs_controller_spec.rb +++ b/spec/requests/delete_logs_controller_spec.rb @@ -230,7 +230,7 @@ RSpec.describe "DeleteLogs", type: :request do expect(response).to redirect_to lettings_logs_path follow_redirect! expect(page).to have_selector(".govuk-notification-banner--success") - expect(page).to have_selector(".govuk-notification-banner--success", text: "2 logs have been deleted") + expect(page).to have_selector(".govuk-notification-banner--success", text: "2 logs have been deleted.") end end @@ -470,7 +470,7 @@ RSpec.describe "DeleteLogs", type: :request do expect(response).to redirect_to sales_logs_path follow_redirect! expect(page).to have_selector(".govuk-notification-banner--success") - expect(page).to have_selector(".govuk-notification-banner--success", text: "2 logs have been deleted") + expect(page).to have_selector(".govuk-notification-banner--success", text: "2 logs have been deleted.") end end @@ -714,7 +714,7 @@ RSpec.describe "DeleteLogs", type: :request do expect(response).to redirect_to lettings_logs_organisation_path(id: organisation) follow_redirect! expect(page).to have_selector(".govuk-notification-banner--success") - expect(page).to have_selector(".govuk-notification-banner--success", text: "2 logs have been deleted") + expect(page).to have_selector(".govuk-notification-banner--success", text: "2 logs have been deleted.") end end @@ -939,7 +939,7 @@ RSpec.describe "DeleteLogs", type: :request do expect(response).to redirect_to sales_logs_organisation_path(id: organisation) follow_redirect! expect(page).to have_selector(".govuk-notification-banner--success") - expect(page).to have_selector(".govuk-notification-banner--success", text: "2 logs have been deleted") + expect(page).to have_selector(".govuk-notification-banner--success", text: "2 logs have been deleted.") end end end diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index 2fc1ef461..dc5af1292 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -1431,7 +1431,7 @@ RSpec.describe LettingsLogsController, type: :request do delete_request expect(response).to redirect_to(lettings_logs_path) follow_redirect! - expect(page).to have_content("Log #{id} has been deleted") + expect(page).to have_content("Log #{id} has been deleted.") end it "marks the log as deleted" do diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb index 5d24e6b01..f5c298595 100644 --- a/spec/requests/sales_logs_controller_spec.rb +++ b/spec/requests/sales_logs_controller_spec.rb @@ -801,7 +801,7 @@ RSpec.describe SalesLogsController, type: :request do delete_request expect(response).to redirect_to(sales_logs_path) follow_redirect! - expect(page).to have_content("Log #{id} has been deleted") + expect(page).to have_content("Log #{id} has been deleted.") end it "marks the log as deleted" do