diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-24 02:50:45 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-02-24 02:50:45 +0000 |
| commit | dba47f680d1716a0e5d96809522301ed3400e396 (patch) | |
| tree | 0105e9cba593d3196e94831d4179226355e7c4fc /features | |
| parent | 9f80118e05e68743d95a83742a1d0a06bba3039c (diff) | |
| parent | 476a8049691951c4e1259cdbb164bbf1fca2bd1e (diff) | |
| download | gitlab-ce-dba47f680d1716a0e5d96809522301ed3400e396.tar.gz | |
Merge branch 'issue_13301_emoji-menu' into 'master'
Load award emoji picker with ajax request
Fixes #13301.
See merge request !2888
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/issues/award_emoji.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb index 93cf608cc62..277c63914d1 100644 --- a/features/steps/project/issues/award_emoji.rb +++ b/features/steps/project/issues/award_emoji.rb @@ -96,6 +96,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps end step 'The search field is focused' do - page.evaluate_script("document.activeElement.id").should eq "emoji_search" + expect(page).to have_selector('#emoji_search') + expect(page.evaluate_script('document.activeElement.id')).to eq('emoji_search') end end |