solidus_core 2.5.2 → 2.6.0.rc1

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

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/stock_item_factory'
 
 FactoryBot.define do
   factory :stock_movement, class: 'Spree::StockMovement' do
-    quantity { 1 }
-    action { 'sold' }
+    quantity 1
+    action 'sold'
     stock_item
   end
 
   trait :received do
-    action { 'received' }
+    action 'received'
   end
 end

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

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

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

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :store_credit_category, class: 'Spree::StoreCreditCategory' do
-    name { "Exchange" }
+    name "Exchange"
   end
 end

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/store_credit_category_factory'
 require 'spree/testing_support/factories/store_credit_type_factory'
 require 'spree/testing_support/factories/user_factory'
@@ -7,8 +9,8 @@ FactoryBot.define do
     user
     association :created_by, factory: :user
     association :category, factory: :store_credit_category
-    amount { 150.00 }
-    currency { "USD" }
+    amount 150.00
+    currency "USD"
     association :credit_type, factory: :primary_credit_type
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :primary_credit_type, class: 'Spree::StoreCreditType' do
     name      { Spree::StoreCreditType::DEFAULT_TYPE_NAME }

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

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :store_credit_update_reason, class: 'Spree::StoreCreditUpdateReason' do
-    name { "Input error" }
+    name "Input error"
   end
 end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :store, class: 'Spree::Store' do
     sequence(:code) { |i| "spree_#{i}" }
     sequence(:name) { |i| "Spree Test Store #{i}" }
     sequence(:url) { |i| "www.example#{i}.com" }
-    mail_from_address { 'spree@example.org' }
+    mail_from_address 'spree@example.org'
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/sequences'
 
 FactoryBot.define do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/calculator_factory'
 require 'spree/testing_support/factories/tax_category_factory'
 require 'spree/testing_support/factories/zone_factory'
@@ -5,7 +7,7 @@ require 'spree/testing_support/factories/zone_factory'
 FactoryBot.define do
   factory :tax_rate, class: 'Spree::TaxRate' do
     zone
-    amount { 0.1 }
+    amount 0.1
     association(:calculator, factory: :default_tax_calculator)
     tax_categories { [build(:tax_category)] }
   end

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/taxonomy_factory'
 
 FactoryBot.define do
   factory :taxon, class: 'Spree::Taxon' do
-    name { 'Ruby on Rails' }
+    name 'Ruby on Rails'
     taxonomy
-    parent_id { nil }
+    parent_id nil
   end
 end

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

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :taxonomy, class: 'Spree::Taxonomy' do
-    name { 'Brand' }
+    name 'Brand'
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/sequences'
 require 'spree/testing_support/factories/role_factory'
 require 'spree/testing_support/factories/address_factory'
@@ -5,7 +7,7 @@ require 'spree/testing_support/factories/address_factory'
 FactoryBot.define do
   factory :user, class: Spree::UserClassHandle.new do
     email { generate(:email) }
-    password { 'secret' }
+    password 'secret'
     password_confirmation { password }
 
     trait :with_api_key do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/sequences'
 require 'spree/testing_support/factories/option_value_factory'
 require 'spree/testing_support/factories/option_type_factory'
@@ -7,11 +9,11 @@ FactoryBot.define do
   sequence(:random_float) { BigDecimal("#{rand(200)}.#{rand(99)}") }
 
   factory :base_variant, class: 'Spree::Variant' do
-    price { 19.99 }
-    cost_price { 17.00 }
+    price 19.99
+    cost_price 17.00
     sku { generate(:sku) }
-    is_master { 0 }
-    track_inventory { true }
+    is_master 0
+    track_inventory true
 
     product { |p| p.association(:base_product) }
 
@@ -25,16 +27,16 @@ FactoryBot.define do
     end
 
     factory :master_variant do
-      is_master { 1 }
+      is_master 1
       before(:create){ |variant| variant.product.master = variant }
       product { build(:base_product) }
     end
 
     factory :on_demand_variant do
-      track_inventory { false }
+      track_inventory false
 
       factory :on_demand_master_variant do
-        is_master { 1 }
+        is_master 1
       end
     end
   end

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories/product_factory'
 require 'spree/testing_support/factories/property_factory'
 require 'spree/testing_support/factories/option_value_factory'
@@ -9,7 +11,7 @@ FactoryBot.define do
     transient do
       property { create(:property) }
       option_value { create(:option_value) }
-      property_value { nil }
+      property_value nil
     end
 
     after(:build) do |rule, evaluator|

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

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

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/sequences'
 require 'spree/testing_support/factories/country_factory'
 
 FactoryBot.define do
   factory :global_zone, class: 'Spree::Zone' do
-    name { 'GlobalZone' }
+    name 'GlobalZone'
     zone_members do |proxy|
       zone = proxy.instance_eval { @instance }
       Spree::Country.all.map do |c|

data/lib/spree/testing_support/flash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module TestingSupport
     module Flash

data/lib/spree/testing_support/order_walkthrough.rb

@@ -1,78 +1,87 @@
-class OrderWalkthrough
-  def self.up_to(state)
-    new.up_to(state)
-  end
+# frozen_string_literal: true
 
-  def up_to(state)
-    # Need to create a valid zone too...
-    @zone = FactoryBot.create(:zone)
-    @country = FactoryBot.create(:country)
-    @state = FactoryBot.create(:state, country: @country)
+module Spree
+  module TestingSupport
+    class OrderWalkthrough
+      def self.up_to(state)
+        new.up_to(state)
+      end
 
-    @zone.members << Spree::ZoneMember.create(zoneable: @country)
+      def up_to(state)
+        # Need to create a valid zone too...
+        @zone = FactoryBot.create(:zone)
+        @country = FactoryBot.create(:country)
+        @state = FactoryBot.create(:state, country: @country)
 
-    # A shipping method must exist for rates to be displayed on checkout page
-    FactoryBot.create(:shipping_method, zones: [@zone]).tap do |sm|
-      sm.calculator.preferred_amount = 10
-      sm.calculator.preferred_currency = Spree::Config[:currency]
-      sm.calculator.save
-    end
+        @zone.members << Spree::ZoneMember.create(zoneable: @country)
 
-    order = Spree::Order.create!(
-      email: "spree@example.com",
-      store: Spree::Store.first || FactoryBot.create(:store)
-    )
-    add_line_item!(order)
-    order.next!
-
-    states_to_process = if state == :complete
-                          states
-                        else
-                          end_state_position = states.index(state.to_sym)
-                          states[0..end_state_position]
-                        end
-
-    states_to_process.each do |state_to_process|
-      send(state_to_process, order)
-    end
+        # A shipping method must exist for rates to be displayed on checkout page
+        FactoryBot.create(:shipping_method, zones: [@zone]).tap do |sm|
+          sm.calculator.preferred_amount = 10
+          sm.calculator.preferred_currency = Spree::Config[:currency]
+          sm.calculator.save
+        end
 
-    order
-  end
+        order = Spree::Order.create!(
+          email: "spree@example.com",
+          store: Spree::Store.first || FactoryBot.create(:store)
+        )
+        add_line_item!(order)
+        order.next!
 
-  private
+        states_to_process = if state == :complete
+                              states
+                            else
+                              end_state_position = states.index(state.to_sym)
+                              states[0..end_state_position]
+                            end
 
-  def add_line_item!(order)
-    FactoryBot.create(:line_item, order: order)
-    order.reload
-  end
+        states_to_process.each do |state_to_process|
+          send(state_to_process, order)
+        end
 
-  def address(order)
-    order.bill_address = FactoryBot.create(:address, country: @country, state: @state)
-    order.ship_address = FactoryBot.create(:address, country: @country, state: @state)
-    order.next!
-  end
+        order
+      end
 
-  def delivery(order)
-    order.next!
-  end
+      private
 
-  def payment(order)
-    credit_card = FactoryBot.create(:credit_card)
-    order.payments.create!(payment_method: credit_card.payment_method, amount: order.total, source: credit_card)
-    # TODO: maybe look at some way of making this payment_state change automatic
-    order.payment_state = 'paid'
-    order.next!
-  end
+      def add_line_item!(order)
+        FactoryBot.create(:line_item, order: order)
+        order.reload
+      end
 
-  def confirm(order)
-    order.complete!
-  end
+      def address(order)
+        order.bill_address = FactoryBot.create(:address, country: @country, state: @state)
+        order.ship_address = FactoryBot.create(:address, country: @country, state: @state)
+        order.next!
+      end
 
-  def complete(order)
-    # noop?
-  end
+      def delivery(order)
+        order.next!
+      end
+
+      def payment(order)
+        credit_card = FactoryBot.create(:credit_card)
+        order.payments.create!(payment_method: credit_card.payment_method, amount: order.total, source: credit_card)
+        # TODO: maybe look at some way of making this payment_state change automatic
+        order.payment_state = 'paid'
+        order.next!
+      end
+
+      def confirm(order)
+        order.complete!
+      end
 
-  def states
-    [:address, :delivery, :payment, :confirm]
+      def complete(order)
+        # noop?
+      end
+
+      def states
+        [:address, :delivery, :payment, :confirm]
+      end
+    end
   end
 end
+
+# @private
+OrderWalkthrough = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('OrderWalkthrough', 'Spree::TestingSupport::OrderWalkthrough')

data/lib/spree/testing_support/preferences.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module TestingSupport
     module Preferences

data/lib/spree/testing_support/sequences.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 
 FactoryBot.define do

data/lib/spree/testing_support/url_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module TestingSupport
     module UrlHelpers

data/lib/spree_core.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'spree/core'

data/lib/tasks/core.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 
 def prompt_for_agree(prompt)
@@ -79,9 +81,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]'
     ActiveRecord::Base.send(:subclasses).each(&:reset_column_information)
 
     load_defaults = Spree::Country.count == 0
-    unless load_defaults # ask if there are already Countries => default data hass been loaded
-      load_defaults = prompt_for_agree('Countries present, load sample data anyways? [y/n]: ')
-    end
+    load_defaults ||= prompt_for_agree('Countries present, load sample data anyways? [y/n]: ')
     if load_defaults
       Rake::Task["db:seed"].invoke
     end
@@ -90,7 +90,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]'
       load_sample = prompt_for_agree("WARNING: In Production and products exist in database, load sample data anyways? [y/n]:" )
     else
       load_sample = true if ENV['AUTO_ACCEPT']
-      load_sample = prompt_for_agree('Load Sample Data? [y/n]: ') unless load_sample
+      load_sample ||= prompt_for_agree('Load Sample Data? [y/n]: ')
     end
 
     if load_sample