From 9306e054b8aab6c1fd032469b54367e852e97152 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Thu, 21 Apr 2022 14:22:39 +0200 Subject: [PATCH] Unless order is complete, /cart could be updated Split_checkout introduced new state for an order Update specs as well Follow up #8944 --- app/views/spree/orders/_form.html.haml | 2 +- spec/system/consumer/split_checkout_spec.rb | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/views/spree/orders/_form.html.haml b/app/views/spree/orders/_form.html.haml index 0b5d2d9444..14b483e980 100644 --- a/app/views/spree/orders/_form.html.haml +++ b/app/views/spree/orders/_form.html.haml @@ -19,7 +19,7 @@ %tbody#line_items{"data-hook" => ""} = render partial: 'line_item', collection: order_form.object.line_items, locals: {order_form: order_form} - = render 'bought' if show_bought_items? && @order.cart? + = render 'bought' if show_bought_items? && !@order.complete? %tfoot#edit-cart = render 'spree/orders/form/cart_actions_row' unless @order.complete? diff --git a/spec/system/consumer/split_checkout_spec.rb b/spec/system/consumer/split_checkout_spec.rb index 8dcee8e27a..89e09ba6ed 100644 --- a/spec/system/consumer/split_checkout_spec.rb +++ b/spec/system/consumer/split_checkout_spec.rb @@ -887,12 +887,22 @@ describe "As a consumer, I want to checkout my order", js: true do order_cycle: order_cycle, distributor: distributor, user_id: order.user_id) } - it "informs about previous orders if distributor allow order changes" do - order.distributor.allow_order_changes = true - order.distributor.save - visit checkout_step_path(:summary) + context "when distributor allows order changes" do + before do + order.distributor.allow_order_changes = true + order.distributor.save + visit checkout_step_path(:summary) + end - expect(page).to have_content("You have an order for this order cycle already.") + it "informs about previous orders" do + expect(page).to have_content("You have an order for this order cycle already.") + end + + it "show a link to /cart#bought-products page" do + expect(page).to have_link("cart", href: "/cart#bought-products") + click_on "cart" + expect(page).to have_text "#{prev_order.line_items.length} additional items already confirmed for this order cycle" + end end it "don't display any message if distributor don't allow order changes" do