From 84501b9e41eebd257883fbfabf74e66e056e9639 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 4 Apr 2019 17:01:17 +1100 Subject: [PATCH] Move feature spec to controller spec It reduces the runtime (3s instead of 10s). --- .../spree/admin/orders_controller_spec.rb | 17 +++++++++++++++++ spec/features/admin/orders_spec.rb | 13 ------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb index b827f3df0b..aa1bddba97 100644 --- a/spec/controllers/spree/admin/orders_controller_spec.rb +++ b/spec/controllers/spree/admin/orders_controller_spec.rb @@ -14,6 +14,23 @@ describe Spree::Admin::OrdersController, type: :controller do spree_get :edit, id: order }.to change { order.reload.state }.from("cart").to("complete") end + + describe "view" do + render_views + + it "shows only eligible adjustments" do + adjustment = create( + :adjustment, + adjustable: order, + label: "invalid adjustment", + amount: 0 + ) + + spree_get :edit, id: order + + expect(response.body).to_not match adjustment.label + end + end end context "#update" do diff --git a/spec/features/admin/orders_spec.rb b/spec/features/admin/orders_spec.rb index 095457c4f9..ad51abed4f 100644 --- a/spec/features/admin/orders_spec.rb +++ b/spec/features/admin/orders_spec.rb @@ -282,19 +282,6 @@ feature %q{ end end - scenario "shows only eligible adjustments" do - adjustment = create( - :adjustment, - adjustable: @order, - label: "invalid adjustment", - amount: 0 - ) - - visit spree.edit_admin_order_path(@order) - - expect(page).to have_no_content adjustment.label - end - scenario "cannot split the order in different stock locations" do # There's only 1 stock location in OFN, so the split functionality that comes with spree should be hidden expect(page).to_not have_selector '.split-item'