solidus_backend 1.3.2 → 1.4.0.beta1

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

@@ -73,16 +73,16 @@ describe "Payment Methods", type: :feature do
       create(:credit_card_payment_method)
       click_link "Payment Methods"
       click_icon :edit
-      expect(page).to have_content('TEST MODE')
+      expect(page).to have_content('Test Mode')
 
       select2_search 'Spree::PaymentMethod::Check', from: 'Provider'
       expect(page).to have_content('you must save first')
-      expect(page).to have_no_content('TEST MODE')
+      expect(page).to have_no_content('Test Mode')
 
       # change back
       select2_search 'Spree::Gateway::Bogus', from: 'Provider'
       expect(page).to have_no_content('you must save first')
-      expect(page).to have_content('TEST MODE')
+      expect(page).to have_content('Test Mode')
     end
 
     it "displays message when changing preference source" do
@@ -91,16 +91,16 @@ describe "Payment Methods", type: :feature do
       create(:credit_card_payment_method)
       click_link "Payment Methods"
       click_icon :edit
-      expect(page).to have_content('TEST MODE')
+      expect(page).to have_content('Test Mode')
 
       select2_search 'my_prefs', from: 'Preference Source'
       expect(page).to have_content('you must save first')
-      expect(page).to have_no_content('TEST MODE')
+      expect(page).to have_no_content('Test Mode')
 
       # change back
       select2_search 'Custom', from: 'Preference Source'
       expect(page).to have_no_content('you must save first')
-      expect(page).to have_content('TEST MODE')
+      expect(page).to have_content('Test Mode')
     end
 
     it "updates successfully and keeps secrets" do
@@ -118,7 +118,7 @@ describe "Payment Methods", type: :feature do
       # change back
       select2_search 'Custom', from: 'Preference Source'
       click_on 'Update'
-      expect(page).to have_content('TEST MODE')
+      expect(page).to have_content('Test Mode')
       expect(page).to have_no_content('secret')
     end
   end

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

@@ -32,7 +32,7 @@ describe "Stock Locations", type: :feature do
     # Wait for API request to complete.
     wait_for_ajax
     visit current_path
-    expect(page).to have_content("NO STOCK LOCATIONS FOUND")
+    expect(page).to have_content("No Stock Locations found")
   end
 
   it "can update an existing stock location" do

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

@@ -12,7 +12,7 @@ describe "Tax Categories", type: :feature do
     it "should display the existing tax categories" do
       create(:tax_category, name: "Clothing", tax_code: "CL001", description: "For Clothing")
       click_link "Tax Categories"
-      expect(page).to have_content("Listing Tax Categories")
+      expect(page).to have_content("SettingsTaxesTax Categories")
       within_row(1) do
         expect(column_text(1)).to eq("Clothing")
         expect(column_text(2)).to eq("CL001")

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

@@ -6,7 +6,7 @@ describe "Zones", type: :feature do
   before(:each) do
     Spree::Zone.delete_all
     visit spree.admin_path
-    click_link "Areas"
+    click_link "Locations"
   end
 
   context "show" do

data/spec/features/admin/homepage_spec.rb

@@ -43,8 +43,8 @@ describe "Homepage", type: :feature do
         within('.selected .admin-subnav') { page.find_link("Option Types")['/admin/option_types'] }
       end
 
-      it "should have a link to properties" do
-        within('.selected .admin-subnav') { page.find_link("Properties")['/admin/properties'] }
+      it "should have a link to property types" do
+        within('.selected .admin-subnav') { page.find_link("Property Types")['/admin/properties'] }
       end
 
       it "should have a link to prototypes" do

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

@@ -119,7 +119,7 @@ describe "Adjustments", type: :feature do
         end
       end
 
-      expect(page).to have_content(/TOTAL: ?\$170\.00/)
+      expect(page).to have_content(/Total: ?\$170\.00/)
     end
   end
 end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Cancelling inventory" do
+describe "Cancel items" do
   stub_authorization!
 
   let!(:order) do
@@ -20,29 +20,29 @@ describe "Cancelling inventory" do
     end
   end
 
-  context "when some inventory is cancelable" do
-    it "can cancel the inventory" do
+  context "when some items are cancelable" do
+    it "can cancel the item" do
       visit_order
 
-      click_link 'Cancel Inventory'
+      click_link 'Cancel Items'
 
       within_row(1) do
         check 'inventory_unit_ids[]'
       end
 
-      click_button "Cancel Inventory"
+      click_button "Cancel Items"
       expect(page).to have_content("Inventory canceled")
       expect(page).to have_content("1 x canceled")
     end
   end
 
-  context "when all inventory is not cancelable" do
+  context "when all items are not cancelable" do
     before { order.inventory_units.each(&:cancel!) }
 
-    it "does not display the link to cancel inventory" do
+    it "does not display the link to cancel items" do
       visit_order
 
-      expect(page).to have_no_content('Cancel Inventory')
+      expect(page).to have_no_content('Cancel Items')
     end
   end
 end

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

@@ -16,20 +16,25 @@ 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 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
+    let(:quantity) { 1 }
+
+    before do
       visit spree.admin_path
       click_link "Orders"
       click_link "New Order"
       click_on 'Cart'
       select2_search product.name, from: Spree.t(:name_or_sku)
       within("table.stock-levels") do
-        find('.variant_quantity').set(1)
+        find('.variant_quantity').set(quantity)
       end
-      click_icon :plus
+      click_button 'Add'
       expect(page).to have_css('.line-item')
       click_link "Customer"
       targetted_select2 "foobar@example.com", from: "#s2id_customer_search"
+    end
+
+    # 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
       # 5317 - Address prefills using user's default.
       expect(page).to have_field('First Name', with: user.bill_address.firstname)
       expect(page).to have_field('Last Name', with: user.bill_address.lastname)
@@ -43,6 +48,16 @@ describe "Customer Details", type: :feature, js: true do
       click_button "Update"
       expect(Spree::Order.last.user).not_to be_nil
     end
+
+    context "when required quantity is more than available" do
+      let(:quantity) { 11 }
+      let!(:product) { create(:product_not_backorderable) }
+
+      it "displays an error" do
+        click_button "Update"
+        expect(page).to have_content Spree.t(:insufficient_stock_for_order)
+      end
+    end
   end
 
   context "editing an order" do
@@ -89,7 +104,7 @@ describe "Customer Details", type: :feature, js: true do
       # 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("dt#order_status + dd")).to have_content("COMPLETE")
+        expect(find("dt#order_status + dd")).to have_content("complete")
       end
     end
 

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

@@ -17,7 +17,7 @@ describe "Orders Listing", type: :feature, js: true do
     it "should list existing orders" do
       within_row(1) do
         expect(column_text(2)).to eq "R100"
-        expect(column_text(3)).to eq "CART"
+        expect(column_text(3)).to eq "cart"
       end
 
       within_row(2) do
@@ -45,105 +45,132 @@ describe "Orders Listing", type: :feature, js: true do
   end
 
   context "searching orders" do
-    it "should be able to search orders" do
-      click_on 'Filter'
-      fill_in "q_number_cont", with: "R200"
-      click_on 'Filter Results'
-      within_row(1) do
-        expect(page).to have_content("R200")
+    context "when there are multiple stores" do
+      let(:stores) { FactoryGirl.create_pair(:store) }
+
+      before do
+        stores.each do |store|
+          FactoryGirl.create(:completed_order_with_totals, number: "R#{store.id}999", store: store)
+        end
       end
 
-      # Ensure that the other order doesn't show up
-      within("table#listing_orders") { expect(page).not_to have_content("R100") }
-    end
+      it "can find the orders belonging to a specific store" do
+        main_store, other_store = stores
 
-    it "should be able to filter on variant_id" do
-      click_on 'Filter'
-      select2_search @order1.products.first.sku, from: Spree.t(:variant)
-      click_on 'Filter Results'
+        click_on "Filter"
+        select2 main_store.name, from: Spree.t(:store)
+        click_on "Filter Results"
 
-      within_row(1) do
-        expect(page).to have_content(@order1.number)
-      end
+        within_row(1) do
+          expect(page).to have_content("R#{main_store.id}999")
+        end
 
-      expect(page).not_to have_content(@order2.number)
+        # Ensure that the other order doesn't show up
+        within("table#listing_orders") { expect(page).not_to have_content("R#{other_store.id}999") }
+      end
     end
 
-    context "when pagination is really short" do
-      before do
-        @old_per_page = Spree::Config[:orders_per_page]
-        Spree::Config[:orders_per_page] = 1
-      end
+    context "when there's a single store" do
+      it "should be able to search orders" do
+        click_on 'Filter'
+        fill_in "q_number_cont", with: "R200"
+        click_on 'Filter Results'
+        within_row(1) do
+          expect(page).to have_content("R200")
+        end
 
-      after do
-        Spree::Config[:orders_per_page] = @old_per_page
+        # Ensure that the other order doesn't show up
+        within("table#listing_orders") { expect(page).not_to have_content("R100") }
       end
 
-      # 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" }
+      it "should be able to filter on variant_id" do
         click_on 'Filter'
-        uncheck "q_completed_at_not_null"
+        select2_search @order1.products.first.sku, from: Spree.t(:variant)
         click_on 'Filter Results'
-        within(".pagination", match: :first) do
-          click_link "2"
-        end
-        expect(page).to have_content("incomplete@example.com")
-        click_on 'Filter'
-        expect(find("#q_completed_at_not_null")).not_to be_checked
-      end
-    end
 
-    it "should be able to search orders using only completed at input" do
-      click_on 'Filter'
-      fill_in "q_created_at_gt", with: Date.current
+        within_row(1) do
+          expect(page).to have_content(@order1.number)
+        end
 
-      # Just so the datepicker gets out of poltergeists way.
-      page.execute_script("$('#q_created_at_gt').datepicker('widget').hide();")
+        expect(page).not_to have_content(@order2.number)
+      end
 
-      click_on 'Filter Results'
-      within_row(1) { expect(page).to have_content("R100") }
+      context "when pagination is really short" do
+        before do
+          @old_per_page = Spree::Config[:orders_per_page]
+          Spree::Config[:orders_per_page] = 1
+        end
 
-      # Ensure that the other order doesn't show up
-      within("table#listing_orders") { expect(page).not_to have_content("R200") }
-    end
+        after do
+          Spree::Config[:orders_per_page] = @old_per_page
+        end
 
-    context "filter on promotions" do
-      before(:each) do
-        @order1.order_promotions.build(
-          promotion: promotion,
-          promotion_code: promotion_code
-        )
-        @order1.save
-        visit spree.admin_orders_path
+        # 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", match: :first) do
+            click_link "2"
+          end
+          expect(page).to have_content("incomplete@example.com")
+          click_on 'Filter'
+          expect(find("#q_completed_at_not_null")).not_to be_checked
+        end
       end
 
-      it "only shows the orders with the selected promotion" do
+      it "should be able to search orders using only completed at input" do
         click_on 'Filter'
-        fill_in "q_promotions_codes_value_cont", with: promotion.codes.first.value
+        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") }
+
+        # Ensure that the other order doesn't show up
         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')
+      context "filter on promotions" do
+        before(:each) do
+          @order1.order_promotions.build(
+            promotion: promotion,
+            promotion_code: promotion_code
+          )
+          @order1.save
+          visit spree.admin_orders_path
+        end
+
+        it "only shows the orders with the selected promotion" do
+          click_on 'Filter'
+          fill_in "q_promotions_codes_value_cont", 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") }
+        end
       end
 
-      it "shows both complete and incomplete orders" do
-        check "q_completed_at_not_null"
-        click_on 'Filter'
+      context "when toggling the completed orders checkbox" do
+        before do
+          create(:order, number: 'R300', completed_at: nil, state: 'cart')
+        end
 
-        expect(page).to have_content("R200")
-        expect(page).to_not have_content("R300")
+        it "shows both complete and incomplete orders" do
+          check "q_completed_at_not_null"
+          click_on 'Filter'
 
-        uncheck "q_completed_at_not_null"
-        click_on 'Filter Results'
+          expect(page).to have_content("R200")
+          expect(page).to_not have_content("R300")
 
-        expect(page).to have_content("R200")
-        expect(page).to 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/new_order_spec.rb

@@ -28,7 +28,7 @@ describe "New Order", type: :feature do
 
     fill_in_quantity("table.stock-levels", "quantity_0", 2)
 
-    click_icon :plus
+    click_button 'Add'
     click_on "Customer"
 
     within "#select-customer" do
@@ -56,10 +56,39 @@ describe "New Order", type: :feature do
     click_on "ship"
 
     within '.carton-state' do
-      expect(page).to have_content('SHIPPED')
+      expect(page).to have_content('shipped')
     end
   end
 
+  it 'can create split payments', js: true do
+    click_on 'Cart'
+    select2_search product.name, from: Spree.t(:name_or_sku)
+
+    fill_in_quantity("table.stock-levels", "quantity_0", 2)
+
+    click_button 'Add'
+    click_on "Customer"
+
+    within "#select-customer" do
+      targetted_select2_search user.email, from: "#s2id_customer_search"
+    end
+
+    check "order_use_billing"
+    fill_in_address
+    click_on "Update"
+
+    click_on "Payments"
+    fill_in "Amount", with: '10.00'
+    click_on 'Update'
+
+    click_on 'New Payment'
+    fill_in "Amount", with: '29.98'
+    click_on 'Update'
+
+    expect(page).to have_content("$10.00")
+    expect(page).to have_content("$29.98")
+  end
+
   context "adding new item to the order", js: true do
     it "inventory items show up just fine and are also registered as shipments" do
       click_on 'Cart'
@@ -67,7 +96,7 @@ describe "New Order", type: :feature do
 
       fill_in_quantity('table.stock-levels', 'quantity_0', 2)
 
-      click_icon :plus
+      click_button 'Add'
 
       within(".line-items") do
         expect(page).to have_content(product.name)
@@ -103,7 +132,7 @@ describe "New Order", type: :feature do
 
       fill_in_quantity('table.stock-levels', 'quantity_0', 1)
 
-      click_icon :plus
+      click_button 'Add'
 
       within(".line-items") do
         within(".line-item-name") do
@@ -144,7 +173,7 @@ describe "New Order", type: :feature do
       click_on "Continue"
 
       within(".additional-info .state") do
-        expect(page).to have_content("CONFIRM")
+        expect(page).to have_content("confirm")
       end
     end
   end
@@ -161,7 +190,7 @@ describe "New Order", type: :feature do
         find('.variant_quantity').set(1)
       end
 
-      click_icon :plus
+      click_button 'Add'
 
       expect(page).to have_css('.line-item')