Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Capitalize event buttons in OrdersHelper #2177

Merged
merged 1 commit into from
Aug 29, 2017
Merged

Capitalize event buttons in OrdersHelper #2177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/spec/features/admin/orders/cancelling_and_resuming_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

it "can cancel an order" do
visit spree.edit_admin_order_path(order.number)
click_button 'cancel'
click_button 'Cancel'
within(".additional-info") do
expect(find('dt#order_status + dd')).to have_content("Canceled")
end
Expand All @@ -34,7 +34,7 @@

it "can resume an order" do
visit spree.edit_admin_order_path(order.number)
click_button 'resume'
click_button 'Resume'
within(".additional-info") do
expect(find('dt#order_status + dd')).to have_content("Resumed")
end
Expand Down
2 changes: 1 addition & 1 deletion backend/spec/features/admin/orders/risk_analysis_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def visit_order
end

it "can be approved" do
click_button('approve')
click_button('Approve')
expect(page).to have_content 'Approver'
expect(page).to have_content 'Approved at'
expect(page).to have_content 'Status: Complete'
Expand Down
6 changes: 3 additions & 3 deletions core/config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ en:
analytics_trackers: Analytics Trackers
and: and
apply_code: Apply Code
approve: approve
approve: Approve
approver: Approver
approved_at: Approved at
are_you_sure: Are you sure?
Expand Down Expand Up @@ -1046,7 +1046,7 @@ en:
calculated_reimbursements: Calculated Reimbursements
calculator: Calculator
calculator_settings_warning: If you are changing the calculator type or preference source, you must save first before you can edit the calculator settings
cancel: cancel
cancel: Cancel
cancel_inventory: 'Cancel Items'
canceled: canceled
canceled_at: Canceled at
Expand Down Expand Up @@ -1772,7 +1772,7 @@ en:
reset_password: Reset my password
response_code: Response Code
restock_inventory: Restock Inventory
resume: resume
resume: Resume
resumed: Resumed
return: return
return_authorization: Return Merchandise Authorization
Expand Down