Skip to content

Commit 48f98ae

Browse files
committed
Change the wording for the alert status check boxes
1 parent dafeecd commit 48f98ae

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

config/locales/en.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
en:
55
alert_status:
6-
avoid_all_but_essential_travel_to_parts: The FCO advise against all but essential travel to parts of the country
7-
avoid_all_travel_to_parts: The FCO advise against all travel to parts of the country
8-
avoid_all_but_essential_travel_to_whole_country: The FCO advise against all but essential travel to the whole country
9-
avoid_all_travel_to_whole_country: The FCO advise against all travel to the whole country
6+
avoid_all_but_essential_travel_to_parts: FCO advises against all but essential travel to parts of the country
7+
avoid_all_travel_to_parts: FCO advises against all travel to parts of the country
8+
avoid_all_but_essential_travel_to_whole_country: FCO advises against all but essential travel to the whole country
9+
avoid_all_travel_to_whole_country: FCO advises against all travel to the whole country
1010
country_table:
1111
filter:
1212
label: Filter countries

spec/features/edition_edit_spec.rb

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ def assert_details_does_not_contain(content_id, key)
156156
end
157157

158158
within_section "the fieldset labelled General information" do
159-
expect(page).to have_unchecked_field("The FCO advise against all travel to the whole country")
160-
expect(page).to have_unchecked_field("The FCO advise against all travel to parts of the country")
161-
expect(page).to have_unchecked_field("The FCO advise against all but essential travel to the whole country")
162-
expect(page).to have_unchecked_field("The FCO advise against all but essential travel to parts of the country")
159+
expect(page).to have_unchecked_field("FCO advises against all travel to the whole country")
160+
expect(page).to have_unchecked_field("FCO advises against all travel to parts of the country")
161+
expect(page).to have_unchecked_field("FCO advises against all but essential travel to the whole country")
162+
expect(page).to have_unchecked_field("FCO advises against all but essential travel to parts of the country")
163163
end
164164

165165
within_section "the fieldset labelled Parts (govspeak available)" do
@@ -340,13 +340,13 @@ def assert_details_does_not_contain(content_id, key)
340340
@edition = create(:travel_advice_edition, country_slug: "australia", state: "draft")
341341
visit "/admin/editions/#{@edition.to_param}/edit"
342342

343-
expect(page).to have_unchecked_field("The FCO advise against all but essential travel to parts of the country")
344-
expect(page).to have_unchecked_field("The FCO advise against all travel to parts of the country")
345-
expect(page).to have_unchecked_field("The FCO advise against all but essential travel to the whole country")
346-
expect(page).to have_unchecked_field("The FCO advise against all travel to the whole country")
343+
expect(page).to have_unchecked_field("FCO advises against all but essential travel to parts of the country")
344+
expect(page).to have_unchecked_field("FCO advises against all travel to parts of the country")
345+
expect(page).to have_unchecked_field("FCO advises against all but essential travel to the whole country")
346+
expect(page).to have_unchecked_field("FCO advises against all travel to the whole country")
347347

348-
check "The FCO advise against all but essential travel to parts of the country"
349-
check "The FCO advise against all travel to parts of the country"
348+
check "FCO advises against all but essential travel to parts of the country"
349+
check "FCO advises against all travel to parts of the country"
350350

351351
click_on "Save"
352352

@@ -357,13 +357,13 @@ def assert_details_does_not_contain(content_id, key)
357357
)
358358

359359
expect(@edition.reload.alert_status).to eq %w[avoid_all_travel_to_parts avoid_all_but_essential_travel_to_parts]
360-
expect(page).to have_checked_field("The FCO advise against all but essential travel to parts of the country")
361-
expect(page).to have_checked_field("The FCO advise against all travel to parts of the country")
362-
expect(page).to have_unchecked_field("The FCO advise against all but essential travel to the whole country")
363-
expect(page).to have_unchecked_field("The FCO advise against all travel to the whole country")
360+
expect(page).to have_checked_field("FCO advises against all but essential travel to parts of the country")
361+
expect(page).to have_checked_field("FCO advises against all travel to parts of the country")
362+
expect(page).to have_unchecked_field("FCO advises against all but essential travel to the whole country")
363+
expect(page).to have_unchecked_field("FCO advises against all travel to the whole country")
364364

365-
uncheck "The FCO advise against all but essential travel to parts of the country"
366-
uncheck "The FCO advise against all travel to parts of the country"
365+
uncheck "FCO advises against all but essential travel to parts of the country"
366+
uncheck "FCO advises against all travel to parts of the country"
367367

368368
WebMock::RequestRegistry.instance.reset!
369369

@@ -372,10 +372,10 @@ def assert_details_does_not_contain(content_id, key)
372372
assert_details_contains("48baf826-7d71-4fea-a9c4-9730fd30eb9e", "alert_status", [])
373373

374374
expect(@edition.reload.alert_status).to eq []
375-
expect(page).to have_unchecked_field("The FCO advise against all but essential travel to parts of the country")
376-
expect(page).to have_unchecked_field("The FCO advise against all travel to parts of the country")
377-
expect(page).to have_unchecked_field("The FCO advise against all but essential travel to the whole country")
378-
expect(page).to have_unchecked_field("The FCO advise against all travel to the whole country")
375+
expect(page).to have_unchecked_field("FCO advises against all but essential travel to parts of the country")
376+
expect(page).to have_unchecked_field("FCO advises against all travel to parts of the country")
377+
expect(page).to have_unchecked_field("FCO advises against all but essential travel to the whole country")
378+
expect(page).to have_unchecked_field("FCO advises against all travel to the whole country")
379379
end
380380

381381
scenario "managing images for an edition" do

0 commit comments

Comments
 (0)