diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-01-23 14:02:22 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-01-23 14:02:22 +0300 |
commit | 3ed8078507b6cb37c7dd85f2fc22c9494faf9e1e (patch) | |
tree | 21aa75227bf35bc41b31c22f0f26f986e00c0108 /spec/support/shared_examples | |
parent | da251c6436d6e17b18911d37c1b18314fb29329d (diff) | |
parent | c607b358241712af0d6b442b8e7a277cb6ba8a38 (diff) |
Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master'
Resolve "Changing wording to "Delete" when referring to removing a branch"
Closes #25569
See merge request gitlab-org/gitlab-ce!23966
Diffstat (limited to 'spec/support/shared_examples')
-rw-r--r-- | spec/support/shared_examples/features/editable_merge_request_shared_examples.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb b/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb index a096627ee62..eef0327c9a6 100644 --- a/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb +++ b/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb @@ -129,12 +129,12 @@ RSpec.shared_examples 'an editable merge request' do expect(merge_request.merge_params['force_remove_source_branch']).to be_truthy visit edit_project_merge_request_path(target_project, merge_request) - uncheck 'Remove source branch when merge request is accepted' + uncheck 'Delete source branch when merge request is accepted' click_button 'Save changes' expect(page).to have_unchecked_field 'remove-source-branch-input' - expect(page).to have_content 'Remove source branch' + expect(page).to have_content 'Delete source branch' end end end |