Skip to content

Commit 5ffdeaf

Browse files
Merge pull request #198 from spree-contrib/drop-old-versions
Add Spree 3.5 and 3.6 to tests and drop Ruby 2.2 support
2 parents 527b4a2 + 4236897 commit 5ffdeaf

9 files changed

+41
-50
lines changed

.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ env:
88
- DB=mysql
99

1010
gemfile:
11-
- gemfiles/spree_3_1.gemfile
12-
- gemfiles/spree_3_1_spree_auth_devise.gemfile
1311
- gemfiles/spree_3_2.gemfile
1412
- gemfiles/spree_3_2_spree_auth_devise.gemfile
15-
- gemfiles/spree_3_3.gemfile
16-
- gemfiles/spree_3_3_spree_auth_devise.gemfile
13+
- gemfiles/spree_3_5.gemfile
14+
- gemfiles/spree_3_5_spree_auth_devise.gemfile
15+
- gemfiles/spree_3_6.gemfile
16+
- gemfiles/spree_3_6_spree_auth_devise.gemfile
1717
- gemfiles/spree_master.gemfile
1818
- gemfiles/spree_master_spree_auth_devise.gemfile
1919

@@ -23,8 +23,9 @@ script:
2323
- bundle exec codeclimate-test-reporter
2424

2525
rvm:
26-
- 2.3.1
27-
- 2.2.7
26+
- 2.3.7
27+
- 2.4.4
28+
- 2.5.1
2829

2930
matrix:
3031
allow_failures:

Appraisals

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,33 @@
1-
appraise 'spree-3-1' do
1+
appraise 'spree-3-2' do
22
ENV['WITHOUT_SPREE_AUTH_DEVISE'] = 'true'
33

4-
gem 'spree', '~> 3.1.0'
5-
gem 'test_after_commit'
6-
gem "rails_test_params_backport", group: :test
7-
gem "rails", "~> 4.2.10"
4+
gem 'spree', '~> 3.2.0'
85
end
96

10-
appraise 'spree-3-1-spree-auth-devise' do
11-
gem 'spree', '~> 3.1.0'
12-
gem 'spree_auth_devise', '~> 3.1.0'
13-
gem 'test_after_commit'
14-
gem "rails_test_params_backport", group: :test
15-
gem "rails", "~> 4.2.10"
7+
appraise 'spree-3-2-spree-auth-devise' do
8+
gem 'spree', '~> 3.2.0'
9+
gem 'spree_auth_devise', '~> 3.2.0'
1610
end
1711

18-
appraise 'spree-3-2' do
12+
appraise 'spree-3-5' do
1913
ENV['WITHOUT_SPREE_AUTH_DEVISE'] = 'true'
2014

21-
gem 'spree', '~> 3.2.0'
15+
gem 'spree', '~> 3.5.0'
2216
end
2317

24-
appraise 'spree-3-2-spree-auth-devise' do
25-
gem 'spree', '~> 3.2.0'
26-
gem 'spree_auth_devise', '~> 3.2.0'
18+
appraise 'spree-3-5-spree-auth-devise' do
19+
gem 'spree', '~> 3.5.0'
20+
gem 'spree_auth_devise', '~> 3.3.0'
2721
end
2822

29-
appraise 'spree-3-3' do
23+
appraise 'spree-3-6' do
3024
ENV['WITHOUT_SPREE_AUTH_DEVISE'] = 'true'
3125

32-
gem 'spree', '~> 3.3.0'
26+
gem 'spree', '~> 3.6.1'
3327
end
3428

35-
appraise 'spree-3-3-spree-auth-devise' do
36-
gem 'spree', '~> 3.3.0'
29+
appraise 'spree-3-6-spree-auth-devise' do
30+
gem 'spree', '~> 3.6.1'
3731
gem 'spree_auth_devise', '~> 3.3.0'
3832
end
3933

gemfiles/spree_3_1.gemfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

gemfiles/spree_3_1_spree_auth_devise.gemfile

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "spree", "~> 3.3.0"
5+
gem "spree", "~> 3.5.0"
66
gem 'rails-controller-testing'
77

88
gemspec :path => "../"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "spree", "~> 3.5.0"
6+
gem "spree_auth_devise", "~> 3.3"
7+
gem 'rails-controller-testing'
8+
9+
gemspec :path => "../"

gemfiles/spree_3_6.gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "spree", "~> 3.6.0"
6+
gem 'rails-controller-testing'
7+
8+
gemspec :path => "../"

gemfiles/spree_3_3_spree_auth_devise.gemfile renamed to gemfiles/spree_3_6_spree_auth_devise.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "spree", "~> 3.3.0"
5+
gem "spree", "~> 3.6.0"
66
gem "spree_auth_devise", "~> 3.3.0"
77
gem 'rails-controller-testing'
88

spree_braintree_vzero.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
4343
s.add_development_dependency 'simplecov'
4444
s.add_development_dependency 'sqlite3'
4545
s.add_development_dependency 'pg', '~> 0.18'
46-
s.add_development_dependency 'mysql2', '~> 0.3.18'
46+
s.add_development_dependency 'mysql2', '~> 0.4'
4747
s.add_development_dependency 'pry'
4848
s.add_development_dependency 'vcr'
4949
s.add_development_dependency 'webmock', '~> 2.3' # https://github.com/bblimke/webmock/issues/683

0 commit comments

Comments
 (0)