raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt customer search override to spree v2 and fix customer details spec in admin orders spec

Browse Source
This commit is contained in:
luisramos0
2019-02-03 12:25:22 +00:00
parent e5fdc89659
commit 698ba4618d
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/overrides/spree/admin/orders/customer_details/edit/replace_customer_search.html.haml.deface
View File

@@ -1,4 +1,4 @@
/ replace "code[erb-loud]:contains('hidden_field_tag :customer_search')"
/ replace "erb[loud]:contains('hidden_field_tag :customer_search')"
- content_for :app_wrapper_attrs do
= 'ng-app=admin.orders'

12
spec/features/admin/orders_spec.rb
View File

@@ -147,12 +147,17 @@ feature %q{
scenario "filling customer details" do
# Given a customer with an order, which includes their shipping and billing address
# We change the 1st order's address details
# This way we validate that the original details (stored in customer) are picked up in the 2nd order
@order.ship_address = create(:address, lastname: 'Ship')
@order.bill_address = create(:address, lastname: 'Bill')
shipping_method = create(:shipping_method_with, :delivery)
@order.shipments << create(:shipment_with, :shipping_method, shipping_method: shipping_method)
@order.save!
# We set the existing shipping method to delivery, this shipping method will be used in the 2nd order
# Otherwise order_updater.shipping_address_from_distributor will set the 2nd order address to the distributor address
@order.shipping_method.update_attribute :require_ship_address, true
# When I create a new order
quick_login_as @user
new_order_with_distribution(@distributor, @order_cycle)
@@ -160,12 +165,13 @@ feature %q{
find('button.add_variant').click
page.has_selector? "table.index tbody[data-hook='admin_order_form_line_items'] tr" # Wait for JS
click_button 'Update'
expect(page).to have_selector 'h1.page-title', text: "Customer Details"
# And I select that customer's email address and save the order
targetted_select2_search @customer.email, from: '#customer_search_override', dropdown_css: '.select2-drop'
click_button 'Update'
expect(page).to have_selector "h1.page-title", text: "Shipments"
expect(page).to have_selector "h1.page-title", text: "Customer Details"
# Then their addresses should be associated with the order
order = Spree::Order.last