diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-15 22:22:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-15 22:22:51 +0000 |
| commit | 12918b0b9e99449181ce6f24c9bdb5d58ae6b89a (patch) | |
| tree | bbf5e5f01f62c8ccf874fc3a06e93a0b4a660201 /features/project | |
| parent | 931eadaa5e8e0063c7d8f90b5863789ffcd33b30 (diff) | |
| parent | 20308867dd8832f3e7ae2cc87334c075ce8c5400 (diff) | |
| download | gitlab-ce-12918b0b9e99449181ce6f24c9bdb5d58ae6b89a.tar.gz | |
Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'
Add rspec feature tests for the diff notes feature.
## What are the relevant issue numbers?
Closes #19957.
See merge request !5417
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/merge_requests.feature | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 6bac6011467..1b8e4262e40 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -107,16 +107,6 @@ Feature: Project Merge Requests Then The list should be sorted by "Least popular" @javascript - Scenario: I comment on a merge request diff - Given project "Shop" have "Bug NS-05" open merge request with diffs inside - 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 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" |