diff options
author | Robert Speicher <robert@gitlab.com> | 2016-03-18 04:27:52 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-18 11:52:35 +0300 |
commit | 7e1ccb5c840b144ab44c8ff422e015640fb0254e (patch) | |
tree | de65b83d96e7d8870982017ca03c2a702973eb20 /features | |
parent | 51a4c597ffe5d7ddec508d7a1dcdb3afc9d51722 (diff) |
Merge branch 'improve-award-emoji-spinach-tests' into 'master'
Improve award emoji test reliability by checking that the emoji is displayed before the search field is focused
See merge request !3288
Diffstat (limited to 'features')
-rw-r--r-- | features/project/issues/award_emoji.feature | 11 | ||||
-rw-r--r-- | features/steps/project/issues/award_emoji.rb | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/features/project/issues/award_emoji.feature b/features/project/issues/award_emoji.feature index 2945bb3753a..f0fd414a9f9 100644 --- a/features/project/issues/award_emoji.feature +++ b/features/project/issues/award_emoji.feature @@ -18,21 +18,24 @@ Feature: Award Emoji @javascript Scenario: I add and remove custom award in the issue Given I click to emoji-picker - Then The search field is focused - And I click to emoji in the picker + Then The emoji menu is visible + And The search field is focused + Then I click to emoji in the picker Then I have award added And I can remove it by clicking to icon @javascript Scenario: I can see the list of emoji categories Given I click to emoji-picker - Then The search field is focused + Then The emoji menu is visible + And The search field is focused Then I can see the activity and food categories @javascript Scenario: I can search emoji Given I click to emoji-picker - Then The search field is focused + Then The emoji menu is visible + And The search field is focused And I search "hand" Then I see search result for "hand" diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb index ce2554bc80d..c5d45709b44 100644 --- a/features/steps/project/issues/award_emoji.rb +++ b/features/steps/project/issues/award_emoji.rb @@ -92,6 +92,10 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps end end + step 'The emoji menu is visible' do + page.find(".emoji-menu.is-visible") + 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') |