solidus_virtual_gift_card 1.2.0 → 1.3.0

data/spec/controllers/spree/admin/gift_cards_controller_spec.rb

@@ -3,24 +3,24 @@ require 'spec_helper'
 describe Spree::Admin::GiftCardsController do
   stub_authorization!
   let!(:gc_category) { create(:store_credit_gift_card_category) }
-  let!(:credit_type) { create(:secondary_credit_type, name: "Non-expiring") }
+  let!(:credit_type) { create(:secondary_credit_type, name: 'Non-expiring') }
 
   describe 'GET index' do
-    subject { spree_get :index }
+    subject { get :index }
 
-    it "returns a 200 status code" do
+    it 'returns a 200 status code' do
       subject
-      expect(response.code).to eq "200"
+      expect(response.code).to eq '200'
     end
   end
 
   describe 'GET lookup' do
     let(:user) { create :user }
-    subject { spree_get :lookup, user_id: user.id }
+    subject { get :lookup, params: { user_id: user.id } }
 
-    it "returns a 200 status code" do
+    it 'returns a 200 status code' do
       subject
-      expect(response.code).to eq "200"
+      expect(response.code).to eq '200'
     end
   end
 
@@ -30,52 +30,52 @@ describe Spree::Admin::GiftCardsController do
     let(:order) { create(:shipped_order, line_items_count: 1) }
     let!(:default_refund_reason) { Spree::RefundReason.find_or_create_by!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false) }
 
-    subject { spree_put :deactivate, id: gift_card.id, order_id: order.number  }
+    subject { put :deactivate, params: { id: gift_card.id, order_id: order.number  } }
 
-    context "when successful" do
-      it "redirects to the admin order edit page" do
+    context 'when successful' do
+      it 'redirects to the admin order edit page' do
         expect(subject).to redirect_to spree.edit_admin_order_path(order)
       end
 
-      it "deactivates the gift card" do
+      it 'deactivates the gift card' do
         subject
         expect(gift_card.reload.deactivated_at).to be_present
       end
     end
 
-    context "when deactivating fails without raising an exception" do
+    context 'when deactivating fails without raising an exception' do
       before { expect_any_instance_of(Spree::VirtualGiftCard).to receive(:deactivate).and_return(false) }
 
-      it "does not deactivate the gift card" do
+      it 'does not deactivate the gift card' do
         subject
         expect(gift_card.reload.deactivated_at).to be_nil
       end
 
-      it "redirects to gift card edit page" do
+      it 'redirects to gift card edit page' do
         expect(subject).to redirect_to spree.edit_admin_order_gift_card_path(order, gift_card)
       end
 
-      it "sets the flash message" do
+      it 'sets the flash message' do
         subject
-        expect(flash[:error]).to eq Spree.t('admin.gift_cards.errors.unable_to_reimburse_gift_card')
+        expect(flash[:error]).to eq I18n.t('spree.admin.gift_cards.errors.unable_to_reimburse_gift_card')
       end
     end
 
-    context "when deactivating fails from reimbursement" do
+    context 'when deactivating fails from reimbursement' do
       before { expect_any_instance_of(Spree::VirtualGiftCard).to receive(:deactivate).and_raise(Spree::Reimbursement::IncompleteReimbursementError) }
 
-      it "does not deactivate the gift card" do
+      it 'does not deactivate the gift card' do
         subject
         expect(gift_card.reload.deactivated_at).to be_nil
       end
 
-      it "redirects to gift card edit page" do
+      it 'redirects to gift card edit page' do
         expect(subject).to redirect_to spree.edit_admin_order_gift_card_path(order, gift_card)
       end
 
-      it "sets the flash message" do
+      it 'sets the flash message' do
         subject
-        expect(flash[:error]).to eq Spree.t('admin.gift_cards.errors.unable_to_reimburse_gift_card')
+        expect(flash[:error]).to eq I18n.t('spree.admin.gift_cards.errors.unable_to_reimburse_gift_card')
       end
     end
   end
@@ -85,48 +85,47 @@ describe Spree::Admin::GiftCardsController do
     let(:gift_card) { create(:redeemable_virtual_gift_card) }
     let(:redemption_code) { gift_card.redemption_code }
 
-    subject { spree_post :redeem, user_id: user.id, gift_card: { redemption_code: redemption_code } }
+    subject { post :redeem, params: { user_id: user.id, gift_card: { redemption_code: redemption_code } } }
 
-    context "with a gift card that has not yet been redeemed" do
-
-      it "redirects to store credit index" do
+    context 'with a gift card that has not yet been redeemed' do
+      it 'redirects to store credit index' do
         expect(subject).to redirect_to spree.admin_user_store_credits_path(user)
       end
 
-      it "redeems the gift card" do
+      it 'redeems the gift card' do
         subject
         expect(gift_card.reload.redeemed?).to eq true
       end
 
-      it "sets the redeemer to the correct user" do
+      it 'sets the redeemer to the correct user' do
         subject
         expect(gift_card.reload.redeemer).to eq user
       end
 
-      it "creates store credit for the user" do
+      it 'creates store credit for the user' do
         subject
         expect(user.reload.store_credits.count).to eq 1
       end
 
-      it "sets the store credit equal to the amount of the gift card" do
+      it 'sets the store credit equal to the amount of the gift card' do
         subject
         expect(user.reload.store_credits.first.amount).to eq gift_card.amount
       end
     end
 
-    context "with a gift card that has already been redeemed" do
+    context 'with a gift card that has already been redeemed' do
       before(:each) { gift_card.update_attribute(:redeemed_at, Date.yesterday) }
 
-      it "renders the lookup page" do
+      it 'renders the lookup page' do
         subject
         expect(response).to render_template(:lookup)
       end
     end
 
-    context "with a gift card code that does not exist" do
-      let(:redemption_code) { "INVALID-REDEMPTION-CODE" }
+    context 'with a gift card code that does not exist' do
+      let(:redemption_code) { 'INVALID-REDEMPTION-CODE' }
 
-      it "renders the lookup page" do
+      it 'renders the lookup page' do
         subject
         expect(response).to render_template(:lookup)
       end

data/spec/controllers/spree/api/gift_cards_controller_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe Spree::Api::GiftCardsController do
   render_views
-  let!(:credit_type) { create(:secondary_credit_type, name: "Non-expiring") }
+  let!(:credit_type) { create(:secondary_credit_type, name: 'Non-expiring') }
   let!(:gc_category) { create(:store_credit_gift_card_category) }
 
-  describe "POST redeem" do
+  describe 'POST redeem' do
     let(:gift_card) { create(:redeemable_virtual_gift_card) }
 
     let(:parameters) do
@@ -14,18 +14,18 @@ describe Spree::Api::GiftCardsController do
       }
     end
 
-    subject { spree_post :redeem, parameters, { format: :json } }
+    subject { post :redeem, params: parameters.merge(format: :json) }
 
-    context "the user is not logged in" do
+    context 'the user is not logged in' do
 
       before { subject }
 
-      it "returns a 401" do
+      it 'returns a 401' do
         expect(response.status).to eq 401
       end
     end
 
-    context "the current api user is authenticated" do
+    context 'the current api user is authenticated' do
       let(:api_user) { create(:user) }
 
       before do
@@ -35,7 +35,7 @@ describe Spree::Api::GiftCardsController do
 
       let(:parsed_response) { HashWithIndifferentAccess.new(JSON.parse(response.body)) }
 
-      context "given an invalid gift card redemption code" do
+      context 'given an invalid gift card redemption code' do
         before { subject }
 
         let(:parameters) do
@@ -52,21 +52,20 @@ describe Spree::Api::GiftCardsController do
           expect(parsed_response['error_message']).to be_present
         end
 
-        it "returns a 404" do
+        it 'returns a 404' do
           expect(subject.status).to eq 404
         end
       end
 
-      context "there is no redemption code in the request body" do
+      context 'there is no redemption code in the request body' do
         let(:parameters) { {} }
 
-        it "returns a 404" do
+        it 'returns a 404' do
           expect(subject.status).to eq 404
         end
       end
 
-      context "given a valid gift card redemption code" do
-
+      context 'given a valid gift card redemption code' do
         it 'finds the gift card' do
           subject
           expect(assigns(:gift_card)).to eq gift_card
@@ -78,7 +77,7 @@ describe Spree::Api::GiftCardsController do
           subject
         end
 
-        it "returns a 201" do
+        it 'returns a 201' do
           subject
           expect(subject.status).to eq 201
         end

data/spec/features/admin/gift_cards_spec.rb

@@ -1,28 +1,33 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe 'Gift Cards', :type => :feature, :js => true do
+describe "Gift Cards", type: :feature do
   stub_authorization!
 
+  let(:gift_card) { create(:redeemable_virtual_gift_card) }
+  let(:product) { gift_card.line_item.product }
+  let!(:order) do
+    create(:order_ready_to_ship,
+      number: "R100",
+      state: "complete",
+      line_items: [gift_card.line_item])
+  end
   let(:admin_user) { create(:admin_user) }
 
   before do
     allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(admin_user)
+    product.update_attribute(:gift_card, true)
   end
 
   describe "edit gift card" do
-    let(:gift_card) { create(:redeemable_virtual_gift_card) }
-    let(:order) { gift_card.line_item.order }
     let(:new_recipient_name) { "Heidi" }
     let(:new_recipient_email) { "heidi@gmail.com" }
     let(:new_purchaser_name) { "Neerali" }
     let(:new_gift_message) { "Sweaters!" }
 
     it "can edit recipient information and send email date" do
-      visit spree.cart_admin_order_path(order)
+      visit spree.edit_admin_order_path(order)
 
-      within ".line-item-name" do
-        click_link("Edit Details")
-      end
+      click_link("Edit Details")
 
       fill_in "virtual_gift_card_recipient_name", with: new_recipient_name
       fill_in "virtual_gift_card_recipient_email", with: new_recipient_email
@@ -30,10 +35,7 @@ describe 'Gift Cards', :type => :feature, :js => true do
       fill_in "virtual_gift_card_gift_message", with: new_gift_message
       fill_in "virtual_gift_card_send_email_at", with: Date.tomorrow
 
-      # Just so the datepicker gets out of poltergeists way.
-      page.execute_script("$('#virtual_gift_card_send_email_at').datepicker('widget').hide();")
-
-      click_on 'Update'
+      click_on "Update"
       expect(page).to have_content("Gift card updated!")
       expect(gift_card.reload.recipient_name).to eq(new_recipient_name)
       expect(gift_card.recipient_email).to eq(new_recipient_email)
@@ -43,12 +45,12 @@ describe 'Gift Cards', :type => :feature, :js => true do
   end
 
   describe "lookup a gift card" do
-    let(:gift_card) { create(:redeemable_virtual_gift_card,
-                             recipient_name: "Daeva",
-                             recipient_email: 'dog@example.com',
-                            )
+    let(:gift_card) {
+      create(:redeemable_virtual_gift_card,
+        recipient_name: "Daeva",
+        recipient_email: "dog@example.com")
     }
-    let(:other_gift_card) { create(:redeemable_virtual_gift_card)}
+    let(:other_gift_card) { create(:redeemable_virtual_gift_card) }
     let(:order) { gift_card.line_item.order }
 
     it "can lookup gift card by recipient email" do

data/spec/features/admin/products_card_spec.rb

@@ -9,17 +9,17 @@ describe 'Gift Cards', type: :feature, js: true do
     allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(admin_user)
   end
 
-  describe "edit product" do
+  describe 'edit product' do
     let(:product) { create(:product, available_on: 1.year.from_now) }
 
-    it "can mark a product as a gift card" do
+    it 'can mark a product as a gift card' do
       visit spree.admin_product_path(product)
 
       find('#product_gift_card').click
 
       click_on 'Update'
 
-      expect(page).to have_content("successfully updated!")
+      expect(page).to have_content('successfully updated!')
       expect(page).to have_field('product_gift_card', checked: true)
     end
   end

data/spec/lib/tasks/send_gift_card_emails_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "solidus_virtual_gift_card:send_current_emails" do
+describe 'solidus_virtual_gift_card:send_current_emails' do
 
   let(:task) { Rake::Task['solidus_virtual_gift_card:send_current_emails'] }
   let(:purchaser) {create(:user)}
@@ -12,46 +12,46 @@ describe "solidus_virtual_gift_card:send_current_emails" do
 
   subject { task.invoke }
 
-  context "with gift card sent today" do
-    it "sends emails to be sent today" do
+  context 'with gift card sent today' do
+    it 'sends emails to be sent today' do
       gift_card = Spree::VirtualGiftCard.create!(amount: 50, send_email_at: Date.today, redeemable: true, purchaser: purchaser)
       expect(Spree::GiftCardMailer).to receive(:gift_card_email).with(gift_card).and_return(double(deliver_later: true))
       subject
     end
 
-    it "does not send unredeemable giftcards" do
+    it 'does not send unredeemable giftcards' do
       gift_card = Spree::VirtualGiftCard.create!(amount: 50, send_email_at: Date.today)
       expect(Spree::GiftCardMailer).to_not receive(:gift_card_email).with(gift_card)
       subject
     end
   end
 
-  context "with gift card already sent today" do
-    it "sends emails to be sent today" do
+  context 'with gift card already sent today' do
+    it 'sends emails to be sent today' do
       Spree::VirtualGiftCard.create!(amount: 50, send_email_at: Date.today, sent_at: DateTime.now, redeemable: true, purchaser: purchaser)
       expect(Spree::GiftCardMailer).to_not receive(:gift_card_email)
       subject
     end
   end
 
-  context "with gift cards sent in the future" do
-    it "does not sends emails" do
+  context 'with gift cards sent in the future' do
+    it 'does not sends emails' do
       Spree::VirtualGiftCard.create!(amount: 50, send_email_at: 10.days.from_now.to_date, redeemable: true, purchaser: purchaser)
       expect(Spree::GiftCardMailer).to_not receive(:gift_card_email)
       subject
     end
   end
 
-  context "with gift cards sent in the past" do
-    it "does not sends emails" do
+  context 'with gift cards sent in the past' do
+    it 'does not sends emails' do
       Spree::VirtualGiftCard.create!(amount: 50, send_email_at: 1.days.ago, sent_at: 1.days.ago.to_date, redeemable: true, purchaser: purchaser)
       expect(Spree::GiftCardMailer).to_not receive(:gift_card_email)
       subject
     end
   end
 
-  context "with gift cards not specified" do
-    it "does not sends emails" do
+  context 'with gift cards not specified' do
+    it 'does not sends emails' do
       Spree::VirtualGiftCard.create!(amount: 50, send_email_at: nil)
       expect(Spree::GiftCardMailer).to_not receive(:gift_card_email)
       subject

data/spec/mailers/spree/gift_card_mailer_spec.rb

@@ -6,13 +6,13 @@ describe Spree::GiftCardMailer, type: :mailer do
 
     subject { Spree::GiftCardMailer.gift_card_email(gift_card) }
 
-    context "the recipient email is blank" do
+    context 'the recipient email is blank' do
       before do
-        gift_card.update_attributes!(recipient_email: "")
-        gift_card.line_item.order.update_attributes!(email: "gift_card_tester@example.com")
+        gift_card.update!(recipient_email: '')
+        gift_card.line_item.order.update!(email: 'gift_card_tester@example.com')
       end
 
-      it "uses the email associated with the order" do
+      it 'uses the email associated with the order' do
         expect(subject.to).to contain_exactly('gift_card_tester@example.com')
       end
     end

data/spec/models/concerns/spree/redemption_code_generator_spec.rb

@@ -14,7 +14,7 @@ describe Spree::RedemptionCodeGenerator do
     subject { Spree::RedemptionCodeGenerator.format_redemption_code_for_lookup(redemption_code) }
 
     context 'redemption code has no dashes' do
-      let(:redemption_code) { "1234ABCD1234ABCD" }
+      let(:redemption_code) { '1234ABCD1234ABCD' }
 
       it 'does nothing to the code' do
         expect(subject).to eq redemption_code
@@ -22,8 +22,8 @@ describe Spree::RedemptionCodeGenerator do
     end
 
     context 'redemption code 4 groups of 4 characters, separated by dashes' do
-      let(:redemption_code) { "1234-ABCD-1234-ABCD" }
-      let(:formatted_redemption_code) { "1234ABCD1234ABCD" }
+      let(:redemption_code) { '1234-ABCD-1234-ABCD' }
+      let(:formatted_redemption_code) { '1234ABCD1234ABCD' }
 
       it 'strips the dashes' do
         expect(subject).to eq formatted_redemption_code
@@ -31,8 +31,8 @@ describe Spree::RedemptionCodeGenerator do
     end
 
     context 'redemption code is mixed-case' do
-      let(:redemption_code) { "1234-aBCd-1234-AbcD" }
-      let(:formatted_redemption_code) { "1234ABCD1234ABCD" }
+      let(:redemption_code) { '1234-aBCd-1234-AbcD' }
+      let(:formatted_redemption_code) { '1234ABCD1234ABCD' }
 
       it 'makes it all upcase' do
         expect(subject).to eq formatted_redemption_code

data/spec/models/spree/line_item_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::LineItem do
-  describe "#redemption_codes" do
+  describe '#redemption_codes' do
     let(:line_item) { create(:line_item, quantity: 2) }
     let!(:gift_card) { create(:virtual_gift_card, line_item: line_item) }
     let!(:gift_card_2) { create(:virtual_gift_card, line_item: line_item) }
@@ -28,7 +28,7 @@ describe Spree::LineItem do
     end
   end
 
-  describe "#gift_card_details" do
+  describe '#gift_card_details' do
     let(:line_item) { create(:line_item, quantity: 2) }
     let!(:gift_card) { create(:redeemable_virtual_gift_card, line_item: line_item) }
     let!(:gift_card_2) { create(:redeemable_virtual_gift_card, line_item: line_item) }