spree_core 5.3.4 → 5.4.0.beta2

data/lib/spree/core.rb

@@ -11,13 +11,14 @@ require 'action_cable/engine'
 require 'mail'
 require 'action_mailer/railtie'
 
-require 'active_merchant'
+
 require 'acts_as_list'
 require 'acts-as-taggable-on'
 require 'awesome_nested_set'
 require 'cancan'
 require 'countries/global'
 require 'friendly_id'
+require 'jwt'
 require 'monetize'
 require 'mobility'
 require 'name_of_person'
@@ -25,12 +26,12 @@ require 'paranoia'
 require 'ransack'
 require 'state_machines-activerecord'
 require 'active_storage_validations'
-require 'request_store'
 require 'wannabe_bool'
 require 'geocoder'
-require 'oembed'
+
 require 'safely_block'
 require 'ar_lazy_preload'
+require 'sqids'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
@@ -40,7 +41,7 @@ module Spree
   mattr_accessor :base_class, :user_class, :admin_user_class,
                  :private_storage_service_name, :public_storage_service_name,
                  :cdn_host, :root_domain, :searcher_class, :events_adapter_class, :queues,
-                 :google_places_api_key, :screenshot_api_token
+                 :google_places_api_key
 
   def self.base_class(constantize: true)
     @@base_class ||= 'Spree::Base'
@@ -60,8 +61,6 @@ module Spree
   end
 
   def self.admin_user_class(constantize: true)
-    @@admin_user_class ||= @@user_class
-
     if @@admin_user_class.is_a?(Class)
       raise 'Spree.admin_user_class MUST be a String or Symbol object, not a Class object.'
     elsif @@admin_user_class.is_a?(String) || @@admin_user_class.is_a?(Symbol)
@@ -109,18 +108,19 @@ module Spree
       themes: :default,
       addresses: :default,
       gift_cards: :default,
-      webhooks: :default
+      webhooks: :default,
+      api_keys: :default
     )
   end
 
-  def self.searcher_class(constantize: true)
-    @@searcher_class ||= 'Spree::Core::Search::Base'
+  # @deprecated Spree.searcher_class is deprecated and will be removed in Spree 5.5.
+  def self.searcher_class=(value)
+    Spree::Deprecation.warn('Spree.searcher_class is deprecated and will be removed in Spree 5.5. Please remove it from your initializer.')
+    @@searcher_class = value
+  end
 
-    if @@searcher_class.is_a?(Class)
-      raise 'Spree.searcher_class MUST be a String or Symbol object, not a Class object.'
-    elsif @@searcher_class.is_a?(String) || @@searcher_class.is_a?(Symbol)
-      constantize ? @@searcher_class.to_s.constantize : @@searcher_class.to_s
-    end
+  def self.searcher_class(constantize: true)
+    @@searcher_class
   end
 
   # Returns the events adapter class used for publishing and subscribing to events.
@@ -144,10 +144,6 @@ module Spree
     @@google_places_api_key
   end
 
-  def self.screenshot_api_token
-    @@screenshot_api_token
-  end
-
   def self.always_use_translations?
     Spree::Config.always_use_translations
   end
@@ -246,14 +242,6 @@ module Spree
     Rails.application.config.spree.line_item_comparison_hooks = value
   end
 
-  def self.data_feed_types
-    Rails.application.config.spree.data_feed_types
-  end
-
-  def self.data_feed_types=(value)
-    Rails.application.config.spree.data_feed_types = value
-  end
-
   def self.export_types
     Rails.application.config.spree.export_types
   end
@@ -414,7 +402,6 @@ module Spree
   end
 
   module Core
-    autoload :ProductFilters, 'spree/core/product_filters'
     autoload :TokenGenerator, 'spree/core/token_generator'
 
     class GatewayError < RuntimeError; end
@@ -441,11 +428,9 @@ require 'spree/webhooks'
 
 require 'spree/core/partials'
 require 'spree/core/importer'
-require 'spree/core/query_filters'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'
-require 'spree/core/controller_helpers/search'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 require 'spree/core/controller_helpers/locale'

data/lib/spree/database_type_utilities.rb

@@ -1,9 +1,16 @@
 module Spree
+  # @deprecated Use the integer constant directly instead, eg. `2_147_483_647` for 4-byte signed integer max.
+  #   This module will be removed in Spree 5.5.
   module DatabaseTypeUtilities
     # Maximum value for a 4-byte signed integer (default database integer type)
     INTEGER_MAX = (2**31) - 1
 
     def self.maximum_value_for(data_type)
+      Spree::Deprecation.warn(
+        'Spree::DatabaseTypeUtilities.maximum_value_for is deprecated and will be removed in Spree 5.5. ' \
+        'Use the integer constant directly instead, eg. 2_147_483_647 for 4-byte signed integer max.'
+      )
+
       case data_type
       when :integer
         INTEGER_MAX

data/lib/spree/events.rb

@@ -177,10 +177,11 @@ module Spree
       # Check if events are enabled
       #
       # Events can be temporarily disabled using Spree::Events.disable { ... }
+      # or globally with Spree::Events.disable!
       #
       # @return [Boolean]
       def enabled?
-        !RequestStore.store[:spree_events_disabled]
+        !@globally_disabled && !Thread.current[:spree_events_disabled]
       end
 
       # Temporarily disable events within a block
@@ -195,18 +196,21 @@ module Spree
       #   end
       #
       def disable
-        previous = RequestStore.store[:spree_events_disabled]
-        RequestStore.store[:spree_events_disabled] = true
+        previous = Thread.current[:spree_events_disabled]
+        Thread.current[:spree_events_disabled] = true
         yield
       ensure
-        RequestStore.store[:spree_events_disabled] = previous
+        Thread.current[:spree_events_disabled] = previous
       end
 
       # Globally disable events
-      # Useful for testing to disable events for the entire test suite
+      #
+      # Uses a class-level flag that is not affected by per-request cleanup.
+      # Useful for disabling events for the entire test suite.
+      #
       # @return [void]
       def disable!
-        RequestStore.store[:spree_events_disabled] = true
+        @globally_disabled = true
       end
 
       # Temporarily enable events within a block
@@ -222,18 +226,21 @@ module Spree
       #   end
       #
       def enable
-        previous = RequestStore.store[:spree_events_disabled]
-        RequestStore.store[:spree_events_disabled] = false
+        previous_global = @globally_disabled
+        previous_thread = Thread.current[:spree_events_disabled]
+        @globally_disabled = false
+        Thread.current[:spree_events_disabled] = false
         yield
       ensure
-        RequestStore.store[:spree_events_disabled] = previous
+        @globally_disabled = previous_global
+        Thread.current[:spree_events_disabled] = previous_thread
       end
 
       # Globally enable events
       # Useful for testing
       # @return [void]
       def enable!
-        RequestStore.store[:spree_events_disabled] = false
+        @globally_disabled = false
       end
     end
   end

data/lib/spree/money.rb

@@ -51,17 +51,10 @@ module Spree
     # 1) prevent blank, breaking spaces
     # 2) prevent escaping of HTML character entities
     def to_html(opts = { html: true })
-      # html option is deprecated and we need to fallback to html_wrap
-      opts[:html_wrap] = opts[:html]
       opts.delete(:html)
 
-      output = money.format(options.merge(opts))
-      if opts[:html_wrap]
-        output.gsub!(/<\/?[^>]*>/, '') # we don't want wrap every element in span
-        output = output.sub(' ', '&nbsp;').html_safe
-      end
-
-      output
+      output = money.format(options.merge(opts).merge(html_wrap: false))
+      output.sub(' ', '&nbsp;').html_safe
     end
 
     def as_json(*)

data/lib/spree/permitted_attributes.rb

@@ -2,6 +2,7 @@ module Spree
   module PermittedAttributes
     ATTRIBUTES = [
       :address_attributes,
+      :api_key_attributes,
       :asset_attributes,
       :checkout_attributes,
       :classification_attributes,
@@ -22,6 +23,7 @@ module Spree
       :inventory_unit_attributes,
       :invitation_attributes,
       :line_item_attributes,
+      :market_attributes,
       :menu_attributes,
       :menu_item_attributes,
       :metafield_attributes,
@@ -34,16 +36,14 @@ module Spree
       :page_section_attributes,
       :payment_attributes,
       :payment_method_attributes,
+      :payment_session_attributes,
+      :payment_setup_session_attributes,
       :policy_attributes,
-      :post_attributes,
-      :post_category_attributes,
       :price_list_attributes,
       :product_attributes,
       :promotion_attributes,
       :promotion_rule_attributes,
       :promotion_action_attributes,
-      :product_properties_attributes,
-      :property_attributes,
       :refund_attributes,
       :refund_reason_attributes,
       :reimbursement_attributes,
@@ -80,18 +80,20 @@ module Spree
 
     @@address_attributes = [
       :id, :firstname, :lastname, :first_name, :last_name,
-      :address1, :address2, :city, :country_iso, :country_id, :state_id,
+      :address1, :address2, :city, :country_iso, :state_abbr, :country_id, :state_id,
       :zipcode, :phone, :state_name, :alternative_phone, :company,
       :user_id, :deleted_at, :label, :quick_checkout,
       { country: [:iso, :name, :iso3, :iso_name],
         state: [:name, :abbr] }
     ]
 
+    @@api_key_attributes = [:name, :key_type]
+
     @@asset_attributes = [:type, :viewable_id, :viewable_type, :attachment, :alt, :position]
 
     @@checkout_attributes = [
       :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, :currency,
+      :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account, :currency, :locale,
       :internal_note
     ]
 
@@ -134,7 +136,10 @@ module Spree
 
     @@invitation_attributes = [:email, :expires_at, :role_id]
 
-    @@line_item_attributes = [:id, :variant_id, :quantity]
+    @@line_item_attributes = [:id, :variant_id, :quantity, { metadata: {} }]
+
+    @@market_attributes = [:name, :currency, :default_locale, :supported_locales,
+                           :tax_inclusive, :default, :position, country_ids: []]
 
     @@menu_attributes = [:name, :locale, :location]
 
@@ -162,16 +167,14 @@ module Spree
 
     @@payment_method_attributes = [:name, :type, :description, :active, :display_on, :auto_capture, :position]
 
-    @@policy_attributes = [:name, :slug, :body]
+    @@payment_session_attributes = [:amount, :payment_method_id, { external_data: {} }]
 
-    @@post_attributes = [:title, :meta_title, :meta_description, :slug, :author_id, :post_category_id, :published_at, :content, :excerpt, :image, tag_list: []]
+    @@payment_setup_session_attributes = [:payment_method_id, { external_data: {} }]
 
-    @@post_category_attributes = [:title, :slug, :description]
+    @@policy_attributes = [:name, :slug, :body]
 
     @@price_list_attributes = [:name, :description, :match_policy, :starts_at, :ends_at, :status, :position]
 
-    @@product_properties_attributes = [:property_name, :property_id, :value, :position, :_destroy]
-
     @@product_attributes = [
       :name, :description, :available_on, :make_active_at, :discontinue_on, :permalink, :meta_description,
       :meta_keywords, :meta_title, :price, :sku, :deleted_at, :prototype_id,
@@ -197,8 +200,6 @@ module Spree
 
     @@promotion_action_attributes = [:type, :calculator_type, calculator_attributes: {}, promotion_action_line_items_attributes: [:id, :promotion_action_id, :variant_id, :quantity, :_destroy]]
 
-    @@property_attributes = [:name, :presentation, :position, :kind, :display_on]
-
     @@refund_attributes = [:amount, :refund_reason_id]
 
     @@refund_reason_attributes = [:name, :active, :mutable]
@@ -262,19 +263,18 @@ module Spree
                                    stock_movements_attributes: [:variant_id, :quantity, :originator_id, :stock_item_id]]
 
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
-                          :meta_description, :default_currency, :mail_from_address,
+                          :meta_description, :default_currency, :default_country_iso, :mail_from_address,
                           :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,
-                          :preferred_timezone, :preferred_weight_unit, :preferred_unit_system,
+                          :supported_locales, :default_locale, :supported_currencies,
+                          :new_order_notifications_email, :seo_robots,
+                          :preferred_admin_locale, :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]
+                          :customer_returns_policy, :customer_shipping_policy]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 

data/lib/spree/testing_support/capybara_config.rb

@@ -1,7 +1,7 @@
 require 'capybara-screenshot/rspec'
 
 Capybara.configure do |config|
-  config.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+  config.save_path = ENV['CI_ARTIFACTS'] if ENV['CI_ARTIFACTS']
   config.server = :puma
   config.default_driver = :rack_test
   config.javascript_driver = :selenium_chrome_headless
@@ -27,7 +27,7 @@ Capybara.register_driver :selenium_chrome_headless do |app|
   options.add_argument '--window-size=1920,1080'
   options.add_argument '--disable-search-engine-choice-screen'
 
-  # Required for running in Docker containers (CircleCI)
+  # Required for running in CI containers
   options.add_argument '--no-sandbox'
   options.add_argument '--disable-dev-shm-usage'
 

data/lib/spree/testing_support/common_rake.rb

@@ -4,14 +4,25 @@ require 'generators/spree/dummy_model/dummy_model_generator'
 desc 'Generates a dummy app for testing'
 namespace :common do
   task :test_app, [:authentication, :user_class, :admin_user_class, :css, :javascript, :install_admin, :install_storefront] do |_t, args|
-    args.with_defaults(
+    # Support both Rake::TaskArguments (via invoke) and Hash (via execute)
+    # When using execute with a Hash, args IS the hash directly
+    defaults = {
       authentication: 'dummy',
       user_class: 'Spree::LegacyUser',
+      admin_user_class: 'Spree::LegacyAdminUser',
       install_storefront: false,
       install_admin: false,
       javascript: false,
       css: false
-    )
+    }
+    # Rake::TaskArguments#with_defaults modifies in-place
+    # ActiveSupport adds Hash#with_defaults which returns a new hash, so check for Rake::TaskArguments specifically
+    if args.is_a?(Rake::TaskArguments)
+      args.with_defaults(defaults)
+    else
+      # Hash passed via execute - use reverse_merge! to merge defaults in place
+      args.reverse_merge!(defaults)
+    end
     require ENV['LIB_NAME'].to_s
 
     # Convert to booleans (supports both string and boolean values for backwards compatibility)
@@ -60,8 +71,8 @@ namespace :common do
     core_gems = %w[spree/core spree/api]
     root_gemfile = File.expand_path('../../../../Gemfile', __dir__)
     use_root_gemfile = core_gems.include?(ENV['LIB_NAME']) &&
-                       File.exist?(root_gemfile) &&
-                       File.exist?(File.expand_path('../../../../spree.gemspec', __dir__))
+      File.exist?(root_gemfile) &&
+      File.exist?(File.expand_path('../../../../spree.gemspec', __dir__))
     bundle_exec = use_root_gemfile ? "bundle exec --gemfile=#{root_gemfile}" : 'bundle exec'
     puts 'Running Spree install generator...'
     system("#{bundle_exec} rails g spree:install --force --auto-accept --migrate=false --seed=false --sample=false --user_class=#{args[:user_class]} --admin_user_class=#{args[:admin_user_class]} --authentication=#{args[:authentication]}")

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

@@ -0,0 +1,19 @@
+FactoryBot.define do
+  factory :api_key, class: Spree::ApiKey do
+    name { FFaker::Lorem.word }
+    key_type { 'publishable' }
+    store
+
+    trait :publishable do
+      key_type { 'publishable' }
+    end
+
+    trait :secret do
+      key_type { 'secret' }
+    end
+
+    trait :revoked do
+      revoked_at { Time.current }
+    end
+  end
+end

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

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

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

@@ -16,5 +16,17 @@ FactoryBot.define do
         )
       end
     end
+
+    factory :customer_import, class: 'Spree::Imports::Customers', parent: :import do
+      type { 'Spree::Imports::Customers' }
+
+      after(:create) do |import|
+        import.attachment.attach(
+          io: File.open(Spree::Core::Engine.root.join('spec', 'fixtures', 'files', 'customers_import.csv')),
+          filename: 'customers_import.csv',
+          content_type: 'text/csv'
+        )
+      end
+    end
   end
 end

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

@@ -0,0 +1,35 @@
+FactoryBot.define do
+  factory :market, class: Spree::Market do
+    sequence(:name) { |n| "Market #{n}" }
+    currency { 'USD' }
+    default_locale { 'en' }
+    store
+    countries { [association(:country)] }
+
+    after(:build) do |market|
+      if market.countries.any?
+        zone = Spree::Zone.find_or_create_by!(name: 'Test Shipping Zone') do |z|
+          z.kind = 'country'
+        end
+        market.countries.each do |country|
+          zone.zone_members.find_or_create_by!(zoneable: country)
+        end
+        if zone.shipping_methods.empty?
+          shipping_category = Spree::ShippingCategory.first || FactoryBot.create(:shipping_category)
+          FactoryBot.create(:shipping_method, zones: [zone], shipping_categories: [shipping_category])
+        end
+      end
+    end
+
+    trait :default do
+      default { true }
+    end
+
+    trait :eu do
+      name { 'Europe' }
+      currency { 'EUR' }
+      default_locale { 'de' }
+      tax_inclusive { true }
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ FactoryBot.define do
     completed_at { nil }
     email        { user&.email }
     currency     { 'USD' }
+    locale       { 'en' }
 
     transient do
       line_items_price { BigDecimal(10) }
@@ -75,8 +76,10 @@ FactoryBot.define do
         state { 'complete' }
 
         after(:create) do |order, evaluator|
-          order.refresh_shipment_rates(evaluator.shipping_method_filter)
+          # Set completed_at before refreshing shipment rates so order.completed? returns true
+          # This prevents the shipping rate selection from recalculating order totals
           order.update_column(:completed_at, order.completed_at || Time.current)
+          order.refresh_shipment_rates(evaluator.shipping_method_filter)
         end
 
         factory :completed_order_with_pending_payment do

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

@@ -23,12 +23,7 @@ FactoryBot.define do
     name { 'Credit Card' }
   end
 
-  # authorize.net was moved to spree_gateway.
-  # Leaving this factory in place with bogus in case anyone is using it.
-  factory :simple_credit_card_payment_method, parent: :payment_method, class: Spree::Gateway::BogusSimple do
-    type { 'Spree::Gateway::BogusSimple' }
-    name { 'Credit Card' }
-  end
+  factory :simple_credit_card_payment_method, parent: :credit_card_payment_method
 
   factory :store_credit_payment_method, parent: :payment_method, class: Spree::PaymentMethod::StoreCredit do
     type          { 'Spree::PaymentMethod::StoreCredit' }
@@ -42,4 +37,6 @@ FactoryBot.define do
     type { 'Spree::Gateway::CustomPaymentSourceMethod' }
     name { 'Custom' }
   end
+
+  factory :bogus_payment_method, parent: :credit_card_payment_method
 end

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

@@ -0,0 +1,47 @@
+FactoryBot.define do
+  factory :payment_session, class: 'Spree::PaymentSession' do
+    order
+    payment_method { create(:credit_card_payment_method, stores: [order.store]) }
+    amount { order.total }
+    currency { order.currency }
+    status { 'pending' }
+    external_id { "ps_test_#{SecureRandom.hex(12)}" }
+    external_data { {} }
+
+    trait :processing do
+      status { 'processing' }
+    end
+
+    trait :completed do
+      status { 'completed' }
+    end
+
+    trait :failed do
+      status { 'failed' }
+    end
+
+    trait :canceled do
+      status { 'canceled' }
+    end
+
+    trait :expired do
+      status { 'expired' }
+      expires_at { 1.hour.ago }
+    end
+
+    trait :with_expiration do
+      expires_at { 24.hours.from_now }
+    end
+
+    trait :with_customer do
+      customer { order.user || create(:user) }
+    end
+
+    factory :bogus_payment_session, class: 'Spree::PaymentSessions::Bogus' do
+      type { 'Spree::PaymentSessions::Bogus' }
+      payment_method { create(:bogus_payment_method, stores: [order.store]) }
+      external_id { "bogus_#{SecureRandom.hex(12)}" }
+      external_data { { 'client_secret' => "bogus_secret_#{SecureRandom.hex(8)}" } }
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+FactoryBot.define do
+  factory :payment_setup_session, class: 'Spree::PaymentSetupSession' do
+    customer { create(:user) }
+    payment_method { create(:credit_card_payment_method) }
+    status { 'pending' }
+    external_id { "seti_test_#{SecureRandom.hex(12)}" }
+    external_client_secret { "seti_secret_#{SecureRandom.hex(12)}" }
+    external_data { {} }
+
+    trait :processing do
+      status { 'processing' }
+    end
+
+    trait :completed do
+      status { 'completed' }
+      payment_source { create(:credit_card, user: customer) }
+    end
+
+    trait :failed do
+      status { 'failed' }
+    end
+
+    trait :canceled do
+      status { 'canceled' }
+    end
+
+    trait :expired do
+      status { 'expired' }
+    end
+  end
+end

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

@@ -45,5 +45,15 @@ FactoryBot.define do
         customer_group_ids { [] }
       end
     end
+
+    factory :market_price_rule, class: Spree::PriceRules::MarketRule do
+      after(:build) do |rule, evaluator|
+        rule.preferred_market_ids = evaluator.market_ids if evaluator.respond_to?(:market_ids)
+      end
+
+      transient do
+        market_ids { [] }
+      end
+    end
   end
 end

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

@@ -50,13 +50,6 @@ FactoryBot.define do
       factory :product_with_option_types do
         after(:create) { |product| create(:product_option_type, product: product) }
       end
-      factory :product_with_properties do
-        after(:create) do |product|
-          property = create(:property, :brand)
-          create(:product_property, product: product, property: property, value: 'Epsilon')
-        end
-      end
-
       factory :digital_product do
         track_inventory { false }
         shipping_category { |r| Spree::ShippingCategory.digital || r.association(:digital_shipping_category) }

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

@@ -1,11 +1,9 @@
 FactoryBot.define do
   factory :prototype, class: Spree::Prototype do
     name       { 'Baseball Cap' }
-    properties { [build(:property)] }
   end
   factory :prototype_with_option_types, class: Spree::Prototype do
     name         { 'Baseball Cap' }
-    properties   { [build(:property)] }
     option_types { [build(:option_type)] }
   end
 end