solidus_backend 1.3.2 → 1.4.0.beta1

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

@@ -2,6 +2,8 @@
 require 'spec_helper'
 
 describe "Order Details", type: :feature, js: true do
+  include OrderFeatureHelper
+
   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) }
@@ -11,8 +13,12 @@ describe "Order Details", type: :feature, js: true do
   let!(:shipping_method) { create(:shipping_method, name: "Default") }
 
   before do
-    order.shipments.create(stock_location_id: stock_location.id)
+    @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
+    # reload now
+    order.reload
   end
 
   context 'as Admin' do
@@ -45,7 +51,7 @@ describe "Order Details", type: :feature, js: true do
           fill_in "quantity_0", with: 2
         end
 
-        click_icon :plus
+        click_button "Add"
 
         within("#order_total") do
           expect(page).to have_content("$80.00")
@@ -61,7 +67,7 @@ describe "Order Details", type: :feature, js: true do
           end
         end
 
-        expect(page).to have_content("YOUR ORDER IS EMPTY") # wait for page refresh
+        expect(page).to have_content("Your order is empty") # wait for page refresh
         expect(page).not_to have_content("spree t-shirt")
       end
 
@@ -133,7 +139,7 @@ describe "Order Details", type: :feature, js: true do
             fill_in "variant_quantity", with: 1
           end
 
-          click_icon :plus
+          click_button 'Add'
 
           within(".line-items") do
             expect(page).to have_content(tote.name)
@@ -152,7 +158,7 @@ describe "Order Details", type: :feature, js: true do
 
           expect(page).to have_selector('.select2-no-results')
           within(".select2-no-results") do
-            expect(page).to have_content("NO MATCHES FOUND")
+            expect(page).to have_content("No matches found")
           end
         end
       end
@@ -179,8 +185,7 @@ describe "Order Details", type: :feature, js: true do
             expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
 
             within_row(1) { click_icon 'arrows-h' }
-            targetted_select2 stock_location2.name, from: '#s2id_item_stock_location'
-            click_icon :ok
+            complete_split_to(stock_location2)
 
             expect(page).to have_css('.shipment', count: 2)
 
@@ -194,11 +199,9 @@ describe "Order Details", type: :feature, js: true do
             expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
 
             within_row(1) { click_icon 'arrows-h' }
-            targetted_select2 stock_location2.name, from: '#s2id_item_stock_location'
-            fill_in 'item_quantity', with: 2
-            click_icon :ok
+            complete_split_to(stock_location2, quantity: 2)
 
-            expect(page).to have_content("PENDING PACKAGE FROM 'CLARKSVILLE'")
+            expect(page).to have_content("pending package from 'Clarksville'")
 
             expect(order.shipments.count).to eq(1)
             expect(order.shipments.last.backordered?).to eq(false)
@@ -210,11 +213,9 @@ describe "Order Details", type: :feature, js: true do
             expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
 
             within_row(1) { click_icon 'arrows-h' }
-            targetted_select2 stock_location2.name, from: '#s2id_item_stock_location'
-            fill_in 'item_quantity', with: 5
-            click_icon :ok
+            complete_split_to(stock_location2, quantity: 5)
 
-            expect(page).to have_content("PENDING PACKAGE FROM 'CLARKSVILLE'")
+            expect(page).to have_content("pending package from 'Clarksville'")
 
             expect(order.shipments.count).to eq(1)
             expect(order.shipments.last.backordered?).to eq(false)
@@ -226,9 +227,7 @@ describe "Order Details", type: :feature, js: true do
             expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
 
             within_row(1) { click_icon 'arrows-h' }
-            targetted_select2 stock_location2.name, from: '#s2id_item_stock_location'
-            fill_in 'item_quantity', with: 'ff'
-            click_icon :ok
+            complete_split_to(stock_location2, quantity: 'ff')
 
             wait_for_ajax
 
@@ -241,9 +240,7 @@ describe "Order Details", type: :feature, js: true do
             expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
 
             within_row(1) { click_icon 'arrows-h' }
-            targetted_select2 stock_location2.name, from: '#s2id_item_stock_location'
-            fill_in 'item_quantity', with: 0
-            click_icon :ok
+            complete_split_to(stock_location2, quantity: 0)
 
             wait_for_ajax
 
@@ -283,9 +280,7 @@ describe "Order Details", type: :feature, js: true do
               product.master.stock_items.last.update_column(:count_on_hand, 0)
 
               within_row(1) { click_icon 'arrows-h' }
-              targetted_select2 stock_location2.name, from: '#s2id_item_stock_location'
-              fill_in 'item_quantity', with: 2
-              click_icon :ok
+              complete_split_to(stock_location2, quantity: 2)
 
               wait_for_ajax
 
@@ -301,11 +296,9 @@ describe "Order Details", type: :feature, js: true do
               product.master.stock_items.last.update_column(:backorderable, true)
 
               within_row(1) { click_icon 'arrows-h' }
-              targetted_select2 stock_location2.name, from: '#s2id_item_stock_location'
-              fill_in 'item_quantity', with: 2
-              click_icon :ok
+              complete_split_to(stock_location2, quantity: 2)
 
-              expect(page).to have_content("PENDING PACKAGE FROM 'CLARKSVILLE'")
+              expect(page).to have_content("pending package from 'Clarksville'")
 
               expect(order.shipments.count).to eq(1)
               expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
@@ -317,12 +310,13 @@ describe "Order Details", type: :feature, js: true do
         context 'multiple items in cart' do
           it 'should have no problem splitting if multiple items are in the from shipment' do
             order.contents.add(create(:variant), 2)
+            order.reload
+
             expect(order.shipments.count).to eq(1)
             expect(order.shipments.first.manifest.count).to eq(2)
 
             within_row(1) { click_icon 'arrows-h' }
-            targetted_select2 stock_location2.name, from: '#s2id_item_stock_location'
-            click_icon :ok
+            complete_split_to(stock_location2)
 
             expect(page).to have_css('.shipment', count: 2)
 
@@ -360,9 +354,7 @@ describe "Order Details", type: :feature, js: true do
           expect(order.shipments.count).to eq(2)
 
           within_row(1) { click_icon 'arrows-h' }
-          targetted_select2 @shipment2.number, from: '#s2id_item_stock_location'
-          fill_in 'item_quantity', with: 2
-          click_icon :ok
+          complete_split_to(@shipment2, quantity: 2)
 
           expect(page).not_to have_content(/Move .* to/)
 
@@ -380,17 +372,13 @@ describe "Order Details", type: :feature, js: true do
             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
+            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' }
-              targetted_select2 @shipment2.number, from: '#s2id_item_stock_location'
-              fill_in 'item_quantity', with: 200
-              click_icon :ok
+              complete_split_to(@shipment2, quantity: 200)
             end
 
             wait_for_ajax
@@ -402,25 +390,20 @@ describe "Order Details", type: :feature, js: true do
 
           it 'should not allow a shipment to split stock to itself' do
             within_row(1) { click_icon 'arrows-h' }
-            targetted_select2 order.shipments.first.number, from: '#s2id_item_stock_location'
-            fill_in 'item_quantity', with: 1
-            click_icon :ok
-
-            wait_for_ajax
-
-            expect(order.shipments.count).to eq(2)
-            expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
+            click_on 'Choose location'
+            within '.select2-results' do
+              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.reload
 
             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
+            complete_split_to(@shipment2, quantity: 1)
 
             expect(page).not_to have_content(/Move .* to/)
             expect(page).to have_css('.shipment', count: 2)
@@ -440,17 +423,13 @@ describe "Order Details", type: :feature, js: true do
             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
+            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' }
-              targetted_select2 @shipment2.number, from: '#s2id_item_stock_location'
-              fill_in 'item_quantity', with: 1
-              click_icon :ok
+              complete_split_to(@shipment2, quantity: 1)
             end
 
             # Empty shipment should be removed
@@ -535,7 +514,7 @@ describe "Order Details", type: :feature, js: true do
       wait_for_ajax
 
       within '.carton-state' do
-        expect(page).to have_content('SHIPPED')
+        expect(page).to have_content('shipped')
       end
     end
   end

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

@@ -66,17 +66,17 @@ describe 'Payments', type: :feature do
       within_row(1) do
         expect(column_text(3)).to eq('$150.00')
         expect(column_text(4)).to eq('Credit Card')
-        expect(column_text(6)).to eq('CHECKOUT')
+        expect(column_text(6)).to eq('checkout')
       end
 
       click_icon :void
-      expect(page).to have_css('#payment_status', text: 'BALANCE DUE')
+      expect(page).to have_css('#payment_status', text: 'balance due')
       expect(page).to have_content('Payment Updated')
 
       within_row(1) do
         expect(column_text(3)).to eq('$150.00')
         expect(column_text(4)).to eq('Credit Card')
-        expect(column_text(6)).to eq('VOID')
+        expect(column_text(6)).to eq('void')
       end
 
       click_on 'New Payment'
@@ -86,7 +86,7 @@ describe 'Payments', type: :feature do
 
       click_icon(:capture)
 
-      expect(page).to have_selector('#payment_status', text: 'PAID')
+      expect(page).to have_selector('#payment_status', text: 'paid')
       expect(page).not_to have_selector('#new_payment_section')
     end
 
@@ -222,6 +222,30 @@ describe 'Payments', type: :feature do
         expect(page).to have_content("Payment Updated")
       end
     end
+
+    context 'with a soft-deleted payment method' do
+      let(:order) { create(:completed_order_with_totals, line_items_count: 1) }
+      let!(:payment_method) { create(:check_payment_method) }
+      let!(:payment) do
+        create(:payment,
+          order:          order,
+          amount:         order.outstanding_balance,
+          payment_method: payment_method
+        )
+      end
+
+      before do
+        payment_method.destroy
+        visit spree.admin_order_payments_path(order.reload)
+      end
+
+      it "can list and view the payment" do
+        expect(page).to have_content(payment.number)
+        click_on payment.number
+        expect(page).to have_current_path("/admin/orders/#{order.number}/payments/#{payment.id}")
+        expect(page).to have_content(payment.amount)
+      end
+    end
   end
 
   # Previously this would fail unless the method was named "Credit Card"
@@ -244,4 +268,33 @@ describe 'Payments', type: :feature do
       expect(page).to have_content("Payment has been successfully created!")
     end
   end
+
+  context "when required quantity is more than available" do
+    let(:product) { create(:product_not_backorderable) }
+
+    let(:order) do
+      create(:order_with_line_items, {
+        line_items_count: 1,
+        line_items_attributes: [{ quantity: 11, product: product }],
+        stock_location: product.master.stock_locations.first
+      })
+    end
+
+    let!(:chequing_payment_method) { create(:check_payment_method) }
+    let!(:payment_method) { create(:credit_card_payment_method, name: "Multipass!") }
+
+    before do
+      visit spree.admin_order_payments_path(order.reload)
+    end
+
+    it "displays an error" do
+      choose payment_method.name
+      fill_in "Card Number", with: "4111 1111 1111 1111"
+      fill_in "Name", with: "Test User"
+      fill_in "Expiration", with: "09 / #{Time.current.year + 1}"
+      fill_in "Card Code", with: "007"
+      click_button "Continue"
+      expect(page).to have_content Spree.t(:insufficient_stock_for_order)
+    end
+  end
 end

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

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "ReturnAuthorizations", type: :feature do
+  include OrderFeatureHelper
+
+  stub_authorization!
+
+  let!(:order) { create(:shipped_order) }
+  let!(:return_authorization) { create(:return_authorization, order: order) }
+
+  it "can visit the return authorizations list page" do
+    visit spree.admin_order_return_authorizations_path(order)
+  end
+
+  describe "edit" do
+    it "can visit the return authorizations edit page" do
+      visit spree.edit_admin_order_return_authorization_path(order, return_authorization)
+    end
+
+    it "return authorizations edit page has a data hook for extensions to add content above, below or within the RA form" do
+      visit spree.edit_admin_order_return_authorization_path(order, return_authorization)
+      expect(page).to have_selector("[data-hook=return-authorization-form-wrapper]")
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe "Shipments", type: :feature do
+  include OrderFeatureHelper
+
   stub_authorization!
 
   let!(:order) { create(:order_ready_to_ship, number: "R100", state: "complete", line_items_count: 5) }
@@ -32,7 +34,7 @@ describe "Shipments", type: :feature do
       find(".ship-shipment-button").click
       wait_for_ajax
 
-      expect(page).to have_content("SHIPPED PACKAGE")
+      expect(page).to have_content("shipped package")
       expect(order.reload.shipment_state).to eq("shipped")
     end
   end
@@ -53,16 +55,14 @@ describe "Shipments", type: :feature do
       shipment1 = order.shipments[0]
 
       within_row(1) { click_icon 'arrows-h' }
-      targetted_select2 'LA', from: '#s2id_item_stock_location'
-      click_icon :ok
+      complete_split_to('LA')
 
       expect(page).to have_css("#shipment_#{shipment1.id} tr.stock-item", count: 4)
       shipment2 = (order.reload.shipments.to_a - [shipment1]).first
       expect(page).to have_css("#shipment_#{shipment2.id} tr.stock-item", count: 1)
 
       within_row(2) { click_icon 'arrows-h' }
-      targetted_select2 "LA(#{shipment2.number})", from: '#s2id_item_stock_location'
-      click_icon :ok
+      complete_split_to("LA(#{shipment2.number})")
       expect(page).to have_css("#shipment_#{shipment2.id} tr.stock-item", count: 2)
       expect(page).to have_css("#shipment_#{shipment1.id} tr.stock-item", count: 3)
     end

data/spec/features/admin/products/edit/products_spec.rb

@@ -15,7 +15,7 @@ describe 'Product Details', type: :feature do
 
       click_link 'Product Details'
 
-      expect(page).to have_css('.page-title', text: 'Products / Bún thịt nướng')
+      expect(page).to have_content('ProductsBún thịt nướng')
       expect(page).to have_field('product_name', with: 'Bún thịt nướng')
       expect(page).to have_field('product_slug', with: 'bun-th-t-n-ng')
       expect(page).to have_field('product_description', with: 'lorem ipsum')

data/spec/features/admin/products/edit/taxons_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe "Product Taxons", type: :feature do
+describe "Product Display Order", type: :feature do
   stub_authorization!
 
-  context "managing taxons", js: true do
+  context "managing display order", js: true do
     def assert_selected_taxons(taxons)
       # Regression test for https://github.com/spree/spree/issues/2139
       taxons.each do |taxon|
@@ -16,7 +16,7 @@ describe "Product Taxons", type: :feature do
 
     let(:product) { create(:product) }
 
-    it "should allow an admin to manage taxons" do
+    it "should allow an admin to manage display order (taxons)" do
       taxon_1 = create(:taxon)
       taxon_2 = create(:taxon, name: 'Clothing')
       product.taxons << taxon_1
@@ -25,7 +25,7 @@ describe "Product Taxons", type: :feature do
 
       assert_selected_taxons([taxon_1])
 
-      select2_search "Clothing", from: "Taxons"
+      select2_search "Clothing", from: "Taxon"
       click_button "Update"
       assert_selected_taxons([taxon_1, taxon_2])
     end
@@ -36,7 +36,7 @@ describe "Product Taxons", type: :feature do
       it "displays the escaped HTML without executing it" do
         visit spree.edit_admin_product_path(product)
 
-        select2_search "<script>", from: "Taxons"
+        select2_search "<script>", from: "Taxon"
 
         expect(page).to have_content(taxon_name)
       end

data/spec/features/admin/products/edit/variants_spec.rb

@@ -16,7 +16,7 @@ describe "Product Variants", type: :feature do
       within_row(1) { click_icon :edit }
 
       within('nav > ul.tabs') { click_link "Variants" }
-      expect(page).to have_content("TO ADD VARIANTS, YOU MUST FIRST DEFINE")
+      expect(page).to have_content("To add variants, you must first define")
     end
 
     it "allows admin to create a variant if there are option types" do