Browse Source

Add full stop after deletion messages

pull/1752/head
Kat 3 years ago
parent
commit
2ef740048e
  1. 2
      app/controllers/lettings_logs_controller.rb
  2. 2
      app/controllers/sales_logs_controller.rb
  3. 8
      config/locales/en.yml
  4. 4
      spec/features/lettings_log_spec.rb
  5. 4
      spec/features/sales_log_spec.rb
  6. 8
      spec/requests/delete_logs_controller_spec.rb
  7. 2
      spec/requests/lettings_logs_controller_spec.rb
  8. 2
      spec/requests/sales_logs_controller_spec.rb

2
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

2
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

8
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:

4
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")

4
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")

8
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

2
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

2
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

Loading…
Cancel
Save