diff options
| author | Rubén Dávila Santos <ruben@gitlab.com> | 2016-08-16 16:14:54 +0000 |
|---|---|---|
| committer | Rubén Dávila Santos <ruben@gitlab.com> | 2016-08-16 16:14:54 +0000 |
| commit | b44b09b302e6f4d19c7e6b2dac3be62fe83b31b2 (patch) | |
| tree | 87473c4cc27ecf487e326507d54c480a56ff390b /features/project | |
| parent | e51de3b9a5c572419d4a29ebca694aba7884d676 (diff) | |
| download | gitlab-ce-b44b09b302e6f4d19c7e6b2dac3be62fe83b31b2.tar.gz | |
Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'"
This reverts merge request !5417
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/merge_requests.feature | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 1b8e4262e40..6bac6011467 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -107,6 +107,16 @@ 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" |