Skip to content

Commit

Permalink
Merge pull request #1 from Arpsara/master
Browse files Browse the repository at this point in the history
Update en.yml
  • Loading branch information
Arpsara authored Dec 16, 2016
2 parents 431663f + c27dfc7 commit 9621084
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion backend/spec/features/admin/orders/new_order_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
click_icon "capture"

click_on "Shipments"
click_on "ship"
click_on "Ship"

within '.carton-state' do
expect(page).to have_content('shipped')
Expand Down
4 changes: 2 additions & 2 deletions backend/spec/features/admin/stock_transfer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
describe 'with enough stock' do
it 'ships stock transfer' do
visit spree.tracking_info_admin_stock_transfer_path(stock_transfer)
click_on 'ship'
click_on 'Ship'

expect(page).to have_current_path(spree.admin_stock_transfers_path)
expect(stock_transfer.reload.shipped_at).to_not be_nil
Expand All @@ -102,7 +102,7 @@
it 'does not ship stock transfer' do
visit spree.tracking_info_admin_stock_transfer_path(stock_transfer)

click_on 'ship'
click_on 'Ship'

expect(page).to have_current_path(spree.tracking_info_admin_stock_transfer_path(stock_transfer))
expect(stock_transfer.reload.shipped_at).to be_nil
Expand Down
2 changes: 1 addition & 1 deletion core/config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ en:
list: List
listing: Listing
new: New
receive: Receive
receive: Receive
refund: Refund
remove: Remove
save: Save
Expand Down

0 comments on commit 9621084

Please sign in to comment.