diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-10 19:22:53 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-10 19:22:53 +0000 |
| commit | 3f4715322e598652b788b55073e41ac095d1ebed (patch) | |
| tree | 3b6c616f6095d2fd95dbb35473a53df03f78347f /features/project | |
| parent | b20f677baa94aaea1dbc3437c51abbfd6f0e1548 (diff) | |
| parent | 9d6e5f0a28cda3dcbf2dcbcb8a869c0873ea3afc (diff) | |
| download | gitlab-ce-3f4715322e598652b788b55073e41ac095d1ebed.tar.gz | |
Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master'
Fix editing notes on a merge request diff
Fixes #3910
See merge request !2041
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 35ace948888..7490ad400b5 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -85,6 +85,16 @@ Feature: Project Merge Requests Then I should see a discussion has started on diff @javascript + Scenario: I edit a 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 change the comment "Line is wrong" to "Typo, please fix" on diff + Then I should not see a diff comment saying "Line is wrong" + And I should see a diff comment saying "Typo, please fix" + + @javascript Scenario: I comment on a line of a commit in merge request Given project "Shop" have "Bug NS-05" open merge request with diffs inside And I visit merge request page "Bug NS-05" |