diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2015-11-24 22:41:36 -0500 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2015-12-04 10:43:33 -0500 |
| commit | aa1ba0093632a66c9c9c0eac710d63d7513ad358 (patch) | |
| tree | 9fe78dfa860f1607667bd9462ff46c58df914def /features/project/merge_requests | |
| parent | 238ca3e472a67d319521daa5aeab6455b4740cdb (diff) | |
| download | gitlab-ce-aa1ba0093632a66c9c9c0eac710d63d7513ad358.tar.gz | |
Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583
Diffstat (limited to 'features/project/merge_requests')
| -rw-r--r-- | features/project/merge_requests/accept.feature | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/features/project/merge_requests/accept.feature b/features/project/merge_requests/accept.feature new file mode 100644 index 00000000000..3e6e59a3808 --- /dev/null +++ b/features/project/merge_requests/accept.feature @@ -0,0 +1,17 @@ +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 + Then I should not see the Remove Source Branch button + + @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 + Then I should see the Remove Source Branch button |