solidus_backend 2.2.2 → 2.3.0.beta1

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

@@ -12,7 +12,7 @@ describe "Tax Rates", type: :feature do
 
   # 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.current)
+    tax_rate.tax_categories.first.update_column(:deleted_at, Time.current)
     click_link "Tax Rates"
 
     expect(find("table tbody td:nth-child(3)")).to have_content('N/A')

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

@@ -5,7 +5,7 @@ describe "Adjustments", type: :feature do
 
   let!(:ship_address) { create(:address) }
   let!(:tax_zone) { create(:global_zone) } # will include the above address
-  let!(:tax_rate) { create(:tax_rate, amount: 0.20, zone: tax_zone, tax_category: tax_category) }
+  let!(:tax_rate) { create(:tax_rate, amount: 0.20, zone: tax_zone, tax_categories: [tax_category]) }
 
   let!(:order) do
     create(

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

@@ -24,7 +24,6 @@ describe "Customer Details", type: :feature, js: true do
       visit spree.admin_path
       click_link "Orders"
       click_link "New Order"
-      click_on 'Cart'
 
       add_line_item product.name, quantity: quantity
 
@@ -79,7 +78,7 @@ describe "Customer Details", type: :feature, js: true do
         click_link "Customer"
 
         within("#billing") do
-          targetted_select2 "Brazil", from: "#s2id_order_bill_address_attributes_country_id"
+          select "Brazil", from: "Country"
           fill_in "order_bill_address_attributes_state_name", with: "Piaui"
         end
 
@@ -95,8 +94,8 @@ describe "Customer Details", type: :feature, js: true do
       order.save!
 
       click_link "Customer"
-      within("#shipping") { fill_in_address "ship" }
-      within("#billing") { fill_in_address "bill" }
+      within("#shipping") { fill_in_address }
+      within("#billing") { fill_in_address }
 
       click_button "Update"
       click_link "Customer"
@@ -136,6 +135,7 @@ describe "Customer Details", type: :feature, js: true do
       end
 
       it "sets default country when displaying form" do
+        click_link "Cart"
         click_link "Customer"
         expect(page).to have_field("order_bill_address_attributes_country_id", with: brazil.id, visible: false)
       end
@@ -158,18 +158,17 @@ describe "Customer Details", type: :feature, js: true do
         fill_in "order_ship_address_attributes_city",       with: "Bethesda"
         fill_in "order_ship_address_attributes_zipcode",    with: "20170"
 
-        select_state('Alabama', 'ship')
+        within("#shipping") do
+          select 'Alabama', from: "State"
+        end
+
         fill_in "order_ship_address_attributes_phone", with: "123-456-7890"
         click_button "Update"
       end
     end
   end
 
-  def select_state(state_name, kind = "bill")
-    targetted_select2 state_name, from: "#s2id_order_#{kind}_address_attributes_state_id"
-  end
-
-  def fill_in_address(kind = "bill")
+  def fill_in_address
     fill_in "First Name",              with: "John 99"
     fill_in "Last Name",               with: "Doe"
     fill_in "Company",                 with: "Company"
@@ -177,7 +176,7 @@ describe "Customer Details", type: :feature, js: true do
     fill_in "Street Address (cont'd)", with: "#101"
     fill_in "City",                    with: "Bethesda"
     fill_in "Zip Code",                with: "20170"
-    select_state("Alabama", kind)
+    select 'Alabama', from: "State"
     fill_in "Phone",                   with: "123-456-7890"
   end
 end

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

@@ -73,7 +73,7 @@ describe "Orders Listing", type: :feature, js: true do
         main_store, other_store = stores
 
         click_on "Filter Results"
-        select2 main_store.name, from: Spree.t(:store)
+        select main_store.name, from: Spree.t(:store)
         click_on "Filter Results"
 
         within_row(1) do

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

@@ -4,7 +4,7 @@ describe "New Order", type: :feature do
   include OrderFeatureHelper
 
   let!(:product) { create(:product_in_stock) }
-  let!(:state) { create(:state) }
+  let!(:state) { create(:state, state_code: 'CA') }
   let!(:store) { create(:store) }
   let!(:user) { create(:user, ship_address: create(:address), bill_address: create(:address)) }
   let!(:payment_method) { create(:check_payment_method) }
@@ -25,7 +25,6 @@ describe "New Order", type: :feature do
   end
 
   it "completes new order succesfully without using the cart", js: true do
-    click_on 'Cart'
     add_line_item product.name
 
     click_on "Customer"
@@ -60,7 +59,6 @@ describe "New Order", type: :feature do
   end
 
   it 'can create split payments', js: true do
-    click_on 'Cart'
     add_line_item product.name
 
     click_on "Customer"
@@ -87,7 +85,6 @@ describe "New Order", type: :feature do
 
   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'
       add_line_item product.name
 
       within(".line-items") do
@@ -119,7 +116,6 @@ describe "New Order", type: :feature do
     end
 
     it "can still see line items" do
-      click_on 'Cart'
       add_line_item product.name
 
       within(".line-items") do
@@ -149,8 +145,7 @@ describe "New Order", type: :feature do
       fill_in_address
       click_on "Update"
 
-      click_on "Shipments"
-
+      # Automatically redirected to Shipments page
       select2_search product.name, from: Spree.t(:name_or_sku)
 
       click_icon :plus
@@ -175,8 +170,6 @@ describe "New Order", type: :feature do
     end
 
     it "transitions to delivery not to complete" do
-      click_on 'Cart'
-
       add_line_item product.name
 
       expect(page).to have_css('.line-item')
@@ -200,14 +193,14 @@ describe "New Order", type: :feature do
     end
   end
 
-  def fill_in_address(kind = "bill")
+  def fill_in_address
     fill_in "First Name",                with: "John 99"
     fill_in "Last Name",                 with: "Doe"
     fill_in "Street Address",            with: "100 first lane"
     fill_in "Street Address (cont'd)",   with: "#101"
     fill_in "City",                      with: "Bethesda"
     fill_in "Zip Code",                  with: "20170"
-    targetted_select2_search state.name, from: "#s2id_order_#{kind}_address_attributes_state_id"
+    select state.name, from: "State"
     fill_in "Phone",                     with: "123-456-7890"
   end
 end

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

@@ -9,8 +9,6 @@ describe "Order Details", type: :feature, js: true do
   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") }
 
   before do
     @shipment1 = order.shipments.create(stock_location_id: stock_location.id)
@@ -57,7 +55,7 @@ describe "Order Details", type: :feature, js: true do
         expect(page).to have_content("spree t-shirt")
 
         within_row(1) do
-          accept_alert do
+          accept_confirm "Are you sure you want to delete this record?" do
             click_icon :trash
           end
         end
@@ -74,7 +72,7 @@ describe "Order Details", type: :feature, js: true do
 
         within_row(1) do
           # Click "cancel" on confirmation dialog
-          dismiss_confirm do
+          dismiss_confirm "Are you sure you want to delete this record?" do
             click_icon :trash
           end
         end
@@ -101,11 +99,11 @@ describe "Order Details", type: :feature, js: true do
         within("table.index tr.show-method") do
           click_icon :edit
         end
-        select2 "Default", from: "Shipping Method"
+        select "UPS Ground $100.00", from: "Shipping Method"
         click_icon :check
 
         expect(page).not_to have_css('#selected_shipping_rate_id')
-        expect(page).to have_content("Default")
+        expect(page).to have_content("UPS Ground")
       end
 
       context "with a completed order" do
@@ -219,35 +217,24 @@ describe "Order Details", type: :feature, js: true do
             expect(order.shipments.first.stock_location.id).to eq(stock_location2.id)
           end
 
-          it 'should not split anything if the input quantity is garbage' do
-            expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
-
-            within_row(1) { click_icon 'arrows-h' }
-            complete_split_to(stock_location2, quantity: 'ff')
-
-            accept_alert "undefined"
-
-            expect(order.shipments.count).to eq(1)
-            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
-
           it 'should not allow less than or equal to zero qty' do
             expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
 
             within_row(1) { click_icon 'arrows-h' }
-            complete_split_to(stock_location2, quantity: 0)
 
-            accept_alert "undefined"
+            accept_alert "Unable to complete split" do
+              complete_split_to(stock_location2, quantity: 0)
+            end
 
             expect(order.shipments.count).to eq(1)
             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
 
-            accept_alert "undefined"
+            accept_alert "Unable to complete split" do
+              click_icon :ok
+            end
 
             expect(order.shipments.count).to eq(1)
             expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
@@ -278,7 +265,7 @@ describe "Order Details", type: :feature, js: true do
               within_row(1) { click_icon 'arrows-h' }
               complete_split_to(stock_location2, quantity: 2)
 
-              accept_alert "undefined"
+              accept_alert "Unable to complete split"
 
               expect(order.shipments.count).to eq(1)
               expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
@@ -333,7 +320,9 @@ describe "Order Details", type: :feature, js: true do
           expect(page).to have_css('.stock-item', count: 2)
 
           within '[data-hook=admin_shipment_form]', text: @shipment2.number do
-            click_icon :trash
+            accept_confirm "Are you sure you want to delete this record?" do
+              click_icon :trash
+            end
           end
 
           expect(page).to have_css('.stock-item', count: 1)
@@ -374,10 +363,11 @@ describe "Order Details", type: :feature, js: true do
 
             within(all('.stock-contents', count: 2).first) do
               within_row(1) { click_icon 'arrows-h' }
-              complete_split_to(@shipment2, quantity: 200)
-            end
 
-            accept_alert "undefined"
+              accept_alert("Unable to complete split") do
+                complete_split_to(@shipment2, quantity: 200)
+              end
+            end
 
             expect(order.shipments.count).to eq(2)
             expect(order.shipments.first.inventory_units_for(product.master).count).to eq(1)
@@ -520,11 +510,11 @@ describe "Order Details", type: :feature, js: true do
       within("table.index tr.show-method") do
         click_icon :edit
       end
-      select2 "Default", from: "Shipping Method"
+      select "UPS Ground $100.00", from: "Shipping Method"
       click_icon :check
 
       expect(page).not_to have_css('#selected_shipping_rate_id')
-      expect(page).to have_content("Default")
+      expect(page).to have_content("UPS Ground")
     end
 
     it 'can ship' do

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

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe "Return payment state spec" do
+  stub_authorization!
+
+  before do
+    Spree::RefundReason.create!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false)
+  end
+
+  let!(:order) { create(:shipped_order) }
+
+  # Regression test for https://github.com/spree/spree/issues/6229
+  it "refunds and has outstanding_balance of zero", js: true do
+    expect(order).to have_attributes(
+      total: 110,
+      refund_total: 0,
+      payment_total: 110,
+      outstanding_balance: 0,
+      payment_state: 'paid'
+    )
+
+    # From an order with a shipped shipment
+    visit "/admin/orders/#{order.number}/edit"
+
+    # Create a Return Authorization (select the Original Reimbursement type)
+    click_on 'RMA'
+    click_on 'New RMA'
+
+    find('.add-item').click # check first (and only) item
+    select Spree::StockLocation.first.name, from: 'return_authorization[stock_location_id]', visible: false
+    click_on 'Create'
+
+    # Create a Customer Return (select the item from 'Items in Return Authorizations')
+    click_on 'Customer Returns'
+    click_on 'New Customer Return'
+
+    find('input.add-item').click # check first (and only) item
+    select 'Received', from: 'customer_return[return_items_attributes][0][reception_status_event]', visible: false
+    select Spree::StockLocation.first.name, from: 'customer_return[stock_location_id]', visible: false
+    click_on 'Create'
+
+    # Create reimbursement
+    click_on 'Create reimbursement'
+
+    # Reimburse.
+    click_on 'Reimburse'
+
+    expect(page).to have_css('tr.reimbursement-refund')
+
+    order.reload
+
+    expect(order).to have_attributes(
+      total: 110,
+      refund_total: 10,
+      payment_total: 100,
+      outstanding_balance: 0,
+      payment_state: 'paid'
+    )
+  end
+end

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

@@ -73,11 +73,18 @@ describe "Shipments", type: :feature do
       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 "#shipment_#{shipment2.id}" do
+        expect(page).to have_content("UPS Ground")
+      end
 
       within_row(2) { click_icon 'arrows-h' }
       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)
+
+      within "#shipment_#{shipment2.id}" do
+        expect(page).to have_content("UPS Ground")
+      end
     end
 
     context "with a ready-to-ship order" do

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

@@ -30,22 +30,33 @@ describe "Product Images", type: :feature do
       click_button "Update"
       expect(page).to have_content("successfully created!")
 
+      # Icons are hidden, so hover to have them pop-up
+      find('tbody > tr').hover
       within_row(1) do
-        click_icon(:edit)
+        within ".actions" do
+          click_icon :edit
+        end
       end
+
       fill_in "image_alt", with: "ruby on rails t-shirt"
       click_button "Update"
-      expect(page).to have_content("successfully updated!")
-      expect(page).to have_content("ruby on rails t-shirt")
 
+      expect(page).to have_content "successfully updated!"
+      expect(page).to have_field "image[alt]", with: "ruby on rails t-shirt"
+
+      find('tbody > tr').hover
       accept_alert do
         click_icon :trash
       end
-      expect(page).not_to have_content("ruby on rails t-shirt")
+      expect(page).not_to have_field "image[alt]", with: "ruby on rails t-shirt"
     end
   end
 
   context 'Via the upload zone', js: true do
+    before do
+      create(:variant, product: product)
+    end
+
     it "uploads an image with ajax and appends it to the images table" do
       visit spree.admin_product_images_path(product)
       expect(page).to have_content("No images found")
@@ -58,22 +69,30 @@ describe "Product Images", type: :feature do
       expect(page).not_to have_content("No images found")
 
       within("table.index") do
-        expect(page).to have_css("tbody tr", count: 1)
+        expect(page).to have_css "tbody tr", count: 1
 
         within("tbody") do
-          expect(page).to have_xpath("//img[contains(@src,'ror_ringer')]")
+          expect(page).to have_xpath "//img[contains(@src,'ror_ringer')]"
+          expect(page).to have_content "All"
         end
+
+        # Change the image to the other variant
+        targetted_select2 "Size: S", from: "#s2id_image_viewable_id"
+        click_icon :check
+        expect(page).to have_content "Size: S"
       end
+
+      expect(Spree::Image.last.viewable).to eq(product.master)
     end
   end
 
-  # Regression test for https://github.com/spree/spree/issues/2228
-  it "should see variant images" do
+  it "should see variant images and allow for inline changing the image's variant", js: true do
     variant = create(:variant)
     variant.images.create!(attachment: File.open(file_path))
     visit spree.admin_product_images_path(variant.product)
 
     expect(page).not_to have_content("No Images Found.")
+
     within("table.index") do
       expect(page).to have_content(variant.options_text)
 
@@ -85,10 +104,30 @@ describe "Product Images", type: :feature do
         expect(page).to have_content("Variant")
       end
 
-      # ensure variant header is displayed
       within("tbody") do
         expect(page).to have_content("Size: S")
       end
+
+      # Do an inline change of variant and alt
+      targetted_select2 "All", from: "#s2id_image_viewable_id"
+      fill_in 'image[alt]', with: 'ruby on rails t-shirt'
+      click_icon :check
+
+      expect(page).to have_content "All"
+      expect(page).to have_field "image[alt]", with: "ruby on rails t-shirt"
+
+      # test escape
+      find("#image_alt").click # to focus
+      fill_in 'image[alt]', with: 'red shirt'
+      find("#image_alt").send_keys(:escape)
+      expect(page).to have_field "image[alt]", with: "ruby on rails t-shirt"
+
+      # And then go back to Size S variant, but using Enter key
+      targetted_select2 "Size: S", from: "#s2id_image_viewable_id"
+      find("#s2id_image_viewable_id").send_keys(:return)
+
+      expect(page).to have_content "Size: S"
+      expect(page).to have_field "image[alt]", with: "ruby on rails t-shirt"
     end
   end