Add poltergeist

vinsol-spree-contrib · Nov 8, 2017 · cae00fc · cae00fc
1 parent 933e3ca
commit cae00fc
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/app/models/spree/order_contents_decorator.rb b/app/models/spree/order_contents_decorator.rb
@@ -4,5 +4,5 @@ def grab_line_item_by_variant_with_gift_card(variant, raise_error = false, optio
 
     grab_line_item_by_variant_without_gift_card(variant, raise_error, options)
   end
-  alias_method_chain :grab_line_item_by_variant, :gift_card
+  alias_method :orig_grab_line_item_by_variant, :grab_line_item_by_variant
 end
diff --git a/gemfiles/spree_3_2.gemfile b/gemfiles/spree_3_2.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "spree", "~> 3.2.0"
-gem "byebug"
 gem "rails-controller-testing", "~> 1.0.1"
 
 group :test do

diff --git a/gemfiles/spree_3_3.gemfile b/gemfiles/spree_3_3.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "spree", "~> 3.3.0"
-gem "byebug"
 gem "rails-controller-testing", "~> 1.0.1"
 
 group :test do

diff --git a/gemfiles/spree_master.gemfile b/gemfiles/spree_master.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "spree", github: "spree/spree", branch: "master"
-gem "byebug"
 gem "rails-controller-testing", "~> 1.0.1"
 
 group :test do

diff --git a/spec/features/admin/gift_card_administration_spec.rb b/spec/features/admin/gift_card_administration_spec.rb
@@ -54,7 +54,7 @@
     within 'table.index' do
       expect(page).to have_content('First Last')
       find('[data-action="remove"]').click
-      page.driver.browser.switch_to.alert.accept
+      # page.driver.browser.switch_to.alert.accept
     end
     sleep 1
     expect(Spree::GiftCard.count).to eql(0)

diff --git a/spec/features/checkout_spec.rb b/spec/features/checkout_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Checkout", js: true do
 
-  let!(:country) { create(:country, name: "United States of America", states_required: true) }
+  let!(:country) { create(:country, name: "United States of America", states_required: false) }
   let!(:state) { create(:state, name: "Alabama", country: country) }
   let!(:shipping_method) { create(:shipping_method) }
   let!(:stock_location) { create(:stock_location) }
@@ -12,6 +12,7 @@
   let!(:zone) { create(:zone) }
 
   before do
+    Spree::Config[:address_requires_state] = false
     create(:gift_card, code: "foobar", variant: create(:variant, price: 5))
   end
 

diff --git a/spec/features/purchase_spec.rb b/spec/features/purchase_spec.rb
@@ -2,7 +2,7 @@
 
 feature "Purchase Gift Card", js: true do
 
-  let!(:country) { create(:country, name: "United States of America", states_required: true) }
+  let!(:country) { create(:country, name: "United States of America", states_required: false) }
   let!(:state) { create(:state, name: "Alabama", country: country) }
   let!(:shipping_method) { create(:shipping_method) }
   let!(:stock_location) { create(:stock_location) }
@@ -11,6 +11,7 @@
   let!(:zone) { create(:zone) }
 
   before do
+    Spree::Config[:address_requires_state]
     ## TODO seed helper for gc
     product = Spree::Product.new(available_on: Time.now, name: "Gift Card", is_gift_card: true, slug: 'gift-card', price: 0, shipping_category_id: shipping_method.shipping_categories.first.id)
     option_type = Spree::OptionType.new(name: "is-gift-card", presentation: "Value")

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -18,7 +18,6 @@
 
 require 'database_cleaner'
 require 'factory_bot'
-FactoryBot.find_definitions
 require 'ffaker'
 require 'shoulda-matchers'
 
@@ -32,6 +31,8 @@
 require 'spree/testing_support/capybara_ext'
 require 'spree/testing_support/url_helpers'
 require 'rspec/active_model/mocks'
+require 'spree_gift_card/factories'
+require 'capybara/poltergeist'
 
 RSpec.configure do |config|
   config.include FactoryBot::Syntax::Methods
@@ -52,6 +53,8 @@
     DatabaseCleaner.start
   end
 
+  Capybara.javascript_driver = :poltergeist
+
   config.after :each do
     DatabaseCleaner.clean
   end

diff --git a/spree_gift_card.gemspec b/spree_gift_card.gemspec
@@ -39,4 +39,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rspec-activemodel-mocks'
   s.add_development_dependency 'rails-controller-testing', '~> 1.0.1'
+  s.add_development_dependency 'poltergeist'
 end