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

10 files changed, 35 insertions, 35 deletions

diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index 02b3d5269a6..52a20fa8d07 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -331,7 +331,7 @@ describe Projects::BranchesController do
         let(:branch) { "feature" }
 
         it 'returns JSON response with message' do
-          expect(json_response).to eql("message" => 'Branch was removed')
+          expect(json_response).to eql("message" => 'Branch was deleted')
         end
 
         it { expect(response).to have_gitlab_http_status(200) }
@@ -341,7 +341,7 @@ describe Projects::BranchesController do
         let(:branch) { "improve/awesome" }
 
         it 'returns JSON response with message' do
-          expect(json_response).to eql('message' => 'Branch was removed')
+          expect(json_response).to eql('message' => 'Branch was deleted')
         end
 
         it { expect(response).to have_gitlab_http_status(200) }
@@ -351,7 +351,7 @@ describe Projects::BranchesController do
         let(:branch) { 'improve%2Fawesome' }
 
         it 'returns JSON response with message' do
-          expect(json_response).to eql('message' => 'Branch was removed')
+          expect(json_response).to eql('message' => 'Branch was deleted')
         end
 
         it { expect(response).to have_gitlab_http_status(200) }
diff --git a/spec/features/merge_request/user_accepts_merge_request_spec.rb b/spec/features/merge_request/user_accepts_merge_request_spec.rb
index 01aeed93947..00ac7c72a11 100644
--- a/spec/features/merge_request/user_accepts_merge_request_spec.rb
+++ b/spec/features/merge_request/user_accepts_merge_request_spec.rb
@@ -25,7 +25,7 @@ describe 'User accepts a merge request', :js do
     end
 
     it 'accepts a merge request' do
-      check('Remove source branch')
+      check('Delete source branch')
       click_button('Merge')
 
       expect(page).to have_content('The changes were merged into')
@@ -60,7 +60,7 @@ describe 'User accepts a merge request', :js do
     end
 
     it 'accepts a merge request' do
-      check('Remove source branch')
+      check('Delete source branch')
       click_button('Merge')
 
       expect(page).to have_content('The changes were merged into')
diff --git a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
index 29b3d2b629b..6e54aa6006b 100644
--- a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
+++ b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
@@ -33,7 +33,7 @@ describe 'Merge request > User merges when pipeline succeeds', :js do
           click_button "Merge when pipeline succeeds"
 
           expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds"
-          expect(page).to have_content "The source branch will not be removed"
+          expect(page).to have_content "The source branch will not be deleted"
           expect(page).to have_selector ".js-cancel-auto-merge"
           visit project_merge_request_path(project, merge_request) # Needed to refresh the page
           expect(page).to have_content /enabled an automatic merge when the pipeline for \h{8} succeeds/i
@@ -94,7 +94,7 @@ describe 'Merge request > User merges when pipeline succeeds', :js do
         click_link 'Merge when pipeline succeeds'
 
         expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds"
-        expect(page).to have_content "The source branch will not be removed"
+        expect(page).to have_content "The source branch will not be deleted"
         expect(page).to have_link "Cancel automatic merge"
       end
     end
@@ -127,10 +127,10 @@ describe 'Merge request > User merges when pipeline succeeds', :js do
       expect(page).to have_content "canceled the automatic merge"
     end
 
-    it 'allows to remove source branch' do
-      click_link "Remove source branch"
+    it 'allows to delete source branch' do
+      click_link "Delete source branch"
 
-      expect(page).to have_content "The source branch will be removed"
+      expect(page).to have_content "The source branch will be deleted"
     end
 
     context 'when pipeline succeeds' do
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb
index d8ebd3c92af..afb978d7c45 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -316,7 +316,7 @@ describe 'Merge request > User sees merge widget', :js do
 
     it 'user cannot remove source branch' do
       expect(page).not_to have_field('remove-source-branch-input')
-      expect(page).to have_content('Removes source branch')
+      expect(page).to have_content('Deletes source branch')
     end
   end
 
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
 
diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb
index 63c38a25f4b..0aff916ec83 100644
--- a/spec/features/protected_branches_spec.rb
+++ b/spec/features/protected_branches_spec.rb
@@ -97,7 +97,7 @@ describe 'Protected Branches', :js do
         set_protected_branch_name('some-branch')
         click_on "Protect"
 
-        within(".protected-branches-list") { expect(page).to have_content('branch was removed') }
+        within(".protected-branches-list") { expect(page).to have_content('branch was deleted') }
       end
     end
 
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js
index d46ad0acc9b..b9718a78fa4 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js
@@ -121,14 +121,14 @@ describe('MRWidgetMergeWhenPipelineSucceeds', () => {
       expect(vm.$el.innerText).toContain('to be merged automatically when the pipeline succeeds');
       expect(vm.$el.innerText).toContain('The changes will be merged into');
       expect(vm.$el.innerText).toContain(targetBranch);
-      expect(vm.$el.innerText).toContain('The source branch will not be removed');
+      expect(vm.$el.innerText).toContain('The source branch will not be deleted');
       expect(vm.$el.querySelector('.js-cancel-auto-merge').innerText).toContain(
         'Cancel automatic merge',
       );
 
       expect(vm.$el.querySelector('.js-cancel-auto-merge').getAttribute('disabled')).toBeFalsy();
       expect(vm.$el.querySelector('.js-remove-source-branch').innerText).toContain(
-        'Remove source branch',
+        'Delete source branch',
       );
 
       expect(vm.$el.querySelector('.js-remove-source-branch').getAttribute('disabled')).toBeFalsy();
@@ -143,19 +143,19 @@ describe('MRWidgetMergeWhenPipelineSucceeds', () => {
       });
     });
 
-    it('should show source branch will be removed text when it source branch set to remove', done => {
+    it('should show source branch will be deleted text when it source branch set to remove', done => {
       vm.mr.shouldRemoveSourceBranch = true;
 
       Vue.nextTick(() => {
         const normalizedText = vm.$el.innerText.replace(/\s+/g, ' ');
 
-        expect(normalizedText).toContain('The source branch will be removed');
-        expect(normalizedText).not.toContain('The source branch will not be removed');
+        expect(normalizedText).toContain('The source branch will be deleted');
+        expect(normalizedText).not.toContain('The source branch will not be deleted');
         done();
       });
     });
 
-    it('should not show remove source branch button when user not able to remove source branch', done => {
+    it('should not show delete source branch button when user not able to delete source branch', done => {
       vm.mr.currentUserId = 4;
 
       Vue.nextTick(() => {
@@ -164,7 +164,7 @@ describe('MRWidgetMergeWhenPipelineSucceeds', () => {
       });
     });
 
-    it('should disable remove source branch button when the action is in progress', done => {
+    it('should disable delete source branch button when the action is in progress', done => {
       vm.isRemovingSourceBranch = true;
 
       Vue.nextTick(() => {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
index da5cb752c6f..1683da805b9 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
@@ -128,7 +128,7 @@ describe('MRWidgetMerged', () => {
           new Promise(resolve => {
             resolve({
               data: {
-                message: 'Branch was removed',
+                message: 'Branch was deleted',
               },
             });
           }),
@@ -157,8 +157,8 @@ describe('MRWidgetMerged', () => {
     expect(vm.$el.textContent).toContain(targetBranch);
   });
 
-  it('renders information about branch being removed', () => {
-    expect(vm.$el.textContent).toContain('The source branch has been removed');
+  it('renders information about branch being deleted', () => {
+    expect(vm.$el.textContent).toContain('The source branch has been deleted');
   });
 
   it('shows revert and cherry-pick buttons', () => {
@@ -189,24 +189,24 @@ describe('MRWidgetMerged', () => {
     expect(selectors.mergeCommitShaLink.href).toBe(vm.mr.mergeCommitPath);
   });
 
-  it('should not show source branch removed text', done => {
+  it('should not show source branch deleted text', done => {
     vm.mr.sourceBranchRemoved = false;
 
     Vue.nextTick(() => {
-      expect(vm.$el.innerText).toContain('You can remove source branch now');
-      expect(vm.$el.innerText).not.toContain('The source branch has been removed');
+      expect(vm.$el.innerText).toContain('You can delete the source branch now');
+      expect(vm.$el.innerText).not.toContain('The source branch has been deleted');
       done();
     });
   });
 
-  it('should show source branch removing text', done => {
+  it('should show source branch deleting text', done => {
     vm.mr.isRemovingSourceBranch = true;
     vm.mr.sourceBranchRemoved = false;
 
     Vue.nextTick(() => {
-      expect(vm.$el.innerText).toContain('The source branch is being removed');
-      expect(vm.$el.innerText).not.toContain('You can remove source branch now');
-      expect(vm.$el.innerText).not.toContain('The source branch has been removed');
+      expect(vm.$el.innerText).toContain('The source branch is being deleted');
+      expect(vm.$el.innerText).not.toContain('You can delete the source branch now');
+      expect(vm.$el.innerText).not.toContain('The source branch has been deleted');
       done();
     });
   });
diff --git a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
index 99b80df766a..34b90c23c19 100644
--- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
@@ -453,7 +453,7 @@ describe('mrWidgetOptions', () => {
       vm.$nextTick(() => {
         const tooltip = vm.$el.querySelector('.fa-question-circle');
 
-        expect(vm.$el.textContent).toContain('Removes source branch');
+        expect(vm.$el.textContent).toContain('Deletes source branch');
         expect(tooltip.getAttribute('data-original-title')).toBe(
           'A user with write access to the source branch selected this option',
         );
@@ -468,8 +468,8 @@ describe('mrWidgetOptions', () => {
       vm.mr.state = 'merged';
 
       vm.$nextTick(() => {
-        expect(vm.$el.textContent).toContain('The source branch has been removed');
-        expect(vm.$el.textContent).not.toContain('Removes source branch');
+        expect(vm.$el.textContent).toContain('The source branch has been deleted');
+        expect(vm.$el.textContent).not.toContain('Deletes source branch');
 
         done();
       });
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