solidus_virtual_gift_card 1.2.0 → 1.3.0

data/spec/models/spree/virtual_gift_card_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Spree::VirtualGiftCard do
   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') }
 
   context 'validations' do
     let(:invalid_gift_card) { build(:virtual_gift_card, amount: 0) }
@@ -19,13 +19,13 @@ describe Spree::VirtualGiftCard do
     end
   end
 
-  describe "#can_deactivate?" do
+  describe '#can_deactivate?' do
     subject { gift_card.can_deactivate? }
 
     let!(:default_refund_reason) { Spree::RefundReason.find_or_create_by!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false) }
     let(:gift_card) { create(:redeemable_virtual_gift_card, line_item: order.line_items.first) }
 
-    context "the order is not complete" do
+    context 'the order is not complete' do
       let(:order) { create(:order_with_line_items, line_items_count: 1) }
 
       it "can't deactivate" do
@@ -33,7 +33,7 @@ describe Spree::VirtualGiftCard do
       end
     end
 
-    context "gift card is already deactivated" do
+    context 'gift card is already deactivated' do
       before { gift_card.deactivate }
       let(:order) { create(:shipped_order, line_items_count: 1) }
 
@@ -42,7 +42,7 @@ describe Spree::VirtualGiftCard do
       end
     end
 
-    context "order is not paid" do
+    context 'order is not paid' do
       let(:order) { create(:order_with_line_items, line_items_count: 1) }
 
       it "can't deactivate" do
@@ -50,46 +50,46 @@ describe Spree::VirtualGiftCard do
       end
     end
 
-    context "order is paid and complete and gift card is active" do
+    context 'order is paid and complete and gift card is active' do
       let(:order) { create(:shipped_order, line_items_count: 1) }
 
-      it "can deactivate" do
+      it 'can deactivate' do
         expect(subject).to be_truthy
       end
     end
   end
 
-  describe "#deactivate" do
+  describe '#deactivate' do
     let!(:gift_card) { create(:redeemable_virtual_gift_card, line_item: order.line_items.first) }
     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 { gift_card.deactivate }
 
-    it "makes it not redeemable" do
+    it 'makes it not redeemable' do
       subject
       expect(gift_card.reload.redeemable?).to be_falsey
     end
 
-    it "sets the deactivated_at" do
+    it 'sets the deactivated_at' do
       subject
       expect(gift_card.reload.deactivated_at).to be_present
     end
 
-    it "#deactivated? returns true" do
+    it '#deactivated? returns true' do
       subject
       expect(gift_card.reload.deactivated?).to be_truthy
     end
 
-    it "cancels the inventory unit" do
+    it 'cancels the inventory unit' do
       subject
       expect(gift_card.inventory_unit.unit_cancel).to be_present
     end
 
-    it "creates a reimbursement" do
+    it 'creates a reimbursement' do
       expect { subject }.to change { Spree::Reimbursement.count }.by(1)
     end
 
-    it "returns true" do
+    it 'returns true' do
       expect(subject).to be_truthy
     end
   end
@@ -101,12 +101,12 @@ describe Spree::VirtualGiftCard do
     let(:inventory_unit) { order.inventory_units.first }
     subject { gift_card.make_redeemable!(purchaser: user, inventory_unit: inventory_unit) }
 
-    it "sets the purchaser" do
+    it 'sets the purchaser' do
       subject
       expect(gift_card.purchaser).to be user
     end
 
-    it "sets the inventory unit" do
+    it 'sets the inventory unit' do
       subject
       expect(gift_card.inventory_unit).to be inventory_unit
     end
@@ -119,9 +119,9 @@ describe Spree::VirtualGiftCard do
     end
 
     context 'redemption code is already set' do
-      let(:expected_code) { "EXPECTEDCODE" }
+      let(:expected_code) { 'EXPECTEDCODE' }
       before { gift_card.redemption_code = expected_code }
-      it "does not update the redemption code" do
+      it 'does not update the redemption code' do
         subject
         expect(gift_card.redemption_code).to eq expected_code
       end
@@ -130,7 +130,7 @@ describe Spree::VirtualGiftCard 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, redemption_code: "ABC123-EFG456") }
+        let!(:existing_giftcard) { create(:virtual_gift_card, redemption_code: 'ABC123-EFG456') }
         let(:expected_code) { 'EXPECTEDCODE' }
         let(:generator) { Spree::RedemptionCodeGenerator }
 
@@ -145,7 +145,7 @@ describe Spree::VirtualGiftCard do
       end
 
       context 'the existing gift card has been redeemed' do
-        let!(:existing_giftcard) { create(:virtual_gift_card, redemption_code: "ABC123-EFG456", 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
@@ -313,17 +313,17 @@ describe Spree::VirtualGiftCard do
     end
   end
 
-  describe "#send_email" do
+  describe '#send_email' do
     let(:gift_card) { create(:redeemable_virtual_gift_card) }
 
     subject { gift_card.send_email }
 
-    it "sends the gift card email" do
+    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
+    it 'sets sent_at' do
       expect { subject }.to change { gift_card.sent_at }
     end
   end

data/spec/spec_helper.rb

@@ -1,89 +1,28 @@
-# Run Coverage report
-require 'simplecov'
-SimpleCov.start do
-  add_filter 'spec'
-  add_group 'Controllers', 'app/controllers'
-  add_group 'Helpers', 'app/helpers'
-  add_group 'Mailers', 'app/mailers'
-  add_group 'Models', 'app/models'
-  add_group 'Views', 'app/views'
-  add_group 'Libraries', 'lib'
-end
-
-# Configure Rails Environment
-ENV['RAILS_ENV'] = 'test'
+# frozen_string_literal: true
 
-require File.expand_path('../dummy/config/environment.rb',  __FILE__)
+require "simplecov"
+SimpleCov.start "rails"
 
-require 'rspec/rails'
-require 'rake'
+ENV["RAILS_ENV"] ||= "test"
 
-require 'database_cleaner'
-require 'ffaker'
+require File.expand_path('dummy/config/environment.rb', __dir__)
 
-require 'spree/testing_support/factories'
+require "solidus_support"
+require "solidus_support/extension/feature_helper"
 require 'spree/testing_support/controller_requests'
-require 'spree/testing_support/authorization_helpers'
-require 'spree/testing_support/url_helpers'
+require 'spree/testing_support/capybara_ext'
+require 'webdrivers'
 
-require 'cancan/matchers'
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
 
-require "spree_virtual_gift_card/factories"
-
-require "capybara/poltergeist"
-Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, timeout: 120)
-end
-Capybara.javascript_driver = :poltergeist
-
-Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+require 'spree_virtual_gift_card/factories'
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
-  config.mock_with :rspec
-
-  config.color = true
-  config.order = "random"
-
-  config.expose_current_running_example_as :example
-  config.fail_fast = ENV["FAIL_FAST"] || false
-
-  config.filter_run focus: true
-  config.run_all_when_everything_filtered = true
-  config.use_transactional_fixtures = false
+  config.raise_errors_for_deprecations!
 
   config.example_status_persistence_file_path = "./spec/examples.txt"
 
-  config.include FactoryGirl::Syntax::Methods
+  config.include Spree::TestingSupport::UrlHelpers
   config.include Spree::TestingSupport::ControllerRequests, type: :controller
-  config.include Spree::TestingSupport::UrlHelpers, type: :controller
-
-  config.before :suite do
-    DatabaseCleaner.clean_with :truncation
-  end
-
-  config.before :each do |example|
-    if RSpec.current_example.metadata[:js]
-      page.driver.browser.url_blacklist = ['http://fonts.googleapis.com']
-      DatabaseCleaner.strategy = :truncation
-    else
-      DatabaseCleaner.strategy = :transaction
-    end
-    DatabaseCleaner.start
-
-    Spree::Api::Config[:requires_authentication] = true
-    Spree::Config.reset
-  end
-
-  # After each spec clean the database.
-  config.append_after :each do
-    DatabaseCleaner.clean
-  end
-
-  if defined?(VersionCake::TestHelpers)
-    config.include VersionCake::TestHelpers, type: :controller
-    config.before(:each, type: :controller) do
-      set_request_version('', 1)
-    end
-  end
 end

data/spec/support/cancan.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "cancan/matchers"

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: solidus_virtual_gift_card
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,6 +130,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.18'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +157,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,6 +184,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -184,9 +218,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -197,19 +231,16 @@ files:
 - app/assets/stylesheets/spree/frontend/solidus_virtual_gift_card.css
 - app/controllers/spree/admin/gift_cards_controller.rb
 - app/controllers/spree/api/gift_cards_controller.rb
+- app/decorators/models/solidus_virtual_gift_card/spree/inventory_unit_decorator.rb
+- app/decorators/models/solidus_virtual_gift_card/spree/line_item_decorator.rb
+- app/decorators/models/solidus_virtual_gift_card/spree/order_contents_decorator.rb
+- app/decorators/models/solidus_virtual_gift_card/spree/order_decorator.rb
+- app/decorators/models/solidus_virtual_gift_card/spree/store_credit_category_decorator.rb
 - app/mailers/spree/gift_card_mailer.rb
-- app/models/concerns/spree/gift_cards/inventory_unit_concerns.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/inventory_unit_decorator.rb
-- app/models/spree/line_item_decorator.rb
-- app/models/spree/order_contents_decorator.rb
-- app/models/spree/order_decorator.rb
+- app/models/spree/gift_cards/gift_card_date_format_error.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/redemption_code_generator.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
@@ -230,7 +261,6 @@ files:
 - 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
@@ -271,6 +301,7 @@ files:
 - spec/models/spree/store_credit_category_spec.rb
 - spec/models/spree/virtual_gift_card_spec.rb
 - spec/spec_helper.rb
+- spec/support/cancan.rb
 homepage: https://solidus.io
 licenses:
 - BSD-3-Clause
@@ -283,7 +314,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -291,8 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Virtual gift card for purchase, drops into the user's account as store credit
@@ -312,3 +342,4 @@ test_files:
 - spec/models/spree/store_credit_category_spec.rb
 - spec/models/spree/virtual_gift_card_spec.rb
 - spec/spec_helper.rb
+- spec/support/cancan.rb