solidus_backend 2.7.4 → 2.9.2

data/solidus_backend.gemspec

@@ -26,12 +26,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'coffee-rails'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
-  s.add_dependency 'jbuilder', '~> 2.6'
+  s.add_dependency 'jbuilder', '~> 2.8'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'kaminari', '~> 1.1'
-  s.add_dependency 'sass-rails'
-  s.add_dependency 'sass', '>= 3.5.2'
+  s.add_dependency 'sassc-rails'
 
-  s.add_dependency 'autoprefixer-rails', '~> 7.1'
+  s.add_dependency 'autoprefixer-rails'
   s.add_dependency 'handlebars_assets', '~> 0.23'
 end

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

@@ -15,7 +15,7 @@ describe Spree::Admin::BaseController, type: :controller do
 
   context "unauthorized request" 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
 
     it "redirects to unauthorized" do

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

@@ -22,7 +22,7 @@ describe Spree::Admin::CancellationsController do
   describe "#cancel" do
     subject { post :short_ship, params: { order_id: order.number, inventory_unit_ids: inventory_units.map(&:id) } }
 
-    let(:order) { create(:order_ready_to_ship, number: "R100", state: "complete", line_items_count: 1) }
+    let(:order) { create(:order_with_line_items, line_items_attributes: [{ quantity: 4 }]) }
     let(:referer) { "order_admin_page" }
 
     context "no inventory unit ids are provided" do
@@ -67,12 +67,16 @@ describe Spree::Admin::CancellationsController do
       end
 
       it "creates a unit cancel" do
-        expect { subject }.to change { Spree::UnitCancel.count }.by(1)
+        expect { subject }.to change { Spree::UnitCancel.count }.by(4)
       end
 
       it "cancels the inventory" do
         subject
-        expect(order.inventory_units.map(&:state).uniq).to match_array(['canceled'])
+        expect(order.reload.inventory_units.map(&:state).uniq).to match_array(['canceled'])
+      end
+
+      it "adjusts the order" do
+        expect { subject }.to change { order.reload.total }.by(-40.0)
       end
     end
   end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::LocaleController, type: :controller do
+  stub_authorization!
+
+  before { I18n.backend.store_translations(:fr, {}) }
+
+  after do
+    I18n.locale = :en
+    I18n.reload!
+  end
+
+  context 'switch_to_locale specified' do
+    let(:json_response) { JSON.parse(response.body, symbolize_names: true) }
+
+    before do
+      get :set, params: { switch_to_locale: switch_to_locale, format: :json }
+    end
+
+    context 'available locale' do
+      let(:switch_to_locale) { 'fr' }
+
+      it 'sets locale and returns the location for the redirect' do
+        expect(I18n.locale).to eq :fr
+        expect(session[:admin_locale]).to eq(switch_to_locale)
+        expect(json_response).
+          to eq({ locale: switch_to_locale,
+                  location: spree.admin_url(host: 'test.host') })
+        expect(response).to have_http_status(:ok)
+      end
+    end
+
+    context 'unavailable locale' do
+      let(:switch_to_locale) { 'klingon' }
+
+      it 'does not change locale and returns 404' do
+        expect(I18n.locale).to eq :en
+        expect(json_response).to eq({ locale: 'en', })
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+  end
+end

data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb

@@ -7,11 +7,59 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
   context "with authorization" do
     stub_authorization!
 
-    let(:order) { create(:order, number: "R123456789") }
+    context '#edit' do
+      context 'when order has no shipping nor billing address' do
+        let(:order) { create(:order, number: "R123456789", ship_address: nil, bill_address: nil) }
 
-    before { allow(Spree::Order).to receive_message_chain(:includes, :find_by!) { order } }
+        context "with a checkout_zone set as the country of Canada" do
+          let!(:united_states) { create(:country, iso: 'US', states_required: true) }
+          let!(:canada) { create(:country, iso: 'CA', states_required: true) }
+          let!(:checkout_zone) { create(:zone, name: "Checkout Zone", countries: [canada]) }
+
+          before do
+            stub_spree_preferences(checkout_zone: checkout_zone.name)
+          end
+
+          context "and default_country_iso of the Canada" do
+            before do
+              stub_spree_preferences(default_country_iso: Spree::Country.find_by!(iso: "CA").iso)
+            end
+
+            it 'defaults the shipping address country to Canada' do
+              get :edit, params: { order_id: order.number }
+              expect(assigns(:order).shipping_address.country_id).to eq canada.id
+            end
+
+            it 'defaults the billing address country to Canada' do
+              get :edit, params: { order_id: order.number }
+              expect(assigns(:order).billing_address.country_id).to eq canada.id
+            end
+          end
+
+          context "and default_country_iso of the United States" do
+            before do
+              stub_spree_preferences(default_country_iso: Spree::Country.find_by!(iso: "US").iso)
+            end
+
+            it 'defaults the shipping address country to nil' do
+              get :edit, params: { order_id: order.number }
+              expect(assigns(:order).shipping_address.country_id).to be_nil
+            end
+
+            it 'defaults the billing address country to nil' do
+              get :edit, params: { order_id: order.number }
+              expect(assigns(:order).billing_address.country_id).to be_nil
+            end
+          end
+        end
+      end
+    end
 
     context "#update" do
+      let(:order) { create(:order, number: "R123456789") }
+
+      before { allow(Spree::Order).to receive_message_chain(:includes, :find_by!) { order } }
+
       it "updates + progresses the order" do
         expect(order).to receive(:update_attributes) { true }
         expect(order).to receive(:next) { false }

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

@@ -69,7 +69,7 @@ describe Spree::Admin::OrdersController, type: :controller do
       it "can page through the orders" do
         get :index, params: { page: 2, per_page: 10 }
         expect(assigns[:orders].offset_value).to eq(10)
-        expect(assigns[:orders].current_per_page).to eq(10)
+        expect(assigns[:orders].limit_value).to eq(10)
       end
     end
 
@@ -77,7 +77,7 @@ describe Spree::Admin::OrdersController, type: :controller do
     context "#new" do
       let(:user) { create(:user) }
       before do
-        allow(controller).to receive_messages spree_current_user: user
+        allow(controller).to receive_messages try_spree_current_user: user
       end
 
       it "imports a new order and sets the current user as a creator" do
@@ -140,7 +140,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         end
 
         context 'when order_bill_address_used is true' do
-          before { Spree::Config[:order_bill_address_used] = true }
+          before { stub_spree_preferences(order_bill_address_used: true) }
 
           it "should redirect to the customer details page" do
             get :edit, params: { id: order.number }
@@ -149,7 +149,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         end
 
         context 'when order_bill_address_used is false' do
-          before { Spree::Config[:order_bill_address_used] = false }
+          before { stub_spree_preferences(order_bill_address_used: false) }
 
           it "should redirect to the customer details page" do
             get :edit, params: { id: order.number }
@@ -288,18 +288,30 @@ describe Spree::Admin::OrdersController, type: :controller do
       let(:user) { create(:user) }
 
       before do
-        allow(controller).to receive_messages spree_current_user: user
+        allow(controller).to receive_messages try_spree_current_user: user
         user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
 
-        create(:completed_order_with_totals)
-        expect(Spree::Order.count).to eq 1
+        create_list(:completed_order_with_totals, 2)
+        expect(Spree::Order.count).to eq 2
       end
 
-      it "does not display duplicated results" do
-        get :index, params: { q: {
-          line_items_variant_id_in: Spree::Order.first.variants.map(&:id)
-        } }
-        expect(assigns[:orders].map(&:number).count).to eq 1
+      context 'by line_items_variant_id_in' do
+        it "does not display duplicated results" do
+          get :index, params: { q: {
+            line_items_variant_id_in: Spree::Order.first.variants.map(&:id)
+            } }
+          expect(assigns[:orders].size).to eq 1
+        end
+      end
+
+      context 'by email' do
+        it "does not display duplicated results" do
+          get :index, params: { q: {
+            email_start: Spree::Order.first.email
+            } }
+          expect(assigns[:orders].size).to eq 1
+          expect(assigns[:orders][0].email).to eq(Spree::Order.first.email)
+        end
       end
     end
 
@@ -349,7 +361,7 @@ describe Spree::Admin::OrdersController, type: :controller do
     let!(:order) { create(:completed_order_with_totals, number: 'R987654321') }
 
     before do
-      allow(controller).to receive_messages spree_current_user: user
+      allow(controller).to receive_messages try_spree_current_user: user
     end
 
     it 'should grant access to users with an admin role' do

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

@@ -6,7 +6,7 @@ module Spree
   module Admin
     describe PaymentsController, type: :controller do
       before do
-        allow(controller).to receive_messages spree_current_user: user
+        allow(controller).to receive_messages try_spree_current_user: user
       end
 
       let(:user) { create(:admin_user) }

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

@@ -50,6 +50,78 @@ describe Spree::Admin::ProductsController, type: :controller do
     end
   end
 
+  # regression test for https://github.com/solidusio/solidus/issues/2791
+  context "creating a product" do
+    before(:all) do
+      create(:shipping_category)
+    end
+
+    it "creates a product" do
+      post :create, params: {
+             product: {
+               name: "Product #1 - 9632",
+               description: "As seen on TV!",
+               price: 19.99,
+               shipping_category_id: Spree::ShippingCategory.first.id,
+             }
+           }
+      expect(flash[:success]).to eq("Product \"Product #1 - 9632\" has been successfully created!")
+    end
+
+    context "when there is a taxon" do
+      let(:first_taxon) { create(:taxon) }
+
+      it "creates a product with a taxon" do
+        post :create, params: {
+               product: {
+                 name: "Product #1 - 9632",
+                 description: "As seen on TV!",
+                 price: 19.99,
+                 shipping_category_id: Spree::ShippingCategory.first.id,
+                 taxon_ids: first_taxon.id.to_s
+               }
+             }
+        expect(flash[:success]).to eq("Product \"Product #1 - 9632\" has been successfully created!")
+      end
+
+      context "when their are multiple taxons" do
+        let(:second_taxon) { create(:taxon) }
+
+        it "creates a product with multiple taxons" do
+          post :create, params: {
+                 product: {
+                   name: "Product #1 - 9632",
+                   description: "As seen on TV!",
+                   price: 19.99,
+                   shipping_category_id: Spree::ShippingCategory.first.id,
+                   taxon_ids: "#{first_taxon.id}, #{second_taxon.id}"
+                 }
+               }
+          expect(flash[:success]).to eq("Product \"Product #1 - 9632\" has been successfully created!")
+        end
+      end
+    end
+  end
+
+  context "adding taxons to a product" do
+    let(:product) { create(:product) }
+    let(:first_taxon) { create(:taxon) }
+
+    it "adds a single taxon to a product" do
+      put :update, params: { id: product.to_param, product: { taxon_ids: first_taxon.id.to_s } }
+      expect(flash[:success]).to eq("Product #{product.name.inspect} has been successfully updated!")
+    end
+
+    context "when there are mulitple taxons" do
+      let(:second_taxon) { create(:taxon) }
+
+      it "adds multiple taxons to a product" do
+        put :update, params: { id: product.to_param, product: { taxon_ids: "#{first_taxon.id}, #{second_taxon.id}" } }
+        expect(flash[:success]).to eq("Product #{product.name.inspect} has been successfully updated!")
+      end
+    end
+  end
+
   describe "creating variant property rules" do
     let(:first_property) { create(:property) }
     let(:second_property) { create(:property) }

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

@@ -11,10 +11,22 @@ describe Spree::Admin::PromotionCodesController do
   let!(:code2) { create(:promotion_code, promotion: promotion) }
   let!(:code3) { create(:promotion_code, promotion: promotion) }
 
-  it "can create a promotion rule of a valid type" do
+  it "can create a CSV file with all promotion codes" do
     get :index, params: { promotion_id: promotion.id, format: 'csv' }
     expect(response).to be_successful
     parsed = CSV.parse(response.body, headers: true)
     expect(parsed.entries.map(&:to_h)).to eq([{ "Code" => code1.value }, { "Code" => code2.value }, { "Code" => code3.value }])
   end
+
+  it "can create a new code" do
+    post :create, params: { promotion_id: promotion.id, promotion_code: { value: "new_code" } }
+    expect(response).to redirect_to(spree.admin_promotion_promotion_codes_path(promotion))
+    expect(Spree::PromotionCode.where(promotion: promotion).count).to eql(4)
+  end
+
+  it "cannot create an existing code" do
+    post :create, params: { promotion_id: promotion.id, promotion_code: { value: code1.value } }
+    expect(flash[:error]).not_to be_nil
+    expect(Spree::PromotionCode.where(promotion: promotion).count).to eql(3)
+  end
 end

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

@@ -9,6 +9,13 @@ describe Spree::Admin::ReimbursementsController, type: :controller do
     Spree::RefundReason.find_or_create_by!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false)
   end
 
+  let(:user) { stub_model(Spree::LegacyUser, has_spree_role?: true, id: 1) }
+
+  before do
+    allow_any_instance_of(described_class).to receive(:try_spree_current_user).
+      and_return(user)
+  end
+
   describe '#edit' do
     let(:reimbursement) { create(:reimbursement) }
     let(:order) { reimbursement.order }
@@ -42,6 +49,10 @@ describe Spree::Admin::ReimbursementsController, type: :controller do
       expect(assigns(:reimbursement).return_items.to_a).to eq customer_return.return_items.to_a
     end
 
+    it 'order is recalculated' do
+      expect { subject }.to change { order.reload.payment_state }.from('paid').to('credit_owed')
+    end
+
     it 'redirects to the edit page' do
       subject
       expect(response).to redirect_to(spree.edit_admin_order_reimbursement_path(order, assigns(:reimbursement)))

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/stock_locations_controller_spec.rb

@@ -20,7 +20,7 @@ module Spree
         let(:country) { create :country, iso: "BR" }
 
         before do
-          Spree::Config[:default_country_iso] = country.iso
+          stub_spree_preferences(default_country_iso: country.iso)
         end
 
         it "can create a new stock location" 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