solidus_core 1.1.4 → 1.2.0.beta1

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

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :return_reason, class: Spree::ReturnReason do
+    sequence(:name) { |n| "Defect ##{n}" }
+  end
+end

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

@@ -1,3 +1,8 @@
+require 'spree/testing_support/factories/order_factory'
+require 'spree/testing_support/factories/stock_location_factory'
+require 'spree/testing_support/factories/shipping_method_factory'
+require 'spree/testing_support/factories/stock_location_factory'
+
 FactoryGirl.define do
   factory :shipment, class: Spree::Shipment do
     tracking 'U10000'
@@ -16,7 +21,7 @@ FactoryGirl.define do
 
       shipment.order.line_items.each do |line_item|
         line_item.quantity.times do
-          shipment.inventory_units.create(
+          shipment.inventory_units.create!(
             order_id: shipment.order_id,
             variant_id: line_item.variant_id,
             line_item_id: line_item.id

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

@@ -1,24 +1,36 @@
+require 'spree/testing_support/factories/calculator_factory'
+require 'spree/testing_support/factories/shipping_category_factory'
+require 'spree/testing_support/factories/zone_factory'
+
 FactoryGirl.define do
-  factory :base_shipping_method, class: Spree::ShippingMethod do
-    zones { |a| [Spree::Zone.global] }
+  factory(
+    :shipping_method,
+    aliases: [
+      :base_shipping_method
+    ],
+    class: Spree::ShippingMethod
+  ) do
+    zones do
+      [Spree::Zone.find_by(name: 'GlobalZone') || FactoryGirl.create(:global_zone)]
+    end
+
     name 'UPS Ground'
     code 'UPS_GROUND'
 
+    calculator { |s| s.association(:shipping_calculator, strategy: :build, preferred_amount: s.cost) }
+
+    transient do
+      cost 10.0
+    end
+
     before(:create) do |shipping_method, evaluator|
       if shipping_method.shipping_categories.empty?
         shipping_method.shipping_categories << (Spree::ShippingCategory.first || create(:shipping_category))
       end
     end
 
-    factory :shipping_method, class: Spree::ShippingMethod do
-      transient do
-        cost 10.0
-      end
-
-      calculator { |s| s.association(:shipping_calculator, strategy: :build, preferred_amount: s.cost) }
-    end
-
     factory :free_shipping_method, class: Spree::ShippingMethod do
+      cost nil
       association(:calculator, factory: :shipping_no_amount_calculator, strategy: :build)
     end
   end

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

@@ -0,0 +1,9 @@
+require 'spree/testing_support/factories/shipping_method_factory'
+require 'spree/testing_support/factories/shipment_factory'
+
+FactoryGirl.define do
+  factory :shipping_rate, class: Spree::ShippingRate do
+    shipping_method
+    shipment
+  end
+end

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

@@ -1,3 +1,5 @@
+require 'spree/testing_support/factories/country_factory'
+
 FactoryGirl.define do
   factory :state, class: Spree::State do
     name 'Alabama'

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

@@ -1,7 +1,10 @@
+require 'spree/testing_support/factories/stock_location_factory'
+require 'spree/testing_support/factories/variant_factory'
+
 FactoryGirl.define do
   factory :stock_item, class: Spree::StockItem do
     backorderable true
-    stock_location
+    association :stock_location, factory: :stock_location_without_variant_propagation
     variant
 
     after(:create) { |object| object.adjust_count_on_hand(10) }

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

@@ -1,3 +1,7 @@
+require 'spree/testing_support/factories/country_factory'
+require 'spree/testing_support/factories/state_factory'
+require 'spree/testing_support/factories/product_factory'
+
 FactoryGirl.define do
   factory :stock_location, class: Spree::StockLocation do
     name 'NY Warehouse'
@@ -13,6 +17,10 @@ FactoryGirl.define do
       stock_location.country.states.first || stock_location.association(:state, :country => stock_location.country)
     end
 
+    factory :stock_location_without_variant_propagation do
+      propagate_all_variants false
+    end
+
     factory :stock_location_with_items do
       after(:create) do |stock_location, evaluator|
         # variant will add itself to all stock_locations in an after_create

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

@@ -1,3 +1,5 @@
+require 'spree/testing_support/factories/stock_item_factory'
+
 FactoryGirl.define do
   factory :stock_movement, class: Spree::StockMovement do
     quantity 1

data/lib/spree/testing_support/factories/{stock_factory.rb → stock_package_factory.rb}

@@ -1,15 +1,10 @@
-FactoryGirl.define do
-  # must use build()
-  factory :stock_packer, class: Spree::Stock::Packer do
-    transient do
-      stock_location { build(:stock_location) }
-      contents []
-    end
-
-    initialize_with { new(stock_location, contents) }
-  end
+require 'spree/testing_support/factories/inventory_unit_factory'
+require 'spree/testing_support/factories/variant_factory'
 
+FactoryGirl.define do
   factory :stock_package, class: Spree::Stock::Package do
+    skip_create
+
     transient do
       stock_location { build(:stock_location) }
       contents       { [] }

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

@@ -0,0 +1,13 @@
+require 'spree/testing_support/factories/stock_location_factory'
+
+FactoryGirl.define do
+  # must use build()
+  factory :stock_packer, class: Spree::Stock::Packer do
+    transient do
+      stock_location { build(:stock_location) }
+      contents []
+    end
+
+    initialize_with { new(stock_location, contents) }
+  end
+end

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

@@ -20,8 +20,8 @@ FactoryGirl.define do
       end
 
       factory :receivable_stock_transfer_with_items do
-        finalized_at  { Time.now }
-        shipped_at    { Time.now }
+        finalized_at  { Time.current }
+        shipped_at    { Time.current }
       end
     end
   end

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

@@ -1,6 +1,9 @@
+require 'spree/testing_support/factories/store_credit_factory'
+require 'spree/testing_support/factories/store_credit_update_reason_factory'
+
 FactoryGirl.define do
   factory :store_credit_event, class: Spree::StoreCreditEvent do
-    store_credit       { create(:store_credit) }
+    store_credit
     amount             { 100.00 }
     authorization_code { "#{store_credit.id}-SC-20140602164814476128" }
 

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

@@ -1,10 +1,14 @@
+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'
+
 FactoryGirl.define do
   factory :store_credit, class: Spree::StoreCredit do
-    user             { create(:user) }
-    created_by       { create(:user) }
-    category         { create(:store_credit_category) }
-    amount           { 150.00 }
-    currency         { "USD" }
-    credit_type      { create(:primary_credit_type) }
+    user
+    association :created_by, factory: :user
+    association :category, factory: :store_credit_category
+    amount 150.00
+    currency "USD"
+    association :credit_type, factory: :primary_credit_type
   end
 end

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

@@ -1,3 +1,5 @@
+require 'spree/testing_support/sequences'
+
 FactoryGirl.define do
   factory :tax_category, class: Spree::TaxCategory do
     name { "TaxCategory - #{rand(999999)}" }

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

@@ -1,3 +1,7 @@
+require 'spree/testing_support/factories/calculator_factory'
+require 'spree/testing_support/factories/tax_category_factory'
+require 'spree/testing_support/factories/zone_factory'
+
 FactoryGirl.define do
   factory :tax_rate, class: Spree::TaxRate do
     zone

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

@@ -1,3 +1,5 @@
+require 'spree/testing_support/factories/taxonomy_factory'
+
 FactoryGirl.define do
   factory :taxon, class: Spree::Taxon do
     name 'Ruby on Rails'

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

@@ -1,6 +1,10 @@
+require 'spree/testing_support/sequences'
+require 'spree/testing_support/factories/role_factory'
+require 'spree/testing_support/factories/address_factory'
+
 FactoryGirl.define do
   sequence :user_authentication_token do |n|
-    "xxxx#{Time.now.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx"
+    "xxxx#{Time.current.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx"
   end
 
   factory :user, class: Spree.user_class do
@@ -20,7 +24,7 @@ FactoryGirl.define do
       spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }
     end
 
-    factory :user_with_addreses do |u|
+    factory :user_with_addresses do |u|
       bill_address
       ship_address
     end

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

@@ -1,3 +1,8 @@
+require 'spree/testing_support/sequences'
+require 'spree/testing_support/factories/option_value_factory'
+require 'spree/testing_support/factories/option_type_factory'
+require 'spree/testing_support/factories/product_factory'
+
 FactoryGirl.define do
   sequence(:random_float) { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
 

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

@@ -1,3 +1,6 @@
+require 'spree/testing_support/factories/option_value_factory'
+require 'spree/testing_support/factories/variant_property_rule_factory'
+
 FactoryGirl.define do
   factory :variant_property_rule_condition, class: Spree::VariantPropertyRuleCondition do
     variant_property_rule

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

@@ -1,3 +1,7 @@
+require 'spree/testing_support/factories/product_factory'
+require 'spree/testing_support/factories/property_factory'
+require 'spree/testing_support/factories/option_value_factory'
+
 FactoryGirl.define do
   factory :variant_property_rule, class: Spree::VariantPropertyRule do
     product

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

@@ -1,3 +1,6 @@
+require 'spree/testing_support/factories/variant_property_rule_factory'
+require 'spree/testing_support/factories/property_factory'
+
 FactoryGirl.define do
   factory :variant_property_rule_value, class: Spree::VariantPropertyRuleValue do
     variant_property_rule

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

@@ -1,3 +1,5 @@
+require 'spree/testing_support/sequences'
+
 FactoryGirl.define do
   factory :global_zone, class: Spree::Zone do
     name 'GlobalZone'
@@ -13,5 +15,9 @@ FactoryGirl.define do
   factory :zone, class: Spree::Zone do
     name { generate(:random_string) }
     description { generate(:random_string) }
+
+    trait :with_country do
+      countries { [create(:country)] }
+    end
   end
 end

data/lib/spree/testing_support/sequences.rb

@@ -0,0 +1,9 @@
+require 'factory_girl'
+
+FactoryGirl.define do
+  sequence(:random_code)        { Faker::Lorem.characters(10) }
+  sequence(:random_description) { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
+  sequence(:random_email)       { Faker::Internet.email }
+  sequence(:random_string)      { Faker::Lorem.sentence }
+  sequence(:sku) { |n| "SKU-#{n}" }
+end

data/lib/tasks/exchanges.rake

@@ -20,12 +20,13 @@ namespace :exchanges do
       begin
         item_charger.charge_for_items
       rescue Spree::UnreturnedItemCharger::ChargeFailure => e
-        failure = {message: e.message, new_order: e.new_order.try(:number)}
-      rescue Exception => e
-        failure = {message: "#{e.class}: #{e.message}"}
+        failure = { message: e.message }
+      rescue => e
+        failure = { message: "#{e.class}: #{e.message}" }
       end
 
       if failure
+        failure[:new_order] = item_charger.new_order.number if item_charger.new_order
         failures << failure.merge({
           order: item_charger.original_order.number,
           shipment: shipment.number,

data/lib/tasks/migrations/copy_shipped_shipments_to_cartons.rake

@@ -55,8 +55,8 @@ namespace 'spree:migrations:copy_shipped_shipments_to_cartons' do
               spree_shipping_rates.shipping_method_id,
               spree_shipments.tracking,
               spree_shipments.shipped_at,
-              '#{Time.now.to_s(:db)}', -- created_at
-              '#{Time.now.to_s(:db)}' -- updated_at
+              '#{Time.current.to_s(:db)}', -- created_at
+              '#{Time.current.to_s(:db)}' -- updated_at
             from spree_shipments
             left join spree_shipping_rates
               on spree_shipping_rates.shipment_id = spree_shipments.id

data/solidus_core.gemspec

@@ -1,10 +1,10 @@
 # encoding: UTF-8
-version = File.read(File.expand_path("../../SOLIDUS_VERSION", __FILE__)).strip
+require_relative '../core/lib/spree/core/version.rb'
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'solidus_core'
-  s.version     = version
+  s.version     = Spree.solidus_version
   s.summary     = 'Essential models, mailers, and classes for the Solidus e-commerce project.'
   s.description = s.summary
 
@@ -24,16 +24,15 @@ Gem::Specification.new do |s|
   s.add_dependency 'awesome_nested_set', '~> 3.0.1'
   s.add_dependency 'carmen', '~> 1.0.0'
   s.add_dependency 'cancancan', '~> 1.10'
-  s.add_dependency 'deface', '~> 1.0.0'
   s.add_dependency 'ffaker', '~> 1.16'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
-  s.add_dependency 'friendly_id', '~> 5.0.4'
+  s.add_dependency 'friendly_id', '~> 5.0'
   s.add_dependency 'highline', '~> 1.6.18' # Necessary for the install generator
   s.add_dependency 'json', '~> 1.7'
   s.add_dependency 'kaminari', '~> 0.15', '>= 0.15.1'
   s.add_dependency 'monetize', '~> 1.1'
   s.add_dependency 'paperclip', '~> 4.2.0'
-  s.add_dependency 'paranoia', '~> 2.1.0'
+  s.add_dependency 'paranoia', '~> 2.1.4'
   s.add_dependency 'premailer-rails'
   s.add_dependency 'rails', '~> 4.2.0'
   s.add_dependency 'ransack', '~> 1.6.0'

data/spec/helpers/base_helper_spec.rb

@@ -50,7 +50,7 @@ describe Spree::BaseHelper, :type => :helper do
     end
   end
 
-  # Regression test for #1436
+  # Regression test for https://github.com/spree/spree/issues/1436
   context "defining custom image helpers" do
     let(:product) { mock_model(Spree::Product, :images => [], :variant_images => []) }
     before do
@@ -61,7 +61,7 @@ describe Spree::BaseHelper, :type => :helper do
 
     it "should not raise errors when style exists" do
       ActiveSupport::Deprecation.silence do
-        expect { very_strange_image(product) }.not_to raise_error
+        very_strange_image(product)
       end
     end
 
@@ -71,7 +71,7 @@ describe Spree::BaseHelper, :type => :helper do
 
   end
 
-  # Regression test for #2034
+  # Regression test for https://github.com/spree/spree/issues/2034
   context "flash_message" do
     let(:flash) { {"notice" => "ok", "foo" => "foo", "bar" => "bar"} }
 
@@ -130,7 +130,7 @@ describe Spree::BaseHelper, :type => :helper do
     end
   end
 
-  # Regression test for #2396
+  # Regression test for https://github.com/spree/spree/issues/2396
   context "meta_data_tags" do
     it "truncates a product description to 160 characters" do
       # Because the controller_name method returns "test"
@@ -144,7 +144,7 @@ describe Spree::BaseHelper, :type => :helper do
     end
   end
 
-  # Regression test for #5384
+  # Regression test for https://github.com/spree/spree/issues/5384
   context "custom image helpers conflict with inproper statements" do
     let(:product) { mock_model(Spree::Product, :images => [], :variant_images => []) }
     before do
@@ -155,7 +155,7 @@ describe Spree::BaseHelper, :type => :helper do
 
     it "should not raise errors when helper method called" do
       ActiveSupport::Deprecation.silence do
-        expect { foobar_image(product) }.not_to raise_error
+        foobar_image(product)
       end
     end
 

data/spec/helpers/order_helper_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spree
   describe Spree::OrdersHelper, :type => :helper do
-    # Regression test for #2518 + #2323
+    # Regression test for https://github.com/spree/spree/issues/2518 and https://github.com/spree/spree/issues/2323
     it "truncates HTML correctly in product description" do
       product = double(:description => "<strong>" + ("a" * 95) + "</strong> This content is invisible.")
       expected = "<strong>" + ("a" * 95) + "</strong>..."