spree_core 3.0.0.rc3 → 3.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8039d6ead846bc4fa735aa26d8388a62d5c86a3c
-  data.tar.gz: 5ee17fff4d41214804b660bbf57f528d8f65855a
+  metadata.gz: 4cbd5f726167f74ffe46561c736107c5da112b96
+  data.tar.gz: ba1d064375e342db1715d81d5405977dec6cf607
 SHA512:
-  metadata.gz: 8ed7452b11a0af1096c325d9f63eaf74bc928e82acce258d3fa5e46d5a9cc3b0d3a5a5251bb84ebb1e7732f1ea4038ed06dee1c0f83476e0055df4f69bec9f7d
-  data.tar.gz: 6d904ef3437a05af9bbe5355a566f9659c5828ccf19d57e0a1ef0be9829085d47e4129ab8b908fa688fcc2258049168fe021dd253e2f0313b9907b04e55dade8
+  metadata.gz: a6f1ee67cf444eecc36036df3237aa6c00b51e882df1a838ec34664f4b7faca7e252acfdced21c2d3a56e2778acc98a4d2c8a0470b0e4335ec540805d76a51d4
+  data.tar.gz: 929b702b204003e0e1ce8e90b809285a330b6810deea0e3d610276a9376c203ab4e2bc80d441d1ae229c2796bf5fc39ed8209adb10ce673e04c621fcb58d4a30

data/app/models/spree/product.rb

@@ -263,7 +263,8 @@ module Spree
     end
 
     def punch_slug
-      update_column :slug, "#{Time.now.to_i}_#{slug}" # punch slug with date prefix to allow reuse of original
+      # punch slug with date prefix to allow reuse of original
+      update_column :slug, "#{Time.now.to_i}_#{slug}" unless frozen?
     end
 
     def anything_changed?

data/app/models/spree/shipping_method.rb

@@ -39,7 +39,8 @@ module Spree
     end
 
     def self.calculators
-      spree_calculators.send(model_name_without_spree_namespace).select{ |c| c < Spree::ShippingCalculator }
+      spree_calculators.send(model_name_without_spree_namespace)
+        .select { |c| c.to_s.constantize < Spree::ShippingCalculator }
     end
 
     # Some shipping methods are only meant to be set via backend

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.0.0.rc3"
+    "3.0.0.rc4"
   end
 end

data/lib/spree/testing_support/authorization_helpers.rb

@@ -37,7 +37,9 @@ module Spree
           end
 
           before do
-            allow_any_instance_of(Api::BaseController).to receive(:try_spree_current_user).and_return(Spree.user_class.new)
+            allow(Spree.user_class).to receive(:find_by).
+                                         with(hash_including(:spree_api_key)).
+                                         and_return(Spree.user_class.new)
           end
         end
 
@@ -56,6 +58,6 @@ module Spree
 end
 
 RSpec.configure do |config|
-  config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, :type => :controller
-  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, :type => :feature
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, type: :controller
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :feature
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc3
+  version: 3.0.0.rc4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant