spree_core 4.10.1 → 5.0.0.rc1

data/lib/spree/core/preferences/preferable_class_methods.rb

@@ -2,11 +2,12 @@ module Spree::Preferences
   module PreferableClassMethods
     def preference(name, type, *args)
       options = args.extract_options!
-      options.assert_valid_keys(:default, :deprecated, :nullable)
+      options.assert_valid_keys(:default, :deprecated, :nullable, :parse_on_set)
       default = options[:default]
       default = -> { options[:default] } unless default.is_a?(Proc)
       deprecated = options[:deprecated]
       nullable = options[:nullable]
+      parse_on_set = options[:parse_on_set]
 
       # cache_key will be nil for new objects, then if we check if there
       # is a pending preference before going to default
@@ -17,6 +18,7 @@ module Spree::Preferences
       end
 
       define_method preference_setter_method(name) do |value|
+        value = parse_on_set.call(value) if parse_on_set.is_a?(Proc)
         value = convert_preference_value(value, type, nullable: nullable)
         preferences[name] = value
 
@@ -37,6 +39,10 @@ module Spree::Preferences
       define_method preference_deprecated_getter_method(name) do
         deprecated
       end
+
+      define_method prefers_query_method(name) do
+        preferences.fetch(name).to_b
+      end
     end
 
     def preference_getter_method(name)
@@ -58,5 +64,9 @@ module Spree::Preferences
     def preference_type_getter_method(name)
       "preferred_#{name}_type".to_sym
     end
+
+    def prefers_query_method(name)
+      "prefers_#{name}?".to_sym
+    end
   end
 end

data/lib/spree/core/preferences/runtime_configuration.rb

@@ -7,6 +7,12 @@ module Spree
         end
       end
 
+      def reset
+        self.class.defaults.each do |key, value|
+          self[key] = value
+        end
+      end
+
       def configure
         yield(self) if block_given?
       end
@@ -17,8 +23,13 @@ module Spree
 
       alias [] get
 
-      def set(preference, value)
-        send("#{preference}=", value)
+      def set(*args)
+        options = args.extract_options!
+        options.each do |name, value|
+          send("#{name}=", value)
+        end
+
+        send("#{args[0]}=", args[1]) if args.size == 2
       end
 
       alias []= set

data/lib/spree/core/search/base.rb

@@ -5,6 +5,8 @@ module Spree
         attr_accessor :properties, :current_user, :current_currency, :current_store, :taxon
 
         def initialize(params)
+          Spree::Deprecation.warn("Spree::Core::Search::Base is deprecated and will be removed in Spree 6. Please use `Spree::Products::Find` finder instead.")
+
           @properties = {}
           @current_store = params[:current_store] || Spree::Store.default
           @current_currency = @current_store.default_currency

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.10.1'.freeze
+  VERSION = '5.0.0.rc1'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -1,33 +1,55 @@
+require 'ostruct'
 require 'action_controller/railtie'
 require 'action_view/railtie'
 require 'active_job/railtie'
 require 'active_model/railtie'
 require 'active_record/railtie'
 require 'active_storage/engine'
+require 'action_text/engine'
+
+require 'mail'
+require 'action_mailer/railtie'
+require 'sprockets/railtie'
 
 require 'active_merchant'
 require 'acts_as_list'
+require 'acts-as-taggable-on'
 require 'auto_strip_attributes'
 require 'awesome_nested_set'
 require 'cancan'
+require 'countries/global'
 require 'friendly_id'
 require 'kaminari'
 require 'monetize'
 require 'mobility'
+require 'name_of_person'
 require 'paranoia'
 require 'ransack'
 require 'state_machines-activerecord'
 require 'active_storage_validations'
-require 'activerecord-typedstore'
 require 'request_store'
+require 'wannabe_bool'
+require 'geocoder'
+require 'oembed'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
 StateMachines::Machine.ignore_method_conflicts = true
 
 module Spree
-  mattr_accessor :user_class, :admin_user_class, :private_storage_service_name,
-                 :public_storage_service_name, :cdn_host, :searcher_class
+  mattr_accessor :base_class, :user_class, :admin_user_class,
+                 :private_storage_service_name, :public_storage_service_name,
+                 :cdn_host, :root_domain, :searcher_class, :queues,
+                 :google_places_api_key, :screenshot_api_token
+
+  def self.base_class(constantize: true)
+    @@base_class ||= 'Spree::Base'
+    if @@base_class.is_a?(Class)
+      raise 'Spree.base_class MUST be a String or Symbol object, not a Class object.'
+    elsif @@base_class.is_a?(String) || @@base_class.is_a?(Symbol)
+      constantize ? @@base_class.to_s.constantize : @@base_class.to_s
+    end
+  end
 
   def self.user_class(constantize: true)
     if @@user_class.is_a?(Class)
@@ -51,9 +73,9 @@ module Spree
     if @@private_storage_service_name
       if @@private_storage_service_name.is_a?(String) || @@private_storage_service_name.is_a?(Symbol)
         @@private_storage_service_name.to_sym
-      else
-        raise 'Spree.private_storage_service_name MUST be a String or Symbol object.'
       end
+    else
+      Rails.application.config.active_storage.service
     end
   end
 
@@ -61,12 +83,31 @@ module Spree
     if @@public_storage_service_name
       if @@public_storage_service_name.is_a?(String) || @@public_storage_service_name.is_a?(Symbol)
         @@public_storage_service_name.to_sym
-      else
-        raise 'Spree.public_storage_service_name MUST be a String or Symbol object.'
       end
+    else
+      Rails.application.config.active_storage.service
     end
   end
 
+  def self.root_domain
+    @@root_domain ||= Rails.application.routes.default_url_options[:host] || 'lvh.me'
+  end
+
+  def self.queues
+    @@queues ||= OpenStruct.new(
+      default: :default,
+      exports: :default,
+      reports: :default,
+      variants: :default,
+      taxons: :default,
+      stock_location_stock_items: :default,
+      coupon_codes: :default,
+      webhooks: :default,
+      themes: :default,
+      addresses: :addresses
+    )
+  end
+
   def self.searcher_class(constantize: true)
     @@searcher_class ||= 'Spree::Core::Search::Base'
 
@@ -77,12 +118,20 @@ module Spree
     end
   end
 
+  def self.google_places_api_key
+    @@google_places_api_key
+  end
+
+  def self.screenshot_api_token
+    @@screenshot_api_token
+  end
+
   def self.always_use_translations?
-    Spree::RuntimeConfig.always_use_translations
+    Spree::Config.always_use_translations
   end
 
   def self.use_translations?
-    Spree::RuntimeConfig.always_use_translations || I18n.default_locale != I18n.locale
+    Spree::Config.always_use_translations || I18n.default_locale != I18n.locale
   end
 
   # Used to configure Spree.
@@ -137,10 +186,10 @@ require 'spree/money'
 require 'spree/permitted_attributes'
 require 'spree/service_module'
 require 'spree/database_type_utilities'
+require 'spree/analytics'
 
 require 'spree/core/importer'
 require 'spree/core/query_filters'
-require 'spree/core/product_duplicator'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'
@@ -149,9 +198,10 @@ require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 require 'spree/core/controller_helpers/locale'
 require 'spree/core/controller_helpers/currency'
+require 'spree/core/controller_helpers/turbo'
 
 require 'spree/core/preferences/store'
 require 'spree/core/preferences/scoped_store'
 require 'spree/core/preferences/runtime_configuration'
 
-require "spree/core/webhooks"
+require 'spree/core/webhooks'

data/lib/spree/i18n.rb

@@ -17,15 +17,12 @@ module Spree
     end
 
     def available_locales
-      locales_from_i18n = I18n.available_locales
-      locales =
-        if defined?(SpreeI18n)
-          (SpreeI18n::Locale.all << :en).map(&:to_sym)
-        else
-          [Rails.application.config.i18n.default_locale, I18n.locale, :en]
-        end
+      locales = defined?(SpreeI18n) ? SpreeI18n::Locale.all.map(&:to_sym) : []
+      locales << :en
+      locales << I18n.locale
+      locales << Rails.application.config.i18n.default_locale
 
-      (locales + locales_from_i18n).uniq.compact
+      locales.uniq.compact
     end
 
     alias t translate

data/lib/spree/migrations.rb

@@ -36,7 +36,7 @@ module Spree
           missing_migrations.each do |migration|
             puts "[#{engine_name.capitalize} WARNING] #{migration} from #{engine_name} is missing."
           end
-          puts "[#{engine_name.capitalize} WARNING] Run `bundle exec rake railties:install:migrations` to get them.\n\n"
+          puts "[#{engine_name.capitalize} WARNING] Run `bundle exec rake spree:install:migrations` to get them.\n\n"
           true
         end
       end

data/lib/spree/permitted_attributes.rb

@@ -42,14 +42,14 @@ module Spree
       :id, :firstname, :lastname, :first_name, :last_name,
       :address1, :address2, :city, :country_iso, :country_id, :state_id,
       :zipcode, :phone, :state_name, :alternative_phone, :company,
-      :user_id, :deleted_at, :label,
+      :user_id, :deleted_at, :label, :quick_checkout,
       { country: [:iso, :name, :iso3, :iso_name],
         state: [:name, :abbr] }
     ]
 
     @@checkout_attributes = [
-      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing,
-      :user_id, :bill_address_id, :ship_address_id
+      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, :use_shipping,
+      :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account
     ]
 
     @@classification_attributes = [
@@ -94,10 +94,14 @@ module Spree
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
       :cost_currency, :cost_price, :compare_at_price,
-      { option_type_ids: [], taxon_ids: [] }
+      {
+        tag_list: [],
+        option_type_ids: [],
+        taxon_ids: []
+      }
     ]
 
-    @@property_attributes = [:name, :presentation]
+    @@property_attributes = [:name, :presentation, :position]
 
     @@return_authorization_attributes = [:amount, :memo, :stock_location_id, :inventory_units_attributes,
                                          :return_authorization_reason_id]
@@ -109,7 +113,7 @@ module Spree
 
     # month / year may be provided by some sources, or others may elect to use one field
     @@source_attributes = [
-      :number, :month, :year, :expiry, :verification_value,
+      :id, :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
     ]
@@ -128,13 +132,18 @@ module Spree
 
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
                           :meta_description, :default_currency, :mail_from_address,
-                          :customer_support_email, :facebook, :twitter, :instagram,
-                          :description, :address, :contact_phone, :supported_locales,
-                          :default_locale, :default_country_id, :supported_currencies,
+                          :customer_support_email, :description, :address, :contact_phone,
+                          :supported_locales, :default_locale, :default_country_id, :supported_currencies,
                           :new_order_notifications_email, :checkout_zone_id, :seo_robots,
-                          :digital_asset_authorized_clicks, :digital_asset_authorized_days,
-                          :limit_digital_download_count, :limit_digital_download_days, :digital_asset_link_expire_time,
-                          { mailer_logo_attributes: {}, favicon_image_attributes: {}, logo_attributes: {} }]
+                          :preferred_timezone, :preferred_weight_unit, :preferred_unit_system,
+                          :preferred_digital_asset_authorized_clicks, :preferred_digital_asset_authorized_days,
+                          :preferred_limit_digital_download_count, :preferred_limit_digital_download_days,
+                          :preferred_digital_asset_link_expire_time,
+                          :logo, :mailer_logo, :social_logo, :favicon_image,
+                          :import_products_from_store_id, :import_payment_methods_from_store_id,
+                          :checkout_message, :preferred_guest_checkout,
+                          :customer_terms_of_service, :customer_privacy_policy,
+                          :customer_returns_policy, :customer_shipping_policy, :default_country_iso]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 
@@ -145,16 +154,16 @@ module Spree
       :taxonomy_id, :meta_description, :meta_keywords, :meta_title, :child_index
     ]
 
-    # TODO: Should probably use something like Spree.user_class.attributes
     @@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :first_name, :last_name,
-                         :password_confirmation, { public_metadata: {}, private_metadata: {} }, :selected_locale]
+                         :password_confirmation, :selected_locale, :avatar, :accepts_email_marketing, :phone,
+                         { public_metadata: {}, private_metadata: {}, tag_list: [] }]
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :discontinue_on, :lock_version,
       :position, :track_inventory,
       :product_id, :product, :option_values_attributes, :price, :compare_at_price,
       :weight, :height, :width, :depth, :sku, :barcode, :cost_currency,
-      :weight_unit, :dimensions_unit, 
+      :weight_unit, :dimensions_unit,
       { options: [:name, :value], option_value_ids: [] }
     ]
 

data/lib/spree/testing_support/authorization_helpers.rb

@@ -16,8 +16,15 @@ module Spree
 
         def stub_authorization!(&block)
           ability_class = build_ability(&block)
+
+          let(:user) { Spree.admin_user_class.new(email: FFaker::Internet.email) }
+
           before do
             allow(controller).to receive(:current_ability).and_return(ability_class.new(nil))
+
+            if defined?(Spree::Admin::BaseController)
+              allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(user)
+            end
           end
         end
       end
@@ -37,16 +44,12 @@ module Spree
             ability_class.register_ability(ability)
           end
 
-          let(:user) { Spree.admin_user_class.new }
-          let(:admin_app) { Spree::OauthApplication.create!(name: 'Admin Panel', scopes: 'admin') }
-          let(:admin_token) { Spree::OauthAccessToken.create!(application: admin_app, scopes: 'admin').token }
+          let(:user) { Spree.admin_user_class.new(email: FFaker::Internet.email) }
 
           before do
             allow(Spree.admin_user_class).to receive(:find_by).and_return(user)
-            if defined?(Spree::Admin)
+            if defined?(Spree::Admin::BaseController)
               allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(user)
-              allow_any_instance_of(Spree::Admin::BaseController).to receive(:admin_oauth_application).and_return(admin_app)
-              allow_any_instance_of(Spree::Admin::BaseController).to receive(:admin_oauth_token).and_return(admin_token)
             end
           end
         end

data/lib/spree/testing_support/capybara_config.rb

@@ -23,5 +23,16 @@ Capybara.register_driver :selenium_chrome_headless do |app|
   options.add_argument '--window-size=1400,900'
   options.add_argument '--disable-search-engine-choice-screen'
 
+  # Disable timers being throttled in background pages/tabs. Useful for parallel test runs.
+  options.add_argument '--disable-background-timer-throttling'
+
+  # Normally, Chrome will treat a 'foreground' tab instead as backgrounded if the surrounding window is occluded (aka
+  # visually covered) by another window. This flag disables that. Useful for parallel test runs.
+  options.add_argument '--disable-backgrounding-occluded-windows'
+
+  # This disables non-foreground tabs from getting a lower process priority. Useful for parallel test runs.
+  options.add_argument '--disable-renderer-backgrounding'
+
+
   Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
 end

data/lib/spree/testing_support/common_rake.rb

@@ -8,16 +8,26 @@ require 'generators/spree/dummy_model/dummy_model_generator'
 desc 'Generates a dummy app for testing'
 namespace :common do
   task :test_app, :user_class do |_t, args|
-    args.with_defaults(user_class: 'Spree::LegacyUser', install_storefront: 'false', install_admin: 'false')
+    args.with_defaults(
+      user_class: 'Spree::LegacyUser',
+      install_storefront: 'false',
+      install_admin: 'false',
+      authentication: 'dummy'
+    )
     require ENV['LIB_NAME'].to_s
 
     ENV['RAILS_ENV'] = 'test'
     Rails.env = 'test'
 
-    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}"]
+    skip_javascript = ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
+
+    Spree::DummyGenerator.start [
+      "--lib_name=#{ENV['LIB_NAME']}",
+      "--skip_javascript=#{skip_javascript}"
+    ]
 
     # install frontend libraries
-    unless ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
+    unless skip_javascript
       system('bin/rails importmap:install')
       system('bin/rails turbo:install')
       system('bin/rails stimulus:install')
@@ -32,14 +42,15 @@ namespace :common do
       '--copy_storefront=false',
       "--install_storefront=#{args[:install_storefront]}",
       "--install_admin=#{args[:install_admin]}",
-      "--user_class=#{args[:user_class]}"
+      "--user_class=#{args[:user_class]}",
+      "--authentication=#{args[:authentication]}"
     ]
 
     puts 'Setting up dummy database...'
-    system('bin/rails db:environment:set RAILS_ENV=test')
-    system('bundle exec rake db:drop db:create')
+    system('bin/rails db:environment:set RAILS_ENV=test > /dev/null 2>&1')
+    system('bundle exec rake db:drop db:create > /dev/null 2>&1')
     Spree::DummyModelGenerator.start
-    system('bundle exec rake db:migrate')
+    system('bundle exec rake db:migrate > /dev/null 2>&1')
 
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"
@@ -49,14 +60,11 @@ namespace :common do
       puts 'Skipping installation no generator to run...'
     end
 
-    unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
-      puts 'Precompiling assets...'
-      system('bundle exec rake assets:precompile')
-    end
+    system('bundle exec rake assets:precompile > /dev/null 2>&1') if !skip_javascript || ENV['LIB_NAME'] == 'spree/emails'
   end
 
   task :seed do |_t|
     puts 'Seeding ...'
-    system('bundle exec rake db:seed RAILS_ENV=test')
+    system('bundle exec rake db:seed RAILS_ENV=test > /dev/null 2>&1')
   end
 end

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

@@ -17,4 +17,20 @@ FactoryBot.define do
   factory :shipping_no_amount_calculator, class: Spree::Calculator::Shipping::FlatRate do
     after(:create) { |c| c.set_preference(:amount, 0) }
   end
+
+  factory :flat_rate_calculator, class: Spree::Calculator::FlatRate do
+    preferred_amount { 10 }
+  end
+
+  factory :flat_percent_item_total_calculator, class: Spree::Calculator::FlatPercentItemTotal do
+    preferred_flat_percent { 10 }
+  end
+
+  factory :non_free_shipping_calculator, class: Spree::Calculator::Shipping::FlatRate do
+    after(:create) { |c| c.set_preference(:amount, 20.0) }
+  end
+
+  factory :digital_shipping_calculator, class: Spree::Calculator::Shipping::DigitalDelivery do
+    after(:create) { |c| c.set_preference(:amount, 0) }
+  end
 end

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

@@ -5,5 +5,13 @@ FactoryBot.define do
     sequence(:iso)      { |n| "I#{n}" }
     sequence(:iso3)     { |n| "IS#{n}" }
     numcode             { 840 }
+
+    factory :country_us, class: Spree::Country, parent: :country do
+      iso { 'US' }
+      iso3 { 'USA' }
+      name { 'United States of America' }
+      iso_name { 'UNITED STATES' }
+      states_required { true }
+    end
   end
 end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :coupon_code, class: Spree::CouponCode do
+    sequence(:code) { |n| "PROMO#{n}" }
+    state { :unused }
+    promotion
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :custom_domain, class: Spree::CustomDomain do
+    url { FFaker::Internet.domain_name }
+    store { create(:store) }
+    default { true }
+  end
+end

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

@@ -0,0 +1,32 @@
+# == Schema Information
+#
+# Table name: spree_exports
+#
+#  id            :uuid             not null, primary key
+#  format        :integer          not null
+#  number        :string(32)       not null
+#  search_params :jsonb
+#  type          :string           not null
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#  project_id    :uuid             not null
+#  store_id      :uuid             not null
+#  user_id       :uuid
+#  vendor_id     :uuid
+#
+FactoryBot.define do
+  factory :export, class: 'Spree::Export' do
+    store { create(:store) }
+    user { create(:admin_user) }
+    type { 'Spree::Export::Products' }
+    format { 'csv' }
+
+    factory :product_export, class: 'Spree::Exports::Products', parent: :export do
+      type { 'Spree::Exports::Products' }
+    end
+
+    factory :order_export, class: 'Spree::Exports::Orders', parent: :export do
+      type { 'Spree::Exports::Orders' }
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :gateway_customer, class: Spree::GatewayCustomer do
+    sequence(:profile_id) { |n| "cus_#{n}" }
+    user { |p| p.association(:user) }
+    payment_method { |p| p.association(:payment_method) }
+  end
+end

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

@@ -47,14 +47,20 @@ FactoryBot.define do
         without_line_items     { false }
         shipment_cost          { 100 }
         shipping_method_filter { Spree::ShippingMethod::DISPLAY_ON_FRONT_END }
+        variants               { [] }
       end
 
       after(:create) do |order, evaluator|
-        unless evaluator.without_line_items
+        if evaluator.variants.empty? && !evaluator.without_line_items
           create_list(:line_item, evaluator.line_items_count, order: order, price: evaluator.line_items_price)
           order.line_items.reload
         end
 
+        if evaluator.variants.any?
+          evaluator.variants.each { |variant| create(:line_item, order: order, product: variant.product, variant: variant, price: evaluator.line_items_price) }
+          order.line_items.reload
+        end
+
         stock_location = order.line_items&.first&.variant&.stock_items&.first&.stock_location || create(:stock_location)
         create(:shipment, order: order, cost: evaluator.shipment_cost, stock_location: stock_location)
         order.shipments.reload
@@ -89,8 +95,13 @@ FactoryBot.define do
           payment_state  { 'paid' }
           shipment_state { 'ready' }
 
-          after(:create) do |order|
-            create(:payment, amount: order.total, order: order, state: 'completed')
+          transient do
+            with_payment { true }
+          end
+
+          after(:create) do |order, evaluator|
+            create(:payment, amount: order.total, order: order, state: 'completed') if evaluator.with_payment
+
             order.shipments.each do |shipment|
               shipment.inventory_units.update_all state: 'on_hand'
               shipment.update_column('state', 'ready')

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

@@ -0,0 +1,21 @@
+FactoryBot.define do
+  factory :page_block, class: Spree::PageBlock do
+    section { create(:page_section) }
+
+    trait :buttons do
+      type { 'Spree::PageBlocks::Buttons' }
+    end
+
+    trait :nav do
+      section { create(:header_page_section) }
+
+      type { 'Spree::PageBlocks::Nav' }
+    end
+
+    trait :heading do
+      type { 'Spree::PageBlocks::Heading' }
+    end
+
+    factory :heading_block, traits: [:heading], class: Spree::PageBlocks::Heading
+  end
+end