diff options
author | Rémy Coutable <remy@rymai.me> | 2016-01-19 20:17:56 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-01-19 20:22:01 +0300 |
commit | 491c2248c05ee9e93eff34f0126802add0e05565 (patch) | |
tree | f1e206cbacb8f5bea351c96fe143fead3e19a9c4 /features/project/merge_requests.feature | |
parent | c8d66514efcf946f847cb3120b271d8f0f0327f2 (diff) |
Fix diff comments loaded by AJAX to load comment with diff in discussion tab
This commits also fixes two minor issues:
- Ensure notes that the current user is not allowed to see are not
returned in the AJAX notes loading
- Ensure the notes counter badge is decremented of 1 instead of 2
Diffstat (limited to 'features/project/merge_requests.feature')
-rw-r--r-- | features/project/merge_requests.feature | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index aa9078b878f..1be5ddcd7e4 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -83,6 +83,15 @@ Feature: Project Merge Requests And I leave a comment like "Line is wrong" on diff And I switch to the merge request's comments tab Then I should see a discussion has started on diff + And I should see a badge of "1" next to the discussion link + + @javascript + Scenario: I see a new comment on merge request diff from another user in the discussion tab + Given project "Shop" have "Bug NS-05" open merge request with diffs inside + And I visit merge request page "Bug NS-05" + And user "John Doe" leaves a comment like "Line is wrong" on diff + Then I should see a discussion by user "John Doe" has started on diff + And I should see a badge of "1" next to the discussion link @javascript Scenario: I edit a comment on a merge request diff @@ -100,9 +109,11 @@ Feature: Project Merge Requests And I visit merge request page "Bug NS-05" And I click on the Changes tab And I leave a comment like "Line is wrong" on diff + And I should see a badge of "1" next to the discussion link And I delete the comment "Line is wrong" on diff And I click on the Discussion tab Then I should not see any discussion + And I should see a badge of "0" next to the discussion link @javascript Scenario: I comment on a line of a commit in merge request |