diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-01 14:15:51 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-01 14:15:51 +0300 |
| commit | 523fb730c27976900edf040b5ea03e45d29ea965 (patch) | |
| tree | 829b6928f84ea84c84d922bbcbbf3b00072f6876 /features | |
| parent | 11dd2348c410949c98adfc10cdcf5be787742179 (diff) | |
| parent | 9f949d4e24c5939b5ea4071c3e86c514b4d82970 (diff) | |
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')
| -rw-r--r-- | features/project/issues/award_emoji.feature | 2 | ||||
| -rw-r--r-- | features/steps/project/issues/award_emoji.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/features/project/issues/award_emoji.feature b/features/project/issues/award_emoji.feature index f0fd414a9f9..1d7adfdd2c2 100644 --- a/features/project/issues/award_emoji.feature +++ b/features/project/issues/award_emoji.feature @@ -42,4 +42,4 @@ Feature: Award Emoji @javascript Scenario: I add award emoji using regular comment Given I leave comment with a single emoji - Then I have award added + Then I have new comment with emoji added 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' |