spree_core 3.0.1 → 3.0.2

data/lib/spree/testing_support/common_rake.rb

@@ -16,15 +16,10 @@ namespace :common do
     Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--migrate=false", "--seed=false", "--sample=false", "--quiet", "--user_class=#{args[:user_class]}"]
 
     puts "Setting up dummy database..."
-    cmd = "bundle exec rake db:drop db:create db:migrate"
+    system("bundle exec rake db:drop db:create db:migrate > #{File::NULL}")
 
-    if RUBY_PLATFORM =~ /mswin|mingw/ # windows
-      cmd += " >nul"
-    else
-      cmd += " >/dev/null"
-    end
-
-    system(cmd)
+    puts "Precompiling assets..."
+    system("bundle exec rake assets:precompile > #{File::NULL}")
 
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"

data/lib/spree/testing_support/factories.rb

@@ -7,7 +7,7 @@ Spree::Zone.class_eval do
 end
 
 Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
-  require File.expand_path(f)
+  load File.expand_path(f)
 end
 
 FactoryGirl.define do

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

@@ -17,6 +17,17 @@ FactoryGirl.define do
       end
     end
 
+    factory :order_with_line_item_quantity do
+      transient do
+        line_items_quantity 1
+      end
+
+      after(:create) do |order, evaluator|
+        create(:line_item, order: order, price: evaluator.line_items_price, quantity: evaluator.line_items_quantity)
+        order.line_items.reload # to ensure order.line_items is accessible after
+      end
+    end
+
     factory :order_with_line_items do
       bill_address
       ship_address

data/lib/spree/testing_support/order_walkthrough.rb

@@ -30,7 +30,7 @@ class OrderWalkthrough
     order.next!
 
     end_state_position = states.index(state.to_sym)
-    states[0..end_state_position].each do |state|
+    states[0...end_state_position].each do |state|
       send(state, order)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -260,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -397,6 +397,7 @@ files:
 - app/models/concerns/spree/user_api_authentication.rb
 - app/models/concerns/spree/user_payment_source.rb
 - app/models/concerns/spree/user_reporting.rb
+- app/models/friendly_id/slug_decorator.rb
 - app/models/spree/ability.rb
 - app/models/spree/address.rb
 - app/models/spree/adjustable/adjustments_updater.rb
@@ -444,6 +445,7 @@ files:
 - app/models/spree/order/payments.rb
 - app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
+- app/models/spree/order_merger.rb
 - app/models/spree/order_updater.rb
 - app/models/spree/payment.rb
 - app/models/spree/payment/gateway_options.rb
@@ -570,6 +572,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/default/spree/countries.rb
+- db/default/spree/default_reimbursement_type.rb
 - db/default/spree/roles.rb
 - db/default/spree/states.rb
 - db/default/spree/stores.rb
@@ -776,6 +779,10 @@ files:
 - db/migrate/20150128060325_remove_spree_configurations.rb
 - db/migrate/20150216173445_add_index_to_spree_stock_items_variant_id.rb
 - db/migrate/20150309161154_ensure_payments_have_numbers.rb
+- db/migrate/20150515211137_fix_adjustment_order_id.rb
+- db/migrate/20150522181728_add_deleted_at_to_friendly_id_slugs.rb
+- db/migrate/20150609093816_increase_scale_on_pre_tax_amounts.rb
+- db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt