Merge branch '196861-improve-pipelines-copy' into 'master'

Resolve "Improve copy of pipelines in the Merge Request widget"

See merge request gitlab-org/gitlab!23199

app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue

@@ -32,12 +32,12 @@ export default {
     },
   },
   deployedTextMap: {
-    [MANUAL_DEPLOY]: __('Can deploy manually to'),
+    [MANUAL_DEPLOY]: __('Can be manually deployed to'),
     [WILL_DEPLOY]: __('Will deploy to'),
     [RUNNING]: __('Deploying to'),
     [SUCCESS]: __('Deployed to'),
     [FAILED]: __('Failed to deploy to'),
-    [CANCELED]: __('Canceled deploy to'),
+    [CANCELED]: __('Canceled deployment to'),
   },
   computed: {
     deployTimeago() {

changelogs/unreleased/196861-improve-pipelines-copy.yml

+---
+title: Update pipeline status copy in deploy footer
+merge_request: 23199
+author:
+type: changed

locale/gitlab.pot

@@ -3081,7 +3081,7 @@ msgstr ""
 msgid "Callback URL"
 msgstr ""
 
-msgid "Can deploy manually to"
+msgid "Can be manually deployed to"
 msgstr ""
 
 msgid "Can override approvers and approvals required per merge request"
@@ -3114,7 +3114,7 @@ msgstr ""
 msgid "Cancel this job"
 msgstr ""
 
-msgid "Canceled deploy to"
+msgid "Canceled deployment to"
 msgstr ""
 
 msgid "Cancelling Preview"

spec/features/merge_request/user_sees_deployment_widget_spec.rb

@@ -96,7 +96,7 @@ describe 'Merge request > User sees deployment widget', :js do
         visit project_merge_request_path(project, merge_request)
         wait_for_requests
 
-        expect(page).to have_content("Canceled deploy to #{environment.name}")
+        expect(page).to have_content("Canceled deployment to #{environment.name}")
         expect(page).not_to have_css('.js-deploy-time')
       end
     end

spec/frontend/vue_mr_widget/deployment/deployment_spec.js

@@ -56,27 +56,27 @@ describe('Deployment component', () => {
     const deployGroup = [DeploymentViewButton, DeploymentStopButton];
 
     describe.each`
-      status      | previous | deploymentDetails | text                        | actionButtons
-      ${CREATED}  | ${true}  | ${deployDetail}   | ${'Can deploy manually to'} | ${deployGroup}
-      ${CREATED}  | ${true}  | ${noDetails}      | ${'Will deploy to'}         | ${deployGroup}
-      ${CREATED}  | ${false} | ${deployDetail}   | ${'Can deploy manually to'} | ${noActions}
-      ${CREATED}  | ${false} | ${noDetails}      | ${'Will deploy to'}         | ${noActions}
-      ${RUNNING}  | ${true}  | ${deployDetail}   | ${'Deploying to'}           | ${deployGroup}
-      ${RUNNING}  | ${true}  | ${noDetails}      | ${'Deploying to'}           | ${deployGroup}
-      ${RUNNING}  | ${false} | ${deployDetail}   | ${'Deploying to'}           | ${noActions}
-      ${RUNNING}  | ${false} | ${noDetails}      | ${'Deploying to'}           | ${noActions}
-      ${SUCCESS}  | ${true}  | ${deployDetail}   | ${'Deployed to'}            | ${deployGroup}
-      ${SUCCESS}  | ${true}  | ${noDetails}      | ${'Deployed to'}            | ${deployGroup}
-      ${SUCCESS}  | ${false} | ${deployDetail}   | ${'Deployed to'}            | ${deployGroup}
-      ${SUCCESS}  | ${false} | ${noDetails}      | ${'Deployed to'}            | ${deployGroup}
-      ${FAILED}   | ${true}  | ${deployDetail}   | ${'Failed to deploy to'}    | ${deployGroup}
-      ${FAILED}   | ${true}  | ${noDetails}      | ${'Failed to deploy to'}    | ${deployGroup}
-      ${FAILED}   | ${false} | ${deployDetail}   | ${'Failed to deploy to'}    | ${noActions}
-      ${FAILED}   | ${false} | ${noDetails}      | ${'Failed to deploy to'}    | ${noActions}
-      ${CANCELED} | ${true}  | ${deployDetail}   | ${'Canceled deploy to'}     | ${deployGroup}
-      ${CANCELED} | ${true}  | ${noDetails}      | ${'Canceled deploy to'}     | ${deployGroup}
-      ${CANCELED} | ${false} | ${deployDetail}   | ${'Canceled deploy to'}     | ${noActions}
-      ${CANCELED} | ${false} | ${noDetails}      | ${'Canceled deploy to'}     | ${noActions}
+      status      | previous | deploymentDetails | text                             | actionButtons
+      ${CREATED}  | ${true}  | ${deployDetail}   | ${'Can be manually deployed to'} | ${deployGroup}
+      ${CREATED}  | ${true}  | ${noDetails}      | ${'Will deploy to'}              | ${deployGroup}
+      ${CREATED}  | ${false} | ${deployDetail}   | ${'Can be manually deployed to'} | ${noActions}
+      ${CREATED}  | ${false} | ${noDetails}      | ${'Will deploy to'}              | ${noActions}
+      ${RUNNING}  | ${true}  | ${deployDetail}   | ${'Deploying to'}                | ${deployGroup}
+      ${RUNNING}  | ${true}  | ${noDetails}      | ${'Deploying to'}                | ${deployGroup}
+      ${RUNNING}  | ${false} | ${deployDetail}   | ${'Deploying to'}                | ${noActions}
+      ${RUNNING}  | ${false} | ${noDetails}      | ${'Deploying to'}                | ${noActions}
+      ${SUCCESS}  | ${true}  | ${deployDetail}   | ${'Deployed to'}                 | ${deployGroup}
+      ${SUCCESS}  | ${true}  | ${noDetails}      | ${'Deployed to'}                 | ${deployGroup}
+      ${SUCCESS}  | ${false} | ${deployDetail}   | ${'Deployed to'}                 | ${deployGroup}
+      ${SUCCESS}  | ${false} | ${noDetails}      | ${'Deployed to'}                 | ${deployGroup}
+      ${FAILED}   | ${true}  | ${deployDetail}   | ${'Failed to deploy to'}         | ${deployGroup}
+      ${FAILED}   | ${true}  | ${noDetails}      | ${'Failed to deploy to'}         | ${deployGroup}
+      ${FAILED}   | ${false} | ${deployDetail}   | ${'Failed to deploy to'}         | ${noActions}
+      ${FAILED}   | ${false} | ${noDetails}      | ${'Failed to deploy to'}         | ${noActions}
+      ${CANCELED} | ${true}  | ${deployDetail}   | ${'Canceled deployment to'}      | ${deployGroup}
+      ${CANCELED} | ${true}  | ${noDetails}      | ${'Canceled deployment to'}      | ${deployGroup}
+      ${CANCELED} | ${false} | ${deployDetail}   | ${'Canceled deployment to'}      | ${noActions}
+      ${CANCELED} | ${false} | ${noDetails}      | ${'Canceled deployment to'}      | ${noActions}
     `(
       '$status + previous: $previous + manual: $deploymentDetails.isManual',
       ({ status, previous, deploymentDetails, text, actionButtons }) => {