Merge branch...

Merge branch '229155-clarify-checking-ability-to-merge-automatically-message-on-mr-widget' into 'master'

Change loading message for merge widget

Closes #229155

See merge request gitlab-org/gitlab!37181

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue

@@ -12,7 +12,7 @@ export default {
   <div class="mr-widget-body media">
     <status-icon :show-disabled-button="true" status="loading" />
     <div class="media-body space-children">
-      <span class="bold"> {{ s__('mrWidget|Checking ability to merge automatically…') }} </span>
+      <span class="bold"> {{ s__('mrWidget|Checking if merge request can be merged…') }} </span>
     </div>
   </div>
 </template>

changelogs/unreleased/229155-clarify-checking-ability-to-merge-automatically-message-on-mr-widg.yml

+---
+title: Change loading MR message wording
+merge_request: 37181
+author:
+type: changed

ee/spec/features/merge_request/user_approves_spec.rb

@@ -97,7 +97,7 @@ RSpec.xdescribe 'Merge request > User approves', :js do
     end
 
     it 'does not show checking ability text' do
-      expect(find('.js-mr-approvals')).not_to have_text('Checking ability to merge automatically')
+      expect(find('.js-mr-approvals')).not_to have_text('Checking if merge request can be merged')
       expect(find('.js-mr-approvals')).to have_selector('.approvals-body')
     end
   end

ee/spec/features/merge_request/user_sees_approval_widget_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe 'Merge request > User sees approval widget', :js do
 
     # TODO: https://gitlab.com/gitlab-org/gitlab/issues/9430
     xit 'does not show checking ability text' do
-      expect(find('.js-mr-approvals')).not_to have_text('Checking ability to merge automatically')
+      expect(find('.js-mr-approvals')).not_to have_text('Checking if merge request can be merged')
       expect(find('.js-mr-approvals')).to have_selector('.approvals-body')
     end
   end

locale/gitlab.pot

@@ -28286,7 +28286,7 @@ msgstr ""
 msgid "mrWidget|Check out branch"
 msgstr ""
 
-msgid "mrWidget|Checking ability to merge automatically…"
+msgid "mrWidget|Checking if merge request can be merged…"
 msgstr ""
 
 msgid "mrWidget|Cherry-pick"

spec/frontend/vue_mr_widget/components/states/mr_widget_checking_spec.js

@@ -25,7 +25,7 @@ describe('MRWidgetChecking', () => {
 
   it('renders information about merging', () => {
     expect(vm.$el.querySelector('.media-body').textContent.trim()).toEqual(
-      'Checking ability to merge automatically…',
+      'Checking if merge request can be merged…',
     );
   });
 });