2015-12-09 04:50:28 -05:00
|
|
|
@project_merge_requests
|
2015-11-24 22:41:36 -05:00
|
|
|
Feature: Project Merge Requests Acceptance
|
|
|
|
|
Background:
|
|
|
|
|
Given There is an open Merge Request
|
|
|
|
|
And I am signed in as a developer of the project
|
|
|
|
|
|
|
|
|
|
@javascript
|
|
|
|
|
Scenario: Accepting the Merge Request and removing the source branch
|
|
|
|
|
Given I am on the Merge Request detail page
|
|
|
|
|
When I click on "Remove source branch" option
|
|
|
|
|
And I click on Accept Merge Request
|
2015-12-07 14:09:30 -05:00
|
|
|
Then I should see merge request merged
|
|
|
|
|
And I should not see the Remove Source Branch button
|
2015-11-24 22:41:36 -05:00
|
|
|
|
2015-12-21 22:59:15 -05:00
|
|
|
@javascript
|
|
|
|
|
Scenario: Accepting the Merge Request when URL has an anchor
|
|
|
|
|
Given I am on the Merge Request detail with note anchor page
|
|
|
|
|
When I click on "Remove source branch" option
|
|
|
|
|
And I click on Accept Merge Request
|
|
|
|
|
Then I should see merge request merged
|
|
|
|
|
And I should not see the Remove Source Branch button
|
|
|
|
|
|
2015-11-24 22:41:36 -05:00
|
|
|
@javascript
|
|
|
|
|
Scenario: Accepting the Merge Request without removing the source branch
|
|
|
|
|
Given I am on the Merge Request detail page
|
|
|
|
|
When I click on Accept Merge Request
|
2015-12-07 14:09:30 -05:00
|
|
|
Then I should see merge request merged
|
|
|
|
|
And I should see the Remove Source Branch button
|
