summaryrefslogtreecommitdiff
path: root/features/project/merge_requests.feature
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-09-12 20:12:31 +0200
committerMarin Jankovski <marin@gitlab.com>2014-09-12 20:12:31 +0200
commit75fbca83e36100b1e2ab2416c8906d6e5b805231 (patch)
tree06bb961d1e6df8e81b3c27c79226636c937da907 /features/project/merge_requests.feature
parent9945e8c4244d90a0481846454355e02e80369aa2 (diff)
downloadgitlab-ce-75fbca83e36100b1e2ab2416c8906d6e5b805231.tar.gz
Add one feature test.
Diffstat (limited to 'features/project/merge_requests.feature')
-rw-r--r--features/project/merge_requests.feature10
1 files changed, 10 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 8b6c296dfe6..f8dccc15c0e 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -147,3 +147,13 @@ Feature: Project Merge Requests
And I switch to the diff tab
And I unfold diff
Then I should see additional file lines
+
+ @javascript
+ Scenario: I show comments on a merge request side-by-side 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 Side-by-side Diff tab
+ Then I should see comments on the side-by-side diff page