2012-09-10 15:35:23 +02:00
|
|
|
Feature: Project Merge Requests
|
2012-08-09 07:13:29 +02:00
|
|
|
Background:
|
2012-09-10 15:35:23 +02:00
|
|
|
Given I sign in as a user
|
2012-08-09 07:13:29 +02:00
|
|
|
And I own project "Shop"
|
|
|
|
|
And project "Shop" have "Bug NS-04" open merge request
|
|
|
|
|
And project "Shop" have "Feature NS-03" closed merge request
|
2012-09-10 15:35:23 +02:00
|
|
|
And I visit project "Shop" merge requests page
|
2012-08-09 07:13:29 +02:00
|
|
|
|
|
|
|
|
Scenario: I should see open merge requests
|
|
|
|
|
Then I should see "Bug NS-04" in merge requests
|
|
|
|
|
And I should not see "Feature NS-03" in merge requests
|
|
|
|
|
|
|
|
|
|
Scenario: I should see closed merge requests
|
|
|
|
|
Given I click link "Closed"
|
|
|
|
|
Then I should see "Feature NS-03" in merge requests
|
|
|
|
|
And I should not see "Bug NS-04" in merge requests
|
|
|
|
|
|
|
|
|
|
Scenario: I should see all merge requests
|
|
|
|
|
Given I click link "All"
|
|
|
|
|
Then I should see "Feature NS-03" in merge requests
|
|
|
|
|
And I should see "Bug NS-04" in merge requests
|
|
|
|
|
|
|
|
|
|
Scenario: I visit merge request page
|
|
|
|
|
Given I click link "Bug NS-04"
|
|
|
|
|
Then I should see merge request "Bug NS-04"
|
|
|
|
|
|
|
|
|
|
Scenario: I close merge request page
|
|
|
|
|
Given I click link "Bug NS-04"
|
|
|
|
|
And I click link "Close"
|
|
|
|
|
Then I should see closed merge request "Bug NS-04"
|
|
|
|
|
|
|
|
|
|
Scenario: I submit new unassigned merge request
|
|
|
|
|
Given I click link "New Merge Request"
|
|
|
|
|
And I submit new merge request "Wiki Feature"
|
|
|
|
|
Then I should see merge request "Wiki Feature"
|
|
|
|
|
|
2013-02-28 08:25:23 +01:00
|
|
|
#@javascript
|
|
|
|
|
#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"
|
2012-08-09 07:13:29 +02:00
|
|
|
|
2012-10-29 22:23:49 +01:00
|
|
|
@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
|
