solidus_virtual_gift_card 1.0.0 → 1.0.1

data/spec/models/spree/virtual_gift_card_spec.rb

@@ -5,7 +5,7 @@ describe Spree::VirtualGiftCard do
   let!(:credit_type) { create(:secondary_credit_type, name: "Non-expiring") }
 
   context 'validations' do
-    let(:invalid_gift_card) { Spree::VirtualGiftCard.new(amount: 0, currency: 'USD', purchaser: create(:user)) }
+    let(:invalid_gift_card) { build(:virtual_gift_card, amount: 0) }
 
     context 'given an amount less than one' do
       it 'is not valid' do
@@ -19,29 +19,31 @@ describe Spree::VirtualGiftCard do
     end
   end
 
-  context 'before create callbacks' do
-    let(:gift_card) { Spree::VirtualGiftCard.new(amount: 20, currency: 'USD', purchaser: create(:user), line_item: create(:line_item) ) }
-    subject { gift_card.save }
+  describe '#make_redeemable!' do
+    let(:user) { create(:user) }
+    let(:gift_card) { create(:virtual_gift_card) }
+    subject { gift_card.make_redeemable!(purchaser: user) }
 
-    context 'a redemption code is set already' do
-      before { gift_card.redemption_code = 'foo' }
-      it 'keeps that redemption code' do
+    context 'no collision on redemption code' do
+      it 'sets a redemption code' do
         subject
-        expect(gift_card.redemption_code).to eq 'foo'
+        expect(gift_card.redemption_code).to be_present
       end
     end
 
-    context 'no collision on redemption code' do
-      it 'sets an initial redemption code' do
+    context 'redemption code is already set' do
+      let(:expected_code) { "EXPECTEDCODE" }
+      before { gift_card.redemption_code = expected_code }
+      it "does not update the redemption code" do
         subject
-        expect(gift_card.redemption_code).to be_present
+        expect(gift_card.redemption_code).to eq expected_code
       end
     end
 
 
-    context 'there is a collision on redemption code' do 
+    context 'there is a collision on redemption code' do
       context 'the existing giftcard has not been redeemed yet' do
-        let!(:existing_giftcard) { create(:virtual_gift_card) }
+        let!(:existing_giftcard) { create(:virtual_gift_card, redemption_code: "ABC123-EFG456") }
         let(:expected_code) { 'EXPECTEDCODE' }
         let(:generator) { Spree::RedemptionCodeGenerator }
 
@@ -56,7 +58,7 @@ describe Spree::VirtualGiftCard do
       end
 
       context 'the existing gift card has been redeemed' do
-        let!(:existing_giftcard) { create(:virtual_gift_card, redeemed_at: Time.now) }
+        let!(:existing_giftcard) { create(:virtual_gift_card, redemption_code: "ABC123-EFG456", redeemed_at: Time.now) }
         let(:generator) { Spree::RedemptionCodeGenerator }
 
         it 'recursively generates redemption codes' do
@@ -71,26 +73,42 @@ describe Spree::VirtualGiftCard do
   end
 
   describe '#redeemed?' do
-    let(:gift_card) { Spree::VirtualGiftCard.new(amount: 20, currency: 'USD') }
-    subject { gift_card.save }
+    let(:gift_card) { build(:virtual_gift_card) }
 
     it 'is redeemed if there is a redeemed_at set' do
       gift_card.redeemed_at = Time.now
-      subject
       expect(gift_card.redeemed?).to be true
     end
 
     it 'is not redeemed if there is no timestamp for redeemed_at' do
-      subject
       expect(gift_card.redeemed?).to be false
     end
   end
 
   describe '#redeem' do
-    let(:gift_card) { Spree::VirtualGiftCard.create(amount: 20, currency: 'USD', purchaser: create(:user), line_item: create(:line_item)) }
+    let(:gift_card) { create(:redeemable_virtual_gift_card) }
     let(:redeemer) { create(:user) }
     subject { gift_card.redeem(redeemer) }
 
+    context 'it is not redeemable' do
+      before { gift_card.redeemable = false }
+
+      it 'should return false' do
+        expect(subject).to be false
+      end
+
+      context 'does nothing to the gift card' do
+        it 'should not create a store credit' do
+          expect(gift_card.store_credit).not_to be_present
+        end
+
+        it 'should not update the gift card' do
+          expect { subject }.to_not change{ gift_card }
+        end
+      end
+    end
+
+
     context 'it has already been redeemed' do
       before { gift_card.redeemed_at = Date.yesterday }
 
@@ -109,7 +127,7 @@ describe Spree::VirtualGiftCard do
       end
     end
 
-    context 'it has not been redeemed already' do
+    context 'it has not been redeemed already and is redeemable' do
       context 'generates a store credit' do
         before { subject }
         let(:store_credit) { gift_card.store_credit }
@@ -165,15 +183,28 @@ describe Spree::VirtualGiftCard do
   end
 
   describe '#formatted_redemption_code' do
-    let(:redemption_code) { 'AAAABBBBCCCCDDDD' }
     let(:formatted_redemption_code) { 'AAAA-BBBB-CCCC-DDDD' }
-    let(:gift_card) { Spree::VirtualGiftCard.create(amount: 20, currency: 'USD') }
+    let(:gift_card) { build(:redeemable_virtual_gift_card, redemption_code: 'AAAABBBBCCCCDDDD') }
 
     subject { gift_card.formatted_redemption_code }
 
     it 'inserts dashes into the code after every 4 characters' do
-      expect(gift_card).to receive(:redemption_code).and_return(redemption_code)
       expect(subject).to eq formatted_redemption_code
     end
   end
+
+  describe "#send_email" do
+    let(:gift_card) { create(:redeemable_virtual_gift_card) }
+
+    subject { gift_card.send_email }
+
+    it "sends the gift card email" do
+      expect(Spree::GiftCardMailer).to receive(:gift_card_email).with(gift_card).and_return(double(deliver_later: true))
+      subject
+    end
+
+    it "sets sent_at" do
+      expect { subject }.to change { gift_card.sent_at }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ ENV['RAILS_ENV'] = 'test'
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 
 require 'rspec/rails'
+require 'rake'
 
 require 'database_cleaner'
 require 'ffaker'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_virtual_gift_card
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Bonobos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -175,28 +175,37 @@ files:
 - app/mailers/spree/gift_card_mailer.rb
 - app/models/concerns/spree/gift_cards/line_item_concerns.rb
 - app/models/concerns/spree/gift_cards/order_concerns.rb
+- app/models/concerns/spree/gift_cards/order_contents_concerns.rb
 - app/models/concerns/spree/redemption_code_generator.rb
 - app/models/spree/line_item_decorator.rb
+- app/models/spree/order_contents_decorator.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/permission_sets/virtual_gift_card_display.rb
 - app/models/spree/permission_sets/virtual_gift_card_management.rb
 - app/models/spree/store_credit_category_decorator.rb
 - app/models/spree/virtual_gift_card.rb
+- app/overrides/admin_gift_card_order_confirmation.rb
 - app/overrides/admin_item_view_gift_card_codes.rb
 - app/overrides/admin_user_sidebar_store_credits.rb
 - app/overrides/admin_user_sub_menu.rb
 - app/views/spree/admin/gift_cards/_lookup_form.html.erb
 - app/views/spree/admin/gift_cards/_redemption_form.html.erb
+- app/views/spree/admin/gift_cards/edit.html.erb
 - app/views/spree/admin/gift_cards/index.html.erb
 - app/views/spree/admin/gift_cards/lookup.html.erb
 - app/views/spree/admin/gift_cards/show.html.erb
-- app/views/spree/admin/orders/_gift_card_redemption_codes.html.erb
+- app/views/spree/admin/orders/_cart_gift_card_details.html.erb
+- app/views/spree/admin/orders/_confirmation_gift_card_details.html.erb
+- app/views/spree/admin/orders/_gift_card_details.html.erb
+- app/views/spree/admin/orders/_shipments_gift_card_details.html.erb
 - app/views/spree/admin/users/_gift_card_sidebar.html.erb
 - app/views/spree/admin/users/_sub_menu.html.erb
 - app/views/spree/gift_card_mailer/gift_card_email.text.erb
 - bin/rails
 - circle.yml
 - config/initializers/gift_card_store_credit_event_originator.rb
+- config/initializers/line_item_controller_gift_card_details.rb
+- config/initializers/ransack.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20140623152903_create_virtual_gift_card.rb
@@ -204,16 +213,24 @@ files:
 - db/migrate/20140627185148_add_timestamps_to_gift_cards.rb
 - db/migrate/20140702153907_add_gift_card_flag_to_products.rb
 - db/migrate/20140707200431_add_line_item_to_gift_card.rb
+- db/migrate/20151013172931_add_recipient_fields_to_virtual_gift_card.rb
+- db/migrate/20151013210615_add_active_flag_to_virtual_gift_card.rb
+- db/migrate/20151013214647_set_redeemable_true_on_virtual_gift_cards.rb
+- db/migrate/20151019190731_add_email_send_time_to_virtual_gift_card.rb
 - db/seeds.rb
 - lib/generators/solidus_virtual_gift_card/install/install_generator.rb
 - lib/solidus_virtual_gift_card.rb
 - lib/spree_virtual_gift_card/engine.rb
 - lib/spree_virtual_gift_card/factories.rb
+- lib/tasks/send_gift_card_emails.rake
 - solidus_virtual_gift_card.gemspec
 - spec/controllers/spree/admin/gift_cards_controller_spec.rb
 - spec/controllers/spree/api/gift_cards_controller_spec.rb
+- spec/features/admin/gift_cards_spec.rb
+- spec/lib/tasks/send_gift_card_emails_spec.rb
 - spec/models/concerns/spree/redemption_code_generator_spec.rb
 - spec/models/spree/line_item_spec.rb
+- spec/models/spree/order_contents_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/models/spree/permission_sets/virtual_gift_card_display_spec.rb
 - spec/models/spree/permission_sets/virtual_gift_card_management_spec.rb
@@ -248,8 +265,11 @@ summary: Virtual gift card for purchase, drops into the user's account as store
 test_files:
 - spec/controllers/spree/admin/gift_cards_controller_spec.rb
 - spec/controllers/spree/api/gift_cards_controller_spec.rb
+- spec/features/admin/gift_cards_spec.rb
+- spec/lib/tasks/send_gift_card_emails_spec.rb
 - spec/models/concerns/spree/redemption_code_generator_spec.rb
 - spec/models/spree/line_item_spec.rb
+- spec/models/spree/order_contents_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/models/spree/permission_sets/virtual_gift_card_display_spec.rb
 - spec/models/spree/permission_sets/virtual_gift_card_management_spec.rb

data/app/views/spree/admin/orders/_gift_card_redemption_codes.html.erb

@@ -1,3 +0,0 @@
-<% item.line_item.gift_cards.each do |gift_card| %>
-  <br><strong><%= Spree.t('admin.gift_cards.redemption_code') %>:</strong> <%= gift_card.redemption_code %>
-<% end %>