Fixed dependency for Spree 3.7/4.0

Author: jkojro

.travis.yml

@@ -13,13 +13,13 @@ env:
 gemfile:
   - gemfiles/spree_3_2.gemfile
   - gemfiles/spree_3_5.gemfile
-  - gemfiles/spree_3_6.gemfile
+  - gemfiles/spree_3_7.gemfile
   - gemfiles/spree_master.gemfile
 
 rvm:
   - 2.5.1
   - 2.4.4
-  - 2.3.7
+  - 2.3.3
 
 matrix:
     allow_failures:

Appraisals

@@ -1,6 +1,6 @@
 appraise 'spree-3-2' do
   gem 'spree', '~> 3.2.0'
-  gem 'spree_auth_devise', '~> 3.2.0'
+  gem 'spree_auth_devise', '~> 3.3.0'
   gem 'rails-controller-testing'
 end
 
@@ -10,8 +10,8 @@ appraise 'spree-3-5' do
   gem 'rails-controller-testing'
 end
 
-appraise 'spree-3-6' do
-  gem 'spree', '~> 3.6.0'
+appraise 'spree-3-7' do
+  gem 'spree', '~> 3.7.0'
   gem 'spree_auth_devise', '~> 3.3.0'
   gem 'rails-controller-testing'
 end

app/controllers/spree/checkout_controller_decorator.rb

@@ -36,7 +36,7 @@ def normalize_addresses
 
       bill_address = @order.bill_address
       ship_address = @order.ship_address
-      if @order.bill_address_id != @order.ship_address_id && bill_address.same_as?(ship_address)
+      if @order.bill_address_id != @order.ship_address_id && bill_address == ship_address
         @order.update_column(:bill_address_id, ship_address.id)
         bill_address.destroy
       else

gemfiles/spree_3_6.gemfile gemfiles/spree_3_7.gemfilegemfiles/spree_3_6.gemfile renamed to gemfiles/spree_3_7.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "spree", "~> 3.6.0"
+gem "spree", "~> 3.7.0"
 gem "spree_auth_devise", "~> 3.3.0"
 gem "rails-controller-testing"
 

spec/features/checkout_address_selection_spec.rb

@@ -25,8 +25,9 @@
       end
     end
 
-    it 'should only see shipping address form' do
+    it 'should only see shipping address form', js: true do
       within('#shipping') do
+        uncheck 'order_use_billing'
         should_have_address_fields
         expect(page).to_not have_selector(".select_address")
       end

spec/spec_helper.rb

@@ -34,7 +34,7 @@
     # not sure exactly what is happening here, but i think it takes
     # an iteration for the country data to load
     if Spree::Country.count > 0
-      Spree::Config[:default_country_id] = Spree::Country.find_by_iso3('USA').id
+      Spree::Config[:default_country_id] = Spree::Country.find_by_iso3('USA')&.id
     end
     Spree::Config[:address_requires_state]
   end

spree_address_book.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  spree_version = '>= 3.2.0', '< 4.0'
+  spree_version = '>= 3.2.0', '< 5.0'
   s.add_runtime_dependency 'spree_core', spree_version
   s.add_runtime_dependency 'spree_auth_devise', spree_version
 
@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'selenium-webdriver'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'sqlite3', '~> 1.3.6'
 end