Browse Source

Update copy for error message

pull/2583/head
Kat 2 years ago
parent
commit
8289f08960
  1. 2
      config/locales/en.yml
  2. 2
      spec/requests/merge_requests_controller_spec.rb

2
config/locales/en.yml

@ -175,7 +175,7 @@ en:
merge_request: merge_request:
attributes: attributes:
absorbing_organisation_id: absorbing_organisation_id:
blank: "Select the organisation absorbing the others" blank: "Select the absorbing organisation"
merge_date: merge_date:
blank: "Enter a merge date" blank: "Enter a merge date"
invalid: "Enter a valid merge date" invalid: "Enter a valid merge date"

2
spec/requests/merge_requests_controller_spec.rb

@ -246,7 +246,7 @@ RSpec.describe MergeRequestsController, type: :request do
it "renders the error" do it "renders the error" do
request request
expect(page).to have_content("Select the organisation absorbing the others") expect(page).to have_content("Select the absorbing organisation")
end end
it "does not update the request" do it "does not update the request" do

Loading…
Cancel
Save