summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-12-22 19:47:38 +0200
committerValery Sizov <vsv2711@gmail.com>2015-12-22 23:12:23 +0200
commitbfe905b3aea71e2f08f1565dc1d0e3ff18d5fdfa (patch)
tree33e016dcca17d8c08fb6294badd694b686ed03b0
parent0ae0881250055e6924f35af6ef24b0a56468732d (diff)
downloadgitlab-ce-bfe905b3aea71e2f08f1565dc1d0e3ff18d5fdfa.tar.gz
add some spinach
-rw-r--r--features/project/issues/award_emoji.feature5
-rw-r--r--features/steps/project/issues/award_emoji.rb7
2 files changed, 12 insertions, 0 deletions
diff --git a/features/project/issues/award_emoji.feature b/features/project/issues/award_emoji.feature
index 0ce99e855c6..cbf2e7104ab 100644
--- a/features/project/issues/award_emoji.feature
+++ b/features/project/issues/award_emoji.feature
@@ -14,6 +14,11 @@ Feature: Award Emoji
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 I can see the activity and food categories
+
+ @javascript
Scenario: I add award emoji using regular comment
Given I leave comment with a single emoji
Then I have award added
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index e367323f4a5..c94d0ba7306 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -27,6 +27,13 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
end
end
+ step 'I can see the activity and food categories' do
+ page.within '.emoji-menu' do
+ expect(page).to_not have_selector 'Activity'
+ expect(page).to_not have_selector 'Food'
+ end
+ end
+
step 'I have award added' do
page.within '.awards' do
expect(page).to have_selector '.award'