solidus_core 2.5.2 → 2.6.0.rc1

data/lib/spree/testing_support/common_rake.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 unless defined?(Spree::InstallGenerator)
   require 'generators/spree/install/install_generator'
 end

data/lib/spree/testing_support/controller_requests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module TestingSupport
     # A module providing convenience methods to test Solidus controllers

data/lib/spree/testing_support/dummy_app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV['RAILS_ENV'] = 'test'
 ENV['DISABLE_DATABASE_ENVIRONMENT_CHECK'] = '1'
 
@@ -10,19 +12,24 @@ Rails.env = 'test'
 
 require 'solidus_core'
 
+# @private
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 end
 
+# @private
 class ApplicationRecord < ActiveRecord::Base
 end
 
+# @private
 class ApplicationMailer < ActionMailer::Base
 end
 
+# @private
 module ApplicationHelper
 end
 
+# @private
 module DummyApp
   def self.setup(gem_root:, lib_name:, auto_migrate: true)
     ENV["LIB_NAME"] = lib_name
@@ -30,10 +37,6 @@ module DummyApp
 
     DummyApp::Application.initialize!
 
-    DummyApp::Application.routes.draw do
-      mount Spree::Core::Engine, at: '/'
-    end
-
     if auto_migrate
       DummyApp::Migrations.auto_migrate
     end
@@ -55,6 +58,11 @@ module DummyApp
     config.active_support.deprecation                 = :stderr
     config.secret_key_base                            = 'SECRET_TOKEN'
 
+    if config.active_record.sqlite3
+      # Rails >= 5.2
+      config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
+
     # Avoid issues if an old spec/dummy still exists
     config.paths['config/initializers'] = []
     config.paths['config/environments'] = []
@@ -72,12 +80,13 @@ module DummyApp
     config.action_controller.include_all_helpers = false
 
     if config.respond_to?(:assets)
-      config.assets.paths << File.expand_path('../dummy_app/assets/javascripts', __FILE__)
-      config.assets.paths << File.expand_path('../dummy_app/assets/stylesheets', __FILE__)
+      config.assets.paths << File.expand_path('dummy_app/assets/javascripts', __dir__)
+      config.assets.paths << File.expand_path('dummy_app/assets/stylesheets', __dir__)
     end
 
-    config.paths["config/database"] = File.expand_path('../dummy_app/database.yml', __FILE__)
-    config.paths['app/views'] = File.expand_path('../dummy_app/views', __FILE__)
+    config.paths["config/database"] = File.expand_path('dummy_app/database.yml', __dir__)
+    config.paths['app/views'] = File.expand_path('dummy_app/views', __dir__)
+    config.paths['config/routes.rb'] = File.expand_path('dummy_app/routes.rb', __dir__)
 
     ActionMailer::Base.default from: "store@example.com"
   end

data/lib/spree/testing_support/dummy_app/database.yml

@@ -5,12 +5,15 @@ database_prefix = ENV['LIB_NAME'].presence || "solidus"
 when 'mysql' %>
 test:
   adapter: mysql2
-  <% if ENV['TRAVIS'] %>
+  <% if ENV['CI'] %>
   username: root
   password:
   <% end %>
   database: <%= database_prefix %>_test
   encoding: utf8
+  <% unless ENV['DB_HOST'].blank? %>
+  host: <%= ENV['DB_HOST'] %>
+  <% end %>
 <% when 'postgres', 'postgresql' %>
 <% db_host = ENV['DB_HOST'] %>
 test:

data/lib/spree/testing_support/dummy_app/migrations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DummyApp
   module Migrations
     extend self
@@ -12,15 +14,25 @@ module DummyApp
     end
 
     def needs_migration?
-      !database_exists? || ActiveRecord::Migrator.needs_migration?
+      return true if !database_exists?
+      if ActiveRecord::Base.connection.respond_to?(:migration_context)
+        # Rails >= 5.2
+        ActiveRecord::Base.connection.migration_context.needs_migration?
+      else
+        ActiveRecord::Migrator.needs_migration?
+      end
     end
 
     def auto_migrate
       if needs_migration?
         puts "Configuration changed. Re-running migrations"
+
+        # Disconnect to avoid "database is being accessed by other users" on postgres
+        ActiveRecord::Base.remove_connection
+
         sh 'rake db:reset VERBOSE=false'
 
-        # We might have a brand new database, so we must re-establish our connection
+        # We have a brand new database, so we must re-establish our connection
         ActiveRecord::Base.establish_connection
       end
     end

data/lib/spree/testing_support/dummy_app/rake_tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DummyApp
   class RakeTasks
     include Rake::DSL
@@ -36,7 +38,12 @@ namespace :db do
     # railties:install:migrations and then db:migrate.
     # Migrations should be run one directory at a time
     ActiveRecord::Migrator.migrations_paths.each do |path|
-      ActiveRecord::Migrator.migrate(path)
+      if defined?(ActiveRecord::MigrationContext)
+        # Rails >= 5.2
+        ActiveRecord::MigrationContext.new([path]).migrate
+      else
+        ActiveRecord::Migrator.migrate(path)
+      end
     end
 
     ActiveRecord::Base.clear_cache!

data/lib/spree/testing_support/dummy_app/routes.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+DummyApp::Application.routes.draw do
+  mount Spree::Core::Engine, at: '/'
+end

data/lib/spree/testing_support/extension_rake.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/common_rake'
 
 desc "Generates a dummy app for testing an extension"

data/lib/spree/testing_support/factories.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 
 Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/state_factory'
 require 'spree/testing_support/factories/country_factory'
 
@@ -5,19 +7,19 @@ FactoryBot.define do
   factory :address, class: 'Spree::Address' do
     transient do
       # There's `Spree::Address#country_iso=`, prohibiting me from using `country_iso` here
-      country_iso_code { 'US' }
-      state_code { 'AL' }
+      country_iso_code 'US'
+      state_code 'AL'
     end
 
-    firstname { 'John' }
-    lastname { nil }
-    company { 'Company' }
-    address1 { '10 Lovely Street' }
-    address2 { 'Northwest' }
-    city { 'Herndon' }
+    firstname 'John'
+    lastname nil
+    company 'Company'
+    address1 '10 Lovely Street'
+    address2 'Northwest'
+    city 'Herndon'
     sequence(:zipcode, 10001) { |i| i.to_s }
-    phone { '555-555-0199' }
-    alternative_phone { '555-555-0199' }
+    phone '555-555-0199'
+    alternative_phone '555-555-0199'
 
     state do |address|
       Spree::State.joins(:country).where('spree_countries.iso = (?)', country_iso_code).find_by(abbr: state_code) ||
@@ -34,10 +36,10 @@ FactoryBot.define do
   end
 
   factory :ship_address, parent: :address do
-    address1 { 'A Different Road' }
+    address1 'A Different Road'
   end
 
   factory :bill_address, parent: :address do
-    address1 { 'PO Box 1337' }
+    address1 'PO Box 1337'
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/line_item_factory'
 require 'spree/testing_support/factories/order_factory'
 require 'spree/testing_support/factories/tax_category_factory'
@@ -8,10 +10,10 @@ FactoryBot.define do
   factory :adjustment, class: 'Spree::Adjustment' do
     order
     adjustable { order }
-    amount { 100.0 }
-    label { 'Shipping' }
+    amount 100.0
+    label 'Shipping'
     association(:source, factory: :tax_rate)
-    eligible { true }
+    eligible true
 
     after(:build) do |adjustment|
       adjustments = adjustment.adjustable.adjustments
@@ -23,8 +25,8 @@ FactoryBot.define do
     factory :tax_adjustment, class: 'Spree::Adjustment' do
       order { adjustable.order }
       association(:adjustable, factory: :line_item)
-      amount { 10.0 }
-      label { 'VAT 5%' }
+      amount 10.0
+      label 'VAT 5%'
 
       after(:create) do |adjustment|
         # Set correct tax category, so that adjustment amount is not 0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :adjustment_reason, class: 'Spree::AdjustmentReason' do
     sequence(:name) { |n| "Refund for return ##{n}" }

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

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :calculator, aliases: [:flat_rate_calculator], class: 'Spree::Calculator::FlatRate' do
-    preferred_amount { 10.0 }
+    preferred_amount 10.0
   end
 
   factory :no_amount_calculator, class: 'Spree::Calculator::FlatRate' do
-    preferred_amount { 0 }
+    preferred_amount 0
   end
 
   factory :default_tax_calculator, class: 'Spree::Calculator::DefaultTax' do
   end
 
   factory :shipping_calculator, class: 'Spree::Calculator::Shipping::FlatRate' do
-    preferred_amount { 10.0 }
+    preferred_amount 10.0
   end
 
   factory :shipping_no_amount_calculator, class: 'Spree::Calculator::Shipping::FlatRate' do
-    preferred_amount { 0 }
+    preferred_amount 0
   end
 
   factory :percent_on_item_calculator, class: 'Spree::Calculator::PercentOnLineItem' do
-    preferred_percent { 10 }
+    preferred_percent 10
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/shipment_factory'
 require 'spree/testing_support/factories/inventory_unit_factory'
 

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'carmen'
 
 FactoryBot.define do
   factory :country, class: 'Spree::Country' do
-    iso { 'US' }
+    iso 'US'
 
     transient do
       carmen_country { Carmen::Country.coded(iso) || fail("Unknown country iso code: #{iso.inspect}") }

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

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :credit_card, class: 'Spree::CreditCard' do
-    verification_value { 123 }
-    month { 12 }
+    verification_value 123
+    month 12
     year { 1.year.from_now.year }
-    number { '4111111111111111' }
-    name { 'Spree Commerce' }
+    number '4111111111111111'
+    name 'Spree Commerce'
     association(:payment_method, factory: :credit_card_payment_method)
     association(:address)
 
     trait :failing do
-      number { "0000000000000000" }
+      number "0000000000000000"
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/stock_location_factory'
 require 'spree/testing_support/factories/order_factory'
 require 'spree/testing_support/factories/return_item_factory'
@@ -7,7 +9,7 @@ FactoryBot.define do
     association(:stock_location, factory: :stock_location)
 
     transient do
-      line_items_count { 1 }
+      line_items_count 1
       return_items_count { line_items_count }
       shipped_order { create :shipped_order, line_items_count: line_items_count }
       return_authorization { create :return_authorization, order: shipped_order }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :image, class: 'Spree::Image' do
     attachment { File.new(Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg') }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/line_item_factory'
 require 'spree/testing_support/factories/variant_factory'
 require 'spree/testing_support/factories/order_factory'
@@ -6,7 +8,7 @@ require 'spree/testing_support/factories/shipment_factory'
 FactoryBot.define do
   factory :inventory_unit, class: 'Spree::InventoryUnit' do
     transient do
-      order { nil }
+      order nil
     end
 
     variant
@@ -17,7 +19,7 @@ FactoryBot.define do
         build(:line_item, variant: variant)
       end
     end
-    state { 'on_hand' }
+    state 'on_hand'
     shipment { build(:shipment, state: 'pending', order: line_item.order) }
     # return_authorization
   end

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

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/order_factory'
 require 'spree/testing_support/factories/product_factory'
 
 FactoryBot.define do
   factory :line_item, class: 'Spree::LineItem' do
-    quantity { 1 }
+    quantity 1
     price { BigDecimal('10.00') }
     order
     transient do
-      product { nil }
+      product nil
     end
     variant do
       (product || create(:product)).master

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :option_type, class: 'Spree::OptionType' do
     sequence(:name) { |n| "foo-size-#{n}" }
-    presentation { 'Size' }
+    presentation 'Size'
   end
 end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :option_value, class: 'Spree::OptionValue' do
     sequence(:name) { |n| "Size-#{n}" }
 
-    presentation { 'S' }
+    presentation 'S'
     option_type
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/address_factory'
 require 'spree/testing_support/factories/shipment_factory'
 require 'spree/testing_support/factories/store_factory'
@@ -10,7 +12,7 @@ FactoryBot.define do
     user
     bill_address
     ship_address
-    completed_at { nil }
+    completed_at nil
     email { user.try(:email) }
     store
 
@@ -38,10 +40,10 @@ FactoryBot.define do
       ship_address
 
       transient do
-        line_items_count { 1 }
+        line_items_count 1
         line_items_attributes { [{}] * line_items_count }
-        shipment_cost { 100 }
-        shipping_method { nil }
+        shipment_cost 100
+        shipping_method nil
         stock_location { create(:stock_location) }
       end
 
@@ -62,7 +64,7 @@ FactoryBot.define do
 
       factory :completed_order_with_promotion do
         transient do
-          promotion { nil }
+          promotion nil
         end
 
         after(:create) do |order, evaluator|
@@ -79,11 +81,11 @@ FactoryBot.define do
       end
 
       factory :order_ready_to_complete do
-        state { 'confirm' }
-        payment_state { 'checkout' }
+        state 'confirm'
+        payment_state 'checkout'
 
         transient do
-          payment_type { :credit_card_payment }
+          payment_type :credit_card_payment
         end
 
         after(:create) do |order, evaluator|
@@ -98,7 +100,7 @@ FactoryBot.define do
       end
 
       factory :completed_order_with_totals do
-        state { 'complete' }
+        state 'complete'
 
         after(:create) do |order|
           order.shipments.each do |shipment|
@@ -114,11 +116,11 @@ FactoryBot.define do
         end
 
         factory :order_ready_to_ship do
-          payment_state { 'paid' }
-          shipment_state { 'ready' }
+          payment_state 'paid'
+          shipment_state 'ready'
 
           transient do
-            payment_type { :credit_card_payment }
+            payment_type :credit_card_payment
           end
 
           after(:create) do |order, evaluator|
@@ -131,7 +133,7 @@ FactoryBot.define do
 
           factory :shipped_order do
             transient do
-              with_cartons { true }
+              with_cartons true
             end
             after(:create) do |order, evaluator|
               order.shipments.each do |shipment|