solidus_backend 1.1.4 → 1.2.0.beta1

data/spec/controllers/spree/admin/payment_methods_controller_spec.rb

@@ -10,7 +10,7 @@ module Spree
 
     let(:payment_method) { GatewayWithPassword.create!(:name => "Bogus", :preferred_password => "haxme") }
 
-    # regression test for #2094
+    # regression test for https://github.com/spree/spree/issues/2094
     it "does not clear password on update" do
       expect(payment_method.preferred_password).to eq("haxme")
       spree_put :update, :id => payment_method.id, :payment_method => { :type => payment_method.class.to_s, :preferred_password => "" }
@@ -22,9 +22,7 @@ module Spree
 
     context "tries to save invalid payment" do
       it "doesn't break, responds nicely" do
-        expect {
-          spree_post :create, :payment_method => { :name => "", :type => "Spree::Gateway::Bogus" }
-        }.not_to raise_error
+        spree_post :create, :payment_method => { :name => "", :type => "Spree::Gateway::Bogus" }
       end
     end
 

data/spec/controllers/spree/admin/payments_controller_spec.rb

@@ -23,7 +23,7 @@ module Spree
               :source_attributes => {
                 :name => "Test User",
                 :number => "4111 1111 1111 1111",
-                :expiry => "09 / #{Time.now.year + 1}",
+                :expiry => "09 / #{Time.current.year + 1}",
                 :verification_value => "123"
               }
             }
@@ -71,7 +71,7 @@ module Spree
         end
       end
 
-      # Regression test for #3233
+      # Regression test for https://github.com/spree/spree/issues/3233
       context "with a backend payment method" do
         before do
           @payment_method = create(:check_payment_method, :display_on => "back_end")

data/spec/controllers/spree/admin/products_controller_spec.rb

@@ -6,7 +6,7 @@ describe Spree::Admin::ProductsController, :type => :controller do
   context "#index" do
     let(:ability_user) { stub_model(Spree::LegacyUser, :has_spree_role? => true) }
 
-    # Regression test for #1259
+    # Regression test for https://github.com/spree/spree/issues/1259
     it "can find a product by SKU" do
       product = create(:product, :sku => "ABC123")
       spree_get :index, :q => { :sku_start => "ABC123" }
@@ -15,7 +15,7 @@ describe Spree::Admin::ProductsController, :type => :controller do
     end
   end
 
-  # regression test for #1370
+  # regression test for https://github.com/spree/spree/issues/1370
   context "adding properties to a product" do
     let!(:product) { create(:product) }
     specify do
@@ -143,7 +143,7 @@ describe Spree::Admin::ProductsController, :type => :controller do
     end
   end
 
-  # regression test for #801
+  # regression test for https://github.com/spree/spree/issues/801
   context "destroying a product" do
     let(:product) do
       product = create(:product)

data/spec/controllers/spree/admin/reports_controller_spec.rb

@@ -31,10 +31,10 @@ describe Spree::Admin::ReportsController, :type => :controller do
 
     before do
       # can't set completed_at during factory creation
-      order_complete_start_of_month.completed_at = Time.zone.now.beginning_of_month + 1.minute
+      order_complete_start_of_month.completed_at = Time.current.beginning_of_month + 1.minute
       order_complete_start_of_month.save!
 
-      order_complete_mid_month.completed_at = Time.zone.now.beginning_of_month + 15.days
+      order_complete_mid_month.completed_at = Time.current.beginning_of_month + 15.days
       order_complete_mid_month.save!
     end
 
@@ -84,7 +84,7 @@ describe Spree::Admin::ReportsController, :type => :controller do
     end
 
     context 'when params has a completed_at_gt' do
-      let(:params) { { q: { completed_at_gt: Time.zone.now.beginning_of_month + 1.day } } }
+      let(:params) { { q: { completed_at_gt: Time.current.beginning_of_month + 1.day } } }
 
       it_behaves_like 'sales total report' do
         let(:expected_returned_orders) { [order_complete_mid_month] }
@@ -101,7 +101,7 @@ describe Spree::Admin::ReportsController, :type => :controller do
     end
 
     context 'when params has a compeleted_at_lt' do
-      let(:params) { { q: { completed_at_lt: Time.zone.now.beginning_of_month } } }
+      let(:params) { { q: { completed_at_lt: Time.current.beginning_of_month } } }
 
       it_behaves_like 'sales total report' do
         let(:expected_returned_orders) { [order_complete_start_of_month] }

data/spec/controllers/spree/admin/return_authorizations_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Spree::Admin::ReturnAuthorizationsController, :type => :controller do
   stub_authorization!
 
-  # Regression test for #1370 #3
+  # Regression test for https://github.com/spree/spree/issues/1370 #3
   let!(:order) { create(:shipped_order, line_items_count: 3) }
   let!(:return_reason) { create(:return_reason) }
   let(:inventory_unit_1) { order.inventory_units.order('id asc')[0] }

data/spec/controllers/spree/admin/shipping_methods_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Spree::Admin::ShippingMethodsController, :type => :controller do
   stub_authorization!
 
-  # Regression test for #1240
+  # Regression test for https://github.com/spree/spree/issues/1240
   it "should not hard-delete shipping methods" do
     shipping_method = stub_model(Spree::ShippingMethod)
     allow(Spree::ShippingMethod).to receive_messages :find => shipping_method

data/spec/controllers/spree/admin/stock_locations_controller_spec.rb

@@ -5,7 +5,7 @@ module Spree
     describe StockLocationsController, :type => :controller do
       stub_authorization!
       
-      # Regression for #4272
+      # Regression for https://github.com/spree/spree/issues/4272
       context "with no countries present" do
         it "cannot create a new stock location" do
           spree_get :new

data/spec/controllers/spree/admin/stock_transfers_controller_spec.rb

@@ -20,8 +20,8 @@ module Spree
         StockTransfer.create do |transfer|
           transfer.source_location_id = warehouse.id
           transfer.destination_location_id = la_store.id
-          transfer.finalized_at = DateTime.now
-          transfer.closed_at = DateTime.now
+          transfer.finalized_at = DateTime.current
+          transfer.closed_at = DateTime.current
         end }
 
       describe "stock location filtering" do
@@ -31,8 +31,8 @@ module Spree
 
         before do
           ability.cannot :manage, Spree::StockLocation
-          ability.can :transfer_from, Spree::StockLocation, id: [warehouse.id]
-          ability.can :transfer_to, Spree::StockLocation, id: [ny_store.id, la_store.id]
+          ability.can :display, Spree::StockLocation, id: [warehouse.id]
+          ability.can :display, Spree::StockLocation, id: [ny_store.id, la_store.id]
 
           allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(user)
           allow_any_instance_of(Spree::Admin::BaseController).to receive(:current_ability).and_return(ability)
@@ -163,7 +163,7 @@ module Spree
 
       context 'stock transfer is not finalizable' do
         before do
-          transfer_with_items.update_attributes(finalized_at: Time.now)
+          transfer_with_items.update_attributes(finalized_at: Time.current)
         end
 
         it 'redirects back to edit' do
@@ -302,12 +302,14 @@ module Spree
       end
     end
 
-    context "#finish" do
-      let(:stock_transfer) { Spree::StockTransfer.create(source_location: warehouse, destination_location: ny_store, created_by: create(:admin_user))}
+    context "#ship" do
+      let(:stock_transfer) { Spree::StockTransfer.create(source_location: warehouse, destination_location: ny_store, created_by: create(:admin_user)) }
       let(:transfer_variant) { create(:variant) }
       let(:warehouse_stock_item) { warehouse.stock_items.find_by(variant: transfer_variant) }
       let(:ny_stock_item) { ny_store.stock_items.find_by(variant: transfer_variant) }
 
+      subject { spree_put :ship, id: stock_transfer.number }
+
       before do
         warehouse_stock_item.set_count_on_hand(1)
         stock_transfer.transfer_items.create!(variant: transfer_variant, expected_quantity: 1)
@@ -316,14 +318,14 @@ module Spree
       context "with transferable items" do
 
         it "marks the transfer shipped" do
-          spree_put :ship, :id => stock_transfer.number
+          subject
 
           expect(stock_transfer.reload.shipped_at).to_not be_nil
           expect(flash[:success]).to be_present
         end
 
         it "makes stock movements for the transferred items" do
-          spree_put :ship, :id => stock_transfer.number
+          subject
 
           expect(Spree::StockMovement.count).to eq 1
           expect(warehouse_stock_item.reload.count_on_hand).to eq 0
@@ -334,13 +336,13 @@ module Spree
         before { warehouse_stock_item.set_count_on_hand(0) }
 
         it "does not mark the transfer shipped" do
-          spree_put :ship, :id => stock_transfer.number
+          subject
 
           expect(stock_transfer.reload.shipped_at).to be_nil
         end
 
         it "errors and redirects to tracking_info page" do
-          spree_put :ship, :id => stock_transfer.number
+          subject
 
           expect(flash[:error]).to match /not enough inventory/
           expect(response).to redirect_to(spree.tracking_info_admin_stock_transfer_path(stock_transfer))

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

@@ -3,9 +3,12 @@ require 'spec_helper'
 describe "General Settings", type: :feature, js: true do
   stub_authorization!
 
+  let!(:store) do
+    create(:store, name: 'Test Store', url: 'test.example.org',
+           mail_from_address: 'test@example.org')
+  end
+
   before(:each) do
-    store = create(:store, name: 'Test Store', url: 'test.example.org',
-                           mail_from_address: 'test@example.org')
     visit spree.admin_path
     click_link "Settings"
     click_link "General Settings"
@@ -14,9 +17,9 @@ describe "General Settings", type: :feature, js: true do
   context "visiting general settings (admin)" do
     it "should have the right content" do
       expect(page).to have_content("General Settings")
-      expect(find("#store_name").value).to eq("Test Store")
-      expect(find("#store_url").value).to eq("test.example.org")
-      expect(find("#store_mail_from_address").value).to eq("test@example.org")
+      expect(page).to have_field("store_name", with: "Test Store")
+      expect(page).to have_field("store_url", with: "test.example.org")
+      expect(page).to have_field("store_mail_from_address", with: "test@example.org")
     end
   end
 
@@ -27,8 +30,8 @@ describe "General Settings", type: :feature, js: true do
       click_button "Update"
 
       assert_successful_update_message(:general_settings)
-      expect(find("#store_name").value).to eq("Spree Demo Site99")
-      expect(find("#store_mail_from_address").value).to eq("spree@example.org")
+      expect(page).to have_field("store_name", with: "Spree Demo Site99")
+      expect(page).to have_field("store_mail_from_address", with: "spree@example.org")
     end
   end
 

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

@@ -52,7 +52,7 @@ describe "Payment Methods", :type => :feature do
       fill_in "payment_method_name", :with => "Payment 99"
       click_button "Update"
       expect(page).to have_content("successfully updated!")
-      expect(find_field("payment_method_name").value).to eq("Payment 99")
+      expect(page).to have_field("payment_method_name", with: "Payment 99")
     end
 
     it "should display validation errors" do

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

@@ -46,7 +46,7 @@ describe "Shipping Methods", :type => :feature do
     end
   end
 
-  # Regression test for #1331
+  # Regression test for https://github.com/spree/spree/issues/1331
   context "update" do
     it "can change the calculator", :js => true do
       within("#listing_shipping_methods") do

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

@@ -46,7 +46,7 @@ describe "States", :type => :feature do
       click_button "Create"
       expect(page).to have_content("successfully created!")
       expect(page).to have_content("Pest megye")
-      expect(find("#s2id_country span").text).to eq("Hungary")
+      expect(find("#s2id_country")).to have_content("Hungary")
     end
 
     it "should show validation errors", :js => true do

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

@@ -10,16 +10,15 @@ describe "Tax Rates", :type => :feature do
     click_link "Settings"
   end
 
-  # Regression test for #535
+  # Regression test for https://github.com/spree/spree/issues/535
   it "can see a tax rate in the list if the tax category has been deleted" do
-    tax_rate.tax_category.update_column(:deleted_at, Time.now)
-    expect { click_link "Tax Rates" }.not_to raise_error
-    within(:xpath, all("table tbody td")[2].path) do
-      expect(page).to have_content("N/A")
-    end
+    tax_rate.tax_category.update_column(:deleted_at, Time.current)
+    click_link "Tax Rates"
+
+    expect(find("table tbody td:nth-child(3)")).to have_content('N/A')
   end
 
-  # Regression test for #1422
+  # Regression test for https://github.com/spree/spree/issues/1422
   it "can create a new tax rate" do
     click_link "Tax Rates"
     click_link "New Tax Rate"

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

@@ -12,7 +12,7 @@ describe "Taxonomies", :type => :feature do
     it "should display existing taxonomies" do
       create(:taxonomy, :name => 'Brand')
       create(:taxonomy, :name => 'Categories')
-      click_link "Taxonomies"
+      click_nav "Products", "Taxonomies"
       within_row(1) { expect(page).to have_content("Brand") }
       within_row(2) { expect(page).to have_content("Categories") }
     end
@@ -20,7 +20,7 @@ describe "Taxonomies", :type => :feature do
 
   context "create" do
     before(:each) do
-      click_link "Taxonomies"
+      click_nav "Products", "Taxonomies"
       click_link "admin_new_taxonomy_link"
     end
 
@@ -41,7 +41,7 @@ describe "Taxonomies", :type => :feature do
   context "edit" do
     it "should allow an admin to update an existing taxonomy" do
       create(:taxonomy)
-      click_link "Taxonomies"
+      click_nav "Products", "Taxonomies"
       within_row(1) { click_icon :edit }
       fill_in "taxonomy_name", :with => "sports 99"
       click_button "Update"

data/spec/features/admin/homepage_spec.rb

@@ -11,7 +11,7 @@ describe "Homepage", :type => :feature do
       end
 
       it "should have a link to overview" do
-        within(:xpath, ".//figure[@data-hook='logo-wrapper']") { page.find(:xpath, "a[@href='/admin']") }
+        within(".admin-nav-header") { page.find(:xpath, "a[@href='/admin']") }
       end
 
       it "should have a link to orders" do
@@ -19,7 +19,7 @@ describe "Homepage", :type => :feature do
       end
 
       it "should have a link to products" do
-        page.find_link("Products")['/admin/products']
+        page.assert_selector(:link, text: "Products", count: 2)
       end
 
       it "should have a link to reports" do
@@ -37,19 +37,19 @@ describe "Homepage", :type => :feature do
       end
 
       it "should have a link to products" do
-        within('#sub-menu') { page.find_link("Products")['/admin/products'] }
+        within('.selected .admin-subnav') { page.find_link("Products")['/admin/products'] }
       end
 
       it "should have a link to option types" do
-        within('#sub-menu') { page.find_link("Option Types")['/admin/option_types'] }
+        within('.selected .admin-subnav') { page.find_link("Option Types")['/admin/option_types'] }
       end
 
       it "should have a link to properties" do
-        within('#sub-menu') { page.find_link("Properties")['/admin/properties'] }
+        within('.selected .admin-subnav') { page.find_link("Properties")['/admin/properties'] }
       end
 
       it "should have a link to prototypes" do
-        within('#sub-menu') { page.find_link("Prototypes")['/admin/prototypes'] }
+        within('.selected .admin-subnav') { page.find_link("Prototypes")['/admin/prototypes'] }
       end
     end
   end

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

@@ -14,8 +14,8 @@ describe "Cancelling + Resuming", :type => :feature do
   let(:order) do
     order = create(:order)
     order.update_columns({
-      :state => 'complete',
-      :completed_at => Time.now
+      state: 'complete',
+      completed_at: Time.current
     })
     order
   end
@@ -24,9 +24,7 @@ describe "Cancelling + Resuming", :type => :feature do
     visit spree.edit_admin_order_path(order.number)
     click_button 'cancel'
     within(".additional-info") do
-      within(".state") do
-        expect(page).to have_content("canceled")
-      end
+      expect(find('dt#order_status + dd')).to have_content("canceled")
     end
   end
 
@@ -39,9 +37,7 @@ describe "Cancelling + Resuming", :type => :feature do
       visit spree.edit_admin_order_path(order.number)
       click_button 'resume'
       within(".additional-info") do
-        within(".state") do
-          expect(page).to have_content("resumed")
-        end
+        expect(find('dt#order_status + dd')).to have_content("resumed")
       end
     end
   end

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

@@ -6,7 +6,7 @@ describe "Customer Details", type: :feature, js: true do
   let(:country) { create(:country, name: "Kangaland") }
   let(:state) { create(:state, name: "Alabama", country: country) }
   let!(:shipping_method) { create(:shipping_method, display_on: "front_end") }
-  let!(:order) { create(:order, state: 'complete', completed_at: "2011-02-01 12:36:15") }
+  let!(:order) { create(:order, ship_address: ship_address, bill_address: bill_address, state: 'complete', completed_at: "2011-02-01 12:36:15") }
   let!(:product) { create(:product_in_stock) }
 
   # We need a unique name that will appear for the customer dropdown
@@ -16,7 +16,7 @@ describe "Customer Details", type: :feature, js: true do
   let!(:user) { create(:user, email: 'foobar@example.com', ship_address: ship_address, bill_address: bill_address) }
 
   context "brand new order" do
-    # Regression test for #3335 & #5317
+    # Regression test for https://github.com/spree/spree/issues/3335 and https://github.com/spree/spree/issues/5317
     it "associates a user when not using guest checkout" do
       visit spree.admin_path
       click_link "Orders"
@@ -69,8 +69,9 @@ describe "Customer Details", type: :feature, js: true do
         end
 
         click_button "Update"
+        expect(page).to have_content "Customer Details Updated"
         click_link "Customer Details"
-        expect(find_field("order_bill_address_attributes_state_name").value).to eq("Piaui")
+        expect(page).to have_field("order_bill_address_attributes_state_name", with: "Piaui")
       end
     end
 
@@ -85,10 +86,10 @@ describe "Customer Details", type: :feature, js: true do
       click_button "Update"
       click_link "Customer Details"
 
-      # Regression test for #2950 + #2433
+      # Regression test for https://github.com/spree/spree/issues/2950 and https://github.com/spree/spree/issues/2433
       # This act should transition the state of the order as far as it will go too
       within("#order_tab_summary") do
-        expect(find(".state").text).to eq("COMPLETE")
+        expect(find("dt#order_status + dd")).to have_content("COMPLETE")
       end
     end
 
@@ -121,11 +122,11 @@ describe "Customer Details", type: :feature, js: true do
 
       it "sets default country when displaying form" do
         click_link "Customer Details"
-        expect(find_field("order_bill_address_attributes_country_id").value.to_i).to eq brazil.id
+        expect(page).to have_field("order_bill_address_attributes_country_id", with: brazil.id)
       end
     end
 
-    # Regression test for #942
+    # Regression test for https://github.com/spree/spree/issues/942
     context "errors when no shipping methods are available" do
       before do
         Spree::ShippingMethod.delete_all
@@ -144,7 +145,7 @@ describe "Customer Details", type: :feature, js: true do
 
         page.select('Alabama', from: 'order_ship_address_attributes_state_id')
         fill_in "order_ship_address_attributes_phone", with: "123-456-7890"
-        expect { click_button "Update" }.not_to raise_error
+        click_button "Update"
       end
     end
   end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-# Tests for #3958's features
+# Tests for https://github.com/spree/spree/issues/3958's features
 describe "Order Line Items", type: :feature, js: true do
   stub_authorization!
 

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

@@ -79,13 +79,13 @@ describe "Orders Listing", type: :feature, js: true do
         Spree::Config[:orders_per_page] = @old_per_page
       end
 
-      # Regression test for #4004
+      # Regression test for https://github.com/spree/spree/issues/4004
       it "should be able to go from page to page for incomplete orders" do
         10.times { Spree::Order.create email: "incomplete@example.com" }
         click_on 'Filter'
         uncheck "q_completed_at_not_null"
         click_on 'Filter Results'
-        within(".pagination") do
+        within(".pagination", match: :first) do
           click_link "2"
         end
         expect(page).to have_content("incomplete@example.com")

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

@@ -21,7 +21,7 @@ describe "Log entries", :type => :feature do
 
     it "shows a successful attempt" do
       visit spree.admin_order_payments_path(payment.order)
-      find("#payment_#{payment.id} a").click
+      click_on payment.number
       click_link "Logs"
       within("#listing_log_entries") do
         expect(page).to have_content("Transaction successful")
@@ -45,11 +45,11 @@ describe "Log entries", :type => :feature do
 
     it "shows a failed attempt" do
       visit spree.admin_order_payments_path(payment.order)
-      find("#payment_#{payment.id} a").click
+      click_on payment.number
       click_link "Logs"
       within("#listing_log_entries") do
         expect(page).to have_content("Transaction failed")
       end
     end
   end
-end
+end

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

@@ -91,7 +91,7 @@ describe "New Order", :type => :feature do
     end
   end
 
-  # Regression test for #3958
+  # Regression test for https://github.com/spree/spree/issues/3958
   context "without a delivery step", js: true do
     before do
       allow(Spree::Order).to receive_messages checkout_step_names: [:address, :payment, :confirm, :complete]
@@ -119,7 +119,7 @@ describe "New Order", :type => :feature do
     end
   end
 
-  # Regression test for #3336
+  # Regression test for https://github.com/spree/spree/issues/3336
   context "start by customer address" do
     it "completes order fine", js: true do
       click_on "Customer Details"
@@ -149,7 +149,7 @@ describe "New Order", :type => :feature do
     end
   end
 
-  # Regression test for #5327
+  # Regression test for https://github.com/spree/spree/issues/5327
   context "customer with default credit card", js: true do
     before do
       create(:credit_card, default: true, user: user)
@@ -172,18 +172,6 @@ describe "New Order", :type => :feature do
     end
   end
 
-  context "customer with attempted XSS", js: true do
-    let(:xss_string) { %(<script>throw("XSS")</script>) }
-    before do
-      user.update!(email: xss_string)
-    end
-    it "displays the user's email escaped without executing" do
-      click_on "Customer Details"
-      targetted_select2_search user.email, from: "#s2id_customer_search"
-      expect(page).to have_field("Email", with: xss_string)
-    end
-  end
-
   def fill_in_address(kind = "bill")
     fill_in "First Name",                with: "John 99"
     fill_in "Last Name",                 with: "Doe"

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

@@ -67,7 +67,7 @@ describe "Order Details", type: :feature, js: true do
         expect(page).not_to have_content("spree t-shirt")
       end
 
-      # Regression test for #3862
+      # Regression test for https://github.com/spree/spree/issues/3862
       it "can cancel removing an item from a shipment" do
         expect(page).to have_content("spree t-shirt")
 
@@ -373,12 +373,12 @@ describe "Order Details", type: :feature, js: true do
             fill_in 'item_quantity', with: 1
             click_icon :ok
 
-            wait_for_ajax
-
-            within_row(1) { click_icon 'arrows-h' }
-            targetted_select2 @shipment2.number, from: '#s2id_item_stock_location'
-            fill_in 'item_quantity', with: 200
-            click_icon :ok
+            within(all('.stock-contents', count: 2).first) do
+              within_row(1) { click_icon 'arrows-h' }
+              targetted_select2 @shipment2.number, from: '#s2id_item_stock_location'
+              fill_in 'item_quantity', with: 200
+              click_icon :ok
+            end
 
             wait_for_ajax
 
@@ -424,26 +424,23 @@ describe "Order Details", type: :feature, js: true do
             product.master.stock_items.last.update_column(:count_on_hand, 0)
             expect(@shipment2.reload.backordered?).to eq(false)
 
-
             within_row(1) { click_icon 'arrows-h' }
             targetted_select2 @shipment2.number, from: '#s2id_item_stock_location'
             fill_in 'item_quantity', with: 1
             click_icon :ok
 
-            wait_for_ajax
-
-            expect(@shipment2.reload.backordered?).to eq(true)
+            expect(page).to have_content("1 x backordered")
 
-            within_row(1) { click_icon 'arrows-h' }
-            targetted_select2 @shipment2.number, from: '#s2id_item_stock_location'
-            fill_in 'item_quantity', with: 1
-            click_icon :ok
-
-            wait_for_ajax
+            within('.stock-contents', text: "1 x on hand") do
+              within_row(1) { click_icon 'arrows-h' }
+              targetted_select2 @shipment2.number, from: '#s2id_item_stock_location'
+              fill_in 'item_quantity', with: 1
+              click_icon :ok
+            end
 
-            expect(order.shipments.count).to eq(1)
-            expect(order.shipments.last.inventory_units_for(product.master).count).to eq(2)
-            expect(@shipment2.reload.backordered?).to eq(true)
+            # Empty shipment should be removed
+            expect(page).to have_css('.stock-contents', count: 1)
+            expect(page).to have_content("2 x backordered")
           end
         end
       end