diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-31 19:19:40 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-31 19:19:40 +0300 |
| commit | ee4643c732c3d91437e50d0c8486dbb8ea5b51b5 (patch) | |
| tree | de3ad974cca2910270afbea95c9804ba249d82bd /features/project | |
| parent | 5a68c20fba095ec61aa3b74cb0fbeb69adbc1373 (diff) | |
| download | gitlab-ce-ee4643c732c3d91437e50d0c8486dbb8ea5b51b5.tar.gz | |
Fix MR tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/merge_requests.feature | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 6a2ba7e3b28..d4c71ba336e 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -52,27 +52,27 @@ Feature: Project Merge Requests 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 185 of the first file + 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 line 185 + Then I should see a discussion has started on diff @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" - And I click on the first commit in the merge request - And I leave a comment like "Line is wrong" on line 185 of the first file in commit + And I click on the commit in the merge request + And I leave a comment like "Line is wrong" on diff in commit And I switch to the merge request's comments tab - Then I should see a discussion has started on commit b1e6a9dbf1:L185 + Then I should see a discussion has started on commit diff @javascript Scenario: I comment on 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" - And I click on the first commit in the merge request + And I click on the commit in the merge request And I leave a comment on the diff page in commit And I switch to the merge request's comments tab - Then I should see a discussion has started on commit b1e6a9dbf1 + Then I should see a discussion has started on commit @javascript Scenario: I accept merge request with custom commit message |