Skip to content
This repository has been archived by the owner on Nov 5, 2019. It is now read-only.

Fixed_dependency_for_Spree_3.7/4.0 #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ matrix:
gemfile:
- gemfiles/spree_3_2.gemfile
- gemfiles/spree_3_3.gemfile
- gemfiles/spree_3_6.gemfile
- gemfiles/spree_3_7.gemfile
- gemfiles/spree_master.gemfile

before_install:
Expand Down
6 changes: 3 additions & 3 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ appraise 'spree-3-3' do
gem 'spree_backend', '~> 3.3.0'
end

appraise 'spree-3-6' do
gem 'spree_core', '~> 3.6.0'
gem 'spree_backend', '~> 3.6.0'
appraise 'spree-3-7' do
gem 'spree_core', '~> 3.7.0'
gem 'spree_backend', '~> 3.7.0'
end

appraise 'spree-master' do
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/spree_3_6.gemfile → gemfiles/spree_3_7.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

source "http://rubygems.org"

gem "spree_core", "~> 3.6.0"
gem "spree_backend", "~> 3.6.0"
gem "spree_core", "~> 3.7.0"
gem "spree_backend", "~> 3.7.0"
gem "codeclimate-test-reporter", group: :test, require: nil
gem "pry", group: [:test, :development]
gem "rails-controller-testing"
Expand Down
10 changes: 5 additions & 5 deletions spec/factories/avalara_factories.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@

# 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 }
sequence(:iso_name) { |n| "ISO_NAME_#{n}" }
sequence(:name) { |n| "NAME_#{n}" }
sequence(:iso) { |n| "I#{n}" }
sequence(:iso3) { |n| "IS#{n}" }
numcode { 840 }
end
end
3 changes: 1 addition & 2 deletions spec/features/vat_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'spec_helper'

describe "VAT", :vcr do
let!(:us) { create(:country, iso: 'US', name: 'United States') }
let!(:us) { create(:country, iso: 'US', name: 'United States', iso_name: 'UNITED STATES') }
let!(:it) { create(:country, iso: 'IT', name: 'Italy', iso_name: 'ITALY') }
let!(:nl) { create(:country, iso: 'NL', name: 'Netherlands', iso_name: 'NETHERLANDS') }
let!(:fr) { create(:country, iso: 'FR', name: 'France', iso_name: 'FRANCE') }
Expand Down Expand Up @@ -151,4 +151,3 @@ def prep_avalara_order
avalara_order.next!
end
end

2 changes: 2 additions & 0 deletions spec/models/spree/address_decorator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

describe Spree::Address, type: :model do
let(:address) { build(:address) }
before { address.country.update(name: 'United States') }


describe '#validation_enabled?' do
it 'returns true if preference is true and country validation is enabled' do
Expand Down
2 changes: 2 additions & 0 deletions spec/models/spree_avatax_certified/address_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
let(:address){ build(:address) }
let(:order) { build(:avalara_order, ship_address: address) }

before { address.country.update(name: 'United States') }

before do
Spree::Config.avatax_address_validation = true
end
Expand Down
4 changes: 2 additions & 2 deletions spree_avatax_certified.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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_backend', spree_version
s.add_runtime_dependency 'spree_extension'
Expand All @@ -37,7 +37,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'sass-rails'
s.add_development_dependency 'selenium-webdriver'
s.add_development_dependency 'simplecov'
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'sqlite3', '~> 1.3.6'
s.add_development_dependency 'mysql2', '~> 0.5.1'
s.add_development_dependency 'shoulda-matchers'
s.add_development_dependency 'vcr'
Expand Down