Merge pull request #3780 from brchristian/email_spelling

Make spelling of 'email' consistent
solidusio · Sep 30, 2020 · 20f57f2 · 20f57f2
2 parents be7c78e + d1e6160
commit 20f57f2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/backend/spec/features/admin/orders/customer_details_spec.rb b/backend/spec/features/admin/orders/customer_details_spec.rb
@@ -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

diff --git a/backend/spec/features/admin/orders/new_order_spec.rb b/backend/spec/features/admin/orders/new_order_spec.rb
@@ -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
 

diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
@@ -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

diff --git a/frontend/spec/features/checkout_spec.rb b/frontend/spec/features/checkout_spec.rb
@@ -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"
 

diff --git a/frontend/spec/features/first_order_promotion_spec.rb b/frontend/spec/features/first_order_promotion_spec.rb
@@ -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")