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.

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

Make spelling of 'email' consistent #3780

Merged
merged 1 commit into from
Sep 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
click_button "Update"
expect(page).to have_content 'Customer Details Updated'
click_link "Customer"
expect(page).to have_field 'Customer E-Mail', with: order.reload.email
expect(page).to have_field 'Customer Email', with: order.reload.email
within '#order_user_link' do
expect(page).to have_link user.email
end
Expand Down
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 @@ -245,7 +245,7 @@
it "displays the user's email escaped without executing" do
click_on "Customer"
targetted_select2_search user.email, from: "#s2id_customer_search"
expect(page).to have_field("Customer E-Mail", with: xss_string)
expect(page).to have_field("Customer Email", with: xss_string)
end
end

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 @@ -116,7 +116,7 @@ en:
considered_risky: Risky
coupon_code: Coupon Code
created_at: Order Date
email: Customer E-Mail
email: Customer Email
included_tax_total: Tax (incl.)
ip_address: IP Address
item_total: Item Total
Expand Down
2 changes: 1 addition & 1 deletion frontend/spec/features/checkout_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@
state_name_css = "order_bill_address_attributes_state_name"

select "Canada", from: "order_bill_address_attributes_country_id"
fill_in 'Customer E-Mail', with: 'test@example.com'
fill_in 'Customer Email', with: 'test@example.com'
fill_in state_name_css, with: xss_string
fill_in "Zip", with: "H0H0H0"

Expand Down
2 changes: 1 addition & 1 deletion frontend/spec/features/first_order_promotion_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
click_button "Apply Code"
expect(page).to have_content("The coupon code was successfully applied to your order")
click_on "Checkout"
fill_in "Customer E-Mail", with: "sam@tom.com"
fill_in "Customer Email", with: "sam@tom.com"
fill_in_address
click_on "Save and Continue"
expect(page).to_not have_content("#summary-order-charges")
Expand Down