summaryrefslogtreecommitdiff
path: root/features/steps
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-01 11:15:51 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-03-01 11:15:51 +0000
commit523fb730c27976900edf040b5ea03e45d29ea965 (patch)
tree829b6928f84ea84c84d922bbcbbf3b00072f6876 /features/steps
parent11dd2348c410949c98adfc10cdcf5be787742179 (diff)
parent9f949d4e24c5939b5ea4071c3e86c514b4d82970 (diff)
downloadgitlab-ce-523fb730c27976900edf040b5ea03e45d29ea965.tar.gz
Merge branch '25437-just-emoji' into 'master'
#25437 Allow posting of just an emoji in comment; add /award slash command Closes #25437 See merge request !9382
Diffstat (limited to 'features/steps')
-rw-r--r--features/steps/project/issues/award_emoji.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index cbe5738e7e4..dd7a58b454a 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -44,6 +44,10 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
end
end
+ step 'I have new comment with emoji added' do
+ expect(page).to have_selector ".emoji[title=':smile:']"
+ end
+
step 'I have award added' do
page.within '.awards' do
expect(page).to have_selector '.js-emoji-btn'