Merge pull request #19 from spark-solutions/fix/spree-3-7

Version 1.4.0

.travis.yml

@@ -20,18 +20,18 @@ env:
 language: ruby
 
 rvm:
- - 2.3.1
- - 2.2.7
+- 2.5.3
+- 2.4.5
+- 2.3.8
 
 matrix:
  allow_failures:
  - gemfile: gemfiles/spree_master.gemfile
 
 gemfile:
- - gemfiles/spree_3_1.gemfile
  - gemfiles/spree_3_2.gemfile
  - gemfiles/spree_3_3.gemfile
- - gemfiles/spree_3_4.gemfile
+ - gemfiles/spree_3_6.gemfile
  - gemfiles/spree_master.gemfile
 
 before_install:

Appraisals

@@ -1,25 +1,19 @@
-appraise 'spree-3-1' do
- gem 'spree', '~> 3.1.0'
- gem 'rails_test_params_backport', group: :test
- gem "rails", "~> 4.2.10"
-end
-
 appraise 'spree-3-2' do
- gem 'spree', '~> 3.2.0'
- gem 'rails-controller-testing'
+ gem 'spree_core', '~> 3.2.0'
+ gem 'spree_backend', '~> 3.2.0'
 end
 
 appraise 'spree-3-3' do
- gem 'spree', '~> 3.3.0'
- gem 'rails-controller-testing'
+ gem 'spree_core', '~> 3.3.0'
+ gem 'spree_backend', '~> 3.3.0'
 end
 
-appraise 'spree-3-4' do
- gem 'spree', '~> 3.4.0'
- gem 'rails-controller-testing'
+appraise 'spree-3-6' do
+ gem 'spree_core', '~> 3.6.0'
+ gem 'spree_backend', '~> 3.6.0'
 end
 
 appraise 'spree-master' do
- gem 'spree', github: 'spree/spree', branch: 'master'
- gem 'rails-controller-testing'
+ gem 'spree_core', github: 'spree/spree', branch: 'master'
+ gem 'spree_backend', github: 'spree/spree', branch: 'master'
 end

Gemfile

@@ -1,7 +1,9 @@
 source 'http://rubygems.org'
 
-gem "spree", github: "spree/spree", branch: 'master'
-gem "codeclimate-test-reporter", group: :test, require: nil
+gem 'spree_core', github: 'spree/spree', branch: 'master'
+gem 'spree_backend', github: 'spree/spree', branch: 'master'
+gem 'codeclimate-test-reporter', group: :test, require: nil
 gem 'pry', group: [:test, :development]
+gem 'rails-controller-testing'
 
 gemspec

gemfiles/spree_3_2.gemfile

@@ -2,7 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "spree", "~> 3.2.0"
+gem "spree_core", "~> 3.2.0"
+gem "spree_backend", "~> 3.2.0"
 gem "codeclimate-test-reporter", group: :test, require: nil
 gem "pry", group: [:test, :development]
 gem "rails-controller-testing"

gemfiles/spree_3_3.gemfile

@@ -2,7 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "spree", "~> 3.3.0"
+gem "spree_core", "~> 3.3.0"
+gem "spree_backend", "~> 3.3.0"
 gem "codeclimate-test-reporter", group: :test, require: nil
 gem "pry", group: [:test, :development]
 gem "rails-controller-testing"

gemfiles/spree_3_4.gemfile → gemfiles/spree_3_6.gemfile

@@ -2,7 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "spree", "~> 3.4.0"
+gem "spree_core", "~> 3.6.0"
+gem "spree_backend", "~> 3.6.0"
 gem "codeclimate-test-reporter", group: :test, require: nil
 gem "pry", group: [:test, :development]
 gem "rails-controller-testing"

gemfiles/spree_master.gemfile

@@ -2,7 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "spree", github: "spree/spree", branch: "master"
+gem "spree_core", github: "spree/spree", branch: "master"
+gem "spree_backend", github: "spree/spree", branch: "master"
 gem "codeclimate-test-reporter", group: :test, require: nil
 gem "pry", group: [:test, :development]
 gem "rails-controller-testing"

lib/generators/spree_avatax_certified/install/install_generator.rb

@@ -4,12 +4,10 @@ class InstallGenerator < Rails::Generators::Base
  class_option :auto_run_migrations, type: :boolean, default: false
 
  def add_javascripts
- append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_avatax_certified\n"
  append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_avatax_certified\n"
  end
 
  def add_stylesheets
- inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_avatax_certified\n", before: /\*\//, :verbose => true
  inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_avatax_certified\n", before: /\*\//, :verbose => true
  end
 

lib/spree_avatax_certified/factories.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
  factory :use_code, class: Spree::AvalaraEntityUseCode do
- use_code "A"
- use_code_description "Federal government"
+ use_code { 'A' }
+ use_code_description { 'Federal government' }
  end
 end

spec/factories/avalara_entity_use_code_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
  factory :avalara_entity_use_code, class: Spree::AvalaraEntityUseCode do
- use_code 'A'
- use_code_description 'Federal government'
+ use_code { 'A' }
+ use_code_description { 'Federal government' }
  end
 end

spec/factories/avalara_factories.rb

@@ -1,19 +1,19 @@
 FactoryBot.define do
  factory :request_hash, class: Hash do
- Commit false
- CustomerCode '1'
- DocDate '2014-11-03'
- CompanyCode '54321'
- CustomerUsageType ''
- ExemptionNo nil
- Client AVATAX_CLIENT_VERSION
- DocCode 'R731071205'
- ReferenceCode 'R731071205'
- DetailLevel 'Tax'
- DocType 'SalesOrder'
- Discount '0.00'
- Addresses [{:AddressCode=>'9', :Line1=>'31 South St', :City=>'Morristown', :PostalCode=>'07960', :Country=>'US'},{:AddressCode=>'Dest', :Line1=>'73 Glenmere Drive', :Line2=>'', :City=>'Chatham', :Region=>'NJ', :Country=>'US', :PostalCode=>'07928'},{:AddressCode=>'Orig', :Line1=>'73 Glenmere Drive', :City=>'Chatham', :PostalCode=>'07928', :Country=>'United States'}]
- Lines [{:LineNo=>'1-LI', :ItemCode=>'ROR-00013', :Qty=>3, :Amount=>62.97, :OriginCode=>'9', :DestinationCode=>'Dest', :Description=>'Ruby on Rails Jr. Spaghetti', :TaxCode=>'P0000000', :Discounted=>false}]
+ Commit { false }
+ CustomerCode { '1' }
+ DocDate { '2014-11-03' }
+ CompanyCode { '54321' }
+ CustomerUsageType { '' }
+ ExemptionNo { nil }
+ Client { AVATAX_CLIENT_VERSION }
+ DocCode { 'R731071205' }
+ ReferenceCode { 'R731071205' }
+ DetailLevel { 'Tax' }
+ DocType { 'SalesOrder' }
+ Discount { '0.00' }
+ Addresses { [{:AddressCode=>'9', :Line1=>'31 South St', :City=>'Morristown', :PostalCode=>'07960', :Country=>'US'},{:AddressCode=>'Dest', :Line1=>'73 Glenmere Drive', :Line2=>'', :City=>'Chatham', :Region=>'NJ', :Country=>'US', :PostalCode=>'07928'},{:AddressCode=>'Orig', :Line1=>'73 Glenmere Drive', :City=>'Chatham', :PostalCode=>'07928', :Country=>'United States'}] }
+ Lines { [{:LineNo=>'1-LI', :ItemCode=>'ROR-00013', :Qty=>3, :Amount=>62.97, :OriginCode=>'9', :DestinationCode=>'Dest', :Description=>'Ruby on Rails Jr. Spaghetti', :TaxCode=>'P0000000', :Discounted=>false}] }
  end
 
  factory :avalara_transaction_calculator, class: Spree::Calculator::AvalaraTransactionCalculator do
@@ -28,26 +28,26 @@
 
  factory :address, class: Spree::Address do
  transient do
- country_iso_code 'US'
- state_code 'AL'
+ country_iso_code { 'US' }
+ state_code { 'AL' }
  end
 
- firstname 'John'
- lastname 'Doe'
- company 'Company'
- address1 '915 S Jackson St'
- address2 ''
- city 'Montgomery'
- state_name 'Alabama'
- zipcode '36104'
- phone '555-555-0199'
- alternative_phone '555-555-0199'
+ firstname { 'John' }
+ lastname { 'Doe' }
+ company { 'Company' }
+ address1 { '915 S Jackson St' }
+ address2 { '' }
+ city { 'Montgomery' }
+ state_name { 'Alabama' }
+ zipcode { '36104' }
+ phone { '555-555-0199' }
+ alternative_phone { '555-555-0199' }
 
  state do |address|
  if !Spree::State.find_by(name: address.state_name).nil?
  Spree::State.find_by(name: address.state_name)
  else
-  address.association(:state, name: 'Alabama', abbr: 'AL')
+ address.association(:state, name: 'Alabama', abbr: 'AL')
  end
  end
 
@@ -58,19 +58,18 @@
  address.association(:country, iso: country_iso_code)
  end
  end
-
  end
 
  factory :ship_address, parent: :address do
- address1 '915 S Jackson St'
+ address1 { '915 S Jackson St' }
  end
 
  # Adding this modifier since US country name changes between solidus versions
  factory :country, class: Spree::Country do
- iso_name 'UNITED STATES'
- name 'United States'
- iso 'US'
- iso3 'USA'
- numcode 840
+ iso_name { 'UNITED STATES' }
+ name { 'United States' }
+ iso { 'US' }
+ iso3 { 'USA' }
+ numcode { 840 }
  end
 end

spec/factories/avalara_order_factory.rb

@@ -3,18 +3,18 @@
  user
  bill_address
  ship_address
- completed_at nil
+ completed_at { nil }
  email { user.email }
  store
- state 'delivery'
+ state { 'delivery' }
 
  transient do
- line_items_price BigDecimal.new(10)
- line_items_count 1
- line_items_quantity 1
- shipment_cost 5
- tax_category Spree::TaxCategory.first
- tax_included false
+ line_items_price { BigDecimal(10) }
+ line_items_count { 1 }
+ line_items_quantity { 1 }
+ shipment_cost { 5 }
+ tax_category { Spree::TaxCategory.first }
+ tax_included { false }
  end
 
  before(:create) do |order, evaluator|
@@ -50,8 +50,8 @@
  end
 
  factory :completed_avalara_order do
- shipment_state 'shipped'
- payment_state 'paid'
+ shipment_state { 'shipped' }
+ payment_state { 'paid' }
 
  after(:create) do |order|
  # order.refresh_shipment_rates

spec/factories/avalara_shipment_factory.rb

@@ -1,13 +1,13 @@
 FactoryBot.define do
  factory :avalara_shipment, class: Spree::Shipment do
- tracking 'U10000'
- cost BigDecimal.new(10)
- state 'pending'
+ tracking { 'U10000' }
+ cost { BigDecimal(10) }
+ state { 'pending' }
  order
  stock_location
 
  transient do
- tax_included false
+ tax_included { false }
  end
 
  after(:create) do |shipment, evalulator|

spec/factories/avalara_shipping_method_factory.rb

@@ -1,13 +1,13 @@
 FactoryBot.define do
  factory :avalara_shipping_method, class: Spree::ShippingMethod do
  zones { |a| [Spree::Zone.find_by(name: 'GlobalZone') || create(:zone, :with_country, default_tax: true)] }
- name 'Avalara Ground'
- code 'Avalara_Ground'
- display_on 'both'
+ name { 'Avalara Ground' }
+ code { 'Avalara_Ground' }
+ display_on { 'both' }
  association(:calculator, factory: :shipping_calculator, strategy: :create)
 
  transient do
- tax_included false
+ tax_included { false }
  end
 
  before(:create) do |shipping_method, evaluator|