solidus_core 2.10.0.beta1 → 2.10.5

data/lib/spree/preferences/static_model_preferences.rb

@@ -30,8 +30,8 @@ module Spree
       end
 
       def initialize
-        @store = Hash.new do |h, klass|
-          h[klass] = {}
+        @store = Hash.new do |data, klass|
+          data[klass] = {}
         end
       end
 

data/lib/spree/testing_support/dummy_app.rb

@@ -13,6 +13,7 @@ Rails.env = 'test'
 require 'solidus_core'
 
 RAILS_52_OR_ABOVE = Gem::Version.new(Rails.version) >= Gem::Version.new('5.2')
+RAILS_6_OR_ABOVE = Gem::Version.new(Rails.version) >= Gem::Version.new('6.0')
 
 # @private
 class ApplicationController < ActionController::Base
@@ -64,7 +65,9 @@ module DummyApp
 
     if RAILS_52_OR_ABOVE
       config.action_controller.default_protect_from_forgery = true
-      config.active_record.sqlite3.represent_boolean_as_integer = true
+      unless RAILS_6_OR_ABOVE
+        config.active_record.sqlite3.represent_boolean_as_integer = true
+      end
     end
 
     # Avoid issues if an old spec/dummy still exists

data/lib/spree/testing_support/factories/inventory_unit_factory.rb

@@ -9,6 +9,7 @@ FactoryBot.define do
   factory :inventory_unit, class: 'Spree::InventoryUnit' do
     transient do
       order { nil }
+      stock_location { nil }
     end
 
     variant
@@ -20,7 +21,13 @@ FactoryBot.define do
       end
     end
     state { 'on_hand' }
-    shipment { build(:shipment, state: 'pending', order: line_item.order) }
+    shipment do
+      if stock_location
+        build(:shipment, state: 'pending', order: line_item.order, stock_location: stock_location)
+      else
+        build(:shipment, state: 'pending', order: line_item.order)
+      end
+    end
     # return_authorization
   end
 end

data/lib/spree/testing_support/factories/promotion_factory.rb

@@ -27,8 +27,15 @@ FactoryBot.define do
         Spree::Promotion::Actions::CreateItemAdjustments.create!(calculator: calculator, promotion: promotion)
       end
     end
+
     factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
 
+    trait :with_free_shipping do
+      after(:create) do |promotion|
+        Spree::Promotion::Actions::FreeShipping.create!(promotion: promotion)
+      end
+    end
+
     trait :with_order_adjustment do
       transient do
         weighted_order_adjustment_amount { 10 }

data/lib/spree/testing_support/factories/stock_package_factory.rb

@@ -17,7 +17,7 @@ FactoryBot.define do
 
     after(:build) do |package, evaluator|
       evaluator.variants_contents.each do |variant, count|
-        package.add_multiple build_list(:inventory_unit, count, variant: variant)
+        package.add_multiple build_list(:inventory_unit, count, variant: variant, stock_location: evaluator.stock_location)
       end
     end
 

data/lib/spree/testing_support/factories/user_factory.rb

@@ -17,7 +17,10 @@ FactoryBot.define do
     end
 
     factory :admin_user do
-      spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }
+      after(:create) do |user, _|
+        admin_role = Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')
+        user.spree_roles << admin_role
+      end
     end
 
     factory :user_with_addresses do |_u|

data/solidus_core.gemspec

@@ -17,18 +17,18 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
 
-  s.required_ruby_version     = '>= 2.2.2'
+  s.required_ruby_version = '>= 2.4.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   %w[
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 5.1', '< 7.0.x']
+    s.add_dependency rails_dep, ['>= 5.1', '< 6.1.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'
-  s.add_dependency 'acts_as_list', '~> 0.3'
+  s.add_dependency 'acts_as_list', '< 2.0'
   s.add_dependency 'awesome_nested_set', '~> 3.2'
   s.add_dependency 'cancancan', ['>= 2.2', '< 4.0']
   s.add_dependency 'carmen', '~> 1.1.0'
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'friendly_id', '~> 5.0'
   s.add_dependency 'kaminari-activerecord', '~> 1.1'
   s.add_dependency 'monetize', '~> 1.8'
-  s.add_dependency 'paperclip', ['>= 4.2', '< 6']
+  s.add_dependency 'paperclip', '>= 4.2'
   s.add_dependency 'paranoia', '~> 2.4'
   s.add_dependency 'ransack', '~> 2.0'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'

data/spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb

@@ -23,7 +23,14 @@ RSpec.describe Spree::Core::ControllerHelpers::StrongParameters, type: :controll
 
   describe '#permitted_checkout_attributes' do
     it 'returns Array class' do
-      expect(controller.permitted_checkout_attributes.class).to eq Array
+      Spree::Deprecation.silence do
+        expect(controller.permitted_checkout_attributes.class).to eq Spree::CheckoutAdditionalAttributes
+      end
+    end
+
+    it 'is deprecated' do
+      expect(Spree::Deprecation).to receive(:warn)
+      controller.permitted_checkout_attributes
     end
   end
 

data/spec/lib/spree/core/environment_extension_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'spree/core/environment_extension'
 
 RSpec.describe Spree::Core::EnvironmentExtension do
-  let(:base) { Class.new }
+  let(:base) { Class.new { def self.to_s; 'ExampleClass'; end } }
   subject! { base.include(described_class).new }
 
   describe '.add_class_set' do
@@ -32,4 +32,15 @@ RSpec.describe Spree::Core::EnvironmentExtension do
       end
     end
   end
+
+  describe '#add_class' do
+    it 'is deprecated' do
+      expect(Spree::Deprecation).to receive(:warn) do |message, _caller|
+        expect(message).to include('ExampleClass.add_class_set(:foo)')
+      end
+      expect(base).to receive(:add_class_set).with(:foo)
+
+      base.new.add_class(:foo)
+    end
+  end
 end

data/spec/lib/spree/core/stock_configuration_spec.rb

@@ -39,6 +39,24 @@ RSpec.describe Spree::Core::StockConfiguration do
     end
   end
 
+  describe '#location_filter_class' do
+    let(:stock_configuration) { described_class.new }
+    subject { stock_configuration.location_filter_class }
+
+    it "returns Spree::Stock::LocationFilter::Active" do
+      is_expected.to be ::Spree::Stock::LocationFilter::Active
+    end
+
+    context "with another constant name assiged" do
+      MyFilter = Class.new
+      before { stock_configuration.location_filter_class = MyFilter.to_s }
+
+      it "returns the constant" do
+        is_expected.to be MyFilter
+      end
+    end
+  end
+
   describe '#location_sorter_class' do
     let(:stock_configuration) { described_class.new }
     subject { stock_configuration.location_sorter_class }
@@ -56,4 +74,22 @@ RSpec.describe Spree::Core::StockConfiguration do
       end
     end
   end
+
+  describe '#allocator_class' do
+    let(:stock_configuration) { described_class.new }
+    subject { stock_configuration.allocator_class }
+
+    it "returns Spree::Stock::Allocator::OnHandFirst" do
+      is_expected.to be ::Spree::Stock::Allocator::OnHandFirst
+    end
+
+    context "with another constant name assiged" do
+      MyAllocator = Class.new
+      before { stock_configuration.allocator_class = MyAllocator.to_s }
+
+      it "returns the constant" do
+        is_expected.to be MyAllocator
+      end
+    end
+  end
 end

data/spec/lib/spree/core/validators/email_spec.rb

@@ -12,27 +12,27 @@ RSpec.describe Spree::EmailValidator do
 
   let(:valid_emails) {
     [
-    'valid@email.com',
-    'valid@email.com.uk',
-    'e@email.com',
-    'valid+email@email.com',
-    'valid-email@email.com',
-    'valid_email@email.com',
-    'valid.email@email.com'
-  ]
+      'valid@email.com',
+      'valid@email.com.uk',
+      'e@email.com',
+      'valid+email@email.com',
+      'valid-email@email.com',
+      'valid_email@email.com',
+      'valid.email@email.com'
+    ]
   }
   let(:invalid_emails) {
     [
-    'invalid email@email.com',
-    '.invalid.email@email.com',
-    'invalid.email.@email.com',
-    '@email.com',
-    '.@email.com',
-    'invalidemailemail.com',
-    '@invalid.email@email.com',
-    'invalid@email@email.com',
-    'invalid.email@@email.com'
-  ]
+      'invalid email@email.com',
+      '.invalid.email@email.com',
+      'invalid.email.@email.com',
+      '@email.com',
+      '.@email.com',
+      'invalidemailemail.com',
+      '@invalid.email@email.com',
+      'invalid@email@email.com',
+      'invalid.email@@email.com'
+    ]
   }
 
   it 'validates valid email addresses' do

data/spec/lib/spree/permitted_attributes_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Spree::PermittedAttributes do
+  describe ".checkout_attributes" do
+    subject(:permitted_attributes) { described_class }
+
+    it "when read emits a deprecation warning and return all steps attributes" do
+      expect(Spree::Deprecation).to receive(:warn)
+      all_attributes = permitted_attributes.checkout_attributes
+
+      expect(all_attributes).to include(*permitted_attributes.checkout_address_attributes)
+      expect(all_attributes).to include(*permitted_attributes.checkout_delivery_attributes)
+      expect(all_attributes).to include(*permitted_attributes.checkout_payment_attributes)
+    end
+
+    it "when changed emits a deprecation warning and push changes to all steps' attributes" do
+      expect(Spree::Deprecation).to receive(:warn).exactly(4).times
+      permitted_attributes.checkout_attributes.push :appended_attribute
+      permitted_attributes.checkout_attributes.append :appended_with_alias_attribute
+      permitted_attributes.checkout_attributes << :another_appended_attribute
+      permitted_attributes.checkout_attributes.prepend :prepended_attribute
+
+      checkout_steps_attributes = [
+        permitted_attributes.checkout_address_attributes,
+        permitted_attributes.checkout_delivery_attributes,
+        permitted_attributes.checkout_payment_attributes,
+        permitted_attributes.checkout_confirm_attributes
+      ]
+
+      checkout_steps_attributes.each do |step_attributes|
+        expect(step_attributes).to include(
+          :appended_attribute,
+          :appended_with_alias_attribute,
+          :another_appended_attribute,
+          :prepended_attribute)
+      end
+    end
+  end
+end

data/spec/models/spree/ability_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe Spree::Ability, type: :model do
     let(:resource) { Object.new }
 
     context 'with admin user' do
-      let(:user) { build :admin_user }
+      let(:user) { create :admin_user }
       it_should_behave_like 'access granted'
       it_should_behave_like 'index allowed'
     end

data/spec/models/spree/address_spec.rb

@@ -152,6 +152,29 @@ RSpec.describe Spree::Address, type: :model do
         it "sets up a new record with Spree::Config[:default_country_iso]" do
           expect(Spree::Address.build_default.country).to eq default_country
         end
+
+        it 'accepts other attributes' do
+          address = Spree::Address.build_default(first_name: 'Ryan')
+
+          expect(address.country).to eq default_country
+          expect(address.first_name).to eq 'Ryan'
+        end
+
+        it 'accepts a block' do
+          address = Spree::Address.build_default do |record|
+            record.first_name = 'Ryan'
+          end
+
+          expect(address.country).to eq default_country
+          expect(address.first_name).to eq 'Ryan'
+        end
+
+        it 'can override the country' do
+          another_country = build :country
+          address = Spree::Address.build_default(country: another_country)
+
+          expect(address.country).to eq another_country
+        end
       end
 
       # Regression test for https://github.com/spree/spree/issues/1142

data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb

@@ -25,7 +25,7 @@ module Spree
         )
       end
 
-      subject { FlatPercentItemTotal.new(preferred_flat_percent: 10) }
+      subject { described_class.new(preferred_flat_percent: 10) }
 
       it "should round result correctly" do
         expect(subject.compute(package)).to eq(4.04)

data/spec/models/spree/calculator/shipping/flat_rate_spec.rb

@@ -6,7 +6,7 @@ require 'shared_examples/calculator_shared_examples'
 module Spree
   module Calculator::Shipping
     RSpec.describe FlatRate, type: :model do
-      subject { Calculator::Shipping::FlatRate.new(preferred_amount: 4.00) }
+      subject { described_class.new(preferred_amount: 4.00) }
 
       it_behaves_like 'a calculator with a description'
 

data/spec/models/spree/calculator/shipping/flexi_rate_spec.rb

@@ -15,7 +15,7 @@ module Spree
         build(:stock_package, variants_contents: { variant1 => 4, variant2 => 6 })
       end
 
-      let(:subject) { FlexiRate.new }
+      let(:subject) { described_class.new }
 
       context "compute" do
         it "should compute amount correctly when all fees are 0" do
@@ -46,7 +46,7 @@ module Spree
         end
 
         it "should allow creation of new object with all the attributes" do
-          FlexiRate.new(preferred_first_item: 1,
+          described_class.new(preferred_first_item: 1,
                         preferred_additional_item: 1,
                         preferred_max_items: 1)
         end

data/spec/models/spree/calculator/shipping/per_item_spec.rb

@@ -15,7 +15,7 @@ module Spree
         build(:stock_package, variants_contents: { variant1 => 5, variant2 => 3 })
       end
 
-      subject { PerItem.new(preferred_amount: 10) }
+      subject { described_class.new(preferred_amount: 10) }
 
       it "correctly calculates per item shipping" do
         expect(subject.compute(package).to_f).to eq(80) # 5 x 10 + 3 x 10

data/spec/models/spree/calculator/shipping/price_sack_spec.rb

@@ -5,7 +5,7 @@ require 'shared_examples/calculator_shared_examples'
 
 RSpec.describe Spree::Calculator::Shipping::PriceSack, type: :model do
   let(:calculator) do
-    calculator = Spree::Calculator::PriceSack.new
+    calculator = described_class.new
     calculator.preferred_minimal_amount = 5
     calculator.preferred_normal_amount = 10
     calculator.preferred_discount_amount = 1
@@ -14,22 +14,31 @@ RSpec.describe Spree::Calculator::Shipping::PriceSack, type: :model do
 
   it_behaves_like 'a calculator with a description'
 
-  let(:order) { stub_model(Spree::Order) }
-  let(:shipment) { stub_model(Spree::Shipment, amount: 10) }
+  describe '#compute' do
+    subject { calculator.compute(package) }
+    let(:package) { build(:stock_package, variants_contents: { build(:variant) => 1 }) }
 
-  # Regression test for https://github.com/spree/spree/issues/714 and https://github.com/spree/spree/issues/739
-  it "computes with an order object" do
-    calculator.compute(order)
-  end
+    before do
+      # This hack is due to our factories not being so smart to understand
+      # that they should create line items with the price of the associated
+      # variant by default.
+      allow_any_instance_of(Spree::Stock::ContentItem).to receive(:price) { amount }
+    end
 
-  # Regression test for https://github.com/spree/spree/issues/1156
-  it "computes with a shipment object" do
-    calculator.compute(shipment)
-  end
+    context 'when price < minimal amount' do
+      let(:amount) { 2 }
+
+      it "returns the discounted amount" do
+        expect(subject).to eq(10)
+      end
+    end
+
+    context 'when price > minimal amount' do
+      let(:amount) { 6 }
 
-  # Regression test for https://github.com/spree/spree/issues/2055
-  it "computes the correct amount" do
-    expect(calculator.compute(2)).to eq(calculator.preferred_normal_amount)
-    expect(calculator.compute(6)).to eq(calculator.preferred_discount_amount)
+      it "returns the discounted amount" do
+        expect(subject).to eq(1)
+      end
+    end
   end
 end