solidus_backend 2.7.4 → 2.8.0

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

@@ -32,6 +32,13 @@ describe Spree::Admin::WidgetsController, type: :controller do
     model do
       acts_as_list
       validates :name, presence: true
+      before_destroy :check_destroy_constraints
+
+      def check_destroy_constraints
+        return unless name == 'undestroyable'
+        errors.add :base, "You can't destroy undestroyable things!"
+        throw(:abort)
+      end
     end
   end
 
@@ -146,6 +153,21 @@ describe Spree::Admin::WidgetsController, type: :controller do
     it 'destroys the resource' do
       expect { subject }.to change { Widget.count }.from(1).to(0)
     end
+
+    context 'failure' do
+      let(:widget) { Widget.create!(name: 'undestroyable') }
+      let(:params) { { id: widget.id } }
+
+      context 'js format' do
+        subject { delete :destroy, params: params, format: 'js' }
+
+        it 'responds with error message' do
+          subject
+          expect(response).to be_unprocessable
+          expect(response.body).to eq assigns(:widget).errors.full_messages.join(', ')
+        end
+      end
+    end
   end
 
   describe '#update_positions' do

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

@@ -13,7 +13,7 @@ module Spree
         let(:stock_item) { variant.stock_items.first }
         let!(:user) { create :user }
 
-        before { expect(controller).to receive(:spree_current_user).and_return(user) }
+        before { expect(controller).to receive(:try_spree_current_user).and_return(user) }
         before { request.env["HTTP_REFERER"] = "product_admin_page" }
 
         subject do

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

@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 shared_examples "update reason loader" do
-  it "sets the update_reasons variable to a list of categories sorted by category name " do
-    expect(assigns(:update_reasons)).to eq [update_reason]
+  it "sets the store_credit_reasons variable to a list of categories sorted by category name " do
+    expect(assigns(:store_credit_reasons)).to eq [store_credit_reason]
   end
 end
 
@@ -16,11 +16,11 @@ describe Spree::Admin::StoreCreditsController do
 
   let!(:b_credit_category) { create(:store_credit_category, name: "B category") }
   let!(:a_credit_category) { create(:store_credit_category, name: "A category") }
-  let!(:update_reason)     { create(:store_credit_update_reason) }
+  let!(:store_credit_reason) { create(:store_credit_reason) }
 
   describe "#show" do
     let!(:store_credit) { create(:store_credit, user: user, category: a_credit_category) }
-    let!(:event)        { create(:store_credit_auth_event, store_credit: store_credit, created_at: 5.days.ago) }
+    let!(:event) { create(:store_credit_auth_event, store_credit: store_credit, created_at: 5.days.ago) }
 
     before { get :show, params: { user_id: user.id, id: store_credit.id  } }
 
@@ -173,12 +173,12 @@ describe Spree::Admin::StoreCreditsController do
   describe "#update_amount" do
     let(:original_amount) { 100.0 }
     let!(:store_credit)   { create(:store_credit, user: user, amount: original_amount) }
-    let!(:update_reason)  { create(:store_credit_update_reason) }
+    let!(:store_credit_reason) { create(:store_credit_reason) }
     let(:parameters) do
       {
         user_id: user.id,
         id: store_credit.id,
-        update_reason_id: update_reason.id,
+        store_credit_reason_id: store_credit_reason.id,
         store_credit: {
           amount: updated_amount
         }
@@ -271,7 +271,7 @@ describe Spree::Admin::StoreCreditsController do
       {
         user_id: user.id,
         id: store_credit.id,
-        update_reason_id: update_reason.id
+        store_credit_reason_id: store_credit_reason.id
       }
     end
 

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

@@ -21,8 +21,8 @@ describe "Payment Methods", type: :feature do
       within("table#listing_payment_methods") do
         expect(all("th")[1].text).to eq("Name")
         expect(all("th")[2].text).to eq("Type")
-        expect(all("th")[3].text).to eq("Available to users")
-        expect(all("th")[4].text).to eq("Available to admin")
+        expect(all("th")[3].text).to eq("Available to Users")
+        expect(all("th")[4].text).to eq("Available to Admin")
         expect(all("th")[5].text).to eq("State")
       end
 

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

@@ -18,7 +18,7 @@ describe "Shipping Methods", type: :feature do
       within_row(1) do
         expect(column_text(1)).to eq(shipping_method.name)
         expect(column_text(2)).to eq(zone.name)
-        expect(column_text(3)).to eq("Flat rate")
+        expect(column_text(3)).to eq("Flat Rate")
         expect(column_text(4)).to eq("Yes")
       end
     end
@@ -99,7 +99,7 @@ describe "Shipping Methods", type: :feature do
         click_icon :edit
       end
 
-      select 'Flexible Rate per package item', from: 'Base Calculator'
+      select 'Flexible Rate per Package Item', from: 'Base Calculator'
 
       fill_in 'First Item', with: 10
       fill_in 'Additional Item', with: 20

data/spec/features/admin/homepage_spec.rb

@@ -23,10 +23,6 @@ describe "Homepage", type: :feature do
         expect(page).to have_link("Products", href: "/admin/products", count: 2)
       end
 
-      it "should have a link to reports" do
-        expect(page).to have_link("Reports", href: "/admin/reports")
-      end
-
       it "should have a link to configuration" do
         expect(page).to have_link("Settings", href: "/admin/stores")
       end
@@ -71,7 +67,7 @@ describe "Homepage", type: :feature do
 
   context 'as fakedispatch user' do
     before do
-      allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
+      allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(nil)
     end
 
     custom_authorization! do |_user|
@@ -84,7 +80,6 @@ describe "Homepage", type: :feature do
       expect(page).to have_link('Orders')
       expect(page).not_to have_link('Products')
       expect(page).not_to have_link('Promotions')
-      expect(page).not_to have_link('Reports')
       expect(page).not_to have_link('Settings')
     end
   end

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

@@ -47,7 +47,7 @@ describe "Orders Listing", type: :feature, js: true do
       within_row(1) { expect(page).to have_content("R100") }
       within_row(2) { expect(page).to have_content("R200") }
 
-      click_link "Completed At", exact: false
+      click_link "Completed at", exact: false
 
       # Completed at desc
       within_row(1) { expect(page).to have_content("R200") }

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

@@ -201,6 +201,123 @@ describe "New Order", type: :feature do
     end
   end
 
+  context 'with a checkout_zone set as the country of Canada' do
+    let!(:canada) { create(:country, iso: 'CA', states_required: true) }
+    let!(:canada_state) { create(:state, country: canada) }
+    let!(:checkout_zone) { create(:zone, name: 'Checkout Zone', countries: [canada]) }
+
+    before do
+      Spree::Country.update_all(states_required: true)
+      Spree::Config.checkout_zone = checkout_zone.name
+    end
+
+    context 'and default_country_iso of the United States' do
+      before do
+        Spree::Config.default_country_iso = Spree::Country.find_by!(iso: 'US').iso
+      end
+
+      it 'the shipping address country select includes only options for Canada' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#shipping' do
+          expect(page).to have_select(
+            'Country',
+            options: ['Canada']
+          )
+        end
+      end
+
+      it 'does not show any shipping address state' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#shipping' do
+          expect(page).to have_select(
+            'State',
+            disabled: true,
+            visible: false,
+            options: ['']
+          )
+        end
+      end
+
+      it 'the billing address country select includes only options for Canada' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#billing' do
+          expect(page).to have_select(
+            'Country',
+            options: ['Canada']
+          )
+        end
+      end
+
+      it 'does not show any billing address state' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#billing' do
+          expect(page).to have_select(
+            'State',
+            disabled: true,
+            visible: false,
+            options: ['']
+          )
+        end
+      end
+    end
+
+    context 'and default_country_iso of Canada' do
+      before do
+        Spree::Config.default_country_iso = Spree::Country.find_by!(iso: 'CA').iso
+      end
+
+      it 'defaults the shipping address country to Canada' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#shipping' do
+          expect(page).to have_select(
+            'Country',
+            selected: 'Canada',
+            options: ['Canada']
+          )
+        end
+      end
+
+      it 'shows relevant shipping address states' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#shipping' do
+          expect(page).to have_select(
+            'State',
+            options: [''] + canada.states.map(&:name)
+          )
+        end
+      end
+
+      it 'defaults the billing address country to Canada' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#billing' do
+          expect(page).to have_select(
+            'Country',
+            selected: 'Canada',
+            options: ['Canada']
+          )
+        end
+      end
+
+      it 'shows relevant billing address states' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#billing' do
+          expect(page).to have_select(
+            'State',
+            options: [''] + canada.states.map(&:name)
+          )
+        end
+      end
+    end
+  end
+
   def fill_in_address
     fill_in "First Name",                with: "John 99"
     fill_in "Last Name",                 with: "Doe"

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'New Refund creation', :js do
+  stub_authorization!
+
+  let(:order) { create :order_ready_to_ship }
+  let(:payment) { order.payments.first }
+  let(:amount) { '10.99' }
+  let!(:reason) { create :refund_reason }
+
+  it 'creates a new refund' do
+    visit spree.new_admin_order_payment_refund_path(order, payment)
+    expect(page).not_to have_selector 'td', text: amount
+    within '.new_refund' do
+      fill_in 'refund_amount', with: amount
+      select reason.name, from: 'Reason'
+      click_button 'Refund'
+    end
+    expect(page).to have_content 'Refund has been successfully created!'
+    expect(page).to have_selector 'td', text: amount
+  end
+
+  it 'disables the button at submit' do
+    visit spree.new_admin_order_payment_refund_path(order, payment)
+    page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+    within '.new_refund' do
+      fill_in 'refund_amount', with: amount
+      select reason.name, from: 'Reason'
+      click_button 'Refund'
+      expect(find('input[type="submit"]')).to be_disabled
+    end
+  end
+end

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

@@ -415,7 +415,7 @@ describe "Order Details", type: :feature, js: true do
           it 'should not allow a shipment to split stock to itself' do
             visit spree.edit_admin_order_path(order)
             within('tr', text: line_item.sku) { click_icon 'arrows-h' }
-            click_on 'Choose location'
+            click_on 'Choose Location'
             within '.select2-results' do
               expect(page).to have_content(shipment2.number)
               expect(page).not_to have_content(shipment1.number)
@@ -499,7 +499,7 @@ describe "Order Details", type: :feature, js: true do
 
   context 'with only read permissions' do
     before do
-      allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
+      allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(nil)
     end
 
     custom_authorization! do |_user|

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

@@ -22,7 +22,7 @@ describe 'Payments', type: :feature do
     end
 
     # Regression tests for https://github.com/spree/spree/issues/1453
-    context 'with a check payment' do
+    context 'with a check payment', js: true do
       let(:order) { create(:completed_order_with_totals, number: 'R100') }
       let!(:payment) do
         create(:payment,
@@ -205,7 +205,7 @@ describe 'Payments', type: :feature do
         visit spree.admin_order_payments_path(order.reload)
       end
 
-      it "can successfully be created and captured" do
+      it "can successfully be created and captured", js: true do
         click_on 'Update'
         expect(page).to have_content("Payment has been successfully created!")
         click_icon(:capture)

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

@@ -7,9 +7,12 @@ describe "Return payment state spec" do
 
   before do
     Spree::RefundReason.create!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false)
+    allow_any_instance_of(Spree::Admin::ReimbursementsController).to receive(:try_spree_current_user).
+      and_return(user)
   end
 
   let!(:order) { create(:shipped_order) }
+  let(:user) { create(:admin_user) }
 
   # Regression test for https://github.com/spree/spree/issues/6229
   it "refunds and has outstanding_balance of zero", js: true do

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

@@ -58,6 +58,34 @@ describe "Shipments", type: :feature do
     end
   end
 
+  context "destroying a shipment", js: true do
+    before do
+      visit spree.admin_path
+      click_link "Orders"
+      within_row(1) do
+        click_link "R100"
+      end
+    end
+
+    context "when the line item cannot be found" do
+      it "shows the proper error message" do
+        expect(page).to have_selector '.delete-item'
+        order.shipments.first.line_items.each(&:destroy)
+        accept_alert { first('.delete-item').click }
+        expect(page).to have_content 'The resource you were looking for could not be found.'
+      end
+    end
+
+    context "when the shipment has already been shipped" do
+      it "shows the proper error message" do
+        expect(page).to have_selector '.delete-item'
+        order.shipments.first.ship!
+        accept_alert { first('.delete-item').click }
+        expect(page).to have_content 'Cannot remove items from a shipped shipment'
+      end
+    end
+  end
+
   context "moving variants between shipments", js: true do
     let!(:order) { create(:completed_order_with_pending_payment, number: "R100", state: "complete", line_items_count: 5) }
     let!(:la) { create(:stock_location, name: "LA") }

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

@@ -299,7 +299,7 @@ describe "Products", type: :feature do
 
   context 'with only product permissions' do
     before do
-      allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
+      allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(nil)
     end
 
     custom_authorization! do |_user|

data/spec/features/admin/products/stock_management_spec.rb

@@ -44,31 +44,28 @@ describe "Product Stock", type: :feature do
     it "can create a positive stock adjustment", js: true do
       adjust_count_on_hand('14')
       stock_item.reload
-      expect(stock_item.count_on_hand).to eq 14
+      expect(stock_item.count_on_hand).to eq 24
       expect(stock_item.stock_movements.count).to eq 1
-      expect(stock_item.stock_movements.first.quantity).to eq 4
+      expect(stock_item.stock_movements.first.quantity).to eq 14
     end
 
     it "can create a negative stock adjustment", js: true do
-      adjust_count_on_hand('4')
+      adjust_count_on_hand('-4')
       stock_item.reload
-      expect(stock_item.count_on_hand).to eq 4
+      expect(stock_item.count_on_hand).to eq 6
       expect(stock_item.stock_movements.count).to eq 1
-      expect(stock_item.stock_movements.first.quantity).to eq(-6)
+      expect(stock_item.stock_movements.first.quantity).to eq(-4)
     end
 
     def adjust_count_on_hand(count_on_hand)
-      within('.variant-stock-items', text: variant.sku) do
-        within('tr', text: stock_item.stock_location.name) do
-          click_icon :edit
-          find(:css, "input[type='number']").set(count_on_hand)
-          click_icon :check
-        end
+      within("tr#spree_variant_#{variant.id}") do
+        find(:css, "input[type='number']").set(count_on_hand)
+        click_icon :check
       end
-      expect(page).to have_content('Updated successfully')
+      expect(page).to have_content('Updated Successfully')
     end
 
-    context "with multiple stock locations" do
+    context "with stock locations that don't have stock items for variant yet" do
       before do
         create(:stock_location, name: 'Other location', propagate_all_variants: false)
       end