Merge branch 'improve-award-emoji-spinach-tests' into 'master'

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"
 

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')