Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Use order_details partial with proper data-hooks on confirm step and … (#10706)
Damian Legawiecc07ddbb51d46
diff --git a/frontend/app/assets/stylesheets/spree/frontend/views/spree/checkout/confirm.scss b/frontend/app/assets/stylesheets/spree/frontend/views/spree/checkout/confirm.scssindex d96ab318a0..d26bddd936 100644--- a/frontend/app/assets/stylesheets/spree/frontend/views/spree/checkout/confirm.scss+++ b/frontend/app/assets/stylesheets/spree/frontend/views/spree/checkout/confirm.scss@@ -3,8 +3,7 @@flex-direction: column;div:first-child {- -webkit-flex: 0;- flex-shrink: 0;+ flex-basis: 100%;}&-order-details {@@ -185,6 +184,8 @@}&-delivery-informations {+ flex-basis: 100%;+div:first-child {flex-shrink: unset;-webkit-flex: unset;@@ -253,9 +254,9 @@}#checkout-summary {- margin-top: 20px;- @include media-breakpoint-up(sm) {- margin-top: 70px;+ flex: 1 1 0;+ @include media-breakpoint-down(sm) {+ margin-top: 20px;}}}diff --git a/frontend/app/helpers/spree/frontend_helper.rb b/frontend/app/helpers/spree/frontend_helper.rbindex e897c11fda..1049929305 100644--- a/frontend/app/helpers/spree/frontend_helper.rb+++ b/frontend/app/helpers/spree/frontend_helper.rb@@ -314,7 +314,9 @@ module Spreeendend- def checkout_edit_link(step = 'address')+ def checkout_edit_link(step = 'address', order = @order)+ return if order.complete?+classes = 'align-text-bottom checkout-confirm-delivery-informations-link'link_to spree.checkout_state_path(step), class: classes, method: :get dodiff --git a/frontend/app/views/spree/checkout/_confirm.html.erb b/frontend/app/views/spree/checkout/_confirm.html.erbindex 43920c43fe..7f2b2a0201 100755--- a/frontend/app/views/spree/checkout/_confirm.html.erb+++ b/frontend/app/views/spree/checkout/_confirm.html.erb@@ -2,37 +2,5 @@<p class="checkout-content-header"><%= Spree.t(:summary).upcase %></p>- <div class='checkout-confirm-order-details' id="order_summary" data-hook>- <%= render partial: 'spree/checkout/delivery_informations', locals: { class_name: 'd-none d-lg-block' } %>- <div class="checkout-confirm-order-details-line-items d-flex flex-column align-items-center w-100">- <div class="checkout-confirm-order-details-line-items-header d-none d-sm-block d-lg-none align-self-start mb-3">- <%= Spree.t(:products) %>- </div>- <div class="d-table w-100">- <div class="d-none d-lg-table-row text-secondary text-uppercase">- <p class="d-table-cell pb-1">- <%= Spree.t(:product) %>- </p>- <p class="d-table-cell pb-1">- <%= Spree.t(:price) %>- </p>- <p class="d-table-cell pb-1">- <%= Spree.t(:quantity) %>- </p>- <p class="d-table-cell pb-1">- <%= Spree.t(:total) %>- </p>- </div>- <%= render partial: 'spree/shared/line_item', collection: @order.line_items, cached: true %>- </div>- </div>- <%= render partial: 'spree/checkout/delivery_informations', locals: { class_name: 'd-lg-none' } %>- <div id="checkout-summary" class="w-100" data-hook="checkout_summary_box">- <%= render partial: 'spree/checkout/summary', locals: { order: @order } %>- <div data-hook="buttons">- <% submit_label_key = @order.confirm? ? :place_order : :save_and_continue %>- <%= submit_tag Spree.t(submit_label_key), class: 'btn btn-primary text-uppercase font-weight-bold w-100 checkout-content-save-continue-button' %>- </div>- </div>- </div>+ <%= render partial: 'spree/shared/order_details', locals: { order: @order } %></div>diff --git a/frontend/app/views/spree/checkout/_delivery_informations.html.erb b/frontend/app/views/spree/checkout/_delivery_informations.html.erbindex a32bc8db3c..81c1dd6d03 100644--- a/frontend/app/views/spree/checkout/_delivery_informations.html.erb+++ b/frontend/app/views/spree/checkout/_delivery_informations.html.erb@@ -3,42 +3,49 @@<%= Spree.t(:delivery_information) %></div><dl>- <div>- <dt class="text-uppercase">- <%= Spree.t(:shipping_address) %>- <%= checkout_edit_link %>- </dt>- <dd><%= sanitize @order.ship_address.to_s, tags: %w[br] %></dd>- </div>- <div>- <dt class="text-uppercase">- <%= Spree.t(:billing_address) %>- <%= checkout_edit_link %>- </dt>- <dd><%= sanitize @order.bill_address.to_s, tags: %w[br] %></dd>- </div>- <div>- <dt class="text-uppercase">- <%= Spree.t(:shipping) %>- <%= checkout_edit_link('delivery') %>- </dt>- <% @order.shipments.pending.each do |shipment| %>- <dd><%= shipment.shipping_method&.name %> </dd>- <% end %>- </div>- <div>- <dt class="text-uppercase">- <%= Spree.t(:payment) %>- <%= checkout_edit_link('payment') %>- </dt>- <dd>- <%= render collection: @order.payments.valid, partial: 'spree/shared/payment' %>- </dd>- <dd>- <% if @order.using_store_credit? %>- <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'continue btn' %>+ <% if order.has_step?("address") %>+ <div data-hook="order-ship-address">+ <dt class="text-uppercase">+ <%= Spree.t(:shipping_address) %>+ <%= checkout_edit_link %>+ </dt>+ <%= render 'spree/shared/address', address: order.ship_address %>+ </div>+ <div data-hook="order-bill-address">+ <dt class="text-uppercase">+ <%= Spree.t(:billing_address) %>+ <%= checkout_edit_link %>+ </dt>+ <%= render 'spree/shared/address', address: order.bill_address %>+ </div>+ <% end %>+ <% if order.has_step?("delivery") %>+ <div data-hook="order-shipment">+ <dt class="text-uppercase">+ <%= Spree.t(:shipping) %>+ <%= checkout_edit_link('delivery') %>+ </dt>+ <% @order.shipments.valid.each do |shipment| %>+ <dd><%= shipment.shipping_method&.name %> </dd><% end %>- </dd>- </div>+ <%= render 'spree/shared/shipment_tracking', order: order if order.shipped? %>+ </div>+ <% end %>+ <% if order.has_step?("payment") %>+ <div data-hook="order-payment">+ <dt class="text-uppercase">+ <%= Spree.t(:payment) %>+ <%= checkout_edit_link('payment') %>+ </dt>+ <dd>+ <%= render collection: @order.payments.valid, partial: 'spree/shared/payment' %>+ </dd>+ <dd>+ <% if @order.using_store_credit? %>+ <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'continue btn' %>+ <% end %>+ </dd>+ </div>+ <% end %></dl></div>diff --git a/frontend/app/views/spree/orders/show.html.erb b/frontend/app/views/spree/orders/show.html.erbindex 3c2b8df995..1ebdb49ea2 100644--- a/frontend/app/views/spree/orders/show.html.erb+++ b/frontend/app/views/spree/orders/show.html.erb@@ -15,75 +15,5 @@<p class="order-show-number text-uppercase w-100 text-center"><%= accurate_title %> / <%= pretty_date(@order.completed_at) %></p>- <dl class="w-100 d-lg-flex justify-content-lg-between">- <div>- <dt class="text-uppercase text-center text-lg-left"><%= Spree.t(:shipping_address) %></dt>- <dd class="text-center text-lg-left">- <%= render 'spree/shared/address', address: @order.ship_address %>- </dd>- </div>- <div>- <dt class="text-uppercase text-center text-lg-left"><%= Spree.t(:billing_address) %></dt>- <dd class="text-center text-lg-left">- <%= render 'spree/shared/address', address: @order.bill_address %>- </dd>- </div>- <div>- <dt class="text-uppercase text-center text-lg-left"><%= Spree.t(:shipping) %></dt>- <% @order.shipments.valid.each do |shipment| %>- <dd class="text-center text-lg-left">- <%= shipment.shipping_method.name %>- <%= link_to_tracking(shipment) if shipment.shipped? %>- </dd>- <% end %>- </div>- <div>- <dt class="text-uppercase text-center text-lg-left"><%= Spree.t(:payment) %></dt>- <dd class="text-center text-lg-left">- <%= render collection: @order.payments.valid, partial: 'spree/shared/payment' %>- </dd>- </div>- </dl>- <hr class="w-100 mt-0 mb-4 d-sm-none" />- <div class="order-show-line-items d-flex flex-column align-items-center">- <% @order.line_items.each do |item| %>- <div class="order-show-line-items-line-item d-flex w-100">- <%= link_to product_image(item.variant), item.product %>- <div class="order-show-line-items-line-item-desc w-100">- <span class="order-show-line-items-line-item-desc-name">- <%= item.name %>- </span>- <span class="order-show-line-items-line-item-desc-subtitle text-break text-uppercase">- <ul class="list-unstyled mb-0">- <% item.variant.option_values.sort { |ov| ov.option_type.position }.each do |ov| %>- <li><%= "#{ov.option_type.presentation}: #{ov.name.titleize}" %></li>- <% end %>- </ul>- </span>- <div class="order-show-line-items-line-item-desc-price">- <div class="order-show-line-items-line-item-desc-price-attr-name d-inline d-lg-block">- <span><%= Spree.t(:price) %></span>- </div>- <span class="font-weight-bold"><%= item.single_money.to_html %></span>- </div>- <div class="order-show-line-items-line-item-desc-quantity">- <div class="order-show-line-items-line-item-desc-quantity-attr-name d-inline d-lg-block">- <span><%= Spree.t(:quantity) %></span>- </div>- <span class="order-show-line-items-line-item-desc-quantity-val d-lg-block"><%= item.quantity %></span>- </div>- <div class="order-show-line-items-line-item-desc-total">- <div class="order-show-line-items-line-item-desc-total-attr-name d-inline d-lg-block">- <span><%= Spree.t(:total) %></span>- </div>- <span class="font-weight-bold d-lg-block"><%= item.display_total.to_s %></span>- </div>- </div>- </div>- <% end %>- </div>- <hr class="w-100 mt-4 mb-0 d-sm-none" />- <div id="checkout-summary" class="w-100" data-hook="checkout_summary_box">- <%= render partial: 'spree/checkout/summary', locals: { order: @order } %>- </div>+ <%= render partial: 'spree/shared/order_details', locals: { order: @order } %></div>diff --git a/frontend/app/views/spree/shared/_order_details.html.erb b/frontend/app/views/spree/shared/_order_details.html.erbindex 86c92e49b1..76faf56921 100644--- a/frontend/app/views/spree/shared/_order_details.html.erb+++ b/frontend/app/views/spree/shared/_order_details.html.erb@@ -1,184 +1,125 @@-<!-- FIXME: Should be removed if it is not used anywhere? -->-<div class="row steps-data">- <% if order.has_step?("address") %>- <div class="col-md-3 col-6 mb-3" data-hook="order-bill-address">- <h4 class="h5">- <%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t(:edit)})", spree.checkout_state_path(:address) unless order.completed? %>- </h4>- <%= render 'spree/shared/address', address: order.bill_address %>+<div class='checkout-confirm-order-details w-100 d-flex flex-wrap' data-hook>+ <div class="checkout-confirm-delivery-informations text-left mt-3">+ <div class="d-lg-none checkout-confirm-delivery-informations-header">+ <%= Spree.t(:delivery_information) %></div>-- <% if order.has_step?("delivery") %>- <div class="col-md-3 col-6 mb-3" data-hook="order-ship-address">- <h4 class="h5">- <%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t(:edit)})", spree.checkout_state_path(:address) unless order.completed? %>- </h4>- <%= render 'spree/shared/address', address: order.ship_address %>- </div>-- <div class="col-md-3 col-6 mb-3" data-hook="order-shipment">- <h4 class="h5">- <%= Spree.t(:shipments) %> <%= link_to "(#{Spree.t(:edit)})", spree.checkout_state_path(:delivery) unless order.completed? %>- </h4>- <div class="delivery">- <% order.shipments.each do |shipment| %>- <div>- <%= Spree.t(:shipment_details, stock_location: shipment.stock_location.name, shipping_method: shipment.selected_shipping_rate.name) %>- </div>+ <dl>+ <% if order.has_step?("address") %>+ <div data-hook="order-ship-address">+ <dt class="text-uppercase">+ <%= Spree.t(:shipping_address) %>+ <%= checkout_edit_link %>+ </dt>+ <%= render 'spree/shared/address', address: order.ship_address %>+ </div>+ <div data-hook="order-bill-address">+ <dt class="text-uppercase">+ <%= Spree.t(:billing_address) %>+ <%= checkout_edit_link %>+ </dt>+ <%= render 'spree/shared/address', address: order.bill_address %>+ </div>+ <% end %>+ <% if order.has_step?("delivery") %>+ <div data-hook="order-shipment">+ <dt class="text-uppercase">+ <%= Spree.t(:shipping) %>+ <%= checkout_edit_link('delivery') %>+ </dt>+ <% @order.shipments.valid.each do |shipment| %>+ <dd><%= shipment.shipping_method&.name %> </dd><% end %>+ <%= render 'spree/shared/shipment_tracking', order: order if order.shipped? %></div>- <%= render 'spree/shared/shipment_tracking', order: order if order.shipped? %>- </div>- <% end %>- <% end %>-- <% if order.has_step?("payment") %>- <div class="col-md-3 col-6 mb-3" data-hook="order-payment">- <h4 class="h5">- <%= Spree.t(:payment_information) %> <%= link_to "(#{Spree.t(:edit)})", spree.checkout_state_path(:payment) unless order.completed? %>- </h4>- <div class="payment-info">- <%= render collection: order.payments.valid, partial: 'spree/shared/payment' %>- </div>- </div>- <% end %>-</div>--<div class="table-responsive">- <table id='line-items' class="table mt-4" data-hook="order_details">- <col width="15%" valign="middle" halign="center">- <col width="70%" valign="middle">- <col width="5%" valign="middle" halign="center">- <col width="5%" valign="middle" halign="center">- <col width="5%" valign="middle" halign="center">-- <thead data-hook>- <tr class="active" data-hook="order_details_line_items_headers">- <th colspan="2"><%= Spree.t(:item) %></th>- <th class="price"><%= Spree.t(:price) %></th>- <th class="qty"><%= Spree.t(:qty) %></th>- <th class="total"><span><%= Spree.t(:total) %></span></th>- </tr>- </thead>-- <tbody data-hook>- <% order.line_items.each do |item| %>- <tr data-hook="order_details_line_item_row">- <td data-hook="order_item_image">- <%= link_to small_image(line_item.variant), line_item.product %>- </td>- <td data-hook="order_item_description">- <h4><%= item.name %></h4>- <p>- <%= truncate(item.description, length: 100) %>- <%= "(" + item.variant.options_text + ")" unless item.variant.option_values.empty? %>- </p>- </td>- <td data-hook="order_item_price" class="lead text-primary price">- <span><%= item.single_money.to_html %></span>- </td>- <td data-hook="order_item_qty" class="order-qty">- <%= item.quantity %>- </td>- <td data-hook="order_item_total" class="lead text-primary total">- <span><%= item.display_amount.to_html %></span>- </td>- </tr><% end %>- </tbody>- <tfoot id="order-total" data-hook="order_details_total">- <tr class="table-warning total">- <td colspan="4" align="right">- <strong><%= Spree.t(:order_total) %>:</strong>- </td>- <td class="total">- <span id="order_total" class="lead text-primary">- <%= order.display_total.to_html %>- </span>- </td>- </tr>- </tfoot>-- <tfoot id="subtotal" data-hook="order_details_subtotal">- <tr class="total" id="subtotal-row">- <td colspan="4">- <strong><%= Spree.t(:subtotal) %>:</strong>- </td>- <td class="total">- <span><%= order.display_item_total.to_html %></span>- </td>- </tr>- </tfoot>-- <% if order.line_item_adjustments.exists? %>- <% if order.line_item_adjustments.promotion.eligible.exists? %>- <tfoot id="price-adjustments" data-hook="order_details_price_adjustments">- <% order.line_item_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>- <tr class="total">- <td colspan="4">- <%= Spree.t(:promotion) %>: <strong><%= label %></strong>- </td>- <td class="total">- <span>- <%= Spree::Money.new(- adjustments.sum(&:amount), currency: order.currency- ) %>- </span>- </td>- </tr>- <% end %>- </tfoot>+ <% if order.has_step?("payment") %>+ <div data-hook="order-payment">+ <dt class="text-uppercase">+ <%= Spree.t(:payment) %>+ <%= checkout_edit_link('payment') %>+ </dt>+ <dd>+ <%= render collection: @order.payments.valid, partial: 'spree/shared/payment' %>+ </dd>+ <dd>+ <% if [email protected]? && @order.using_store_credit? %>+ <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'continue btn' %>+ <% end %>+ </dd>+ </div><% end %>- <% end %>+ </dl>+ </div>- <tfoot id='shipment-total'>- <% order.shipments.group_by { |s| s.selected_shipping_rate.name }.each do |name, shipments| %>- <tr class="total" data-hook='shipment-row'>- <td colspan="4" align="right" class="text-muted">- <%= Spree.t(:shipping) %>: <strong><%= name %></strong>- </td>- <td class="total">- <span>- <%= Spree::Money.new(- shipments.sum(&:discounted_cost), currency: order.currency- ).to_html %>- </span>- </td>- </tr>+ <div class="checkout-confirm-order-details-line-items d-flex flex-column mt-5 mr-4">+ <div class="checkout-confirm-order-details-line-items-header d-none d-sm-block d-lg-none align-self-start mb-3">+ <%= Spree.t(:products) %>+ </div>+ <div class="d-table" data-hook="order_details">+ <div class="d-none d-lg-table-row text-secondary text-uppercase" data-hook="order_details_line_items_headers>+ <p class="d-table-cell pb-1">+ <%= Spree.t(:product) %>+ </p>+ <p class="d-table-cell pb-1">+ <%= Spree.t(:price) %>+ </p>+ <p class="d-table-cell pb-1">+ <%= Spree.t(:quantity) %>+ </p>+ <p class="d-table-cell pb-1">+ <%= Spree.t(:total) %>+ </p>+ </div>+ <% @order.line_items.each do |line_item| %>+ <div class="checkout-confirm-order-details-line-items-line-item w-100 d-table-row" data-hook="order_details_line_item_row">+ <div class="checkout-confirm-order-details-line-items-line-item-name d-table-cell align-middle py-3 py-sm-4">+ <div class="d-flex align-items-lg-center">+ <div data-hook="order_item_image">+ <%= link_to product_image(line_item.variant), line_item.product %>+ </div>+ <div class="d-flex flex-column mt-2 mt-lg-0" data-hook="order_item_description">+ <div><%= link_to line_item.name, line_item.product %></div>+ <% unless line_item.variant.is_master? %>+ <ul class="checkout-confirm-order-details-line-items-line-item-name-options text-uppercase list-unstyled mb-0">+ <% line_item.variant.option_values.sort { |ov| ov.option_type.position }.each do |ov| %>+ <li>+ <% # TODO: rework option values so options_text method can be used here %>+ <%= "#{ov.option_type.presentation}: #{ov.name.titleize}" %>+ </li>+ <% end %>+ </ul>+ <% end %>+ <div class="d-lg-none" data-hook="order_item_price">+ <div class="font-weight-bold"><%= line_item.single_money.to_html %></div>+ </div>+ <div class="d-lg-none" data-hook="order_item_qty">+ <span><%= Spree.t(:quantity) %>:</span>+ <span class="font-weight-bold"><%= line_item.quantity %></span>+ </div>+ </div>+ </div>+ </div>+ <div class="checkout-confirm-order-details-line-items-line-item-price d-none d-lg-table-cell align-middle py-4" data-hook="order_item_price">+ <div><%= line_item.single_money.to_html %></div>+ </div>+ <div class="checkout-confirm-order-details-line-items-line-item-quantity d-none d-lg-table-cell align-middle py-4" data-hook="order_item_qty">+ <span class="checkout-confirm-order-details-line-items-line-item-quantity-val d-lg-block"><%= line_item.quantity %></span>+ </div>+ <div class="checkout-confirm-order-details-line-items-line-item-total d-none d-lg-table-cell align-middle py-4" data-hook="order_item_total">+ <div><%= line_item.display_total.to_s %></div>+ </div>+ </div><% end %>- </tfoot>+ </div>+ </div>- <% if order.all_adjustments.tax.exists? %>- <tfoot id="tax-adjustments" data-hook="order_details_tax_adjustments">- <% order.all_adjustments.tax.group_by(&:label).each do |label, adjustments| %>- <tr class="total">- <td colspan="4" align="right" class="text-muted">- <%= Spree.t(:tax) %>: <strong><%= label %></strong>- </td>- <td class="total">- <span>- <%= Spree::Money.new(- adjustments.sum(&:amount), currency: order.currency- ) %>- </span>- </td>- </tr>- <% end %>- </tfoot>+ <div class="mt-5" id="checkout-summary" data-hook="checkout_summary_box">+ <%= render partial: 'spree/checkout/summary', locals: { order: @order } %>+ <% unless @order.complete? %>+ <div data-hook="buttons">+ <% submit_label_key = @order.confirm? ? :place_order : :save_and_continue %>+ <%= submit_tag Spree.t(submit_label_key), class: 'btn btn-primary text-uppercase font-weight-bold w-100 checkout-content-save-continue-button' %>+ </div><% end %>-- <tfoot id="order-charges" data-hook="order_details_adjustments">- <% order.adjustments.eligible.each do |adjustment| %>- <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>- <tr class="total">- <td colspan="4" align="right">- <strong><%= adjustment.label %></strong>- </td>- <td class="total">- <span><%= adjustment.display_amount.to_html %></span>- </td>- </tr>- <% end %>- </tfoot>- </table>+ </div></div>diff --git a/frontend/spec/features/checkout_address_selection_spec.rb b/frontend/spec/features/checkout_address_selection_spec.rbindex 5b37d9b0b6..f41b0c6c54 100644--- a/frontend/spec/features/checkout_address_selection_spec.rb+++ b/frontend/spec/features/checkout_address_selection_spec.rb@@ -137,11 +137,11 @@ describe 'Address selection during checkout', type: :feature, js: true dofill_in_address(shipping, :ship)endcomplete_checkout(billing)- within('#order_details > #order_summary > .checkout-confirm-delivery-informations > dl > div:nth-child(1)') do+ within first('[data-hook="order-ship-address"]') doexpect(page).to have_content('SHIPPING ADDRESS')expect(page).to have_content(expected_address_format('SHIPPING ADDRESS', shipping))end- within('#order_details > #order_summary > .checkout-confirm-delivery-informations > dl > div:nth-child(2)') do+ within first('[data-hook="order-bill-address"]') doexpect(page).to have_content('BILLING ADDRESS')expect(page).to have_content(expected_address_format('BILLING ADDRESS', billing))end@@ -180,11 +180,11 @@ describe 'Address selection during checkout', type: :feature, js: true dofill_in_address(shipping, :ship)endcomplete_checkout(address)- within('#order_details > #order_summary > .checkout-confirm-delivery-informations > dl > div:nth-child(1)') do+ within first('[data-hook="order-ship-address"]') doexpect(page).to have_content('SHIPPING ADDRESS')expect(page).to have_content(expected_address_format('SHIPPING ADDRESS', shipping))end- within('#order_details > #order_summary > .checkout-confirm-delivery-informations > dl > div:nth-child(2)') do+ within first('[data-hook="order-bill-address"]') doexpect(page).to have_content('BILLING ADDRESS')expect(page).to have_content(expected_address_format('BILLING ADDRESS', address))end@@ -220,11 +220,11 @@ describe 'Address selection during checkout', type: :feature, js: true doendfind('label', text: 'Use Billing Address').clickcomplete_checkout(address)- within('#order_details > #order_summary > .checkout-confirm-delivery-informations > dl > div:nth-child(1)') do+ within first('[data-hook="order-ship-address"]') doexpect(page).to have_content('SHIPPING ADDRESS')expect(page).to have_content(expected_address_format('SHIPPING ADDRESS', address))end- within('#order_details > #order_summary > .checkout-confirm-delivery-informations > dl > div:nth-child(2)') do+ within first('[data-hook="order-bill-address"]') doexpect(page).to have_content('BILLING ADDRESS')expect(page).to have_content(expected_address_format('BILLING ADDRESS', address))end@@ -273,11 +273,11 @@ describe 'Address selection during checkout', type: :feature, js: true dofill_in_address(billing)endcomplete_checkout(address)- within('#order_details > #order_summary > .checkout-confirm-delivery-informations > dl > div:nth-child(1)') do+ within first('[data-hook="order-ship-address"]') doexpect(page).to have_content('SHIPPING ADDRESS')expect(page).to have_content(expected_address_format('SHIPPING ADDRESS', address))end- within('#order_details > #order_summary > .checkout-confirm-delivery-informations > dl > div:nth-child(2)') do+ within first('[data-hook="order-bill-address"]') doexpect(page).to have_content('BILLING ADDRESS')expect(page).to have_content(expected_address_format('BILLING ADDRESS', billing))enddiff --git a/frontend/spec/features/order_spec.rb b/frontend/spec/features/order_spec.rbindex 0ec98f9844..4fa34e6767 100644--- a/frontend/spec/features/order_spec.rb+++ b/frontend/spec/features/order_spec.rb@@ -23,7 +23,7 @@ describe 'orders', type: :feature dovisit spree.order_path(order)- within '.order-show-line-items-line-item-desc-price' do+ within first('[data-hook="order_item_price"]') doexpect(page).to have_content '19.00'endenddiff --git a/frontend/spec/support/shared_contexts/checkout_address_book.rb b/frontend/spec/support/shared_contexts/checkout_address_book.rbindex b80094c849..5a66deb3cc 100644--- a/frontend/spec/support/shared_contexts/checkout_address_book.rb+++ b/frontend/spec/support/shared_contexts/checkout_address_book.rb@@ -68,7 +68,7 @@ shared_context 'checkout address book' doaddress.company.to_s,address.address1.to_s,address.address2.to_s,- "#{address.city}, #{address.state ? address.state.abbr : address.state_name} #{address.zipcode}",+ "#{address.city} #{address.state ? address.state.abbr : address.state_name} #{address.zipcode}",address.country.to_s].reject(&:empty?).join("\n")end