From dabe37ebcb8f8ae2df76747e67561eaf3642c6b1 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 19 Oct 2022 11:01:56 +0100 Subject: [PATCH 1/2] Extracts routing outside it block --- spec/system/admin/products_spec.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/spec/system/admin/products_spec.rb b/spec/system/admin/products_spec.rb index 0595ec2259..88b9605d77 100644 --- a/spec/system/admin/products_spec.rb +++ b/spec/system/admin/products_spec.rb @@ -190,10 +190,13 @@ describe ' expect(page).not_to have_selector "#p_#{order.variants.first.product_id}" end - it 'keeps the line item on the order (admin)' do - visit spree.admin_orders_path - find(".icon-edit").click - expect(page).to have_content(line_item.product.name.to_s) + context "a deleted line item from a shipped order" do + before do + login_as_admin_and_visit spree.edit_admin_order_path(order) + end + it 'keeps the line item on the order (admin)' do + expect(page).to have_content(line_item.product.name.to_s) + end end end end From a244b346272a86db47ec36b348112da10ba2afa0 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 19 Oct 2022 11:15:15 +0100 Subject: [PATCH 2/2] Extracts routing to context (DRY); creates context for separate it block --- spec/system/admin/adjustments_spec.rb | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/spec/system/admin/adjustments_spec.rb b/spec/system/admin/adjustments_spec.rb index c4ceff76d1..cfa8c431f0 100644 --- a/spec/system/admin/adjustments_spec.rb +++ b/spec/system/admin/adjustments_spec.rb @@ -26,11 +26,11 @@ describe ' before do order.finalize! create(:check_payment, order: order, amount: order.total) + login_as_admin_and_visit spree.admin_orders_path end it "adding taxed adjustments to an order" do # When I go to the adjustments page for the order - login_as_admin_and_visit spree.admin_orders_path page.find('td.actions a.icon-edit').click click_link 'Adjustments' @@ -53,7 +53,6 @@ describe ' amount: 110, tax_category: tax_category, order: order) # When I go to the adjustments page for the order - login_as_admin_and_visit spree.admin_orders_path page.find('td.actions a.icon-edit').click click_link 'Adjustments' page.find('tr', text: 'Extra Adjustment').find('a.icon-edit').click @@ -75,7 +74,6 @@ describe ' amount: 110, tax_category: nil, order: order) # When I go to the adjustments page for the order - login_as_admin_and_visit spree.admin_orders_path page.find('td.actions a.icon-edit').click click_link 'Adjustments' page.find('tr', text: 'Extra Adjustment').find('a.icon-edit').click @@ -91,17 +89,22 @@ describe ' expect(page).to have_selector 'td.tax', text: '10.00' end - it "viewing adjustments on a canceled order" do + context "on a canceled order" do # Given a taxed adjustment - adjustment = create(:adjustment, label: "Extra Adjustment", adjustable: order, - amount: 110, tax_category: tax_category, order: order) - order.cancel! + let!(:adjustment) { + create(:adjustment, label: "Extra Adjustment", adjustable: order, + amount: 110, tax_category: tax_category, order: order) + } + before do + order.cancel! + login_as_admin_and_visit spree.edit_admin_order_path(order) + end - login_as_admin_and_visit spree.edit_admin_order_path(order) + it "displays adjustments" do + click_link 'Adjustments' - click_link 'Adjustments' - - expect(page).to_not have_selector('tr a.icon-edit') - expect(page).to_not have_selector('a.icon-plus'), text: I18n.t(:new_adjustment) + expect(page).to_not have_selector('tr a.icon-edit') + expect(page).to_not have_selector('a.icon-plus'), text: I18n.t(:new_adjustment) + end end end