solidus_core 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3429ad38c55c3f8f63d7ed185059e379cb521172e8a0a0e81224ef7ca5cbb3a1
-  data.tar.gz: a48d078ec2c750b99e6cf017645f3cd236356d3c1898ab3cddf5e6519670b6fb
+  metadata.gz: '086d861b411b9e1e18910a57fed0d2f18f375657d409a7b1135af8a33318ba67'
+  data.tar.gz: 73a855a124bdd7e7a4fa433d7b214746cf5dca67de4a172d5b0c3c399d63a955
 SHA512:
-  metadata.gz: 99725a17217f4ae580ce292800821d09376313a9b085374f2d3025ddc2cda98adc7147a809ad600e869dc781cc52e76d6f7129e302ecb960ddd0f8abb22702e8
-  data.tar.gz: 48b10e9c1d0e99777c12e0bdec028395d27ebc0934fbb295ff718ecc6e772a51721997de943784dce0099bab614e4b4ea017435ab119c733a52e685ab29bea5f
+  metadata.gz: bfcdb0ec66a4e56859f14c5c0c544d51c7cc033fce8a6eaf9daf94587d10a412ee602cbc63a488a41ce521e8fd03a7adac6c91c8a379d81ef2dcad19ce913416
+  data.tar.gz: 932832d98cac34c0c9c873f47a70a0b97896f8e467a0f8acc5f21b49d99894b82d2d3e8168b53ae9f2147c2e42e06e585e5dd6ab8698fea096e81ff81990ef1b

data/lib/spree/core/controller_helpers/strong_parameters.rb

@@ -31,16 +31,30 @@ module Spree
         end
 
         def permitted_checkout_attributes
-          permitted_attributes.checkout_attributes + [
-            bill_address_attributes: permitted_address_attributes,
-            ship_address_attributes: permitted_address_attributes,
-            payments_attributes: permitted_payment_attributes,
-            shipments_attributes: permitted_shipment_attributes
-          ]
+          permitted_attributes.checkout_attributes
+        end
+
+        def permitted_checkout_address_attributes
+          permitted_attributes.checkout_address_attributes
+        end
+
+        def permitted_checkout_delivery_attributes
+          permitted_attributes.checkout_delivery_attributes
+        end
+
+        def permitted_checkout_payment_attributes
+          permitted_attributes.checkout_payment_attributes
+        end
+
+        def permitted_checkout_confirm_attributes
+          permitted_attributes.checkout_confirm_attributes
         end
 
         def permitted_order_attributes
-          permitted_checkout_attributes + [
+          permitted_checkout_address_attributes +
+          permitted_checkout_delivery_attributes +
+          permitted_checkout_payment_attributes +
+          permitted_checkout_confirm_attributes + [
             line_items_attributes: permitted_line_item_attributes
           ]
         end

data/lib/spree/core/importer/order.rb

@@ -133,7 +133,8 @@ module Spree
             # spree_wombat serializes payment state as status so imported orders should fall back to status field.
             payment.state = target[:state] || target[:status] || 'completed'
             payment.payment_method = Spree::PaymentMethod.find_by!(name: target[:payment_method])
-            payment.source = create_source_payment_from_params(target[:source], payment) if target[:source]
+            source_attributes = target[:source] || target[:source_attributes]
+            payment.source = create_source_payment_from_params(source_attributes, payment) if source_attributes
             payment.save!
           end
         end

data/lib/spree/core/version.rb

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

data/lib/spree/permitted_attributes.rb

@@ -8,7 +8,10 @@ module Spree
     ATTRIBUTES = [
       :address_attributes,
       :address_book_attributes,
-      :checkout_attributes,
+      :checkout_address_attributes,
+      :checkout_delivery_attributes,
+      :checkout_payment_attributes,
+      :checkout_confirm_attributes,
       :credit_card_update_attributes,
       :customer_return_attributes,
       :image_attributes,
@@ -45,10 +48,6 @@ module Spree
 
     @@address_book_attributes = address_attributes + [:default]
 
-    @@checkout_attributes = [
-      :coupon_code, :email, :special_instructions, :use_billing
-    ]
-
     @@credit_card_update_attributes = [
       :month, :year, :expiry, :first_name, :last_name, :name
     ]
@@ -91,7 +90,7 @@ module Spree
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data,
-      :existing_card_id, :wallet_payment_source_id
+      :existing_card_id, :wallet_payment_source_id, address_attributes: address_attributes
     ]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
@@ -129,5 +128,75 @@ module Spree
       :product_id, :product, :option_values_attributes, :price,
       :weight, :height, :width, :depth, :sku, :cost_currency, option_value_ids: [], options: [:name, :value]
     ]
+
+    @@checkout_address_attributes = [
+      :use_billing,
+      :email,
+      bill_address_attributes: address_attributes,
+      ship_address_attributes: address_attributes
+    ]
+
+    @@checkout_delivery_attributes = [
+      :special_instructions,
+      shipments_attributes: shipment_attributes
+    ]
+
+    @@checkout_payment_attributes = [
+      :coupon_code,
+      payments_attributes: payment_attributes + [
+        source_attributes: source_attributes
+      ]
+    ]
+
+    @@checkout_confirm_attributes = []
+
+    def self.checkout_attributes
+      Spree::Deprecation.warn <<-WARN.squish, caller
+        checkout_attributes is deprecated, please use the permitted
+        attributes set for the specific step that needs to be updated.
+
+        E.g. permitted_checkout_address_attributes
+      WARN
+
+      CheckoutAdditionalAttributes.new(
+        checkout_address_attributes +
+        checkout_delivery_attributes +
+        checkout_payment_attributes +
+        checkout_confirm_attributes
+      )
+    end
+  end
+
+  class CheckoutAdditionalAttributes < Array
+    def <<(*attributes)
+      super
+
+      inject_attributes_to_all_steps(attributes, :<<)
+    end
+
+    def push(*attributes)
+      super
+
+      inject_attributes_to_all_steps(attributes, :push)
+    end
+    alias append push
+
+    def prepend(*attributes)
+      super
+
+      inject_attributes_to_all_steps(attributes, :prepend)
+    end
+    alias unshift prepend
+
+    private
+
+    def inject_attributes_to_all_steps(attributes, method)
+      attributes.each do |attribute|
+        PermittedAttributes.checkout_address_attributes.send(method, attribute)
+        PermittedAttributes.checkout_delivery_attributes.send(method, attribute)
+        PermittedAttributes.checkout_payment_attributes.send(method, attribute)
+        PermittedAttributes.checkout_confirm_attributes.send(method, attribute)
+      end
+    end
   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/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/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/promotion/rules/taxon_spec.rb

@@ -101,6 +101,7 @@ RSpec.describe Spree::Promotion::Rules::Taxon, type: :model do
         before do
           taxon.children << taxon2
           taxon.save!
+          taxon.reload
           product.taxons = [taxon2, taxon3]
           rule.taxons = [taxon, taxon3]
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -976,6 +976,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/permitted_attributes_spec.rb
 - spec/lib/spree/promo/environment_spec.rb
 - spec/lib/tasks/dummy_task.rake
 - spec/lib/tasks/dummy_task_spec.rb