spree_core 4.2.7 → 4.3.0.rc1

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

@@ -17,11 +17,12 @@ 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
-        product_1 = create(:product)
-        product_2 = create(:product)
+        store = create(:store)
+        product_1 = create(:product, stores: [store])
+        product_2 = create(:product, stores: [store])
 
-        stock_location.stock_items.where(variant_id: product_1.master_id).first.adjust_count_on_hand(10)
-        stock_location.stock_items.where(variant_id: product_2.master_id).first.adjust_count_on_hand(20)
+        stock_location.stock_items.where(variant_id: product_1.master.id).first.adjust_count_on_hand(10)
+        stock_location.stock_items.where(variant_id: product_2.master.id).first.adjust_count_on_hand(20)
       end
     end
   end

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

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

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

@@ -12,5 +12,16 @@ FactoryBot.define do
     facebook               { 'spreecommerce' }
     twitter                { 'spreecommerce' }
     instagram              { 'spreecommerce' }
+
+    trait :with_favicon do
+      transient do
+        filepath { Spree::Core::Engine.root.join('spec', 'fixtures', 'favicon.ico') }
+        image_type { 'image/x-icon' }
+      end
+
+      favicon_image do
+        Rack::Test::UploadedFile.new(filepath, image_type)
+      end
+    end
   end
 end

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

@@ -1,7 +1,9 @@
 FactoryBot.define do
   factory :taxon, class: Spree::Taxon do
     sequence(:name) { |n| "taxon_#{n}" }
-    association(:taxonomy, strategy: :create)
+
+    association :taxonomy, strategy: :create
+    association :icon, factory: :taxon_image
     parent_id { taxonomy.root.id }
   end
 end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :taxon_image, class: Spree::TaxonImage do
+    before(:create) do |taxon_image|
+      taxon_image.attachment.attach(io: File.new(Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg'), filename: 'thinking-cat.jpg')
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :taxonomy, class: Spree::Taxonomy do
     sequence(:name) { |n| "taxonomy_#{n}" }
+    store { Spree::Store.default }
   end
 end

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

@@ -15,8 +15,13 @@ FactoryBot.define do
     end
 
     factory :user_with_addresses, aliases: [:user_with_addreses] do
-      ship_address
-      bill_address
+      after(:create) do |user|
+        user.ship_address = create(:address, user: user)
+        user.bill_address = create(:address, user: user)
+        user.addresses << user.ship_address
+        user.addresses << user.bill_address
+        user.save
+      end
     end
   end
 end

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

@@ -12,7 +12,7 @@ FactoryBot.define do
     is_master       { 0 }
     track_inventory { true }
 
-    product       { |p| p.association(:base_product) }
+    product       { |p| p.association(:base_product, stores: [create(:store)]) }
     option_values { [create(:option_value)] }
 
     # ensure stock item will be created for this variant
@@ -20,7 +20,7 @@ FactoryBot.define do
 
     factory :variant do
       # on_hand 5
-      product { |p| p.association(:product) }
+      product { |p| p.association(:product, stores: [create(:store)]) }
     end
 
     factory :master_variant do

data/lib/spree/testing_support/flatpickr_capybara.rb

@@ -1,78 +1,93 @@
 module Spree
   module TestingSupport
     module FlatpickrCapybara
-      def fill_in_date_manually(label_text, with:)
+      def fill_in_date_manually(label_text, options = {})
         with_open_flatpickr(label_text) do |field|
-          fill_in field[:id], with: with
+          fill_in field[:id], with: string_date(options)
         end
       end
 
-      def fill_in_date_picker(label_text, with:)
+      def fill_in_date_picker(label_text, options = {})
+        if options[:hour].blank? && options[:minute].blank?
+          flatpickr_date_only(label_text, options)
+        else
+          flatpickr_date_time(label_text, options)
+        end
+      end
+
+      def fill_in_date_with_js(label_text, options = {})
+        date_field = find("input[id='#{label_text}']")
+        script = "document.querySelector('#{date_field}').flatpickr().setDate('#{string_date(options)}');"
+
+        page.execute_script(script)
+      end
+
+      private
+
+      def flatpickr_date_only(label_text, options = {})
         within_open_flatpickr(label_text) do
           within_flatpickr_months do
-            fill_in_flatpickr_year(with.split('-')[0])
+            fill_in_flatpickr_year(options[:year].to_i)
+            sleep(0.25) # Pause to let JavaScript adjust the month selector in the flatpickr cal in relation to any related FROM...TO cal.
 
-            select_flatpickr_month(with.split('-')[1])
+            select_flatpickr_month(options[:month].to_i)
+            sleep(0.25) # Pause to let JavaScript adjust the day selection area in the flatpickr cal in relation to any related FROM...TO cal.
 
-            click_on_flatpickr_day(with.split('-')[2])
+            click_on_flatpickr_day(options[:day].to_i)
           end
         end
       end
 
-      def fill_in_date_time_picker(label_text, with:)
+      def flatpickr_date_time(label_text, options = {})
         within_open_flatpickr(label_text) do
           within_flatpickr_months do
-            fill_in_flatpickr_year(with.split('-')[0])
+            fill_in_flatpickr_year(options[:year].to_i)
+            sleep(0.25) # Pause to let JavaScript adjust the month selector in the flatpickr cal in relation to any related FROM...TO cal.
 
-            select_flatpickr_month(with.split('-')[1])
+            select_flatpickr_month(options[:month].to_i)
+            sleep(0.25) # Pause to let JavaScript adjust the day selection area in the flatpickr cal in relation to any related FROM...TO cal.
 
-            click_on_flatpickr_day(with.split('-')[2])
+            click_on_flatpickr_day(options[:day].to_i)
           end
 
           within_flatpickr_time do
-            select_flatpickr_hour(with.split('-')[3])
-
-            select_flatpickr_min(with.split('-')[4])
+            select_flatpickr_hour(options[:hour].to_i)
+            select_flatpickr_min(options[:minute].to_i)
           end
         end
       end
 
-      def fill_in_date_with_js(label_text, with:)
-        date_field = find("input[id='#{label_text}']")
-        script = "document.querySelector('#{date_field}').flatpickr().setDate('#{with}');"
-
-        page.execute_script(script)
-      end
-
-      private
-
       def with_open_flatpickr(label_text)
         field_label = find_field(id: label_text, type: :hidden)
 
         date_field = field_label.sibling('.flatpickr-alt-input')
-        date_field.click # Open the widget
+        date_field.click # Open the flatpickr cal.
+        sleep(0.25) # Pause to let JavaScript populate DOM with an open flatpickr cal.
 
-        yield(date_field)
+        yield(date_field) # Complete required action within the open flatpickr cal.
 
-        date_field.send_keys :tab # Close the date picker widget
+        date_field.send_keys :tab # Close the date flatpickr cal.
+        sleep(0.25) # Pause to let JavaScript adjust any DOM values in relation to any related FROM...TO cal.
       end
 
-      def within_open_flatpickr(label_text)
+      def within_open_flatpickr(label_text, &block)
         with_open_flatpickr(label_text) do
-          within find(:xpath, "/html/body/div[contains(@class, 'flatpickr-calendar')]") { yield }
+          within find('.flatpickr-calendar.open', &block)
         end
       end
 
-      def within_flatpickr_months
-        within find('.flatpickr-months .flatpickr-month .flatpickr-current-month') { yield }
+      def within_flatpickr_months(&block)
+        within find('.flatpickr-months > .flatpickr-month > .flatpickr-current-month', &block)
       end
 
-      def within_flatpickr_time
-        within find('.flatpickr-time') { yield }
+      def within_flatpickr_time(&block)
+        within find('.flatpickr-time', &block)
       end
 
       def select_flatpickr_month(month)
-        find("select.flatpickr-monthDropdown-months > option:nth-child(#{month.to_i})").select_option
+        accurate_month = (month.to_i - 1)
+
+        find("select.flatpickr-monthDropdown-months > option[value='#{accurate_month}']").select_option
       end
 
       def fill_in_flatpickr_year(year)
@@ -81,12 +96,12 @@ module Spree
 
       def click_on_flatpickr_day(day)
         within_flatpickr_days do
-          find('span', text: day).click
+          find('.flatpickr-day:not(.prevMonthDay):not(.nextMonthDay)', text: day, exact_text: true).click
         end
       end
 
-      def within_flatpickr_days
-        within find('.flatpickr-innerContainer > .flatpickr-rContainer > .flatpickr-days') { yield }
+      def within_flatpickr_days(&block)
+        within find('.flatpickr-innerContainer > .flatpickr-rContainer > .flatpickr-days > .dayContainer', &block)
       end
 
       def select_flatpickr_hour(hour)
@@ -96,6 +111,14 @@ module Spree
       def select_flatpickr_min(min)
         find('input.flatpickr-minute').set(min)
       end
+
+      def string_date(options)
+        if options[:hour].present? && options[:minute].present?
+          "#{options[:year]}-#{options[:month]}-#{options[:day]}-#{options[:hour]}-#{options[:minute]}"
+        else
+          "#{options[:year]}-#{options[:month]}-#{options[:day]}"
+        end
+      end
     end
   end
 end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -1,12 +1,12 @@
 class OrderWalkthrough
-  def self.up_to(state)
-    store = if Spree::Store.exists?
-              # Ensure the default store is used
-              Spree::Store.default || FactoryBot.create(:store, default: true)
-            else
-              # Create a default store
-              FactoryBot.create(:store, default: true)
-            end
+  def self.up_to(state, store = nil)
+    store ||= if Spree::Store.exists?
+                # Ensure the default store is used
+                Spree::Store.default || FactoryBot.create(:store, default: true)
+              else
+                # Create a default store
+                FactoryBot.create(:store, default: true)
+              end
 
     # A payment method must exist for an order to proceed through the Address state
     unless Spree::PaymentMethod.exists?
@@ -28,7 +28,7 @@ class OrderWalkthrough
       end
     end
 
-    order = Spree::Order.create!(email: 'spree@example.com')
+    order = store.orders.create!(email: 'spree@example.com')
     add_line_item!(order)
     order.next!
 

data/lib/tasks/core.rake

@@ -8,7 +8,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
     file = Pathname.new(args.file)
 
     puts "loading ruby #{file}"
-    require file
+    load file
   end
 
   desc 'Loads fixtures from the the dir you specify using rake db:load_dir[loadfrom]'

data/spree_core.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.version     = Spree.version
   s.authors     = ['Sean Schofield', 'Spark Solutions']
   s.email       = 'hello@spreecommerce.org'
-  s.summary     = 'The bare bones necessary for Spree.'
-  s.description = 'The bare bones necessary for Spree.'
+  s.summary     = 'The bare bones necessary for Spree'
+  s.description = 'Spree Models, Helpers, Services and core libraries'
   s.homepage    = 'https://spreecommerce.org'
   s.license     = 'BSD-3-Clause'
 
@@ -26,8 +26,16 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
   s.require_path = 'lib'
 
+  %w[
+    actionpack actionview activejob activemodel activerecord
+    activestorage activesupport railties
+  ].each do |rails_gem|
+    s.add_dependency rails_gem, '>= 5.2'
+  end
+
   s.add_dependency 'activemerchant', '~> 1.67'
   s.add_dependency 'acts_as_list', '>= 0.8'
+  s.add_dependency 'auto_strip_attributes', '~> 2.6'
   s.add_dependency 'awesome_nested_set', '~> 3.3', '>= 3.3.1'
   s.add_dependency 'carmen', '>= 1.0'
   s.add_dependency 'cancancan', '~> 3.2'
@@ -37,20 +45,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4'
-  s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '>= 5.2', '< 6.2'
   s.add_dependency 'ransack', '~> 2.3'
-  s.add_dependency 'responders'
   s.add_dependency 'rexml'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'state_machines-activemodel', '~> 0.7'
   s.add_dependency 'stringex'
-  s.add_dependency 'twitter_cldr', '>= 4.3'
-  s.add_dependency 'sprockets', '~> 3.7'
-  s.add_dependency 'sprockets-rails'
+  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_development_dependency 'email_spec', '~> 2.2'
 end