diff options
| author | Sam Bigelow <sbigelow@gitlab.com> | 2019-01-09 23:08:52 -0500 |
|---|---|---|
| committer | Sam Bigelow <sbigelow@gitlab.com> | 2019-01-22 12:57:01 -0500 |
| commit | c607b358241712af0d6b442b8e7a277cb6ba8a38 (patch) | |
| tree | 0ac6dd259044b49e317724a542dbf05376070537 /spec/features/merge_requests | |
| parent | 1b3affafab0f28c690ce93cc98ac6bd09cbda59f (diff) | |
| download | gitlab-ce-c607b358241712af0d6b442b8e7a277cb6ba8a38.tar.gz | |
Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branch
This is to match `git branch -D <branchname>`
Diffstat (limited to 'spec/features/merge_requests')
| -rw-r--r-- | spec/features/merge_requests/user_squashes_merge_request_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/user_squashes_merge_request_spec.rb b/spec/features/merge_requests/user_squashes_merge_request_spec.rb index ec1153b7f7f..47f9f10815c 100644 --- a/spec/features/merge_requests/user_squashes_merge_request_spec.rb +++ b/spec/features/merge_requests/user_squashes_merge_request_spec.rb @@ -38,7 +38,7 @@ describe 'User squashes a merge request', :js do def accept_mr expect(page).to have_button('Merge') - uncheck 'Remove source branch' + uncheck 'Delete source branch' click_on 'Merge' end |