diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2017-05-23 12:08:50 -0400 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2017-05-23 12:08:50 -0400 |
| commit | ff5044d8e9f856d4398795618103ce6206b9afee (patch) | |
| tree | 33f99aca0aebe9fdf0af1ebe2d507028023b883c /features | |
| parent | 21fe8f3646618455514e9888dae913be1e14b15b (diff) | |
| download | gitlab-ce-ff5044d8e9f856d4398795618103ce6206b9afee.tar.gz | |
Update spinach specs to explicitly check Remove Source Branch.
Diffstat (limited to 'features')
| -rw-r--r-- | features/project/merge_requests/accept.feature | 3 | ||||
| -rw-r--r-- | features/steps/project/merge_requests/acceptance.rb | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/features/project/merge_requests/accept.feature b/features/project/merge_requests/accept.feature index c45ed9ea68b..2ab1c19f452 100644 --- a/features/project/merge_requests/accept.feature +++ b/features/project/merge_requests/accept.feature @@ -7,6 +7,7 @@ Feature: Project Merge Requests Acceptance @javascript Scenario: Accepting the Merge Request and removing the source branch Given I am on the Merge Request detail page + When I check the "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 @@ -14,6 +15,7 @@ Feature: Project Merge Requests Acceptance @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 check the "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 @@ -21,7 +23,6 @@ Feature: Project Merge Requests Acceptance @javascript Scenario: Accepting the Merge Request without removing the source branch Given I am on the Merge Request detail page - When I click on "Remove source branch" option When I click on Accept Merge Request Then I should see merge request merged And I should see the Remove Source Branch button diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb index 3c976f675a2..cdaa849308c 100644 --- a/features/steps/project/merge_requests/acceptance.rb +++ b/features/steps/project/merge_requests/acceptance.rb @@ -11,10 +11,14 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps visit merge_request_path(@merge_request, anchor: 'note_123') end - step 'I click on "Remove source branch" option' do + step 'I uncheck the "Remove source branch" option' do uncheck('Remove source branch') end + step 'I check the "Remove source branch" option' do + check('Remove source branch') + end + step 'I click on Accept Merge Request' do click_button('Merge') end |