Commit 286a764c authored by Amy Qualls's avatar Amy Qualls Committed by Phil Hughes

Revise messages about creating follow-up issue

parent 7c77b8ee
...@@ -78,8 +78,8 @@ export default { ...@@ -78,8 +78,8 @@ export default {
v-if="resolveAllDiscussionsIssuePath && !allResolved" v-if="resolveAllDiscussionsIssuePath && !allResolved"
v-gl-tooltip v-gl-tooltip
:href="resolveAllDiscussionsIssuePath" :href="resolveAllDiscussionsIssuePath"
:title="s__('Resolve all threads in new issue')" :title="s__('Create issue to resolve all threads')"
:aria-label="s__('Resolve all threads in new issue')" :aria-label="s__('Create issue to resolve all threads')"
class="new-issue-for-discussion discussion-create-issue-btn" class="new-issue-for-discussion discussion-create-issue-btn"
icon="issue-new" icon="issue-new"
/> />
......
...@@ -4,7 +4,7 @@ import { s__ } from '~/locale'; ...@@ -4,7 +4,7 @@ import { s__ } from '~/locale';
export default { export default {
i18n: { i18n: {
buttonLabel: s__('MergeRequests|Resolve this thread in a new issue'), buttonLabel: s__('MergeRequests|Create issue to resolve thread'),
}, },
name: 'ResolveWithIssueButton', name: 'ResolveWithIssueButton',
components: { components: {
......
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
size="small" size="small"
icon="issue-new" icon="issue-new"
> >
{{ s__('mrWidget|Resolve all threads in new issue') }} {{ s__('mrWidget|Create issue to resolve all threads') }}
</gl-button> </gl-button>
</div> </div>
</div> </div>
......
...@@ -9495,6 +9495,9 @@ msgstr "" ...@@ -9495,6 +9495,9 @@ msgstr ""
msgid "Create issue" msgid "Create issue"
msgstr "" msgstr ""
msgid "Create issue to resolve all threads"
msgstr ""
msgid "Create iteration" msgid "Create iteration"
msgstr "" msgstr ""
...@@ -21191,10 +21194,10 @@ msgstr "" ...@@ -21191,10 +21194,10 @@ msgstr ""
msgid "MergeRequests|An error occurred while saving the draft comment." msgid "MergeRequests|An error occurred while saving the draft comment."
msgstr "" msgstr ""
msgid "MergeRequests|Failed to squash. Should be done manually." msgid "MergeRequests|Create issue to resolve thread"
msgstr "" msgstr ""
msgid "MergeRequests|Resolve this thread in a new issue" msgid "MergeRequests|Failed to squash. Should be done manually."
msgstr "" msgstr ""
msgid "MergeRequests|Saving the comment failed" msgid "MergeRequests|Saving the comment failed"
...@@ -28616,9 +28619,6 @@ msgstr "" ...@@ -28616,9 +28619,6 @@ msgstr ""
msgid "Resolve" msgid "Resolve"
msgstr "" msgstr ""
msgid "Resolve all threads in new issue"
msgstr ""
msgid "Resolve conflicts" msgid "Resolve conflicts"
msgstr "" msgstr ""
...@@ -40090,6 +40090,9 @@ msgid_plural "mrWidget|Closes issues" ...@@ -40090,6 +40090,9 @@ msgid_plural "mrWidget|Closes issues"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgid "mrWidget|Create issue to resolve all threads"
msgstr ""
msgid "mrWidget|Delete source branch" msgid "mrWidget|Delete source branch"
msgstr "" msgstr ""
...@@ -40200,9 +40203,6 @@ msgstr "" ...@@ -40200,9 +40203,6 @@ msgstr ""
msgid "mrWidget|Request to merge" msgid "mrWidget|Request to merge"
msgstr "" msgstr ""
msgid "mrWidget|Resolve all threads in new issue"
msgstr ""
msgid "mrWidget|Resolve conflicts" msgid "mrWidget|Resolve conflicts"
msgstr "" msgstr ""
......
...@@ -27,7 +27,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j ...@@ -27,7 +27,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
it 'shows a button to resolve all threads by creating a new issue' do it 'shows a button to resolve all threads by creating a new issue' do
within('.line-resolve-all-container') do within('.line-resolve-all-container') do
expect(page).to have_selector resolve_all_discussions_link_selector( title: "Resolve all threads in new issue" ) expect(page).to have_selector resolve_all_discussions_link_selector( title: "Create issue to resolve all threads" )
end end
end end
...@@ -38,7 +38,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j ...@@ -38,7 +38,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
it 'hides the link for creating a new issue' do it 'hides the link for creating a new issue' do
expect(page).not_to have_selector resolve_all_discussions_link_selector expect(page).not_to have_selector resolve_all_discussions_link_selector
expect(page).not_to have_content "Resolve all threads in new issue" expect(page).not_to have_content "Create issue to resolve all threads"
end end
end end
...@@ -62,7 +62,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j ...@@ -62,7 +62,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
end end
it 'does not show a link to create a new issue' do it 'does not show a link to create a new issue' do
expect(page).not_to have_link 'Resolve all threads in new issue' expect(page).not_to have_link 'Create issue to resolve all threads'
end end
end end
...@@ -77,14 +77,14 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j ...@@ -77,14 +77,14 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
it 'has a link to resolve all threads by creating an issue' do it 'has a link to resolve all threads by creating an issue' do
page.within '.mr-widget-body' do page.within '.mr-widget-body' do
expect(page).to have_link 'Resolve all threads in new issue', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid) expect(page).to have_link 'Create issue to resolve all threads', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
end end
end end
context 'creating an issue for threads' do context 'creating an issue for threads' do
before do before do
page.within '.mr-widget-body' do page.within '.mr-widget-body' do
page.click_link 'Resolve all threads in new issue', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid) page.click_link 'Create issue to resolve all threads', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
wait_for_all_requests wait_for_all_requests
end end
......
...@@ -9,7 +9,7 @@ RSpec.describe 'Resolve an open thread in a merge request by creating an issue', ...@@ -9,7 +9,7 @@ RSpec.describe 'Resolve an open thread in a merge request by creating an issue',
let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion } let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
def resolve_discussion_selector def resolve_discussion_selector
title = 'Resolve this thread in a new issue' title = 'Create issue to resolve thread'
url = new_project_issue_path(project, discussion_to_resolve: discussion.id, merge_request_to_resolve_discussions_of: merge_request.iid) url = new_project_issue_path(project, discussion_to_resolve: discussion.id, merge_request_to_resolve_discussions_of: merge_request.iid)
"a[title=\"#{title}\"][href=\"#{url}\"]" "a[title=\"#{title}\"][href=\"#{url}\"]"
end end
......
...@@ -45,7 +45,7 @@ describe('UnresolvedDiscussions', () => { ...@@ -45,7 +45,7 @@ describe('UnresolvedDiscussions', () => {
expect(wrapper.element.innerText).toContain(`Merge blocked: all threads must be resolved.`); expect(wrapper.element.innerText).toContain(`Merge blocked: all threads must be resolved.`);
expect(wrapper.element.innerText).toContain('Jump to first unresolved thread'); expect(wrapper.element.innerText).toContain('Jump to first unresolved thread');
expect(wrapper.element.innerText).toContain('Resolve all threads in new issue'); expect(wrapper.element.innerText).toContain('Create issue to resolve all threads');
expect(wrapper.element.querySelector('.js-create-issue').getAttribute('href')).toEqual( expect(wrapper.element.querySelector('.js-create-issue').getAttribute('href')).toEqual(
TEST_HOST, TEST_HOST,
); );
...@@ -57,7 +57,7 @@ describe('UnresolvedDiscussions', () => { ...@@ -57,7 +57,7 @@ describe('UnresolvedDiscussions', () => {
expect(wrapper.element.innerText).toContain(`Merge blocked: all threads must be resolved.`); expect(wrapper.element.innerText).toContain(`Merge blocked: all threads must be resolved.`);
expect(wrapper.element.innerText).toContain('Jump to first unresolved thread'); expect(wrapper.element.innerText).toContain('Jump to first unresolved thread');
expect(wrapper.element.innerText).not.toContain('Resolve all threads in new issue'); expect(wrapper.element.innerText).not.toContain('Create issue to resolve all threads');
expect(wrapper.element.querySelector('.js-create-issue')).toEqual(null); expect(wrapper.element.querySelector('.js-create-issue')).toEqual(null);
}); });
}); });
......
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