solidus_core 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53dc4f25ad58a82b01ab735b4a551b0b661c8ef5
-  data.tar.gz: c5a4f607efe39084b7eea2608be5d204390addc8
+  metadata.gz: c15f057db7ca6d5b45b75260b8591056bcea8aee
+  data.tar.gz: 49d2fc2856a7ab0c719109fb492f7aea075acec3
 SHA512:
-  metadata.gz: 010e317d60b47d3d2b6691c28fbe43e774d8fdcd83be633d8241f7146158b7c0da7b8c48e4444e4b09d6f29f02792227a45b3d8176038f2aef2384754d3d4a7f
-  data.tar.gz: 37221dcbd58a729005c0a4f814d79758c2b02385c9d0795103c8d1349537fc62bee288e9155c67df4dc5da2ae0394f20e5ef2bc940d18363120b30ed6eea7420
+  metadata.gz: b393535300c7c584403f87b3ee50b25210964f3a3e2540c2de6bf389f0219dcb8c9b43285585119225b9259eb84d4019e28f127e55507b4423268d0acdba32ab
+  data.tar.gz: aba6c7013b288673bcb66db07ba5c8a3c02799d3ba4f5003ccd1b350c5a848613242c0ae5a38d48d6bba3ecff292f16f4863af8bfc08548df1110e0cc5361516

data/app/models/spree/wallet.rb

@@ -61,7 +61,12 @@ class Spree::Wallet
       raise Unauthorized, "wallet_payment_source #{wallet_payment_source.id} does not belong to wallet of user #{user.id}"
     end
 
-    wallet_payment_source.transaction do
+    # Do not update the payment source if the passed source is already default
+    if default_wallet_payment_source == wallet_payment_source
+      return
+    end
+
+    Spree::WalletPaymentSource.transaction do
       # Unset old default
       default_wallet_payment_source.try!(:update!, default: false)
       # Set new default

data/db/migrate/20160420181916_migrate_credit_cards_to_wallet_payment_sources.rb

@@ -14,7 +14,8 @@ class MigrateCreditCardsToWalletPaymentSources < ActiveRecord::Migration[4.2]
     credit_cards.find_each do |credit_card|
       WalletPaymentSource.find_or_create_by!(
         user_id: credit_card.user_id,
-        payment_source: credit_card
+        payment_source_id: credit_card.id,
+        payment_source_type: 'Spree::CreditCard'
       ) do |wallet_source|
         wallet_source.default = credit_card.default
       end

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.2.0"
+    "2.2.1"
   end
 
   def self.solidus_gem_version

data/spec/models/spree/wallet_spec.rb

@@ -78,20 +78,45 @@ describe Spree::Wallet, type: :model do
             to(wallet_credit_card)
         )
       end
+
+      context "assigning nil" do
+        it "remains unset" do
+          expect(subject.default_wallet_payment_source).to be_nil
+          subject.default_wallet_payment_source = nil
+          expect(subject.default_wallet_payment_source).to be_nil
+        end
+      end
     end
 
-    context "with other payment source already default" do
+    context "with a default" do
       let!(:wallet_credit_card) { subject.add(credit_card) }
-      let!(:wallet_store_credit) { subject.add(store_credit) }
 
       before { subject.default_wallet_payment_source = wallet_credit_card }
 
-      it "sets the new payment source as the default" do
-        expect { subject.default_wallet_payment_source = wallet_store_credit }.to(
-          change(subject, :default_wallet_payment_source).
-            from(wallet_credit_card).
-            to(wallet_store_credit)
-        )
+      context "assigning a new default" do
+        let!(:wallet_store_credit) { subject.add(store_credit) }
+
+        it "sets the new payment source as the default" do
+          expect {
+            subject.default_wallet_payment_source = wallet_store_credit
+          }.to change{ subject.default_wallet_payment_source }.from(wallet_credit_card).to(wallet_store_credit)
+        end
+      end
+
+      context "assigning same default" do
+        it "does not change the default payment source" do
+          expect {
+            subject.default_wallet_payment_source = wallet_credit_card
+          }.not_to change{ subject.default_wallet_payment_source }
+        end
+      end
+
+      context "assigning nil" do
+        it "clears the default payment source" do
+          expect {
+            subject.default_wallet_payment_source = nil
+          }.to change{ subject.default_wallet_payment_source }.to nil
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant