deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add merge request note feature

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-29 22:23:49 +01:00
parent 7971383d53
commit 0b3df2f128
3 changed files with 145 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

28
features/project/merge_requests.feature
View file

@ -35,8 +35,34 @@ Feature: Project Merge Requests
Then I should see merge request "Wiki Feature"
@javascript
Scenario: I comment merge request
Scenario: I comment on a merge request
Given I visit merge request page "Bug NS-04"
And I leave a comment like "XML attached"
Then I should see comment "XML attached"
@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 switch to the diff tab
And I leave a comment like "Line is wrong" on line 185 of the first file
And I switch to the merge request's comments tab
Then I should see a discussion has started on line 185
@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
And I switch to the merge request's comments tab
Then I should see a discussion has started on commit bcf03b5de6c:L185
@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 leave a comment on the diff page
And I switch to the merge request's comments tab
Then I should see a discussion has started on commit bcf03b5de6c