spree_core 3.3.6 → 3.4.0.rc1

data/lib/spree/money.rb

@@ -15,17 +15,13 @@ module Spree
 
     attr_reader :money
 
-    delegate :cents, :currency, to: :money
+    delegate :cents, to: :money
 
-    def initialize(amount, options={})
+    def initialize(amount, options = {})
       @money = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
 
-    def amount_in_cents
-      (cents / currency.subunit_to_unit.to_f * 100).round
-    end
-
     def to_s
       @money.format(@options)
     end
@@ -35,7 +31,7 @@ module Spree
       if options[:html]
         # 1) prevent blank, breaking spaces
         # 2) prevent escaping of HTML character entities
-        output = output.sub(" ", " ").html_safe
+        output = output.sub(' ', ' ').html_safe
       end
       output
     end

data/lib/spree/permitted_attributes.rb

@@ -91,7 +91,7 @@ module Spree
       :quantity, :stock_item, :stock_item_id, :originator, :action]
 
     @@store_attributes = [:name, :url, :seo_title, :meta_keywords,
-                         :meta_description, :default_currency, :mail_from_address]
+                          :meta_description, :default_currency, :mail_from_address]
 
     @@store_credit_attributes = [:amount, :category_id, :memo]
 
@@ -101,7 +101,7 @@ module Spree
       :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id,
       :meta_description, :meta_keywords, :meta_title, :child_index]
 
-    # TODO Should probably use something like Spree.user_class.attributes
+    # TODO: Should probably use something like Spree.user_class.attributes
     @@user_attributes = [:email, :password, :password_confirmation]
 
     @@variant_attributes = [

data/lib/spree/responder.rb

@@ -1,27 +1,26 @@
 module Spree
   class Responder < ::ActionController::Responder #:nodoc:
-
     attr_accessor :on_success, :on_failure
 
-    def initialize(controller, resources, options={})
+    def initialize(controller, resources, options = {})
       super
 
       class_name = controller.class.name.to_sym
       action_name = options.delete(:action_name)
 
-      if result = Spree::BaseController.spree_responders[class_name].try(:[], action_name).try(:[], self.format.to_sym)
+      if result = Spree::BaseController.spree_responders[class_name].try(:[], action_name).try(:[], format.to_sym)
         self.on_success = handler(controller, result, :success)
         self.on_failure = handler(controller, result, :failure)
       end
     end
 
     def to_html
-      super and return if !(on_success || on_failure)
+      super && return unless on_success || on_failure
       has_errors? ? controller.instance_exec(&on_failure) : controller.instance_exec(&on_success)
     end
 
     def to_format
-      super and return if !(on_success || on_failure)
+      super && return unless on_success || on_failure
       has_errors? ? controller.instance_exec(&on_failure) : controller.instance_exec(&on_success)
     end
 

data/lib/spree/testing_support/authorization_helpers.rb

@@ -3,7 +3,7 @@ module Spree
     module AuthorizationHelpers
       module CustomAbility
         def build_ability(&block)
-          block ||= proc{ |u| can :manage, :all }
+          block ||= proc { |_u| can :manage, :all }
           Class.new do
             include CanCan::Ability
             define_method(:initialize, block)
@@ -38,8 +38,8 @@ module Spree
 
           before do
             allow(Spree.user_class).to receive(:find_by).
-                                         with(hash_including(:spree_api_key)).
-                                         and_return(Spree.user_class.new)
+              with(hash_including(:spree_api_key)).
+              and_return(Spree.user_class.new)
           end
         end
 

data/lib/spree/testing_support/caching.rb

@@ -7,7 +7,7 @@ module Spree
 
       def assert_written_to_cache(key)
         unless @cache_write_events.detect { |event| event[:key].starts_with?(key) }
-          fail %Q{Expected to find #{key} in the cache, but didn't.
+          raise %Q{Expected to find #{key} in the cache, but didn't.
 
   Cache writes:
   #{@cache_write_events.join("\n")}
@@ -29,12 +29,12 @@ RSpec.configure do |config|
   config.before(:each, caching: true) do
     ActionController::Base.perform_caching = true
 
-    ActiveSupport::Notifications.subscribe("read_fragment.action_controller") do |event, start_time, finish_time, _, details|
+    ActiveSupport::Notifications.subscribe('read_fragment.action_controller') do |_event, _start_time, _finish_time, _, details|
       @cache_read_events ||= []
-      @cache_read_events << details 
+      @cache_read_events << details
     end
 
-    ActiveSupport::Notifications.subscribe("write_fragment.action_controller") do |event, start_time, finish_time, _, details|
+    ActiveSupport::Notifications.subscribe('write_fragment.action_controller') do |_event, _start_time, _finish_time, _, details|
       @cache_write_events ||= []
       @cache_write_events << details
     end
@@ -44,4 +44,4 @@ RSpec.configure do |config|
     ActionController::Base.perform_caching = false
     Rails.cache.clear
   end
-end
+end

data/lib/spree/testing_support/capybara_ext.rb

@@ -7,7 +7,7 @@ module CapybaraExt
     find(".icon-#{type}").click
   end
 
-  def eventually_fill_in(field, options={})
+  def eventually_fill_in(field, options = {})
     expect(page).to have_css('#' + field)
     fill_in field, options
   end
@@ -16,7 +16,7 @@ module CapybaraExt
     if RSpec.current_example.metadata[:js]
       within("table.table tbody tr:nth-child(#{num})", &block)
     else
-      within(:xpath, all("table.table tbody tr")[num-1].path, &block)
+      within(:xpath, all('table.table tbody tr')[num - 1].path, &block)
     end
   end
 
@@ -24,7 +24,7 @@ module CapybaraExt
     if RSpec.current_example.metadata[:js]
       find("td:nth-child(#{num})").text
     else
-      all("td")[num-1].text
+      all('td')[num - 1].text
     end
   end
 
@@ -34,8 +34,8 @@ module CapybaraExt
 
   def select2_search(value, options)
     label = find_label_by_text(options[:from])
-    within label.first(:xpath,".//..") do
-      options[:from] = "##{find(".select2-container")["id"]}"
+    within label.first(:xpath, './/..') do
+      options[:from] = "##{find('.select2-container')['id']}"
     end
     targetted_select2_search(value, options)
   end
@@ -49,14 +49,14 @@ module CapybaraExt
   def select2(value, options)
     label = find_label_by_text(options[:from])
 
-    within label.first(:xpath,".//..") do
-      options[:from] = "##{find(".select2-container")["id"]}"
+    within label.first(:xpath, './/..') do
+      options[:from] = "##{find('.select2-container')['id']}"
     end
     targetted_select2(value, options)
   end
 
-  def select2_no_label value, options={}
-    raise "Must pass a hash containing 'from'" if not options.is_a?(Hash) or not options.has_key?(:from)
+  def select2_no_label(value, options = {})
+    raise "Must pass a hash containing 'from'" if !options.is_a?(Hash) || !options.key?(:from)
 
     placeholder = options[:from]
     minlength = options[:minlength] || 4
@@ -75,7 +75,7 @@ module CapybaraExt
   def select_select2_result(value)
     # results are in a div appended to the end of the document
     within(:xpath, '//body') do
-      page.find("div.select2-result-label", text: %r{#{Regexp.escape(value)}}i).click
+      page.find('div.select2-result-label', text: %r{#{Regexp.escape(value)}}i).click
     end
   end
 
@@ -90,9 +90,7 @@ module CapybaraExt
       label = find_label(text)
     end
 
-    if label.nil?
-      raise "Could not find label by text #{text}"
-    end
+    raise "Could not find label by text #{text}" if label.nil?
 
     label
   end
@@ -119,7 +117,7 @@ module CapybaraExt
   def wait_for_condition(delay = Capybara.default_max_wait_time)
     counter = 0
     delay_threshold = delay * 10
-    while !yield
+    until yield
       counter += 1
       sleep(0.1)
       raise "Could not achieve condition within #{delay} seconds." if counter >= delay_threshold
@@ -145,7 +143,7 @@ Capybara.configure do |config|
 end
 
 RSpec::Matchers.define :have_meta do |name, expected|
-  match do |actual|
+  match do |_actual|
     has_css?("meta[name='#{name}'][content='#{expected}']", visible: false)
   end
 
@@ -160,12 +158,12 @@ RSpec::Matchers.define :have_meta do |name, expected|
 end
 
 RSpec::Matchers.define :have_title do |expected|
-  match do |actual|
-    has_css?("title", text: expected, visible: false)
+  match do |_actual|
+    has_css?('title', text: expected, visible: false)
   end
 
   failure_message do |actual|
-    actual = first("title")
+    actual = first('title')
     if actual
       "expected that title would have been '#{expected}' but was '#{actual.text}'"
     else

data/lib/spree/testing_support/common_rake.rb

@@ -3,37 +3,36 @@ unless defined?(Spree::InstallGenerator)
 end
 
 require 'generators/spree/dummy/dummy_generator'
-require 'rails'
 
-desc "Generates a dummy app for testing"
+desc 'Generates a dummy app for testing'
 namespace :common do
   task :test_app, :user_class do |_t, args|
-    args.with_defaults(user_class: "Spree::LegacyUser")
+    args.with_defaults(user_class: 'Spree::LegacyUser')
     require ENV['LIB_NAME'].to_s
 
     ENV['RAILS_ENV'] = 'test'
     Rails.env = 'test'
 
-    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--quiet"]
-    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--migrate=false", "--seed=false", "--sample=false", "--quiet", "--user_class=#{args[:user_class]}"]
+    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
+    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_views=false', "--user_class=#{args[:user_class]}"]
 
-    puts "Setting up dummy database..."
+    puts 'Setting up dummy database...'
     system("bundle exec rake db:drop db:create db:migrate > #{File::NULL}")
 
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"
       puts 'Running extension installation generator...'
-      "#{ENV['LIB_NAME'].camelize}::Generators::InstallGenerator".constantize.start(["--auto-run-migrations"])
+      "#{ENV['LIB_NAME'].camelize}::Generators::InstallGenerator".constantize.start(['--auto-run-migrations'])
     rescue LoadError
       puts 'Skipping installation no generator to run...'
     end
 
-    puts "Precompiling assets..."
+    puts 'Precompiling assets...'
     system("bundle exec rake assets:precompile > #{File::NULL}")
   end
 
   task :seed do |_t|
-    puts "Seeding ..."
+    puts 'Seeding ...'
     system("bundle exec rake db:seed RAILS_ENV=test > #{File::NULL}")
   end
 end

data/lib/spree/testing_support/controller_requests.rb

@@ -33,27 +33,27 @@ module Spree
       end
 
       def spree_get(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "GET")
+        process_spree_action(action, parameters, session, flash, 'GET')
       end
 
       # Executes a request simulating POST HTTP method and set/volley the response
       def spree_post(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "POST")
+        process_spree_action(action, parameters, session, flash, 'POST')
       end
 
       # Executes a request simulating PUT HTTP method and set/volley the response
       def spree_put(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "PUT")
+        process_spree_action(action, parameters, session, flash, 'PUT')
       end
 
       # Executes a request simulating PATCH HTTP method and set/volley the response
       def spree_patch(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "PATCH")
+        process_spree_action(action, parameters, session, flash, 'PATCH')
       end
 
       # Executes a request simulating DELETE HTTP method and set/volley the response
       def spree_delete(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "DELETE")
+        process_spree_action(action, parameters, session, flash, 'DELETE')
       end
 
       def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
@@ -78,7 +78,7 @@ module Spree
 
       private
 
-      def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
+      def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = 'GET')
         parameters ||= {}
         process(action, method: method, params: parameters, session: session, flash: flash)
       end

data/lib/spree/testing_support/extension_rake.rb

@@ -1,10 +1,9 @@
 require 'spree/testing_support/common_rake'
 
-desc "Generates a dummy app for testing an extension"
+desc 'Generates a dummy app for testing an extension'
 namespace :extension do
-  task :test_app, [:user_class] do |t, args|
+  task :test_app, [:user_class] do |_t, _args|
     Spree::DummyGeneratorHelper.inject_extension_requirements = true
     Rake::Task['common:test_app'].invoke
   end
 end
-

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :address, aliases: [:bill_address, :ship_address], class: Spree::Address do
     firstname 'John'
     lastname 'Doe'

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :adjustment, class: Spree::Adjustment do
     association(:adjustable, factory: :order)
     amount 100.0

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :calculator, class: Spree::Calculator::FlatRate do
     after(:create) { |c| c.set_preference(:amount, 10.0) }
   end

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :country, class: Spree::Country do
     sequence(:iso_name) { |n| "ISO_NAME_#{n}" }
     sequence(:name) { |n| "NAME_#{n}" }

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :credit_card, class: Spree::CreditCard do
     verification_value 123
     month 12

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

@@ -1,5 +1,4 @@
-FactoryBot.define do
-
+FactoryGirl.define do
   factory :customer_return, class: Spree::CustomerReturn do
     association(:stock_location, factory: :stock_location)
 
@@ -27,5 +26,4 @@ FactoryBot.define do
   factory :customer_return_without_return_items, class: Spree::CustomerReturn do
     association(:stock_location, factory: :stock_location)
   end
-
 end

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

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

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :inventory_unit, class: Spree::InventoryUnit do
     variant
     order

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :line_item, class: Spree::LineItem do
     quantity 1
     price { BigDecimal.new('10.00') }
@@ -6,6 +6,6 @@ FactoryBot.define do
     transient do
       association :product
     end
-    variant{ product.master }
+    variant { product.master }
   end
 end

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :option_value, class: Spree::OptionValue do
     sequence(:name) { |n| "Size-#{n}" }
 

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :order, class: Spree::Order do
     user
     bill_address

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :payment, class: Spree::Payment do
     amount 45.75
     association(:payment_method, factory: :credit_card_payment_method)

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :check_payment_method, class: Spree::PaymentMethod::Check do
     name 'Check'
   end
@@ -14,9 +14,9 @@ FactoryBot.define do
   end
 
   factory :store_credit_payment_method, class: Spree::PaymentMethod::StoreCredit do
-    type          "Spree::PaymentMethod::StoreCredit"
-    name          "Store Credit"
-    description   "Store Credit"
+    type          'Spree::PaymentMethod::StoreCredit'
+    name          'Store Credit'
+    description   'Store Credit'
     active        true
     auto_capture  true
   end

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :price, class: Spree::Price do
     variant
     amount 19.99

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :base_product, class: Spree::Product do
     sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
     description { generate(:random_description) }

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :product_option_type, class: Spree::ProductOptionType do
     product
     option_type

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :product_property, class: Spree::ProductProperty do
     product
     property

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

@@ -1,6 +1,5 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :promotion_category, class: Spree::PromotionCategory do
     name 'Promotion Category'
   end
 end
-

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :promotion, class: Spree::Promotion do
     name 'Promo'
 
@@ -47,6 +47,5 @@ FactoryBot.define do
       end
     end
     factory :promotion_with_item_total_rule, traits: [:with_item_total_rule]
-
   end
 end

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :promotion_rule, class: Spree::PromotionRule do
     association :promotion
   end

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :property, class: Spree::Property do
     name 'baseball_cap_color'
     presentation 'cap color'

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :prototype, class: Spree::Prototype do
     name 'Baseball Cap'
     properties { [create(:property)] }

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}" }
 
   factory :refund, class: Spree::Refund do

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :reimbursement, class: Spree::Reimbursement do
     transient do
       return_items_count 1
@@ -6,7 +6,7 @@ FactoryBot.define do
 
     customer_return { create(:customer_return_with_accepted_items, line_items_count: return_items_count) }
 
-    before(:create) do |reimbursement, evaluator|
+    before(:create) do |reimbursement, _evaluator|
       reimbursement.order ||= reimbursement.customer_return.order
       if reimbursement.return_items.empty?
         reimbursement.return_items = reimbursement.customer_return.return_items

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :reimbursement_type, class: Spree::ReimbursementType do
     sequence(:name) { |n| "Reimbursement Type #{n}" }
     active true

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :return_authorization, class: Spree::ReturnAuthorization do
     association(:order, factory: :shipped_order)
     association(:stock_location, factory: :stock_location)

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :return_item, class: Spree::ReturnItem do
     association(:inventory_unit, factory: :inventory_unit, state: :shipped)
     association(:return_authorization, factory: :return_authorization)

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :role, class: Spree::Role do
     sequence(:name) { |n| "Role ##{n}" }
 

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :shipment, class: Spree::Shipment do
     tracking 'U10000'
     cost 100.00
@@ -6,7 +6,7 @@ FactoryBot.define do
     order
     stock_location
 
-    after(:create) do |shipment, evalulator|
+    after(:create) do |shipment, _evalulator|
       shipment.add_shipping_method(create(:shipping_method), true)
 
       shipment.order.line_items.each do |line_item|

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :shipping_category, class: Spree::ShippingCategory do
     sequence(:name) { |n| "ShippingCategory ##{n}" }
   end

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

@@ -1,11 +1,11 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :base_shipping_method, class: Spree::ShippingMethod do
-    zones { |a| [Spree::Zone.global] }
+    zones { |_a| [Spree::Zone.global] }
     name 'UPS Ground'
     code 'UPS_GROUND'
     display_on 'both'
 
-    before(:create) do |shipping_method, evaluator|
+    before(:create) do |shipping_method, _evaluator|
       if shipping_method.shipping_categories.empty?
         shipping_method.shipping_categories << (Spree::ShippingCategory.first || create(:shipping_category))
       end

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :state, class: Spree::State do
     sequence(:name) { |n| "STATE_NAME_#{n}" }
     sequence(:abbr) { |n| "STATE_ABBR_#{n}" }

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   # must use build()
   factory :stock_packer, class: Spree::Stock::Packer do
     transient do