solidus_backend 2.4.2 → 2.5.0.beta1

data/spec/features/admin/configuration/shipping_methods_spec.rb

@@ -35,6 +35,46 @@ describe "Shipping Methods", type: :feature do
       click_on "Create"
       expect(current_path).to eql(spree.edit_admin_shipping_method_path(Spree::ShippingMethod.last))
     end
+
+    context 'with shipping method having a calculator with array or hash preference type' do
+      before do
+        class ComplexShipments < Spree::ShippingCalculator
+          preference :amount, :decimal
+          preference :currency, :string
+          preference :mapping, :hash
+          preference :list, :array
+
+          def self.description
+            "Complex Shipments"
+          end
+        end
+        @calculators = Rails.application.config.spree.calculators.shipping_methods
+        Rails.application.config.spree.calculators.shipping_methods = [ComplexShipments]
+      end
+
+      after do
+        Rails.application.config.spree.calculators.shipping_methods = @calculators
+      end
+
+      it "does not show array and hash form fields" do
+        click_link "New Shipping Method"
+
+        fill_in "shipping_method_name", with: "bullock cart"
+
+        within("#shipping_method_categories_field") do
+          check first("input[type='checkbox']")["name"]
+        end
+
+        click_on "Create"
+        select 'Complex Shipments', from: 'Base Calculator'
+        click_on "Update"
+
+        expect(page).to have_field('Amount')
+        expect(page).to have_field('Currency')
+        expect(page).to_not have_field('Mapping')
+        expect(page).to_not have_field('List')
+      end
+    end
   end
 
   # Regression test for https://github.com/spree/spree/issues/1331

data/spec/features/admin/homepage_spec.rb

@@ -10,23 +10,27 @@ describe "Homepage", type: :feature do
       end
 
       it "should have a link to overview" do
-        within(".admin-nav-header") { page.find(:xpath, "a[@href='/admin']") }
+        within(".admin-nav-header") { expect(page).to have_link(nil, href: "/admin") }
       end
 
       it "should have a link to orders" do
-        page.find_link("Orders")['/admin/orders']
+        expect(page).to have_link("Orders", href: "/admin/orders")
       end
 
       it "should have a link to products" do
-        page.assert_selector(:link, text: "Products", count: 2)
+        expect(page).to have_link("Products", href: "/admin/products", count: 2)
       end
 
       it "should have a link to reports" do
-        page.find_link("Reports")['/admin/reports']
+        expect(page).to have_link("Reports", href: "/admin/reports")
       end
 
       it "should have a link to configuration" do
-        page.find_link("Settings")['/admin/configurations']
+        expect(page).to have_link("Settings", href: "/admin/stores")
+      end
+
+      it "should have a link to promotions" do
+        expect(page).to have_link("Promotions", href: "/admin/promotions", count: 2)
       end
     end
 
@@ -36,17 +40,30 @@ describe "Homepage", type: :feature do
       end
 
       it "should have a link to products" do
-        within('.selected .admin-subnav') { page.find_link("Products")['/admin/products'] }
+        within('.selected .admin-subnav') { expect(page).to have_link("Products", href: "/admin/products") }
       end
 
       it "should have a link to option types" do
-        within('.selected .admin-subnav') { page.find_link("Option Types")['/admin/option_types'] }
+        within('.selected .admin-subnav') { expect(page).to have_link("Option Types", href: "/admin/option_types") }
       end
 
       it "should have a link to property types" do
-        within('.selected .admin-subnav') { page.find_link("Property Types")['/admin/properties'] }
+        within('.selected .admin-subnav') { expect(page).to have_link("Property Types", href: "/admin/properties") }
       end
+    end
 
+    context "visiting the promotions tab" do
+      before(:each) do
+        visit spree.admin_promotions_path
+      end
+
+      it "should have a link to promotions" do
+        within('.selected .admin-subnav') { expect(page).to have_link("Promotions", href: "/admin/promotions") }
+      end
+
+      it "should have a link to promotion categories" do
+        within('.selected .admin-subnav') { expect(page).to have_link("Promotion Categories", href: "/admin/promotion_categories") }
+      end
     end
   end
 

data/spec/features/admin/orders/adjustments_spec.rb

@@ -65,7 +65,7 @@ describe "Adjustments", type: :feature do
         fill_in "adjustment_amount", with: ""
         fill_in "adjustment_label", with: ""
         click_button "Continue"
-        expect(page).to have_content("Description can't be blank")
+        expect(page).to have_content("Label can't be blank")
         expect(page).to have_content("Amount is not a number")
       end
     end
@@ -98,7 +98,7 @@ describe "Adjustments", type: :feature do
         fill_in "adjustment_amount", with: ""
         fill_in "adjustment_label", with: ""
         click_button "Continue"
-        expect(page).to have_content("Description can't be blank")
+        expect(page).to have_content("Label can't be blank")
         expect(page).to have_content("Amount is not a number")
       end
     end

data/spec/features/admin/orders/customer_details_spec.rb

@@ -61,7 +61,7 @@ describe "Customer Details", type: :feature, js: true do
 
       it "displays an error" do
         click_button "Update"
-        expect(page).to have_content Spree.t(:insufficient_stock_for_order)
+        expect(page).to have_content I18n.t('spree.insufficient_stock_for_order')
       end
     end
   end
@@ -121,14 +121,29 @@ describe "Customer Details", type: :feature, js: true do
       expect(page).to have_content("Shipping address first name can't be blank")
     end
 
-    it "updates order email for an existing order with a user" do
-      order.update_columns(ship_address_id: ship_address.id, bill_address_id: bill_address.id, state: "confirm", completed_at: nil)
-      previous_user = order.user
-      click_link "Customer"
-      fill_in "order_email", with: "newemail@example.com"
-      expect { click_button "Update" }.to change { order.reload.email }.to "newemail@example.com"
-      expect(order.user_id).to eq previous_user.id
-      expect(order.user.email).to eq previous_user.email
+    context "for an order in confirm state with a user" do
+      let(:user) { order.user }
+
+      before do
+        order.update_columns(
+          ship_address_id: ship_address.id,
+          bill_address_id: bill_address.id,
+          state: "confirm",
+          completed_at: nil
+        )
+      end
+
+      it "updating order email works" do
+        click_link "Customer"
+        fill_in "order_email", with: "newemail@example.com"
+        click_button "Update"
+        expect(page).to have_content 'Customer Details Updated'
+        click_link "Customer"
+        expect(page).to have_field 'Customer E-Mail', with: order.reload.email
+        within '#order_user_link' do
+          expect(page).to have_link user.email
+        end
+      end
     end
 
     context "country associated was removed" do

data/spec/features/admin/orders/listing_spec.rb

@@ -61,11 +61,11 @@ describe "Orders Listing", type: :feature, js: true do
 
   context "searching orders" do
     context "when there are multiple stores" do
-      let(:stores) { FactoryGirl.create_pair(:store) }
+      let(:stores) { FactoryBot.create_pair(:store) }
 
       before do
         stores.each do |store|
-          FactoryGirl.create(:completed_order_with_totals, number: "R#{store.id}999", store: store)
+          FactoryBot.create(:completed_order_with_totals, number: "R#{store.id}999", store: store)
         end
       end
 
@@ -73,7 +73,7 @@ describe "Orders Listing", type: :feature, js: true do
         main_store, other_store = stores
 
         click_on "Filter Results"
-        select main_store.name, from: Spree.t(:store)
+        select main_store.name, from: I18n.t('spree.store')
         click_on "Filter Results"
 
         within_row(1) do
@@ -88,7 +88,7 @@ describe "Orders Listing", type: :feature, js: true do
     context "when there's a single store" do
       it "should be able to search orders" do
         click_on "Filter Results"
-        fill_in "q_number_cont", with: "R200"
+        fill_in "q_number_start", with: "R200"
         click_on 'Filter Results'
         within_row(1) do
           expect(page).to have_content("R200")
@@ -100,7 +100,7 @@ describe "Orders Listing", type: :feature, js: true do
 
       it "should be able to filter on variant_id" do
         click_on "Filter Results"
-        select2_search @order1.products.first.sku, from: Spree.t(:variant)
+        select2_search @order1.products.first.sku, from: I18n.t('spree.variant')
         click_on 'Filter Results'
 
         within_row(1) do
@@ -139,9 +139,6 @@ describe "Orders Listing", type: :feature, js: true do
         click_on "Filter Results"
         fill_in "q_created_at_gt", with: Date.current
 
-        # Just so the datepicker gets out of poltergeists way.
-        page.execute_script("$('#q_created_at_gt').datepicker('widget').hide();")
-
         click_on 'Filter Results'
         within_row(1) { expect(page).to have_content("R100") }
 
@@ -161,7 +158,7 @@ describe "Orders Listing", type: :feature, js: true do
 
         it "only shows the orders with the selected promotion" do
           click_on "Filter Results"
-          fill_in "q_order_promotions_promotion_code_value_cont", with: promotion.codes.first.value
+          fill_in "q_order_promotions_promotion_code_value_start", with: promotion.codes.first.value
           click_on 'Filter Results'
           within_row(1) { expect(page).to have_content("R100") }
           within("table#listing_orders") { expect(page).not_to have_content("R200") }

data/spec/features/admin/orders/log_entries_spec.rb

@@ -14,7 +14,6 @@ describe "Log entries", type: :feature do
       )
 
       payment.log_entries.create(
-        source: payment.source,
         details: response.to_yaml
       )
     end

data/spec/features/admin/orders/new_order_spec.rb

@@ -24,6 +24,12 @@ describe "New Order", type: :feature do
     expect(current_path).to eql(spree.edit_admin_order_customer_path(Spree::Order.last))
   end
 
+  it "default line item quantity is 1", js: true do
+    within ".line-items" do
+      expect(page).to have_field 'quantity', with: '1'
+    end
+  end
+
   it "completes new order succesfully without using the cart", js: true do
     add_line_item product.name
 
@@ -146,7 +152,7 @@ describe "New Order", type: :feature do
       click_on "Update"
 
       # Automatically redirected to Shipments page
-      select2_search product.name, from: Spree.t(:name_or_sku)
+      select2_search product.name, from: I18n.t('spree.name_or_sku')
 
       click_icon :plus
 
@@ -177,7 +183,7 @@ describe "New Order", type: :feature do
       click_link "Customer"
       targetted_select2 user.email, from: "#s2id_customer_search"
       click_button "Update"
-      expect(Spree::Order.last.state).to eq 'delivery'
+      expect(page).to have_css('.order-state', text: 'Delivery')
     end
   end
 

data/spec/features/admin/orders/order_details_spec.rb

@@ -6,12 +6,15 @@ describe "Order Details", type: :feature, js: true do
 
   let!(:stock_location) { create(:stock_location_with_items) }
   let!(:product) { create(:product, name: 'spree t-shirt', price: 20.00) }
-  let!(:tote) { create(:product, name: "Tote", price: 15.00) }
   let(:order) { create(:order, state: 'complete', completed_at: "2011-02-01 12:36:15", number: "R100") }
   let(:state) { create(:state) }
+  let(:line_item) { order.line_items.first }
+
+  let!(:shipment1) do
+    order.shipments.create(stock_location_id: stock_location.id)
+  end
 
   before do
-    @shipment1 = order.shipments.create(stock_location_id: stock_location.id)
     order.contents.add(product.master, 2)
     # order.contents.add causes things (like line items & shipments) to get
     # cached, and these are going to change during this spec so we go ahead and
@@ -23,8 +26,14 @@ describe "Order Details", type: :feature, js: true do
     stub_authorization!
 
     context "cart edit page" do
+      let(:track_inventory) { true }
+      let(:backorderable) { true }
+      let(:count_on_hand) { 100 }
+
       before do
-        product.master.stock_items.first.update_column(:count_on_hand, 100)
+        product.master.update_columns(track_inventory: track_inventory)
+        product.master.stock_items.update_all(count_on_hand: count_on_hand, backorderable: backorderable)
+
         visit spree.cart_admin_order_path(order)
       end
 
@@ -32,7 +41,7 @@ describe "Order Details", type: :feature, js: true do
         expect(page).to have_content("spree t-shirt")
         expect(page).to have_content("$40.00")
 
-        within_row(1) do
+        within('tr', text: line_item.sku) do
           click_icon :edit
           fill_in "quantity", with: "1"
         end
@@ -54,7 +63,7 @@ describe "Order Details", type: :feature, js: true do
       it "can remove an item from a shipment" do
         expect(page).to have_content("spree t-shirt")
 
-        within_row(1) do
+        within('tr', text: line_item.sku) do
           accept_confirm "Are you sure you want to delete this record?" do
             click_icon :trash
           end
@@ -70,7 +79,7 @@ describe "Order Details", type: :feature, js: true do
       it "can cancel removing an item from a shipment" do
         expect(page).to have_content("spree t-shirt")
 
-        within_row(1) do
+        within('tr', text: line_item.sku) do
           # Click "cancel" on confirmation dialog
           dismiss_confirm "Are you sure you want to delete this record?" do
             click_icon :trash
@@ -83,31 +92,48 @@ describe "Order Details", type: :feature, js: true do
       it "can add tracking information" do
         visit spree.edit_admin_order_path(order)
 
-        within(".show-tracking") do
+        within("tr", text: "Tracking Number") do
           click_icon :edit
-        end
-        fill_in "tracking", with: "FOOBAR"
-        click_icon :check
+          fill_in "tracking", with: "FOOBAR"
+          click_icon :check
 
-        expect(page).not_to have_css("input[name=tracking]")
-        expect(page).to have_content("Tracking Number FOOBAR")
-      end
-
-      it "can change the shipping method" do
-        order = create(:completed_order_with_totals)
-        visit spree.edit_admin_order_path(order)
-        within("table.index tr.show-method") do
-          click_icon :edit
+          expect(page).not_to have_css("input")
+          expect(page).to have_content("Tracking Number FOOBAR")
         end
-        select "UPS Ground $100.00", from: "selected_shipping_rate_id"
-        click_icon :check
-
-        expect(page).not_to have_css('#selected_shipping_rate_id')
-        expect(page).to have_content("UPS Ground")
       end
 
       context "with a completed order" do
         let!(:order) { create(:completed_order_with_totals) }
+        let(:shipment1) { order.shipments[0] }
+
+        it "can change the shipping method" do
+          visit spree.edit_admin_order_path(order)
+
+          within("tr", text: "Shipping Method") do
+            click_icon :edit
+            select "UPS Ground $100.00"
+            click_icon :check
+          end
+
+          expect(page).not_to have_css('#selected_shipping_rate_id')
+          expect(page).to have_content("UPS Ground")
+        end
+
+        it "can use admin-only shipping methods" do
+          create(:shipping_method, name: "Admin Free Shipping", cost: 0, available_to_users: false)
+
+          visit spree.edit_admin_order_path(order)
+
+          within("tr", text: "Shipping Method") do
+            click_icon :edit
+            select "Admin Free Shipping $0.00"
+            click_icon :check
+          end
+
+          expect(page).not_to have_css('#selected_shipping_rate_id')
+          expect(page).to have_no_content("UPS Ground")
+          expect(page).to have_content("Admin Free Shipping")
+        end
 
         it "will show the variant sku" do
           visit spree.edit_admin_order_path(order)
@@ -125,26 +151,22 @@ describe "Order Details", type: :feature, js: true do
       end
 
       context "variant doesn't track inventory" do
-        before do
-          tote.master.update_column :track_inventory, false
-          # make sure there's no stock level for any item
-          tote.master.stock_items.update_all count_on_hand: 0, backorderable: false
-        end
+        let(:track_inventory) { false }
+        let(:backorderable) { false }
+        let(:count_on_hand) { 0 }
 
         it "adds variant to order just fine" do
-          add_line_item tote.name
+          add_line_item "spree t-shirt"
 
           within(".line-items") do
-            expect(page).to have_content(tote.name)
+            expect(page).to have_content("spree t-shirt")
           end
         end
       end
 
       context "variant out of stock and not backorderable" do
-        before do
-          product.master.stock_items.first.update_column(:backorderable, false)
-          product.master.stock_items.first.update_column(:count_on_hand, 0)
-        end
+        let(:backorderable) { false }
+        let(:count_on_hand) { 0 }
 
         it "doesn't display the out of stock variant in the search results" do
           click_on 'Add Item'
@@ -168,7 +190,6 @@ describe "Order Details", type: :feature, js: true do
       end
 
       context 'splitting to location' do
-        before { visit spree.edit_admin_order_path(order) }
         # can not properly implement until poltergeist supports checking alert text
         # see https://github.com/teampoltergeist/poltergeist/pull/516
         it 'should warn you if you have not selected a location or shipment'
@@ -178,7 +199,9 @@ describe "Order Details", type: :feature, js: true do
             expect(order.shipments.count).to eq(1)
             expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
 
-            within_row(1) { click_icon 'arrows-h' }
+            visit spree.edit_admin_order_path(order)
+
+            within('tr', text: line_item.sku) { click_icon 'arrows-h' }
             complete_split_to(stock_location2)
 
             expect(page).to have_css('.shipment', count: 2)
@@ -190,9 +213,11 @@ describe "Order Details", type: :feature, js: true do
           end
 
           it 'should allow me to make a transfer via splitting off all stock' do
+            visit spree.edit_admin_order_path(order)
+
             expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
 
-            within_row(1) { click_icon 'arrows-h' }
+            within('tr', text: line_item.sku) { click_icon 'arrows-h' }
             complete_split_to(stock_location2, quantity: 2)
 
             expect(page).to have_content("Pending package from 'Clarksville'")
@@ -204,9 +229,11 @@ describe "Order Details", type: :feature, js: true do
           end
 
           it 'should not allow me to split more than I had in the original shipment' do
+            visit spree.edit_admin_order_path(order)
+
             expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
 
-            within_row(1) { click_icon 'arrows-h' }
+            within('tr', text: line_item.sku) { click_icon 'arrows-h' }
             complete_split_to(stock_location2, quantity: 5)
 
             expect(page).to have_content("Pending package from 'Clarksville'")
@@ -218,9 +245,11 @@ describe "Order Details", type: :feature, js: true do
           end
 
           it 'should not allow less than or equal to zero qty' do
+            visit spree.edit_admin_order_path(order)
+
             expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
 
-            within_row(1) { click_icon 'arrows-h' }
+            within('tr', text: line_item.sku) { click_icon 'arrows-h' }
 
             accept_alert "Quantity must be greater than 0" do
               complete_split_to(stock_location2, quantity: 0)
@@ -243,7 +272,7 @@ describe "Order Details", type: :feature, js: true do
 
           context 'A shipment has shipped' do
             it 'should not show or let me back to the cart page, nor show the shipment edit buttons' do
-              order = create(:order, state: 'payment', number: "R100")
+              order = create(:order, state: 'payment')
               order.shipments.create!(stock_location_id: stock_location.id, state: 'shipped')
 
               visit spree.cart_admin_order_path(order)
@@ -262,10 +291,12 @@ describe "Order Details", type: :feature, js: true do
               product.master.stock_items.last.update_column(:backorderable, false)
               product.master.stock_items.last.update_column(:count_on_hand, 0)
 
-              within_row(1) { click_icon 'arrows-h' }
-              complete_split_to(stock_location2, quantity: 2)
+              visit spree.edit_admin_order_path(order)
 
-              accept_alert "Desired shipment not enough stock in desired stock location"
+              within('tr', text: line_item.sku) { click_icon 'arrows-h' }
+              accept_alert "Desired shipment not enough stock in desired stock location" do
+                complete_split_to(stock_location2, quantity: 2)
+              end
 
               expect(order.shipments.count).to eq(1)
               expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
@@ -278,7 +309,9 @@ describe "Order Details", type: :feature, js: true do
               product.master.stock_items.last.update_column(:count_on_hand, 0)
               product.master.stock_items.last.update_column(:backorderable, true)
 
-              within_row(1) { click_icon 'arrows-h' }
+              visit spree.edit_admin_order_path(order)
+
+              within('tr', text: line_item.sku) { click_icon 'arrows-h' }
               complete_split_to(stock_location2, quantity: 2)
 
               expect(page).to have_content("Pending package from 'Clarksville'")
@@ -295,10 +328,12 @@ describe "Order Details", type: :feature, js: true do
             order.contents.add(create(:variant), 2)
             order.reload
 
+            visit spree.edit_admin_order_path(order)
+
             expect(order.shipments.count).to eq(1)
             expect(order.shipments.first.manifest.count).to eq(2)
 
-            within_row(1) { click_icon 'arrows-h' }
+            within('tr', text: line_item.sku) { click_icon 'arrows-h' }
             complete_split_to(stock_location2)
 
             expect(page).to have_css('.shipment', count: 2)
@@ -312,14 +347,15 @@ describe "Order Details", type: :feature, js: true do
       end
 
       context 'removing an item' do
+        let!(:shipment2) { order.shipments.create(stock_location_id: stock_location2.id) }
+
         it "removes only the one item" do
-          @shipment2 = order.shipments.create(stock_location_id: stock_location2.id)
-          order.line_items[0].inventory_units[0].update!(shipment: @shipment2)
+          order.line_items[0].inventory_units[0].update!(shipment: shipment2)
           visit spree.edit_admin_order_path(order)
 
           expect(page).to have_css('.stock-item', count: 2)
 
-          within '[data-hook=admin_shipment_form]', text: @shipment2.number do
+          within '[data-hook=admin_shipment_form]', text: shipment2.number do
             accept_confirm "Are you sure you want to delete this record?" do
               click_icon :trash
             end
@@ -330,20 +366,19 @@ describe "Order Details", type: :feature, js: true do
       end
 
       context 'splitting to shipment' do
-        before do
-          @shipment2 = order.shipments.create(stock_location_id: stock_location2.id)
-          visit spree.edit_admin_order_path(order)
-        end
+        let!(:shipment2) { order.shipments.create(stock_location_id: stock_location2.id) }
 
         it 'should delete the old shipment if enough are split off' do
           expect(order.shipments.count).to eq(2)
 
-          within_row(1) { click_icon 'arrows-h' }
-          complete_split_to(@shipment2, quantity: 2)
+          visit spree.edit_admin_order_path(order)
+
+          within('tr', text: line_item.sku) { click_icon 'arrows-h' }
+          complete_split_to(shipment2, quantity: 2)
 
           expect(page).not_to have_content(/Move .* to/)
 
-          expect(page).to have_css("#shipment_#{@shipment2.id}", count: 1)
+          expect(page).to have_css("#shipment_#{shipment2.id}", count: 1)
 
           expect(order.shipments.count).to eq(1)
           expect(order.shipments.last.inventory_units_for(product.master).count).to eq(2)
@@ -354,18 +389,20 @@ describe "Order Details", type: :feature, js: true do
 
           it 'should not allow a split if the receiving shipment qty plus the incoming is greater than the count_on_hand' do
             expect(order.shipments.count).to eq(2)
+
+            visit spree.edit_admin_order_path(order)
             expect(page).to have_css('.item-name', text: product.name, count: 1)
 
-            within_row(1) { click_icon 'arrows-h' }
-            complete_split_to(@shipment2, quantity: 1)
+            within('tr', text: line_item.sku) { click_icon 'arrows-h' }
+            complete_split_to(shipment2, quantity: 1)
 
             expect(page).to have_css('.item-name', text: product.name, count: 2)
 
             within(all('.stock-contents', count: 2).first) do
-              within_row(1) { click_icon 'arrows-h' }
+              within('tr', text: line_item.sku) { click_icon 'arrows-h' }
 
               accept_alert("Desired shipment not enough stock in desired stock location") do
-                complete_split_to(@shipment2, quantity: 200)
+                complete_split_to(shipment2, quantity: 200)
               end
             end
 
@@ -375,21 +412,24 @@ describe "Order Details", type: :feature, js: true do
           end
 
           it 'should not allow a shipment to split stock to itself' do
-            within_row(1) { click_icon 'arrows-h' }
+            visit spree.edit_admin_order_path(order)
+            within('tr', text: line_item.sku) { click_icon 'arrows-h' }
             click_on 'Choose location'
             within '.select2-results' do
-              expect(page).to have_content(@shipment2.number)
-              expect(page).not_to have_content(@shipment1.number)
+              expect(page).to have_content(shipment2.number)
+              expect(page).not_to have_content(shipment1.number)
             end
           end
 
           it 'should split fine if more than one line_item is in the receiving shipment' do
             variant2 = create(:variant)
-            order.contents.add(variant2, 2, shipment: @shipment2)
+            order.contents.add(variant2, 2, shipment: shipment2)
             order.reload
 
-            within_row(1) { click_icon 'arrows-h' }
-            complete_split_to(@shipment2, quantity: 1)
+            visit spree.edit_admin_order_path(order)
+
+            within('tr', text: line_item.sku) { click_icon 'arrows-h' }
+            complete_split_to(shipment2, quantity: 1)
 
             expect(page).not_to have_content(/Move .* to/)
             expect(page).to have_css('.shipment', count: 2)
@@ -404,19 +444,21 @@ describe "Order Details", type: :feature, js: true do
 
         context 'receiving shipment can backorder' do
           it 'should add more to the backorder' do
-            @shipment1.inventory_units.update_all(state: :on_hand)
+            shipment1.inventory_units.update_all(state: :on_hand)
             product.master.stock_items.last.update_column(:backorderable, true)
             product.master.stock_items.last.update_column(:count_on_hand, 0)
-            expect(@shipment2.reload.backordered?).to eq(false)
+            expect(shipment2.reload).not_to be_backordered
+
+            visit spree.edit_admin_order_path(order)
 
-            within_row(1) { click_icon 'arrows-h' }
-            complete_split_to(@shipment2, quantity: 1)
+            within('tr', text: line_item.sku) { click_icon 'arrows-h' }
+            complete_split_to(shipment2, quantity: 1)
 
             expect(page).to have_content("1 x Backordered")
 
             within('.stock-contents', text: "1 x On hand") do
-              within_row(1) { click_icon 'arrows-h' }
-              complete_split_to(@shipment2, quantity: 1)
+              within('tr', text: line_item.sku) { click_icon 'arrows-h' }
+              complete_split_to(shipment2, quantity: 1)
             end
 
             # Empty shipment should be removed
@@ -508,10 +550,10 @@ describe "Order Details", type: :feature, js: true do
     it "can change the shipping method" do
       order = create(:completed_order_with_totals)
       visit spree.edit_admin_order_path(order)
-      within("table.index tr.show-method") do
+      within("tr", text: "Shipping Method") do
         click_icon :edit
       end
-      select "UPS Ground $100.00", from: "selected_shipping_rate_id"
+      select "UPS Ground $100.00"
       click_icon :check
 
       expect(page).not_to have_css('#selected_shipping_rate_id')