Commit df267104 authored by Stan Hu's avatar Stan Hu

Change case "Add Approval" -> "Add approval"

parent e3c778e9
...@@ -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 **Add Approval** button. approve it by clicking the displayed **Add approval** button.
![Add Approval](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|Add Approval'); approveButtonText = s__('mrWidget|Add approval');
} }
return approveButtonText; return approveButtonText;
}, },
......
--- ---
title: Rename "Approve Additionally" to "Add Approval" title: Rename "Approve Additionally" to "Add approval"
merge_request: merge_request:
author: author:
type: other type: other
...@@ -58,13 +58,13 @@ describe 'User approves a merge request', :js do ...@@ -58,13 +58,13 @@ 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('Add Approval') expect(page).not_to have_button('Add approval')
end end
def sign_in_visit_merge_request(user, additional_approver = false) 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))
button_text = additional_approver ? 'Add Approval' : 'Approve' button_text = additional_approver ? 'Add approval' : 'Approve'
click_button(button_text) click_button(button_text)
wait_for_requests wait_for_requests
sign_out(user) sign_out(user)
......
...@@ -4085,7 +4085,7 @@ msgstr "" ...@@ -4085,7 +4085,7 @@ msgstr ""
msgid "mrWidget|Approve" msgid "mrWidget|Approve"
msgstr "" msgstr ""
msgid "mrWidget|Add Approval" 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 "Add Approval" 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('Add Approval'); 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