diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-12-24 14:38:17 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-12-24 14:38:17 +0300 |
| commit | 999a374f778909b3681190dcf0936ba9bb989413 (patch) | |
| tree | 03a14e9bc34eb856a66c3a641ac1383d21a6f396 /features/project | |
| parent | d794ae8e1f6351282707d45df97ac0ec2a41eeb6 (diff) | |
| parent | e557c8d0a2c1b05148a9d73a8a658962a3ef6147 (diff) | |
Merge branch 'emoji-picker-search'into emoji_picker_frequently_used
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/issues/award_emoji.feature | 10 | ||||
| -rw-r--r-- | features/project/issues/issues.feature | 6 | ||||
| -rw-r--r-- | features/project/service.feature | 6 |
3 files changed, 20 insertions, 2 deletions
diff --git a/features/project/issues/award_emoji.feature b/features/project/issues/award_emoji.feature index cbf2e7104ab..9a06fdc2ee6 100644 --- a/features/project/issues/award_emoji.feature +++ b/features/project/issues/award_emoji.feature @@ -19,6 +19,12 @@ Feature: Award Emoji Then I can see the activity and food categories @javascript + Scenario: I can search emoji + Given I click to emoji-picker + And I search "hand" + Then I see search result for "hand" + + @javascript Scenario: I add award emoji using regular comment - Given I leave comment with a single emoji - Then I have award added + Given I leave comment with a single emoji + Then I have award added diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index f08b30e0b88..ab234bc7507 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -197,3 +197,9 @@ Feature: Project Issues And I should not see labels field And I submit new issue "500 error on profile" Then I should see issue "500 error on profile" + + @javascript + Scenario: Another user adds a comment to issue I'm currently viewing + Given I visit issue page "Release 0.4" + And another user adds a comment with text "Yay!" to issue "Release 0.4" + Then I should see a new comment with text "Yay!" diff --git a/features/project/service.feature b/features/project/service.feature index ff3e7a0b38e..3a7b8308524 100644 --- a/features/project/service.feature +++ b/features/project/service.feature @@ -55,6 +55,12 @@ Feature: Project Services And I fill email on push settings Then I should see email on push service settings saved + Scenario: Activate JIRA service + When I visit project "Shop" services page + And I click jira service link + And I fill jira settings + Then I should see jira service settings saved + Scenario: Activate Irker (IRC Gateway) service When I visit project "Shop" services page And I click Irker service link |