Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix search bug on foreign travel advice page #4079

Merged
merged 1 commit into from
May 31, 2024
Merged

Fix search bug on foreign travel advice page #4079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions app/assets/javascripts/views/travel-advice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,18 @@

this.container = searchInput.closest('.js-travel-container')

searchInput.addEventListener('keyup', function (event) {
searchInput.addEventListener('keydown', function (event) {
if (event.keyCode === enterKeyCode) {
event.preventDefault()
} else {
var filter = this.value
filterInst.filterListItems(filter)
filterInst.track(filter)
}
})

searchInput.addEventListener('keyup', function () {
var filter = this.value
filterInst.filterListItems(filter)
filterInst.track(filter)
})

if (this.container) {
var countryCount = this.container.getElementsByClassName('js-country-count')[0]
if (countryCount) {
Expand Down
4 changes: 2 additions & 2 deletions spec/javascripts/unit/foreign-travel-advice.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ describe('CountryFilter', function () {
expect(filter.filterListItems).toHaveBeenCalled()
})

it('Should cancel events bound to keyup when enter is pressed', function () {
it('Should prevent form submission and filtering when enter key is pressed', function () {
filter = new GOVUK.countryFilter($input[0])
spyOn(filter, 'filterListItems')

window.GOVUK.triggerEvent($input[0], 'keyup', { keyCode: 13 })
window.GOVUK.triggerEvent($input[0], 'keydown', { keyCode: 13 })
expect(filter.filterListItems).not.toHaveBeenCalled()
})

Expand Down
4 changes: 2 additions & 2 deletions test/integration/travel_advice_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ def de_dup_spaces(string)
assert page.has_selector?("#I li") # _In_dia
assert page.has_selector?("#F li") # F_in_land
assert page.has_selector?("#S li") # Spa_in_
assert page.has_no_selector?("#A li")
assert page.has_no_selector?("#M li")
assert page.has_selector?("#A li", visible: false)
assert page.has_selector?("#M li", visible: false)
end

within ".js-country-count" do
Expand Down