diff options
| author | Jacob Carlborg <jacob.carlborg@tretti.se> | 2014-01-09 17:50:27 +0100 |
|---|---|---|
| committer | Jacob Carlborg <doob@me.com> | 2014-02-22 21:21:12 +0100 |
| commit | 2d554f42f07a9bebcb6d43ace2cdeedcc54e8de9 (patch) | |
| tree | 146bda9f4c39dcefe9b18b31b2256c6c66186c36 /features/project/merge_requests.feature | |
| parent | 138e2a50b7d839bd37c21b2849df422f9dfef6bb (diff) | |
| download | gitlab-ce-2d554f42f07a9bebcb6d43ace2cdeedcc54e8de9.tar.gz | |
Add button for toggling inline comments in diff view.
This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
Diffstat (limited to 'features/project/merge_requests.feature')
| -rw-r--r-- | features/project/merge_requests.feature | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 556b96338d6..9eba427c3e3 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -88,3 +88,47 @@ Feature: Project Merge Requests Given I visit merge request page "Bug NS-04" And I leave a comment with a header containing "Comment with a header" Then The comment with the header should not have an ID + + # Toggling inline comments + + @javascript + Scenario: I hide comments on a merge request diff with comments in a single file + Given project "Shop" have "Bug NS-05" open merge request with diffs inside + And I visit merge request page "Bug NS-05" + And I switch to the diff tab + And I leave a comment like "Line is wrong" on line 39 of the second file + And I click link "Hide inline discussion" of the second file + Then I should not see a comment like "Line is wrong" in the second file + + @javascript + Scenario: I show comments on a merge request diff with comments in a single file + Given project "Shop" have "Bug NS-05" open merge request with diffs inside + And I visit merge request page "Bug NS-05" + And I switch to the diff tab + And I leave a comment like "Line is wrong" on line 39 of the second file + And I click link "Hide inline discussion" of the second file + And I click link "Show inline discussion" of the second file + Then I should see a comment like "Line is wrong" in the second file + + @javascript + Scenario: I hide comments on a merge request diff with comments in multiple files + Given project "Shop" have "Bug NS-05" open merge request with diffs inside + And I visit merge request page "Bug NS-05" + And I switch to the diff tab + And I leave a comment like "Line is correct" on line 12 of the first file + And I leave a comment like "Line is wrong" on line 39 of the second file + And I click link "Hide inline discussion" of the second file + Then I should not see a comment like "Line is wrong" in the second file + And I should still see a comment like "Line is correct" in the first file + + @javascript + Scenario: I show comments on a merge request diff with comments in multiple files + Given project "Shop" have "Bug NS-05" open merge request with diffs inside + And I visit merge request page "Bug NS-05" + And I switch to the diff tab + And I leave a comment like "Line is correct" on line 12 of the first file + And I leave a comment like "Line is wrong" on line 39 of the second file + And I click link "Hide inline discussion" of the second file + And I click link "Show inline discussion" of the second file + Then I should see a comment like "Line is wrong" in the second file + And I should still see a comment like "Line is correct" in the first file |