solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe "Cancelling + Resuming", :type => :feature do
-
+describe "Cancelling + Resuming", type: :feature do
   stub_authorization!
 
   let(:user) { build_stubbed(:user, id: 123, spree_api_key: 'fake') }

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

@@ -8,7 +8,7 @@ describe "Cancelling inventory" do
       :order_ready_to_ship,
       number: "R100",
       state: "complete",
-      line_items_count: 1,
+      line_items_count: 1
     )
   end
 

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

@@ -28,7 +28,7 @@ describe "Customer Details", type: :feature, js: true do
       end
       click_icon :plus
       expect(page).to have_css('.line-item')
-      click_link "Customer Details"
+      click_link "Customer"
       targetted_select2 "foobar@example.com", from: "#s2id_customer_search"
       # 5317 - Address prefills using user's default.
       expect(page).to have_field('First Name', with: user.bill_address.firstname)
@@ -48,7 +48,7 @@ describe "Customer Details", type: :feature, js: true do
   context "editing an order" do
     before do
       configure_spree_preferences do |config|
-        config.default_country_id = country.id
+        config.default_country_iso = country.iso
         config.company = true
       end
 
@@ -61,7 +61,7 @@ describe "Customer Details", type: :feature, js: true do
       before { create(:country, iso: "BRA", name: "Brazil") }
 
       it "changes state field to text input" do
-        click_link "Customer Details"
+        click_link "Customer"
 
         within("#billing") do
           targetted_select2 "Brazil", from: "#s2id_order_bill_address_attributes_country_id"
@@ -70,7 +70,7 @@ describe "Customer Details", type: :feature, js: true do
 
         click_button "Update"
         expect(page).to have_content "Customer Details Updated"
-        click_link "Customer Details"
+        click_link "Customer"
         expect(page).to have_field("order_bill_address_attributes_state_name", with: "Piaui")
       end
     end
@@ -79,12 +79,12 @@ describe "Customer Details", type: :feature, js: true do
       order.ship_address = create(:address)
       order.save!
 
-      click_link "Customer Details"
+      click_link "Customer"
       within("#shipping") { fill_in_address "ship" }
       within("#billing") { fill_in_address "bill" }
 
       click_button "Update"
-      click_link "Customer Details"
+      click_link "Customer"
 
       # 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
@@ -95,7 +95,7 @@ describe "Customer Details", type: :feature, js: true do
 
     it "should show validation errors" do
       order.update_attributes!(ship_address_id: nil)
-      click_link "Customer Details"
+      click_link "Customer"
       click_button "Update"
       expect(page).to have_content("Shipping address first name can't be blank")
     end
@@ -103,7 +103,7 @@ describe "Customer Details", type: :feature, js: true do
     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 Details"
+      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
@@ -111,17 +111,17 @@ describe "Customer Details", type: :feature, js: true do
     end
 
     context "country associated was removed" do
-      let(:brazil) { create(:country, iso: "BRA", name: "Brazil") }
+      let(:brazil) { create(:country, iso: "BR", name: "Brazil") }
 
       before do
         order.bill_address.country.destroy
         configure_spree_preferences do |config|
-          config.default_country_id = brazil.id
+          config.default_country_iso = brazil.iso
         end
       end
 
       it "sets default country when displaying form" do
-        click_link "Customer Details"
+        click_link "Customer"
         expect(page).to have_field("order_bill_address_attributes_country_id", with: brazil.id)
       end
     end
@@ -133,7 +133,7 @@ describe "Customer Details", type: :feature, js: true do
       end
 
       specify do
-        click_link "Customer Details"
+        click_link "Customer"
         # Need to fill in valid information so it passes validations
         fill_in "order_ship_address_attributes_firstname",  with: "John 99"
         fill_in "order_ship_address_attributes_lastname",   with: "Doe"

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

@@ -7,11 +7,11 @@ describe "Order Line Items", type: :feature, js: true do
   before do
     # Removing the delivery step causes the order page to render a different
     # partial, called _line_items, which shows line items rather than shipments
-    allow(Spree::Order).to receive_messages :checkout_step_names => [:address, :payment, :confirm, :complete]
+    allow(Spree::Order).to receive_messages checkout_step_names: [:address, :payment, :confirm, :complete]
   end
 
   let!(:order) do
-    order = create(:order_with_line_items, :line_items_count => 1)
+    order = create(:order_with_line_items, line_items_count: 1)
     order.shipments.destroy_all
     order
   end
@@ -20,7 +20,7 @@ describe "Order Line Items", type: :feature, js: true do
     visit spree.edit_admin_order_path(order)
     within(".line-items") do
       find(".edit-line-item").click
-      fill_in "quantity", :with => 10
+      fill_in "quantity", with: 10
       find(".save-line-item").click
     end
     within '.line-item-qty-show' do

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

@@ -112,7 +112,7 @@ describe "Orders Listing", type: :feature, js: true do
       before(:each) do
         @order1.order_promotions.build(
           promotion: promotion,
-          promotion_code: promotion_code,
+          promotion_code: promotion_code
         )
         @order1.save
         visit spree.admin_orders_path
@@ -126,5 +126,25 @@ describe "Orders Listing", type: :feature, js: true do
         within("table#listing_orders") { expect(page).not_to have_content("R200") }
       end
     end
+
+    context "when toggling the completed orders checkbox" do
+      before do
+        create(:order, number: 'R300', completed_at: nil, state: 'cart')
+      end
+
+      it "shows both complete and incomplete orders" do
+        check "q_completed_at_not_null"
+        click_on 'Filter'
+
+        expect(page).to have_content("R200")
+        expect(page).to_not have_content("R300")
+
+        uncheck "q_completed_at_not_null"
+        click_on 'Filter Results'
+
+        expect(page).to have_content("R200")
+        expect(page).to have_content("R300")
+      end
+    end
   end
 end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Log entries", :type => :feature do
+describe "Log entries", type: :feature do
   stub_authorization!
 
   let!(:payment) { create(:payment) }
@@ -10,12 +10,12 @@ describe "Log entries", :type => :feature do
       response = ActiveMerchant::Billing::Response.new(
         true,
         "Transaction successful",
-        :transid => "ABCD1234"
+        transid: "ABCD1234"
       )
 
       payment.log_entries.create(
-        :source => payment.source,
-        :details => response.to_yaml
+        source: payment.source,
+        details: response.to_yaml
       )
     end
 
@@ -34,12 +34,12 @@ describe "Log entries", :type => :feature do
       response = ActiveMerchant::Billing::Response.new(
         false,
         "Transaction failed",
-        :transid => "ABCD1234"
+        transid: "ABCD1234"
       )
 
       payment.log_entries.create(
-        :source => payment.source,
-        :details => response.to_yaml
+        source: payment.source,
+        details: response.to_yaml
       )
     end
 

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "New Order", :type => :feature do
+describe "New Order", type: :feature do
   let!(:product) { create(:product_in_stock) }
   let!(:state) { create(:state) }
   let!(:store) { create(:store) }
@@ -29,7 +29,7 @@ describe "New Order", :type => :feature do
     fill_in_quantity("table.stock-levels", "quantity_0", 2)
 
     click_icon :plus
-    click_on "Customer Details"
+    click_on "Customer"
 
     within "#select-customer" do
       targetted_select2_search user.email, from: "#s2id_customer_search"
@@ -73,7 +73,7 @@ describe "New Order", :type => :feature do
         expect(page).to have_content(product.name)
       end
 
-      click_on "Customer Details"
+      click_on "Customer"
 
       within "#select-customer" do
         targetted_select2_search user.email, from: "#s2id_customer_search"
@@ -122,7 +122,7 @@ describe "New Order", :type => :feature do
   # 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"
+      click_on "Customer"
 
       within "#select-customer" do
         targetted_select2_search user.email, from: "#s2id_customer_search"
@@ -165,7 +165,7 @@ describe "New Order", :type => :feature do
 
       expect(page).to have_css('.line-item')
 
-      click_link "Customer Details"
+      click_link "Customer"
       targetted_select2 user.email, from: "#s2id_customer_search"
       click_button "Update"
       expect(Spree::Order.last.state).to eq 'delivery'
@@ -178,9 +178,9 @@ describe "New Order", :type => :feature do
       user.update!(email: xss_string)
     end
     it "displays the user's email escaped without executing" do
-      click_on "Customer Details"
+      click_on "Customer"
       targetted_select2_search user.email, from: "#s2id_customer_search"
-      expect(page).to have_field("Email", with: xss_string)
+      expect(page).to have_field("Customer E-Mail", with: xss_string)
     end
   end
 

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

@@ -3,12 +3,12 @@ require 'spec_helper'
 
 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!(: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(:shipment) { create(:shipment, :order => order, :stock_location => stock_location) }
-  let!(:shipping_method) { create(:shipping_method, :name => "Default") }
+  # let(:shipment) { create(:shipment, :order => order, :stock_location => stock_location) }
+  let!(:shipping_method) { create(:shipping_method, name: "Default") }
 
   before do
     order.shipments.create(stock_location_id: stock_location.id)
@@ -18,21 +18,19 @@ describe "Order Details", type: :feature, js: true do
   context 'as Admin' do
     stub_authorization!
 
-
     context "cart edit page" do
       before do
         product.master.stock_items.first.update_column(:count_on_hand, 100)
         visit spree.cart_admin_order_path(order)
       end
 
-
       it "should allow me to edit order details" do
         expect(page).to have_content("spree t-shirt")
         expect(page).to have_content("$40.00")
 
         within_row(1) do
           click_icon :edit
-          fill_in "quantity", :with => "1"
+          fill_in "quantity", with: "1"
         end
         click_icon :ok
 
@@ -42,9 +40,9 @@ describe "Order Details", type: :feature, js: true do
       end
 
       it "can add an item to a shipment" do
-        select2_search "spree t-shirt", :from => Spree.t(:name_or_sku)
+        select2_search "spree t-shirt", from: Spree.t(:name_or_sku)
         within("table.stock-levels") do
-          fill_in "quantity_0", :with => 2
+          fill_in "quantity_0", with: 2
         end
 
         click_icon :plus
@@ -87,7 +85,7 @@ describe "Order Details", type: :feature, js: true do
         within(".show-tracking") do
           click_icon :edit
         end
-        fill_in "tracking", :with => "FOOBAR"
+        fill_in "tracking", with: "FOOBAR"
         click_icon :check
 
         expect(page).not_to have_css("input[name=tracking]")
@@ -100,7 +98,7 @@ describe "Order Details", type: :feature, js: true do
         within("table.index tr.show-method") do
           click_icon :edit
         end
-        select2 "Default", :from => "Shipping Method"
+        select2 "Default", from: "Shipping Method"
         click_icon :check
 
         expect(page).not_to have_css('#selected_shipping_rate_id')
@@ -115,7 +113,7 @@ describe "Order Details", type: :feature, js: true do
       end
 
       context "with special_instructions present" do
-        let(:order) { create(:order, :state => 'complete', :completed_at => "2011-02-01 12:36:15", :number => "R100", :special_instructions => "Very special instructions here") }
+        let(:order) { create(:order, state: 'complete', completed_at: "2011-02-01 12:36:15", number: "R100", special_instructions: "Very special instructions here") }
         it "will show the special_instructions" do
           visit spree.edit_admin_order_path(order)
           expect(page).to have_content("Very special instructions here")
@@ -130,9 +128,9 @@ describe "Order Details", type: :feature, js: true do
         end
 
         it "adds variant to order just fine" do
-          select2_search tote.name, :from => Spree.t(:name_or_sku)
+          select2_search tote.name, from: Spree.t(:name_or_sku)
           within("table.stock-levels") do
-            fill_in "variant_quantity", :with => 1
+            fill_in "variant_quantity", with: 1
           end
 
           click_icon :plus
@@ -160,7 +158,6 @@ describe "Order Details", type: :feature, js: true do
       end
     end
 
-
     context 'Shipment edit page' do
       let!(:stock_location2) { create(:stock_location_with_items, name: 'Clarksville') }
 
@@ -254,7 +251,6 @@ describe "Order Details", type: :feature, js: true do
             expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
             expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
 
-
             fill_in 'item_quantity', with: -1
             click_icon :ok
 
@@ -266,9 +262,8 @@ describe "Order Details", type: :feature, js: true do
           end
 
           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', number: "R100")
               order.shipments.create!(stock_location_id: stock_location.id, state: 'shipped')
 
               visit spree.cart_admin_order_path(order)
@@ -278,7 +273,6 @@ describe "Order Details", type: :feature, js: true do
               expect(page).not_to have_selector('.fa-arrows-h')
               expect(page).not_to have_selector('.fa-trash')
             end
-
           end
         end
 
@@ -299,7 +293,6 @@ describe "Order Details", type: :feature, js: true do
               expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
               expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
             end
-
           end
 
           context 'but it can backorder' do
@@ -341,6 +334,21 @@ describe "Order Details", type: :feature, js: true do
         end
       end
 
+      context 'removing an item' do
+        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)
+          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
+            click_icon :trash
+          end
+
+          expect(page).to have_css('.stock-item', count: 1)
+        end
+      end
 
       context 'splitting to shipment' do
         before do
@@ -356,7 +364,9 @@ describe "Order Details", type: :feature, js: true do
           fill_in 'item_quantity', with: 2
           click_icon :ok
 
-          wait_for_ajax
+          expect(page).not_to have_content(/Move .* to/)
+
+          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)
@@ -367,12 +377,15 @@ 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)
+            expect(page).to have_css('.item-name', text: product.name, count: 1)
 
             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
 
+            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' }
               targetted_select2 @shipment2.number, from: '#s2id_item_stock_location'
@@ -406,9 +419,11 @@ describe "Order Details", type: :feature, js: true 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
 
-            wait_for_ajax
+            expect(page).not_to have_content(/Move .* to/)
+            expect(page).to have_css('.shipment', count: 2)
 
             expect(order.shipments.count).to eq(2)
             expect(order.shipments.first.inventory_units_for(product.master).count).to eq 1
@@ -452,7 +467,7 @@ describe "Order Details", type: :feature, js: true do
       allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
     end
 
-    custom_authorization! do |user|
+    custom_authorization! do |_user|
       can [:admin, :index, :read, :edit], Spree::Order
     end
     it "should not display forbidden links" do
@@ -469,7 +484,6 @@ describe "Order Details", type: :feature, js: true do
       # Order item actions
       expect(page).not_to have_css('.delete-item')
       expect(page).not_to have_css('.split-item')
-      expect(page).not_to have_css('.edit-item')
       expect(page).not_to have_css('.edit-tracking')
 
       expect(page).not_to have_css('#add-line-item')
@@ -477,7 +491,7 @@ describe "Order Details", type: :feature, js: true do
   end
 
   context 'as Fakedispatch' do
-    custom_authorization! do |user|
+    custom_authorization! do |_user|
       # allow dispatch to :admin, :index, and :edit on Spree::Order
       can [:admin, :edit, :index, :read], Spree::Order
       # allow dispatch to :index, :show, :create and :update shipments on the admin
@@ -493,8 +507,6 @@ describe "Order Details", type: :feature, js: true do
     it 'should not display order tabs or edit buttons without ability' do
       visit spree.edit_admin_order_path(order)
 
-      # Order Form
-      expect(page).not_to have_css('.edit-item')
       # Order Tabs
       expect(page).not_to have_link('Adjustments')
       expect(page).not_to have_link('Payments')
@@ -507,7 +519,7 @@ describe "Order Details", type: :feature, js: true do
       within("table.index tr.show-method") do
         click_icon :edit
       end
-      select2 "Default", :from => "Shipping Method"
+      select2 "Default", from: "Shipping Method"
       click_icon :check
 
       expect(page).not_to have_css('#selected_shipping_rate_id')