diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-17 08:35:34 +0300 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-17 08:35:34 +0300 |
commit | eeaeb2752a589c9046659d58d4a3f6be8030b699 (patch) | |
tree | 931f3ff83b20a1ba6fce6f8eeb7f05d7852f10aa /features | |
parent | f78ecda55d5431f9a74ab2892b516ecb45f24d80 (diff) | |
parent | 0370c7c8389c43138b11c3c5167993d5b025933a (diff) |
Merge branch '27655-clear-emoji-search-after-selection' into 'master'
Clear emoji search in awards menu after picking emoji
Closes #27655
See merge request !10524
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/project/issues/award_emoji.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb index a4cfc1fb8c8..dfd0bc13305 100644 --- a/features/steps/project/issues/award_emoji.rb +++ b/features/steps/project/issues/award_emoji.rb @@ -87,7 +87,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps end step 'I search "hand"' do - fill_in 'emoji_search', with: 'hand' + fill_in 'emoji-menu-search', with: 'hand' end step 'I see search result for "hand"' do @@ -101,7 +101,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps end step 'The search field is focused' do - expect(page).to have_selector('#emoji_search') - expect(page.evaluate_script('document.activeElement.id')).to eq('emoji_search') + expect(page).to have_selector('.js-emoji-menu-search') + expect(page.evaluate_script("document.activeElement.classList.contains('js-emoji-menu-search')")).to eq(true) end end |