solidus_core 2.9.0.rc.1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71217c9617a1dc11ee7ffa67f022200e9cc9e5e81f0d79fad8712e6264f30d7b
-  data.tar.gz: 2a51df897566b8347205712578172e75cb3ea4d5b8852c98c6a99cdb6de5e40c
+  metadata.gz: '0094b02cd702626b2e096ec98561a32fb8493227a6e5fa265f66abae656fdaf3'
+  data.tar.gz: 79dbb067dacfc98477078c1a48e812c6d5ac19596c897f573dcd892e8504b2d1
 SHA512:
-  metadata.gz: 713cea25167eb830ff1274b1e2b8ca163342f28ebd89e0d148a963dff83fc94d038def70e4713b255cd5df05448580fba1cfbcbd968d1a80dae3429be1dc90f8
-  data.tar.gz: 1b1b5b6321c5df0de1e9bafda1d6cae35b53c8c59671137aefd0cba54a05b457ae1f3ef26b38302dd4ef16780364de0e4591db40b919e370d498c78ee0d990a5
+  metadata.gz: 6b2a0aa8d08f5474ab3e531d5b50b667650183e175daf4ed2f2e4ac2d1b9cbdab012a90bb9ccb488624b1a56eaf460faa07f3a56e566d5075d58bb10c7275317
+  data.tar.gz: 7daf2551e03bf901f010279aa59deb43ea215e0456b27e5cbf80e70d843ae54b41a47a92e1dbcc13f0a7bb720cf2d7805478bf69cffcc5611457f798436b6856

data/app/subscribers/spree/mailer_subscriber.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spree/event/subscriber'
+
+module Spree
+  module MailerSubscriber
+    include Spree::Event::Subscriber
+
+    event_action :order_finalized
+    event_action :send_reimbursement_email, event_name: :reimbursement_reimbursed
+
+    def order_finalized(event)
+      order = event.payload[:order]
+      unless order.confirmation_delivered?
+        Spree::Config.order_mailer_class.confirm_email(order).deliver_later
+        order.update_column(:confirmation_delivered, true)
+      end
+    end
+
+    def send_reimbursement_email(event)
+      reimbursement = event.payload[:reimbursement]
+      Spree::Config.reimbursement_mailer_class.reimbursement_email(reimbursement.id).deliver_later
+    end
+  end
+end

data/lib/generators/spree/install/install_generator.rb

@@ -79,35 +79,40 @@ module Spree
     end
 
     def configure_application
-      application <<-APP
-
-    config.to_prepare do
-      # Load application's model / class decorators
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
-        require_dependency(c)
+      application <<-RUBY
+    # Load application's model / class decorators
+    initializer 'spree.decorators' do |app|
+      config.to_prepare do
+        Dir.glob(Rails.root.join('app/**/*_decorator*.rb')) do |path|
+          require_dependency(path)
+        end
       end
+    end
 
-      # Load application's view overrides
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/*.rb")) do |c|
-        require_dependency(c)
+    # Load application's view overrides
+    initializer 'spree.overrides' do |app|
+      config.to_prepare do
+        Dir.glob(Rails.root.join('app/overrides/*.rb')) do |path|
+          require_dependency(path)
+        end
       end
     end
-      APP
+      RUBY
 
       if !options[:enforce_available_locales].nil?
-        application <<-APP
+        application <<-RUBY
     # Prevent this deprecation message: https://github.com/svenfuchs/i18n/commit/3b6e56e
     I18n.enforce_available_locales = #{options[:enforce_available_locales]}
-        APP
+        RUBY
       end
     end
 
     def include_seed_data
-      append_file "db/seeds.rb", <<-SEEDS.strip_heredoc
+      append_file "db/seeds.rb", <<-RUBY.strip_heredoc
 
         Spree::Core::Engine.load_seed if defined?(Spree::Core)
         Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
-      SEEDS
+      RUBY
     end
 
     def install_migrations
@@ -157,7 +162,7 @@ module Spree
       routes_file_path = File.join('config', 'routes.rb')
       unless File.read(routes_file_path).include? CORE_MOUNT_ROUTE
         insert_into_file routes_file_path, after: "Rails.application.routes.draw do\n" do
-          <<-ROUTES
+          <<-RUBY
   # This line mounts Solidus's routes at the root of your application.
   # This means, any requests to URLs such as /products, will go to Spree::ProductsController.
   # If you would like to change where this engine is mounted, simply change the :at option to something different.
@@ -165,7 +170,7 @@ module Spree
   # We ask that you don't use the :as option here, as Solidus relies on it being the default of "spree"
   #{CORE_MOUNT_ROUTE}, at: '/'
 
-ROUTES
+          RUBY
         end
       end
 

data/lib/generators/spree/install/templates/config/initializers/spree.rb.tt

@@ -22,6 +22,14 @@ Spree.config do |config|
   config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
   config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
 
+
+  # Permission Sets:
+
+  # Uncomment and customize the following line to add custom permission sets
+  # to a custom users role:
+  # config.roles.assign_permissions :role_name, ['Spree::PermissionSets::CustomPermissionSet']
+
+
   # Frontend:
 
   # Custom logo for the frontend
@@ -39,8 +47,11 @@ Spree.config do |config|
   # Gateway credentials can be configured statically here and referenced from
   # the admin. They can also be fully configured from the admin.
   #
+  # Please note that you need to use the solidus_stripe gem to have
+  # Stripe working: https://github.com/solidusio-contrib/solidus_stripe
+  #
   # config.static_model_preferences.add(
-  #   Spree::Gateway::StripeGateway,
+  #   Spree::PaymentMethod::StripeCreditCard,
   #   'stripe_env_credentials',
   #   secret_key: ENV['STRIPE_SECRET_KEY'],
   #   publishable_key: ENV['STRIPE_PUBLISHABLE_KEY'],
@@ -58,6 +69,15 @@ end
 <% if defined?(Spree::Backend::Engine) -%>
 Spree::Backend::Config.configure do |config|
   config.locale = 'en'
+
+  # Uncomment and change the following configuration if you want to add
+  # a new menu item:
+  #
+  # config.menu_items << config.class::MenuItem.new(
+  #   [:section],
+  #   'icon-name',
+  #   url: 'https://solidus.io/'
+  # )
 end
 <% end -%>
 
@@ -68,3 +88,8 @@ end
 <% end -%>
 
 Spree.user_class = <%= (options[:user_class].blank? ? "Spree::LegacyUser" : options[:user_class]).inspect %>
+
+# If you want to add a field to the whitelisted ransackable attributes,
+# just uncomment the following code and change it as you need.
+#
+# Spree::Model.whitelisted_ransackable_attributes << 'field'

data/lib/spree/app_configuration.rb

@@ -475,6 +475,27 @@ module Spree
 
     def environment
       @environment ||= Spree::Core::Environment.new(self).tap do |env|
+        env.calculators.promotion_actions_create_adjustments = %w[
+          Spree::Calculator::FlatPercentItemTotal
+          Spree::Calculator::FlatRate
+          Spree::Calculator::FlexiRate
+          Spree::Calculator::TieredPercent
+          Spree::Calculator::TieredFlatRate
+        ]
+
+        env.calculators.promotion_actions_create_item_adjustments = %w[
+          Spree::Calculator::DistributedAmount
+          Spree::Calculator::FlatRate
+          Spree::Calculator::FlexiRate
+          Spree::Calculator::PercentOnLineItem
+          Spree::Calculator::TieredPercent
+        ]
+
+        env.calculators.promotion_actions_create_quantity_adjustments = %w[
+          Spree::Calculator::PercentOnLineItem
+          Spree::Calculator::FlatRate
+        ]
+
         env.calculators.shipping_methods = %w[
           Spree::Calculator::Shipping::FlatPercentItemTotal
           Spree::Calculator::Shipping::FlatRate
@@ -487,11 +508,6 @@ module Spree
           Spree::Calculator::DefaultTax
         ]
 
-        env.stock_splitters = %w[
-          Spree::Stock::Splitter::ShippingCategory
-          Spree::Stock::Splitter::Backordered
-        ]
-
         env.payment_methods = %w[
           Spree::PaymentMethod::BogusCreditCard
           Spree::PaymentMethod::SimpleBogusCreditCard
@@ -499,53 +515,35 @@ module Spree
           Spree::PaymentMethod::Check
         ]
 
-        env.promotions = Spree::Promo::Environment.new.tap do |promos|
-          promos.rules = %w[
-            Spree::Promotion::Rules::ItemTotal
-            Spree::Promotion::Rules::Product
-            Spree::Promotion::Rules::User
-            Spree::Promotion::Rules::FirstOrder
-            Spree::Promotion::Rules::UserLoggedIn
-            Spree::Promotion::Rules::OneUsePerUser
-            Spree::Promotion::Rules::Taxon
-            Spree::Promotion::Rules::NthOrder
-            Spree::Promotion::Rules::OptionValue
-            Spree::Promotion::Rules::FirstRepeatPurchaseSince
-            Spree::Promotion::Rules::UserRole
-            Spree::Promotion::Rules::Store
-          ]
-
-          promos.actions = %w[
-            Spree::Promotion::Actions::CreateAdjustment
-            Spree::Promotion::Actions::CreateItemAdjustments
-            Spree::Promotion::Actions::CreateQuantityAdjustments
-            Spree::Promotion::Actions::FreeShipping
-          ]
-
-          promos.shipping_actions = %w[
-            Spree::Promotion::Actions::FreeShipping
-          ]
-        end
+        env.promotions.rules = %w[
+          Spree::Promotion::Rules::ItemTotal
+          Spree::Promotion::Rules::Product
+          Spree::Promotion::Rules::User
+          Spree::Promotion::Rules::FirstOrder
+          Spree::Promotion::Rules::UserLoggedIn
+          Spree::Promotion::Rules::OneUsePerUser
+          Spree::Promotion::Rules::Taxon
+          Spree::Promotion::Rules::NthOrder
+          Spree::Promotion::Rules::OptionValue
+          Spree::Promotion::Rules::FirstRepeatPurchaseSince
+          Spree::Promotion::Rules::UserRole
+          Spree::Promotion::Rules::Store
+        ]
 
-        env.calculators.promotion_actions_create_adjustments = %w[
-          Spree::Calculator::FlatPercentItemTotal
-          Spree::Calculator::FlatRate
-          Spree::Calculator::FlexiRate
-          Spree::Calculator::TieredPercent
-          Spree::Calculator::TieredFlatRate
+        env.promotions.actions = %w[
+          Spree::Promotion::Actions::CreateAdjustment
+          Spree::Promotion::Actions::CreateItemAdjustments
+          Spree::Promotion::Actions::CreateQuantityAdjustments
+          Spree::Promotion::Actions::FreeShipping
         ]
 
-        env.calculators.promotion_actions_create_item_adjustments = %w[
-          Spree::Calculator::DistributedAmount
-          Spree::Calculator::FlatRate
-          Spree::Calculator::FlexiRate
-          Spree::Calculator::PercentOnLineItem
-          Spree::Calculator::TieredPercent
+        env.promotions.shipping_actions = %w[
+          Spree::Promotion::Actions::FreeShipping
         ]
 
-        env.calculators.promotion_actions_create_quantity_adjustments = %w[
-          Spree::Calculator::PercentOnLineItem
-          Spree::Calculator::FlatRate
+        env.stock_splitters = %w[
+          Spree::Stock::Splitter::ShippingCategory
+          Spree::Stock::Splitter::Backordered
         ]
       end
     end

data/lib/spree/core/class_constantizer.rb

@@ -18,10 +18,16 @@ module Spree
           klasses.each do |klass|
             self << klass
           end
+
+          self
         end
 
         delegate :clear, :empty?, to: :@collection
 
+        def delete(object)
+          @collection.delete(object.to_s)
+        end
+
         def each
           @collection.each do |klass|
             yield klass.constantize

data/lib/spree/core/engine.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'spree/config'
-require 'spree/event/processors/mailer_processor'
 
 module Spree
   module Core
@@ -45,8 +44,15 @@ module Spree
         Migrations.new(config, engine_name).check
       end
 
-      initializer 'spree.core.subscribe_event_mailer_processor' do
-        Spree::Event::Processors::MailerProcessor.subscribe!
+      # Setup Event Subscribers
+      initializer 'spree.core.initialize_subscribers' do |app|
+        app.reloader.to_prepare do
+          Spree::Event.subscribers.each(&:subscribe!)
+        end
+
+        app.reloader.before_class_unload do
+          Spree::Event.subscribers.each(&:unsubscribe!)
+        end
       end
 
       # Load in mailer previews for apps to use in development.

data/lib/spree/core/environment/promotions.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Spree
+  module Core
+    class Environment
+      class Promotions
+        include EnvironmentExtension
+
+        add_class_set :rules
+        add_class_set :actions
+        add_class_set :shipping_actions
+      end
+    end
+  end
+end

data/lib/spree/core/environment.rb

@@ -15,7 +15,7 @@ module Spree
       def initialize(spree_config)
         @calculators = Calculators.new
         @preferences = spree_config
-        @promotions = Spree::Promo::Environment.new
+        @promotions = Promotions.new
       end
     end
   end

data/lib/spree/core/environment_extension.rb

@@ -22,10 +22,6 @@ module Spree
           end
         end
       end
-
-      def add_class(name)
-        singleton_class.send(:add_class_set, name)
-      end
     end
   end
 end

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "2.9.0.rc.1"
+  VERSION = "2.9.0"
 
   def self.solidus_version
     VERSION

data/lib/spree/core.rb

@@ -59,6 +59,7 @@ require 'spree/core/active_merchant_dependencies'
 require 'spree/core/class_constantizer'
 require 'spree/core/environment_extension'
 require 'spree/core/environment/calculators'
+require 'spree/core/environment/promotions'
 require 'spree/core/environment'
 require 'spree/promo/environment'
 require 'spree/migrations'

data/lib/spree/event/configuration.rb

@@ -1,8 +1,16 @@
 # frozen_string_literal: true
 
+require 'spree/core/class_constantizer'
+
 module Spree
   module Event
     class Configuration
+      def subscribers
+        @subscribers ||= ::Spree::Core::ClassConstantizer::Set.new.tap do |set|
+          set << 'Spree::MailerSubscriber'
+        end
+      end
+
       attr_writer :adapter, :suffix
 
       def adapter

data/lib/spree/event.rb

@@ -21,7 +21,7 @@ module Spree
     #     @order.finalize!
     #   end
     def fire(event_name, opts = {})
-      adapter.fire name_with_suffix(event_name), opts do
+      adapter.fire name_with_suffix(event_name.to_s), opts do
         yield opts if block_given?
       end
     end
@@ -98,6 +98,12 @@ module Spree
       Spree::Config.events.suffix
     end
 
+    # @!attribute [r] subscribers
+    #   @return [Array<Spree::Event::Subscriber>] A list of subscribers used to support class reloading for Spree::Event::Subscriber instances
+    def subscribers
+      Spree::Config.events.subscribers
+    end
+
     private
 
     def name_with_suffix(name)

data/lib/spree/promo/environment.rb

@@ -2,12 +2,11 @@
 
 module Spree
   module Promo
-    class Environment
-      include Core::EnvironmentExtension
-
-      add_class_set :rules
-      add_class_set :actions
-      add_class_set :shipping_actions
-    end
+    Environment =
+      ActiveSupport::Deprecation::DeprecatedConstantProxy.new(
+        'Spree::Promo::Environment',
+        'Spree::Core::Environment::Promotions',
+        Spree::Deprecation
+      )
   end
 end

data/spec/lib/spree/app_configuration_spec.rb

@@ -53,6 +53,81 @@ RSpec.describe Spree::AppConfiguration do
     end
   end
 
+  describe '#environment' do
+    class DummyClass; end;
+
+    subject(:environment) { prefs.environment }
+    it { is_expected.to be_a Spree::Core::Environment }
+
+    shared_examples "working preferences set" do
+      it "allows adding new items" do
+        preferences_set << DummyClass
+        expect(preferences_set).to include DummyClass
+        preferences_set.delete DummyClass
+      end
+    end
+
+    context '.payment_methods' do
+      subject(:preferences_set) { environment.payment_methods }
+      it_should_behave_like "working preferences set"
+    end
+
+    context '.stock_splitters' do
+      subject(:preferences_set) { environment.stock_splitters }
+      it_should_behave_like "working preferences set"
+    end
+
+    context '.calculators' do
+      subject(:calculators) { environment.calculators }
+      it { is_expected.to be_a Spree::Core::Environment::Calculators }
+
+      context '.calculators.shipping_methods' do
+        subject(:preferences_set) { calculators.shipping_methods }
+        it_should_behave_like "working preferences set"
+      end
+
+      context '.calculators.tax_rates' do
+        subject(:preferences_set) { calculators.tax_rates }
+        it_should_behave_like "working preferences set"
+      end
+
+      context '.calculators.promotion_actions_create_adjustments' do
+        subject(:preferences_set) { calculators.promotion_actions_create_adjustments }
+        it_should_behave_like "working preferences set"
+      end
+
+      context '.calculators.promotion_actions_create_item_adjustments' do
+        subject(:preferences_set) { calculators.promotion_actions_create_item_adjustments }
+        it_should_behave_like "working preferences set"
+      end
+
+      context '.calculators.promotion_actions_create_quantity_adjustments' do
+        subject(:preferences_set) { calculators.promotion_actions_create_quantity_adjustments }
+        it_should_behave_like "working preferences set"
+      end
+    end
+
+    context '.promotions' do
+      subject(:promotions) { environment.promotions }
+      it { is_expected.to be_a Spree::Core::Environment::Promotions }
+
+      context '.promotions.rules' do
+        subject(:preferences_set) { promotions.rules }
+        it_should_behave_like "working preferences set"
+      end
+
+      context '.promotions.actions' do
+        subject(:preferences_set) { promotions.actions }
+        it_should_behave_like "working preferences set"
+      end
+
+      context '.promotions.shipping_actions' do
+        subject(:preferences_set) { promotions.shipping_actions }
+        it_should_behave_like "working preferences set"
+      end
+    end
+  end
+
   it 'has a default admin VAT location with nil values by default' do
     expect(prefs.admin_vat_location).to eq(Spree::Tax::TaxLocation.new)
     expect(prefs.admin_vat_location.state_id).to eq(nil)

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

@@ -29,6 +29,10 @@ RSpec.describe Spree::Core::ClassConstantizer::Set do
       expect(set).to include(ClassConstantizerTest::ClassA)
       expect(set).to include(ClassConstantizerTest::ClassB)
     end
+
+    it "returns itself" do
+      expect(set.concat(['String'])).to eql(set)
+    end
   end
 
   describe "<<" do
@@ -68,4 +72,20 @@ RSpec.describe Spree::Core::ClassConstantizer::Set do
       end
     end
   end
+
+  describe "#delete" do
+    before do
+      set << ClassConstantizerTest::ClassA
+    end
+
+    it "can delete by string" do
+      set.delete "ClassConstantizerTest::ClassA"
+      expect(set).not_to include(ClassConstantizerTest::ClassA)
+    end
+
+    it "can delete by class" do
+      set.delete ClassConstantizerTest::ClassA
+      expect(set).not_to include(ClassConstantizerTest::ClassA)
+    end
+  end
 end

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

@@ -3,34 +3,33 @@
 require 'spec_helper'
 require 'spree/core/environment_extension'
 
-class DummyClass
-  include Spree::Core::EnvironmentExtension
-end
-
-class C1; end
-class C2; end
-class C3; end
-
 RSpec.describe Spree::Core::EnvironmentExtension do
-  subject { DummyClass.new }
+  let(:base) { Class.new }
+  subject! { base.include(described_class).new }
 
-  before { subject.add_class('random_name') }
+  describe '.add_class_set' do
+    context 'with a class set named "foo"' do
+      before { base.add_class_set('foo') }
 
-  describe 'Basis' do
-    it { respond_to?(:random_name) }
-    it { respond_to?(:random_name=) }
-  end
+      let(:class_one) { String }
+      let(:class_two) { Array }
+      let(:class_three) { Hash }
 
-  describe '#getter' do
-    it { expect(subject.random_name).to be_empty }
-    it { expect(subject.random_name).to be_kind_of Spree::Core::ClassConstantizer::Set }
-  end
+      describe '#foo' do
+        it { respond_to?(:foo) }
+        it { expect(subject.foo).to be_empty }
+        it { expect(subject.foo).to be_kind_of Spree::Core::ClassConstantizer::Set }
+      end
+
+      describe '#foo=' do
+        it { respond_to?(:foo=) }
 
-  describe '#setter' do
-    before { subject.random_name = [C1, C2]; @set = subject.random_name.to_a }
+        before { subject.foo = [class_one, class_two] }
 
-    it { expect(@set).to include(C1) }
-    it { expect(@set).to include(C2) }
-    it { expect(@set).not_to include(C3) }
+        it { expect(subject.foo).to include(class_one) }
+        it { expect(subject.foo).to include(class_two) }
+        it { expect(subject.foo).not_to include(class_three) }
+      end
+    end
   end
 end

data/spec/lib/spree/event/subscriber_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'spree/event'
 
-RSpec.describe Spree::Event do
+RSpec.describe Spree::Event::Subscriber do
   module M
     include Spree::Event::Subscriber
 

data/spec/lib/spree/event_spec.rb

@@ -14,21 +14,21 @@ RSpec.describe Spree::Event do
     expect(subject.adapter).to eql Spree::Event::Adapters::ActiveSupportNotifications
   end
 
-  before do
-    # ActiveSupport::Notifications does not provide an interface to clean all
-    # subscribers at once, so some low level brittle code is required
-    @old_subscribers = notifier.instance_variable_get('@subscribers').dup
-    @old_listeners = notifier.instance_variable_get('@listeners_for').dup
-    notifier.instance_variable_get('@subscribers').clear
-    notifier.instance_variable_get('@listeners_for').clear
-  end
+  context 'with the default adapter' do
+    before do
+      # ActiveSupport::Notifications does not provide an interface to clean all
+      # subscribers at once, so some low level brittle code is required
+      @old_subscribers = notifier.instance_variable_get('@subscribers').dup
+      @old_listeners = notifier.instance_variable_get('@listeners_for').dup
+      notifier.instance_variable_get('@subscribers').clear
+      notifier.instance_variable_get('@listeners_for').clear
+    end
 
-  after do
-    notifier.instance_variable_set '@subscribers', @old_subscribers
-    notifier.instance_variable_set '@listeners_for', @old_listeners
-  end
+    after do
+      notifier.instance_variable_set '@subscribers', @old_subscribers
+      notifier.instance_variable_set '@listeners_for', @old_listeners
+    end
 
-  context 'with the default adapter' do
     describe '#listeners' do
       context 'when there is no subscription' do
         it { expect(subject.listeners).to be_empty }
@@ -89,4 +89,30 @@ RSpec.describe Spree::Event do
       end
     end
   end
+
+  describe '.subscribers' do
+    let(:subscriber) { instance_double(Module, 'Subscriber') }
+    let(:subscriber_name) { instance_double(String, 'Subscriber name') }
+
+    before do
+      described_class.subscribers.clear
+      allow(subscriber).to receive(:name).and_return(subscriber_name)
+      allow(subscriber_name).to receive(:constantize).and_return(subscriber)
+      allow(subscriber_name).to receive(:to_s).and_return(subscriber_name)
+    end
+
+    it 'accepts the names of constants' do
+      Spree::Config.events.subscribers << subscriber_name
+
+      expect(described_class.subscribers.to_a).to eq([subscriber])
+    end
+
+    it 'discards duplicates' do
+      described_class.subscribers << subscriber_name
+      described_class.subscribers << subscriber_name
+      described_class.subscribers << subscriber_name
+
+      expect(described_class.subscribers.to_a).to eq([subscriber])
+    end
+  end
 end

data/spec/lib/spree/promo/environment_spec.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'spree/core/environment/promotions'
+require 'spree/promo/environment'
+
+RSpec.describe 'Spree::Promo::Environment' do
+  it 'is deprecated' do
+    expect(Spree::Deprecation).to receive(:warn)
+
+    Spree::Promo::Environment.new
+  end
+
+  context 'when customized' do
+    after do
+      # This is needed to cleanup classes after the following specs run.
+      # They will add two new methods but we don't want them to be defined
+      # on the described class for specs that will run later.
+      Spree::Core::Environment::Promotions.remove_method :custom_rules, :custom_rules=
+    end
+
+    context 'with class_eval' do
+      it 'raises a deprecation warning but keep changes' do
+        expect(Spree::Deprecation).to receive(:warn)
+
+        Spree::Promo::Environment.class_eval do
+          add_class_set :custom_rules
+        end
+
+        promo_environment_instance = Spree::Core::Environment::Promotions.new
+        expect(promo_environment_instance).to respond_to(:custom_rules)
+        expect(promo_environment_instance).to respond_to(:custom_rules=)
+      end
+    end
+
+    context 'with prepend' do
+      it 'raises a deprecation warning but keep changes' do
+        expect(Spree::Deprecation).to receive(:warn)
+
+        module CustomRules
+          def self.prepended(base)
+            base.add_class_set :custom_rules
+          end
+        end
+        Spree::Promo::Environment.prepend CustomRules
+
+        promo_environment_instance = Spree::Core::Environment::Promotions.new
+        expect(promo_environment_instance).to respond_to(:custom_rules)
+        expect(promo_environment_instance).to respond_to(:custom_rules=)
+      end
+    end
+  end
+end

data/spec/models/spree/order_spec.rb

@@ -29,14 +29,14 @@ RSpec.describe Spree::Order, type: :model do
       end
 
       # These specs show how notifications can be removed, one at a time or
-      # all the ones set by MailerProcessor module
+      # all the ones set by MailerSubscriber module
       context 'when removing the default email notification subscription' do
         before do
-          Spree::Event.unsubscribe Spree::Event::Processors::MailerProcessor.order_finalized_handler
+          Spree::Event.unsubscribe Spree::MailerSubscriber.order_finalized_handler
         end
 
         after do
-          Spree::Event::Processors::MailerProcessor.subscribe!
+          Spree::MailerSubscriber.subscribe!
         end
 
         it 'does not send the email' do
@@ -47,11 +47,11 @@ RSpec.describe Spree::Order, type: :model do
 
       context 'when removing all the email notification subscriptions' do
         before do
-          Spree::Event::Processors::MailerProcessor.unsubscribe!
+          Spree::MailerSubscriber.unsubscribe!
         end
 
         after do
-          Spree::Event::Processors::MailerProcessor.subscribe!
+          Spree::MailerSubscriber.subscribe!
         end
 
         it 'does not send the email' do

data/spec/rails_helper.rb

@@ -18,6 +18,7 @@ Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
 
 require 'spree/testing_support/factories'
 require 'spree/testing_support/preferences'
+require 'spree/testing_support/rake'
 require 'cancan/matchers'
 
 ActiveJob::Base.queue_adapter = :test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.9.0.rc.1
+  version: 2.9.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -635,6 +635,7 @@ files:
 - app/models/spree/wallet_payment_source.rb
 - app/models/spree/zone.rb
 - app/models/spree/zone_member.rb
+- app/subscribers/spree/mailer_subscriber.rb
 - app/views/layouts/spree/base_mailer.html.erb
 - app/views/spree/carton_mailer/shipped_email.html.erb
 - app/views/spree/carton_mailer/shipped_email.text.erb
@@ -729,6 +730,7 @@ files:
 - lib/spree/core/engine.rb
 - lib/spree/core/environment.rb
 - lib/spree/core/environment/calculators.rb
+- lib/spree/core/environment/promotions.rb
 - lib/spree/core/environment_extension.rb
 - lib/spree/core/importer.rb
 - lib/spree/core/importer/order.rb
@@ -746,7 +748,6 @@ files:
 - lib/spree/event.rb
 - lib/spree/event/adapters/active_support_notifications.rb
 - lib/spree/event/configuration.rb
-- lib/spree/event/processors/mailer_processor.rb
 - lib/spree/event/subscriber.rb
 - lib/spree/i18n.rb
 - lib/spree/localized_number.rb
@@ -866,6 +867,7 @@ files:
 - lib/spree/testing_support/order_walkthrough.rb
 - lib/spree/testing_support/partial_double_verification.rb
 - lib/spree/testing_support/preferences.rb
+- lib/spree/testing_support/rake.rb
 - lib/spree/testing_support/sequences.rb
 - lib/spree/testing_support/shared_examples/gallery.rb
 - lib/spree/testing_support/url_helpers.rb
@@ -969,6 +971,7 @@ files:
 - spec/lib/spree/migrations_spec.rb
 - spec/lib/spree/money_spec.rb
 - spec/lib/spree/permission_sets/default_customer_spec.rb
+- spec/lib/spree/promo/environment_spec.rb
 - spec/lib/tasks/dummy_task.rake
 - spec/lib/tasks/dummy_task_spec.rb
 - spec/lib/tasks/migrations/migrate_shipping_rate_taxes_spec.rb
@@ -1204,7 +1207,6 @@ files:
 - spec/support/concerns/payment_source.rb
 - spec/support/concerns/working_factories.rb
 - spec/support/dummy_ability.rb
-- spec/support/shared_contexts/rake.rb
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jsuri.js
 - vendor/assets/stylesheets/normalize.css

data/lib/spree/event/processors/mailer_processor.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Event
-    module Processors
-      module MailerProcessor
-        include Spree::Event::Subscriber
-
-        event_action :order_finalized
-        event_action :send_reimbursement_email, event_name: :reimbursement_reimbursed
-
-        def order_finalized(event)
-          order = event.payload[:order]
-          unless order.confirmation_delivered?
-            Spree::Config.order_mailer_class.confirm_email(order).deliver_later
-            order.update_column(:confirmation_delivered, true)
-          end
-        end
-
-        def send_reimbursement_email(event)
-          reimbursement = event.payload[:reimbursement]
-          Spree::Config.reimbursement_mailer_class.reimbursement_email(reimbursement.id).deliver_later
-        end
-      end
-    end
-  end
-end