spree_core 4.3.3 → 4.4.0.rc1

data/lib/spree/money.rb

@@ -21,7 +21,7 @@ module Spree
 
     def initialize(amount, options = {})
       use_default_currency
-      @money   = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
+      @money   = Monetize.parse([amount, (options[:currency] || Spree::Store.default.default_currency)].join)
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
 
@@ -66,7 +66,7 @@ module Spree
     end
 
     def use_default_currency
-      currency = Spree::Store.default.default_currency || Spree::Config[:currency]
+      currency = Spree::Store.default.default_currency
       ::Money.default_currency = currency
     end
 

data/lib/spree/permitted_attributes.rb

@@ -2,9 +2,13 @@ module Spree
   module PermittedAttributes
     ATTRIBUTES = [
       :address_attributes,
-      :classification_attributes,
       :checkout_attributes,
+      :classification_attributes,
+      :cms_page_attributes,
+      :cms_section_attributes,
       :customer_return_attributes,
+      :digital_attributes,
+      :digital_link_attributes,
       :image_attributes,
       :inventory_unit_attributes,
       :line_item_attributes,
@@ -28,19 +32,19 @@ module Spree
       :taxonomy_attributes,
       :user_attributes,
       :variant_attributes,
-      :cms_page_attributes,
-      :cms_section_attributes
+      :wishlist_attributes,
+      :wished_item_attributes
     ]
 
-    mattr_reader *ATTRIBUTES
+    mattr_reader(*ATTRIBUTES)
 
     @@address_attributes = [
       :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,
-      country: [:iso, :name, :iso3, :iso_name],
-      state: [:name, :abbr]
+      { country: [:iso, :name, :iso3, :iso_name],
+        state: [:name, :abbr] }
     ]
 
     @@checkout_attributes = [
@@ -54,9 +58,16 @@ module Spree
 
     @@cms_page_attributes = [:title, :meta_title, :content, :meta_description, :visible, :slug, :locale]
 
-    @@cms_section_attributes = [:name, :content, :settings, :fit, :destination]
+    @@cms_section_attributes = [:name, :cms_page_id, :fit, :destination, { content: {}, settings: {} }]
 
-    @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable]]
+    @@customer_return_attributes = [:stock_location_id, {
+      return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount,
+                                :acceptance_status, :exchange_variant_id, :resellable]
+    }]
+
+    @@digital_attributes = [:attachment, :variant_id]
+
+    @@digital_link_attributes = [:access_counter]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
@@ -83,12 +94,13 @@ 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: []
+      { option_type_ids: [], taxon_ids: [] }
     ]
 
     @@property_attributes = [:name, :presentation]
 
-    @@return_authorization_attributes = [:amount, :memo, :stock_location_id, :inventory_units_attributes, :return_authorization_reason_id]
+    @@return_authorization_attributes = [:amount, :memo, :stock_location_id, :inventory_units_attributes,
+                                         :return_authorization_reason_id]
 
     @@shipment_attributes = [
       :order, :special_instructions, :stock_location_id, :id,
@@ -119,7 +131,9 @@ module Spree
                           :customer_support_email, :facebook, :twitter, :instagram,
                           :description, :address, :contact_phone, :supported_locales,
                           :default_locale, :default_country_id, :supported_currencies,
-                          :new_order_notifications_email, :mailer_logo, :favicon_image, :checkout_zone_id, :seo_robots]
+                          :new_order_notifications_email, :mailer_logo, :favicon_image,
+                          :checkout_zone_id, :seo_robots, :digital_asset_authorized_clicks,
+                          :digital_asset_authorized_days, :limit_digital_download_count, :limit_digital_download_days]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 
@@ -131,14 +145,18 @@ module Spree
     ]
 
     # TODO: Should probably use something like Spree.user_class.attributes
-    @@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :password_confirmation]
+    @@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :password_confirmation, { public_metadata: {}, private_metadata: {} }]
 
     @@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, :cost_currency,
-      options: [:name, :value], option_value_ids: []
+      { options: [:name, :value], option_value_ids: [] }
     ]
+
+    @@wishlist_attributes = [:name, :is_default, :is_private]
+
+    @@wished_item_attributes = [:variant_id, :quantity]
   end
 end

data/lib/spree/testing_support/authorization_helpers.rb

@@ -37,11 +37,13 @@ module Spree
             ability_class.register_ability(ability)
           end
 
-          let(:admin_token) { Doorkeeper::AccessToken.create!(scopes: 'admin read write').token }
+          let(:admin_app) { Spree::OauthApplication.create!(name: 'Admin Panel', scopes: 'admin') }
+          let(:admin_token) { Spree::OauthAccessToken.create!(application: admin_app, scopes: 'admin').token }
 
           before do
             allow(Spree.user_class).to receive(:find_by).and_return(Spree.user_class.new)
             if defined?(Spree::Admin)
+              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

data/lib/spree/testing_support/capybara_config.rb

@@ -1,28 +1,23 @@
 require 'capybara-screenshot/rspec'
 
-Capybara.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+Capybara.configure do |config|
+  config.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+  config.server = :puma
+  config.default_driver = :rack_test
+  config.javascript_driver = :selenium_chrome_headless
+  config.default_max_wait_time = ENV.fetch('CAPYBARA_MAX_WAIT_TIME', 45).to_i
+  config.always_include_port = true
+  config.match = :smart
+  config.ignore_hidden_elements = true
+end
 
 if ENV['WEBDRIVER'] == 'accessible'
   require 'capybara/accessible'
   Capybara.javascript_driver = :accessible
-else
-  Capybara.register_driver :chrome do |app|
-    Selenium::WebDriver.logger.level = :error
-
-    Capybara::Selenium::Driver.new app,
-      browser: :chrome,
-      options: Selenium::WebDriver::Chrome::Options.new(
-        args: %w[no-sandbox disable-dev-shm-usage disable-popup-blocking headless disable-gpu window-size=1920,1080 --enable-features=NetworkService,NetworkServiceInProcess --disable-features=VizDisplayCompositor],
-        log_level: :error
-      )
-  end
-  Capybara.javascript_driver = :chrome
+end
 
-  Capybara::Screenshot.register_driver(:chrome) do |driver, path|
-    driver.browser.save_screenshot(path)
+RSpec.configure do |config|
+  config.before(:each, js: true) do
+    Capybara.page.driver.browser.manage.window.resize_to(1400, 900)
   end
 end
-Capybara.default_max_wait_time = ENV.fetch('CAPYBARA_MAX_WAIT_TIME', 45).to_i
-Capybara.server = :puma
-
-Capybara.always_include_port = true

data/lib/spree/testing_support/capybara_ext.rb

@@ -59,15 +59,10 @@ def wait_for(options = {})
   default_options = { error: nil, seconds: 5 }.merge(options)
 
   Selenium::WebDriver::Wait.new(timeout: default_options[:seconds]).until { yield }
-rescue Selenium::WebDriver::Error::TimeOutError
+rescue Selenium::WebDriver::Error::TimeoutError
   default_options[:error].nil? ? false : raise(default_options[:error])
 end
 
-Capybara.configure do |config|
-  config.match = :smart
-  config.ignore_hidden_elements = true
-end
-
 RSpec::Matchers.define :have_meta do |name, expected|
   match do |_actual|
     has_css?("meta[name='#{name}'][content='#{expected}']", visible: false)

data/lib/spree/testing_support/common_rake.rb

@@ -14,6 +14,13 @@ namespace :common do
     ENV['RAILS_ENV'] = 'test'
     Rails.env = 'test'
 
+    if ENV['LIB_NAME'] == 'spree/backend'
+      puts 'Preparing NPM package...'
+      system('yarn install')
+      system('yarn build')
+      system('yarn link')
+    end
+
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
     Spree::InstallGenerator.start [
       "--lib_name=#{ENV['LIB_NAME']}",
@@ -29,9 +36,15 @@ namespace :common do
     ]
 
     puts 'Setting up dummy database...'
-    system("bundle exec rake db:drop db:create > #{File::NULL}")
+    system('bin/rails db:environment:set RAILS_ENV=test')
+    system('bundle exec rake db:drop db:create')
     Spree::DummyModelGenerator.start
-    system("bundle exec rake db:migrate > #{File::NULL}")
+    system('bundle exec rake db:migrate')
+
+    unless ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
+      puts 'Setting up node environment'
+      system('bin/rails javascript:install:esbuild')
+    end
 
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"
@@ -42,13 +55,18 @@ namespace :common do
     end
 
     unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
+      if ENV['LIB_NAME'] == 'spree/backend'
+        puts 'Installing node dependencies...'
+        system('yarn link @spree/dashboard')
+        system('yarn install')
+      end
       puts 'Precompiling assets...'
-      system("bundle exec rake assets:precompile > #{File::NULL}")
+      system('bundle exec rake assets:precompile')
     end
   end
 
   task :seed do |_t|
     puts 'Seeding ...'
-    system("bundle exec rake db:seed RAILS_ENV=test > #{File::NULL}")
+    system('bundle exec rake db:seed RAILS_ENV=test')
   end
 end

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

@@ -0,0 +1,15 @@
+FactoryBot.define do
+  factory :asset, class: Spree::Asset do
+    viewable_type {}
+    viewable_id {}
+    attachment_width { 340 }
+    attachment_height { 280 }
+    attachment_file_size { 128 }
+    position { 1 }
+    attachment_content_type { '.jpg' }
+    attachment_file_name { 'attachment.jpg' }
+    type {}
+    attachment_updated_at {}
+    alt {}
+  end
+end

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

@@ -1,8 +1,8 @@
 FactoryBot.define do
-  factory :cms_section, class: Spree::CmsSection do
+  factory :base_cms_section, class: Spree::CmsSection do
     name { generate(:random_string) }
 
-    association :cms_page, factory: :base_cms_page
+    association :cms_page, factory: :cms_feature_page
 
     factory :cms_hero_image_section do
       type { 'Spree::Cms::Sections::HeroImage' }

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :digital, class: Spree::Digital do
+    after(:build) do |digital|
+      digital.attachment.attach(io: File.new("#{Spree::Core::Engine.root}/spec/fixtures/thinking-cat.jpg"),
+                                filename: 'thinking-cat.jpg')
+    end
+
+    variant
+  end
+end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :digital_link, class: Spree::DigitalLink do
+    digital
+    line_item
+  end
+end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :log_entry, class: Spree::LogEntry do
+    source { build(:order) }
+    details { 'Some details' }
+  end
+end

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

@@ -77,7 +77,10 @@ FactoryBot.define do
 
         factory :completed_order_with_store_credit_payment do
           after(:create) do |order|
-            create(:store_credit_payment, amount: order.total, order: order)
+            store_credit = create(:store_credit, amount: order.total, store: order.store, user: order.user)
+            payment_method = create(:store_credit_payment_method, stores: [order.store])
+
+            create(:store_credit_payment, amount: order.total, order: order, source: store_credit, payment_method: payment_method)
           end
         end
 

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :payment_capture_event, class: Spree::PaymentCaptureEvent do
+    payment
+    amount { 10.0 }
+  end
+end

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

@@ -5,7 +5,7 @@ FactoryBot.define do
     state         { 'checkout' }
     response_code { '12345' }
 
-    association(:payment_method, factory: :credit_card_payment_method)
+    payment_method { create(:credit_card_payment_method, stores: [order.store]) }
     association(:source, factory: :credit_card)
 
     factory :payment_with_refund do
@@ -24,7 +24,7 @@ FactoryBot.define do
   end
 
   factory :store_credit_payment, class: Spree::Payment, parent: :payment do
-    association(:payment_method, factory: :store_credit_payment_method)
-    association(:source, factory: :store_credit)
+    payment_method { create(:store_credit_payment_method, stores: [order.store]) }
+    source { create(:store_credit, store: order.store, user: order.user) }
   end
 end

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

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :promotion_action, class: Spree::PromotionAction do
+    association :promotion
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :reimbursement_credit, class: Spree::Reimbursement::Credit do
+    reimbursement
+
+    amount { 100.00 }
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :shipping_rate, class: Spree::ShippingRate do
+    cost { BigDecimal(10) }
+    shipping_method
+    shipment
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :state_change, class: Spree::StateChange do
+    stateful { build(:order) }
+    previous_state { 'cart' }
+    next_state { 'address' }
+    user { build(:user) }
+  end
+end

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

@@ -4,6 +4,13 @@ FactoryBot.define do
     stock_location
     variant
 
+    before(:create) do |stock_item|
+      Spree::StockItem.find_by(
+        variant: stock_item.variant,
+        stock_location: stock_item.stock_location
+      )&.destroy
+    end
+
     after(:create) { |object| object.adjust_count_on_hand(10) }
   end
 end

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

@@ -17,7 +17,7 @@ FactoryBot.define do
       after(:create) do |stock_location, _evaluator|
         # variant will add itself to all stock_locations in an after_create
         # creating a product will automatically create a master variant
-        store = create(:store)
+        store = Spree::Store.first || create(:store)
         product_1 = create(:product, stores: [store])
         product_2 = create(:product, stores: [store])
 

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :stock_transfer, class: Spree::StockTransfer do
+    destination_location {}
+    number {}
+    reference {}
+    source_location {}
+    type {}
+  end
+end

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

@@ -8,7 +8,7 @@ FactoryBot.define do
     amount { 150.00 }
     currency { 'USD' }
     credit_type { create(:primary_credit_type) }
-    store { create(:store) }
+    store { Spree::Store.default || create(:store) }
   end
 
   factory :store_credits_order_without_user, class: Spree::Order do

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

@@ -4,6 +4,11 @@ FactoryBot.define do
     priority  { '1' }
   end
 
+  factory :store_credit_type, class: Spree::StoreCreditType do
+    name      { Spree::StoreCreditType::DEFAULT_TYPE_NAME }
+    priority  { '1' }
+  end
+
   factory :secondary_credit_type, class: Spree::StoreCreditType do
     name      { 'Non-expiring' }
     priority  { '2' }

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

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :tax_rate, class: Spree::TaxRate do
+    name { "TaxRate - #{rand(999_999)}" }
     zone
     tax_category
     amount { 0.1 }

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

@@ -9,6 +9,8 @@ FactoryBot.define do
     password              { 'secret' }
     password_confirmation { password }
     authentication_token  { generate(:user_authentication_token) } if Spree.user_class.attribute_method? :authentication_token
+    public_metadata { {} }
+    private_metadata { {} }
 
     factory :admin_user do
       spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :wished_item, class: Spree::WishedItem do
+    variant
+    wishlist
+  end
+end

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

@@ -0,0 +1,18 @@
+FactoryBot.define do
+  factory :wishlist, class: Spree::Wishlist do
+    user
+
+    sequence(:name) { |n| "Wishlist_#{n}" }
+    is_private { true }
+    is_default { false }
+
+    before(:create) do |wishlist|
+      if wishlist.store.nil?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        wishlist.store = store
+      end
+    end
+  end
+end

data/lib/spree/testing_support/jobs.rb

@@ -0,0 +1,9 @@
+RSpec.configure do |config|
+  config.before(:each, :job) do
+    ActiveJob::Base.queue_adapter = :test
+  end
+
+  config.after(:each, :job) do
+    ActiveJob::Base.queue_adapter = :inline
+  end
+end

data/lib/tasks/core.rake

@@ -22,7 +22,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
       ruby_files[File.basename(fixture_file, '.*')] = fixture_file
     end
     ruby_files.sort.each do |fixture, ruby_file|
-      # If file exists within application it takes precendence.
+      # If file exists within application it takes precedence.
       if File.exist?(File.join(Rails.root, 'db/default/spree', "#{fixture}.rb"))
         ruby_file = File.expand_path(File.join(Rails.root, 'db/default/spree', "#{fixture}.rb"))
       end
@@ -55,7 +55,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
   task :bootstrap do
     require 'highline/import'
 
-    # remigrate unless production mode (as saftey check)
+    # remigrate unless production mode (as safety check)
     if %w[demo development test].include? Rails.env
       if ENV['AUTO_ACCEPT'] || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
         ENV['SKIP_NAG'] = 'yes'
@@ -109,7 +109,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
       end
     end
 
-    puts 'WARNING: This task will re-associate any line_items associated with deleted variants to non-deleted variants with matching SKUs. Because other attributes and product associations may switch during the re-association, this may have unintended side-effects. If this task finishes successfully, line items for old order should no longer be orphaned from their varaints. You should run this task after you have already run the db migratoin AddDiscontinuedToProductsAndVariants. If the db migration did not warn you that it was leaving deleted records in place because of duplicate SKUs, then you do not need to run this rake task.'
+    puts 'WARNING: This task will re-associate any line_items associated with deleted variants to non-deleted variants with matching SKUs. Because other attributes and product associations may switch during the re-association, this may have unintended side-effects. If this task finishes successfully, line items for old order should no longer be orphaned from their variants. You should run this task after you have already run the db migratoin AddDiscontinuedToProductsAndVariants. If the db migration did not warn you that it was leaving deleted records in place because of duplicate SKUs, then you do not need to run this rake task.'
     puts 'Are you sure you want to continue? (Y/n):'
 
     if get_input
@@ -180,7 +180,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
   task ensure_order_currency_presence: :environment do |_t, _args|
     Spree::Order.where(currency: nil).find_in_batches do |orders|
       orders.each do |order|
-        order.update!(currency: order.store.default_currency || Spree::Config[:currency])
+        order.update!(currency: order.store.default_currency)
       end
     end
   end

data/spree_core.gemspec

@@ -53,5 +53,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'validates_zipcode'
   s.add_dependency 'mini_magick', '~> 4.9', '>= 4.9.4'
   s.add_dependency 'image_processing', '~> 1.2'
-  s.add_dependency 'active_storage_validations', '~> 0.9'
+  s.add_dependency 'active_storage_validations', '~> 0.9', '<= 0.9.5'
+  s.add_dependency 'activerecord-typedstore'
 end