Commit c4f203de authored by Marcel van Remmerden's avatar Marcel van Remmerden

Change wording of state to check merge blockers

parent 4556e138
......@@ -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>
---
title: Change loading MR message wording
merge_request: 37181
author:
type: changed
......@@ -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
......
......@@ -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
......
......@@ -28283,7 +28283,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"
......
......@@ -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',
);
});
});
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment