solidus_core 1.2.3 → 1.3.0.beta1

data/lib/spree/permitted_attributes.rb

@@ -32,7 +32,7 @@ module Spree
       :variant_attributes
     ]
 
-    mattr_reader *ATTRIBUTES
+    mattr_reader(*ATTRIBUTES)
 
     @@address_attributes = [
       :id, :firstname, :lastname, :first_name, :last_name,
@@ -49,10 +49,10 @@ module Spree
     ]
 
     @@credit_card_update_attributes = [
-      :month, :year, :expiry, :first_name, :last_name, :name,
+      :month, :year, :expiry, :first_name, :last_name, :name
     ]
 
-    @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :reception_status_event, :acceptance_status, :exchange_variant_id, :resellable]]
+    @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :amount, :reception_status_event, :acceptance_status, :exchange_variant_id, :resellable]]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
@@ -88,7 +88,7 @@ module Spree
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data,
-      :existing_card_id,
+      :existing_card_id
     ]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
@@ -102,7 +102,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]
 
     @@taxonomy_attributes = [:name]
 
@@ -120,8 +120,8 @@ module Spree
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :lock_version,
-      :position, :option_value_ids, :track_inventory,
+      :position, :track_inventory,
       :product_id, :product, :option_values_attributes, :price,
-      :weight, :height, :width, :depth, :sku, :cost_currency, options: [ :name, :value ]]
+      :weight, :height, :width, :depth, :sku, :cost_currency, option_value_ids: [], options: [:name, :value]]
   end
 end

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 if !(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 if !(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)

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.
+          fail %{Expected to find #{key} in the cache, but didn't.
 
   Cache writes:
   #{@cache_write_events.join("\n")}
@@ -24,24 +24,24 @@ module Spree
 end
 
 RSpec.configure do |config|
-  config.include Spree::TestingSupport::Caching, :caching => true
+  config.include Spree::TestingSupport::Caching, caching: true
 
-  config.before(:each, :caching => true) do
+  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
   end
 
-  config.after(:each, :caching => true) do
+  config.after(:each, caching: true) do
     ActionController::Base.perform_caching = false
     Rails.cache.clear
   end
-end
+end

data/lib/spree/testing_support/capybara_ext.rb

@@ -1,13 +1,12 @@
 module CapybaraExt
   def page!
-    save_and_open_page
   end
 
   def click_icon(type)
     find(".fa-#{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
@@ -22,14 +21,14 @@ module CapybaraExt
 
   def fill_in_quantity(table_column, selector, quantity)
     within(table_column) do
-      fill_in selector, :with => quantity
+      fill_in selector, with: quantity
     end
   end
 
   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
@@ -57,17 +56,16 @@ 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
 
     click_link placeholder
 
@@ -83,7 +81,7 @@ module CapybaraExt
   def select_select2_result(value)
     # results are in a div appended to the end of the document
     within_entire_page do
-      page.find("div.select2-result-label", text: %r{#{Regexp.escape(value)}}i, match: :prefer_exact).click
+      page.find("div.select2-result-label", text: /#{Regexp.escape(value)}/i, match: :prefer_exact).click
     end
   end
 
@@ -93,7 +91,7 @@ module CapybaraExt
     # We need to select labels which are not .select2-offscreen, as select2
     # makes a duplicate label with the same text, and we want to be sure to
     # find the original.
-    find('label:not(.select2-offscreen)', text: %r{#{Regexp.escape(text)}}i, match: :one)
+    find('label:not(.select2-offscreen)', text: /#{Regexp.escape(text)}/i, match: :one)
   end
 
   def wait_for_ajax
@@ -119,7 +117,7 @@ module CapybaraExt
 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
 

data/lib/spree/testing_support/common_rake.rb

@@ -6,9 +6,9 @@ require 'generators/spree/dummy/dummy_generator'
 
 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")
-    require "#{ENV['LIB_NAME']}"
+  task :test_app, :user_class do |_t, args|
+    args.with_defaults(user_class: "Spree::LegacyUser")
+    require ENV['LIB_NAME']
 
     ENV["RAILS_ENV"] = 'test'
 
@@ -30,7 +30,7 @@ namespace :common do
     end
   end
 
-  task :seed do |t, args|
+  task :seed do |_t, _args|
     puts "Seeding ..."
 
     silence_stream(STDOUT) do

data/lib/spree/testing_support/controller_requests.rb

@@ -75,7 +75,7 @@ module Spree
 
       def process_spree_xhr_action(action, parameters = nil, session = nil, flash = nil, method = :get)
         parameters ||= {}
-        parameters.reverse_merge!(:format => :json)
+        parameters.reverse_merge!(format: :json)
         xml_http_request(method, action, parameters, session, flash)
       end
     end

data/lib/spree/testing_support/extension_rake.rb

@@ -2,9 +2,8 @@ require 'spree/testing_support/common_rake'
 
 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,24 +1,35 @@
 require 'spree/testing_support/factories/state_factory'
 require 'spree/testing_support/factories/country_factory'
+require 'twitter_cldr'
 
 FactoryGirl.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'
+    end
+
     firstname 'John'
     lastname 'Doe'
     company 'Company'
     address1 '10 Lovely Street'
     address2 'Northwest'
     city 'Herndon'
-    zipcode '35005'
+    zipcode { TwitterCldr::Shared::PostalCodes.for_territory(country_iso_code).sample.first }
     phone '555-555-0199'
     alternative_phone '555-555-0199'
 
-    state { |address| address.association(:state) }
+    state do |address|
+      Spree::State.joins(:country).where('spree_countries.iso = (?)', country_iso_code).find_by(abbr: state_code) ||
+        address.association(:state, country_iso: country_iso_code, state_code: state_code)
+    end
+
     country do |address|
       if address.state
         address.state.country
       else
-        address.association(:country)
+        address.association(:country, iso: country_iso_code)
       end
     end
   end

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

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :adjustment_reason, class: Spree::AdjustmentReason do
     sequence(:name) { |n| "Refund for return ##{n}" }
-    sequence(:code) { |n| "Code #{n}"}
+    sequence(:code) { |n| "Code #{n}" }
   end
 end

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

@@ -15,9 +15,9 @@ FactoryGirl.define do
           shipment: build(
             :shipment,
             stock_location: stock_location,
-            shipping_method: shipping_method,
+            shipping_method: shipping_method
           )
-        ),
+        )
       ]
     end
   end

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

@@ -7,5 +7,9 @@ FactoryGirl.define do
     name 'Spree Commerce'
     association(:payment_method, factory: :credit_card_payment_method)
     association(:address)
+
+    trait :failing do
+      number "0000000000000000"
+    end
   end
 end

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

@@ -3,20 +3,19 @@ require 'spree/testing_support/factories/order_factory'
 require 'spree/testing_support/factories/return_item_factory'
 
 FactoryGirl.define do
-
   factory :customer_return, class: Spree::CustomerReturn do
     association(:stock_location, factory: :stock_location)
 
     transient do
       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 }
     end
 
     before(:create) do |customer_return, evaluator|
-      shipped_order = create(:shipped_order, line_items_count: evaluator.line_items_count)
-
-      shipped_order.inventory_units.take(evaluator.return_items_count).each do |inventory_unit|
-        customer_return.return_items << build(:return_item, inventory_unit: inventory_unit)
+      evaluator.shipped_order.inventory_units.take(evaluator.return_items_count).each do |inventory_unit|
+        customer_return.return_items << build(:return_item, inventory_unit: inventory_unit, return_authorization: evaluator.return_authorization)
       end
     end
 
@@ -31,5 +30,4 @@ FactoryGirl.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/line_item_factory.rb

@@ -5,7 +5,6 @@ FactoryGirl.define do
   factory :line_item, class: Spree::LineItem do
     quantity 1
     price { BigDecimal.new('10.00') }
-    pre_tax_amount { price }
     order
     transient do
       product nil
@@ -13,5 +12,6 @@ FactoryGirl.define do
     variant do
       (product || create(:product)).master
     end
+    currency { order.currency }
   end
 end

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

@@ -41,7 +41,7 @@ FactoryGirl.define do
         evaluator.stock_location # must evaluate before creating line items
 
         evaluator.line_items_attributes.each do |attributes|
-          attributes = {order: order, price: evaluator.line_items_price}.merge(attributes)
+          attributes = { order: order, price: evaluator.line_items_price }.merge(attributes)
           create(:line_item, attributes)
         end
         order.line_items.reload
@@ -91,15 +91,14 @@ FactoryGirl.define do
               order.shipments.each do |shipment|
                 shipment.inventory_units.update_all state: 'shipped'
                 shipment.update_columns(state: 'shipped', shipped_at: Time.current)
-                if evaluator.with_cartons
-                  Spree::Carton.create!(
-                    stock_location: shipment.stock_location,
-                    address: shipment.address,
-                    shipping_method: shipment.shipping_method,
-                    inventory_units: shipment.inventory_units,
-                    shipped_at: Time.current,
-                  )
-                end
+                next unless evaluator.with_cartons
+                Spree::Carton.create!(
+                  stock_location: shipment.stock_location,
+                  address: shipment.address,
+                  shipping_method: shipment.shipping_method,
+                  inventory_units: shipment.inventory_units,
+                  shipped_at: Time.current
+                )
               end
               order.reload
             end
@@ -120,7 +119,7 @@ FactoryGirl.define do
       promotion_code = evaluator.promotion_code || promotion.codes.first
 
       promotion.actions.each do |action|
-        action.perform({order: order, promotion: promotion, promotion_code: promotion_code})
+        action.perform({ order: order, promotion: promotion, promotion_code: promotion_code })
       end
     end
   end

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

@@ -11,6 +11,11 @@ FactoryGirl.define do
     state 'checkout'
     response_code '12345'
 
+    trait :failing do
+      response_code '00000'
+      association(:source, :failing, { factory: :credit_card })
+    end
+
     factory :payment_with_refund do
       transient do
         refund_amount 5

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

@@ -3,4 +3,3 @@ FactoryGirl.define do
     name 'Promotion Category'
   end
 end
-

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

@@ -58,6 +58,5 @@ FactoryGirl.define do
       end
     end
     factory :promotion_with_item_total_rule, traits: [:with_item_total_rule]
-
   end
 end

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

@@ -2,7 +2,7 @@ require 'spree/testing_support/factories/payment_factory'
 require 'spree/testing_support/factories/refund_reason_factory'
 
 FactoryGirl.define do
-  sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}"}
+  sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}" }
 
   factory :refund, class: Spree::Refund do
     transient do

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

@@ -8,7 +8,7 @@ FactoryGirl.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/return_item_factory.rb

@@ -6,7 +6,7 @@ FactoryGirl.define do
   factory :return_item, class: Spree::ReturnItem do
     association(:inventory_unit, factory: :inventory_unit, state: :shipped)
     association(:return_reason, factory: :return_reason)
-    return_authorization do |return_item|
+    return_authorization do |_return_item|
       build(:return_authorization, order: inventory_unit.order)
     end
 

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

@@ -16,14 +16,17 @@ FactoryGirl.define do
 
     name 'UPS Ground'
     code 'UPS_GROUND'
+    carrier 'UPS'
+    service_level '1DAYGROUND'
 
-    calculator { |s| s.association(:shipping_calculator, strategy: :build, preferred_amount: s.cost) }
+    calculator { |s| s.association(:shipping_calculator, strategy: :build, preferred_amount: s.cost, preferred_currency: s.currency) }
 
     transient do
       cost 10.0
+      currency 'USD'
     end
 
-    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

@@ -2,14 +2,24 @@ require 'spree/testing_support/factories/country_factory'
 
 FactoryGirl.define do
   factory :state, class: Spree::State do
-    name 'Alabama'
-    abbr 'AL'
-    country do |country|
-      if usa = Spree::Country.find_by_numcode(840)
-        country = usa
-      else
-        country.association(:country)
+    transient do
+      country_iso 'US'
+      state_code 'AL'
+
+      carmen_subregion do
+        carmen_country = Carmen::Country.coded(country.iso)
+        carmen_country.subregions.coded(state_code) ||
+          carmen_country.subregions.sort_by(&:name).first ||
+          fail("Country #{country.iso} has no subregions")
       end
     end
+
+    abbr { carmen_subregion.code }
+    name { carmen_subregion.name }
+
+    country do |country|
+      Spree::Country.find_by(iso: country_iso) ||
+        country.association(:country, iso: country_iso)
+    end
   end
 end

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

@@ -14,7 +14,7 @@ FactoryGirl.define do
 
     country  { |stock_location| Spree::Country.first || stock_location.association(:country) }
     state do |stock_location|
-      stock_location.country.states.first || stock_location.association(:state, :country => stock_location.country)
+      stock_location.country.states.first || stock_location.association(:state, country: stock_location.country)
     end
 
     factory :stock_location_without_variant_propagation do
@@ -22,14 +22,14 @@ FactoryGirl.define do
     end
 
     factory :stock_location_with_items do
-      after(:create) do |stock_location, evaluator|
+      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)
 
-        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/stock_transfer_factory.rb

@@ -5,7 +5,7 @@ FactoryGirl.define do
     factory :stock_transfer_with_items do
       destination_location { Spree::StockLocation.create!(name: "Destination Location", code: "DEST", admin_name: "Destination") }
 
-      after(:create) do |stock_transfer, evaluator|
+      after(:create) do |stock_transfer, _evaluator|
         variant_1 = create(:variant)
         variant_2 = create(:variant)
 

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

@@ -1,5 +1,4 @@
 FactoryGirl.define do
-
   factory :store_credit_category, class: Spree::StoreCreditCategory do
     name "Exchange"
   end

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

@@ -1,5 +1,4 @@
 FactoryGirl.define do
-
   factory :primary_credit_type, class: Spree::StoreCreditType do
     name      Spree::StoreCreditType::DEFAULT_TYPE_NAME
     priority  { "1" }
@@ -9,5 +8,4 @@ FactoryGirl.define do
     name      { "Non-expiring" }
     priority  { "2" }
   end
-
 end

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

@@ -2,8 +2,8 @@ require 'spree/testing_support/sequences'
 
 FactoryGirl.define do
   factory :tax_category, class: Spree::TaxCategory do
-    name { "TaxCategory - #{rand(999999)}" }
-    tax_code { "TaxCode - #{rand(999999)}" }
+    name { "TaxCategory - #{rand(999_999)}" }
+    tax_code { "TaxCode - #{rand(999_999)}" }
     description { generate(:random_string) }
   end
 end

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

@@ -24,7 +24,7 @@ FactoryGirl.define do
       spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }
     end
 
-    factory :user_with_addresses do |u|
+    factory :user_with_addresses do |_u|
       bill_address
       ship_address
     end

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

@@ -9,7 +9,7 @@ FactoryGirl.define do
   factory :base_variant, class: Spree::Variant do
     price 19.99
     cost_price 17.00
-    sku    { generate(:sku) }
+    sku { generate(:sku) }
     is_master 0
     track_inventory true
 
@@ -35,6 +35,5 @@ FactoryGirl.define do
         is_master 1
       end
     end
-
   end
 end

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

@@ -1,4 +1,5 @@
 require 'spree/testing_support/sequences'
+require 'spree/testing_support/factories/country_factory'
 
 FactoryGirl.define do
   factory :global_zone, class: Spree::Zone do
@@ -7,7 +8,7 @@ FactoryGirl.define do
     zone_members do |proxy|
       zone = proxy.instance_eval { @instance }
       Spree::Country.all.map do |c|
-        zone_member = Spree::ZoneMember.create(zoneable: c, zone: zone)
+        Spree::ZoneMember.create(zoneable: c, zone: zone)
       end
     end
   end