Commit e3c778e9 authored by Stan Hu's avatar Stan Hu

Rename "Approve Additionally" to "Add Approval"

The former sounds awkward and unclear.
parent 440fc56b
...@@ -81,8 +81,8 @@ the following is possible: ...@@ -81,8 +81,8 @@ the following is possible:
![Approve](img/approve.png) ![Approve](img/approve.png)
- If the required number of approvals has already been met, they can still - If the required number of approvals has already been met, they can still
approve it by clicking the displayed **Approve additionally** button. approve it by clicking the displayed **Add Approval** button.
![Approve additionally](img/approve_additionally.png) ![Add Approval](img/approve_additionally.png)
--- ---
......
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
approveButtonText() { approveButtonText() {
let approveButtonText = s__('mrWidget|Approve'); let approveButtonText = s__('mrWidget|Approve');
if (this.approvalsLeft <= 0) { if (this.approvalsLeft <= 0) {
approveButtonText = s__('mrWidget|Approve additionally'); approveButtonText = s__('mrWidget|Add Approval');
} }
return approveButtonText; return approveButtonText;
}, },
......
---
title: Rename "Approve Additionally" to "Add Approval"
merge_request:
author:
type: other
...@@ -42,13 +42,13 @@ describe 'User approves a merge request', :js do ...@@ -42,13 +42,13 @@ describe 'User approves a merge request', :js do
sign_out(user) sign_out(user)
sign_in_visit_merge_request(user2) sign_in_visit_merge_request(user2, true)
sign_in_visit_merge_request(user3) sign_in_visit_merge_request(user3, true)
expect(all('.js-approver-list-member').count).to eq(3) expect(all('.js-approver-list-member').count).to eq(3)
end end
it "doesn't show the approve additionally when a merge request is closed" do it "doesn't show the add approval when a merge request is closed" do
merge_request_closed = create(:merge_request, :closed, source_project: project, target_project: project) merge_request_closed = create(:merge_request, :closed, source_project: project, target_project: project)
create(:approval, merge_request: merge_request_closed, user: user) create(:approval, merge_request: merge_request_closed, user: user)
...@@ -58,13 +58,14 @@ describe 'User approves a merge request', :js do ...@@ -58,13 +58,14 @@ describe 'User approves a merge request', :js do
wait_for_requests wait_for_requests
expect(page).not_to have_button('Approve') expect(page).not_to have_button('Approve')
expect(page).not_to have_button('Approve additionally') expect(page).not_to have_button('Add Approval')
end end
def sign_in_visit_merge_request(user) def sign_in_visit_merge_request(user, additional_approver = false)
sign_in(user) sign_in(user)
visit(merge_request_path(merge_request)) visit(merge_request_path(merge_request))
click_button('Approve') button_text = additional_approver ? 'Add Approval' : 'Approve'
click_button(button_text)
wait_for_requests wait_for_requests
sign_out(user) sign_out(user)
end end
......
...@@ -4085,7 +4085,7 @@ msgstr "" ...@@ -4085,7 +4085,7 @@ msgstr ""
msgid "mrWidget|Approve" msgid "mrWidget|Approve"
msgstr "" msgstr ""
msgid "mrWidget|Approve additionally" msgid "mrWidget|Add Approval"
msgstr "" msgstr ""
msgid "mrWidget|Approved by" msgid "mrWidget|Approved by"
......
...@@ -115,13 +115,13 @@ import ApprovalsBody from 'ee/vue_merge_request_widget/components/approvals/appr ...@@ -115,13 +115,13 @@ import ApprovalsBody from 'ee/vue_merge_request_widget/components/approvals/appr
}); });
}); });
it('The approve button should have the "Approve additionally" text', function (done) { it('The approve button should have the "Add Approval" text', function (done) {
this.approvalsBody.approvalsLeft = 0; this.approvalsBody.approvalsLeft = 0;
this.approvalsBody.userHasApproved = false; this.approvalsBody.userHasApproved = false;
this.approvalsBody.userCanApprove = true; this.approvalsBody.userCanApprove = true;
Vue.nextTick(() => { Vue.nextTick(() => {
expect(this.approvalsBody.approveButtonText).toBe('Approve additionally'); expect(this.approvalsBody.approveButtonText).toBe('Add Approval');
done(); done();
}); });
}); });
......
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