solidus_core 1.4.0.rc1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5889aa9a1d498a6573bfefa369fb4530f98b69c
-  data.tar.gz: e3e60915860a0ae80dc0e2a1c728ca5754d1017c
+  metadata.gz: 661c9ed876bc3c1ca7789a6d9c0bb5a7efee9563
+  data.tar.gz: 7c4344fc9496ff193294dd1bec6822a550d72e93
 SHA512:
-  metadata.gz: 920ce1f524585315b5133505ab449cb7cbfb74d1d100adfc222238cbde476c7b1da389e0683c359e8679b7409bd50bd46490f4f06175f9dc29471e7b0f899cea
-  data.tar.gz: 48cbf7e4f562469a4ee959bf83afd94dcbc2ea09b784677dea321bf0ef8b996d21b83a4214987518ba87c7f94035667a8d8ed08c544ad775232148a9ddc84222
+  metadata.gz: 62e604e6159522a60acf3ef003e9089e34e34416a40f1a155954c14dd36d32adb5fb2078bfc1f0518f6e191d537957ceacc69b9aa036a9fe5ab34d0a6bec6445
+  data.tar.gz: 076c22fe4f9d670444840b487eb15edf731ddc59e67f2a2c624dd20cc9e56850ed7655ffbae53d8c7adf998927b24d13743eff4b178f5673c0f72dbf9b963b73

data/app/models/spree/credit_card.rb

@@ -64,11 +64,10 @@ module Spree
     #
     # @param num [String] the desired credit card number
     def number=(num)
-      @number = begin
-                  num.gsub(/[^0-9]/, '')
-                rescue
-                  nil
-                end
+      @number =
+        if num.is_a?(String)
+          num.gsub(/[^0-9]/, '')
+        end
     end
 
     # Sets the credit card type, converting it to the preferred internal
@@ -89,7 +88,6 @@ module Spree
 
     # Sets the last digits field based on the assigned credit card number.
     def set_last_digits
-      number.to_s.gsub!(/\s/, '')
       verification_value.to_s.gsub!(/\s/, '')
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end

data/lib/spree/core/version.rb

@@ -5,7 +5,7 @@ module Spree
   end
 
   def self.solidus_version
-    "1.4.0.rc1"
+    "1.4.0"
   end
 
   def self.solidus_gem_version

data/lib/spree/deprecation.rb

@@ -1,3 +1,3 @@
 module Spree
-  Deprecation = ActiveSupport::Deprecation.new('2.0', 'Solidus')
+  Deprecation = ActiveSupport::Deprecation.new('2.1', 'Solidus')
 end

data/spec/models/spree/adjustment_spec.rb

@@ -14,7 +14,8 @@ describe Spree::Adjustment, type: :model do
     let(:adjustment) { Spree::Adjustment.create(label: "Adjustment", amount: 5, order: order, adjustable: line_item) }
 
     it 'touches the adjustable' do
-      expect { adjustment.save }.to change { line_item.updated_at }
+      line_item.update_columns(updated_at: 1.day.ago)
+      expect { adjustment.save! }.to change { line_item.updated_at }
     end
   end
 

data/spec/models/spree/credit_card_spec.rb

@@ -35,7 +35,7 @@ describe Spree::CreditCard, type: :model do
     allow(@payment).to receive_messages payment_method: @payment_gateway
   end
 
-  context "#can_capture?" do
+  describe "#can_capture?" do
     it "should be true if payment is pending" do
       payment = mock_model(Spree::Payment, pending?: true, created_at: Time.current)
       expect(credit_card.can_capture?(payment)).to be true
@@ -47,14 +47,14 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  context "#can_void?" do
+  describe "#can_void?" do
     it "should be true if payment is not void" do
       payment = mock_model(Spree::Payment, failed?: false, void?: false)
       expect(credit_card.can_void?(payment)).to be true
     end
   end
 
-  context "#can_credit?" do
+  describe "#can_credit?" do
     it "should be false if payment is not completed" do
       payment = mock_model(Spree::Payment, completed?: false)
       expect(credit_card.can_credit?(payment)).to be false
@@ -66,7 +66,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  context "#valid?" do
+  describe "#valid?" do
     it "should validate presence of number" do
       credit_card.attributes = valid_credit_card_attributes.except(:number)
       expect(credit_card).not_to be_valid
@@ -109,7 +109,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  context "#save" do
+  describe "#save" do
     before do
       credit_card.attributes = valid_credit_card_attributes
       credit_card.save!
@@ -145,7 +145,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  context "#number=" do
+  describe "#number=" do
     it "should strip non-numeric characters from card input" do
       credit_card.number = "6011000990139424"
       expect(credit_card.number).to eq("6011000990139424")
@@ -161,7 +161,7 @@ describe Spree::CreditCard, type: :model do
   end
 
   # Regression test for https://github.com/spree/spree/issues/3847 and https://github.com/spree/spree/issues/3896
-  context "#expiry=" do
+  describe "#expiry=" do
     it "can set with a 2-digit month and year" do
       credit_card.expiry = '04 / 15'
       expect(credit_card.month).to eq('4')
@@ -208,7 +208,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  context "#cc_type=" do
+  describe "#cc_type=" do
     it "converts between the different types" do
       credit_card.cc_type = 'mastercard'
       expect(credit_card.cc_type).to eq('master')
@@ -257,13 +257,13 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  context "#associations" do
+  describe "#associations" do
     it "should be able to access its payments" do
       credit_card.payments.to_a
     end
   end
 
-  context "#first_name" do
+  describe "#first_name" do
     before do
       credit_card.name = "Ludwig van Beethoven"
     end
@@ -273,7 +273,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  context "#last_name" do
+  describe "#last_name" do
     before do
       credit_card.name = "Ludwig van Beethoven"
     end
@@ -283,7 +283,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  context "#to_active_merchant" do
+  describe "#to_active_merchant" do
     before do
       credit_card.number = "4111111111111111"
       credit_card.year = Time.current.year

data/spec/models/spree/order_shipping_spec.rb

@@ -30,7 +30,7 @@ describe Spree::OrderShipping do
 
     it "updates shipment.shipped_at" do
       Timecop.freeze do |now|
-        expect { subject }.to change { shipment.shipped_at }.from(nil).to(now)
+        expect { subject }.to change { shipment.shipped_at }.from(nil).to be_within(1.second).of(now)
       end
     end
 
@@ -40,7 +40,7 @@ describe Spree::OrderShipping do
         Timecop.freeze(future) do
           subject
         end
-      end.to change { order.updated_at }.from(order.updated_at).to(future)
+      end.to change { order.updated_at }.to be_within(1.second).of(future)
     end
   end
 

data/spec/models/spree/product_spec.rb

@@ -97,6 +97,7 @@ describe Spree::Product, type: :model do
           master = product.master
           master.default_price.price = 11
           master.save!
+          product.update_columns(updated_at: 1.day.ago)
           product.master.default_price.price = 12
         end
 
@@ -342,19 +343,27 @@ describe Spree::Product, type: :model do
 
     context "associations" do
       describe "product_option_types" do
-        it "touches the product instance when an option type is added" do
-          expect {
-            product.product_option_types.create(option_type: create(:option_type, name: 'new-option-type'))
-            product.reload
-          }.to change { product.updated_at }
+        context "with no existing option types" do
+          before { product.update_columns(updated_at: 1.day.ago) }
+
+          it "touches the product instance when an option type is added" do
+            expect {
+              product.product_option_types.create(option_type: create(:option_type, name: 'new-option-type'))
+            }.to change { product.reload.updated_at }
+          end
         end
 
-        it "touches product instance when an option type is removed" do
-          product.product_option_types.create(option_type: create(:option_type, name: 'new-option-type'))
-          expect {
-            product.product_option_types = []
-            product.reload
-          }.to change { product.updated_at }
+        context "with an existing option type" do
+          before do
+            product.product_option_types.create(option_type: create(:option_type, name: 'new-option-type'))
+            product.update_columns(updated_at: 1.day.ago)
+          end
+
+          it "touches product instance when an option type is removed" do
+            expect {
+              product.product_option_types = []
+            }.to change { product.reload.updated_at }
+          end
         end
       end
     end

data/spec/models/spree/stock_item_spec.rb

@@ -199,30 +199,41 @@ describe Spree::StockItem, type: :model do
 
       let(:inventory_cache_threshold) { 5 }
 
-      it "count on hand falls below threshold" do
-        expect do
-          subject.set_count_on_hand(3)
-        end.to change { subject.variant.updated_at }
+      before do
+        subject.set_count_on_hand(existing_count_on_hand)
+        subject.variant.update_column(:updated_at, 1.day.ago)
       end
 
-      it "count on hand rises above threshold" do
-        subject.set_count_on_hand(2)
-        expect do
-          subject.set_count_on_hand(7)
-        end.to change { subject.variant.updated_at }
-      end
+      context "beginning above threshold" do
+        let(:existing_count_on_hand) { 10 }
 
-      it "count on hand stays below threshold" do
-        subject.set_count_on_hand(2)
-        expect do
-          subject.set_count_on_hand(3)
-        end.to change { subject.variant.updated_at }
+        it "count on hand falls below threshold" do
+          expect do
+            subject.set_count_on_hand(3)
+          end.to change { subject.variant.updated_at }
+        end
+
+        it "count on hand stays above threshold" do
+          expect do
+            subject.set_count_on_hand(8)
+          end.not_to change { subject.variant.updated_at }
+        end
       end
 
-      it "count on hand stays above threshold" do
-        expect do
-          subject.set_count_on_hand(8)
-        end.not_to change { subject.variant.updated_at }
+      context "beginning below threshold" do
+        let(:existing_count_on_hand) { 2 }
+
+        it "count on hand rises above threshold" do
+          expect do
+            subject.set_count_on_hand(7)
+          end.to change { subject.variant.updated_at }
+        end
+
+        it "count on hand stays below threshold" do
+          expect do
+            subject.set_count_on_hand(3)
+          end.to change { subject.variant.updated_at }
+        end
       end
     end
 
@@ -255,6 +266,8 @@ describe Spree::StockItem, type: :model do
   end
 
   describe "#after_touch" do
+    before { subject.variant.update_column(:updated_at, 1.day.ago) }
+
     it "touches its variant" do
       expect do
         subject.touch

data/spec/models/spree/store_credit_spec.rb

@@ -838,10 +838,10 @@ describe Spree::StoreCredit do
     subject { store_credit.invalidate(invalidation_reason, invalidation_user) }
 
     it "sets the invalidated_at field to the current time" do
-      invalidated_at = Time.current
+      invalidated_at = 2.minutes.from_now
       Timecop.freeze(invalidated_at) do
         subject
-        expect(store_credit.invalidated_at).to eq invalidated_at
+        expect(store_credit.invalidated_at).to be_within(1.second).of invalidated_at
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc1
+  version: 1.4.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -1410,9 +1410,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1