Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
* `bundle update` across the board
* Update various Ruby minor versions
* Update main Ruby version to 2.7.1
* Update various Rails minor versions
* Start testing against Rails 6.x
  • Loading branch information
mcmire committed Apr 5, 2020
1 parent 8c890f5 commit a8dcab4
Show file tree
Hide file tree
Showing 18 changed files with 558 additions and 286 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.1
2.7.1
32 changes: 22 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,40 @@
language: ruby
sudo: false
dist: xenial
os: linux
cache:
directories:
- vendor/bundle
script: "bundle exec rake"
# Source: <https://docs.travis-ci.com/user/languages/ruby/#bundler-20>
before_install:
- gem update --system '2.7.8' --no-document
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
- gem update --system '3.1.2' --no-document
- gem uninstall -v '< 2' -i $(rvm gemdir)@global -ax bundler || true
- gem install bundler -v '< 2' --no-document
install: "bundle install --jobs=3 --retry=3 --path vendor/bundle"

- nvm use v11.0.0
- bundle config set path vendor/bundle
install: "bundle install --jobs=3 --retry=3"
rvm:
- 2.6.1
- 2.5.1
- 2.4.4
- 2.3.7

- 2.4.9
- 2.5.8
- 2.6.6
- 2.7.1
env:
- TEST_FRAMEWORK=minitest
- TEST_FRAMEWORK=test_unit

gemfile:
- gemfiles/rails_4_2.gemfile
- gemfiles/rails_5_0.gemfile
- gemfiles/rails_5_1.gemfile
- gemfiles/rails_5_2.gemfile
- gemfiles/rails_6_0.gemfile
matrix:
exclude:
- rvm: 2.3.7
gemfile: gemfiles/rails_6_0.gemfile
- rvm: 2.4.9
gemfile: gemfiles/rails_6_0.gemfile
- rvm: 2.6.6
gemfile: gemfiles/rails_4_2.gemfile
- rvm: 2.7.1
gemfile: gemfiles/rails_4_2.gemfile
31 changes: 19 additions & 12 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
shared_dependencies = proc do
gem "sqlite3", "~> 1.3.6"
end

appraise "rails_4_2" do
instance_eval(&shared_dependencies)

gem "rails", "~> 4.2.0"
gem "sprockets", "~> 3.0"
gem "sqlite3", "~> 1.3.6"
end

appraise "rails_5_0" do
instance_eval(&shared_dependencies)

gem "rails", "~> 5.0.0"
gem "sprockets", "~> 3.0"
gem "sqlite3", "~> 1.3.6"
end

appraise "rails_5_1" do
instance_eval(&shared_dependencies)

gem "rails", "~> 5.1.0"
gem "sprockets", "~> 3.0"
gem "sqlite3", "~> 1.3.6"
end

appraise "rails_5_2" do
instance_eval(&shared_dependencies)

gem "rails", "~> 5.2.0"
gem "sprockets", "~> 3.0"
gem "sqlite3", "~> 1.3.6"
end

if Gem::Requirement.new(">= 2.5.0").satisfied_by?(Gem::Version.new(RUBY_VERSION))
appraise "rails_6_0" do
gem "rails", "~> 6.0.0"
gem "bootsnap", ">= 1.4.2", require: false
gem "listen", ">= 3.0.5", "< 3.2"
gem "sqlite3", "~> 1.4"
gem "sprockets", "~> 4.0"
gem "webpacker", "~> 4.0"
end
end
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

* Drop support for RSpec 2 matchers. Matchers passed to `should` must conform
to RSpec 3's API (`failure_message` and `failure_message_when_negated`).
* Drop support for Minitest 4.x (last updated in 2013).
* Drop support for end-of-lifed versions of Rails. Rails 4.2.x, 5.1.x, and 5.2.x
are the only versions supported now.
* Drop support for end-of-lifed versions of Ruby. Ruby 2.3.x, 2.4.x and 2.5.x
are the only versions supported now.
* Drop support for Minitest 4.x (except when used by Rails 4.x).
* Drop support for older versions of Rails. Rails 4.x-6.x are the
only versions supported now.
* Drop support for older versions of Ruby. Ruby 2.3.x-2.7.x are the only
versions supported now.

### Bug fixes

Expand Down
26 changes: 13 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,17 @@ GEM
ast (2.4.0)
byebug (10.0.2)
coderay (1.1.2)
jaro_winkler (1.5.2)
jaro_winkler (1.5.4)
m (1.5.1)
method_source (>= 0.6.7)
rake (>= 0.9.2.2)
metaclass (0.0.4)
method_source (0.9.2)
minitest (5.11.3)
mocha (1.8.0)
metaclass (~> 0.0.1)
parallel (1.17.0)
parser (2.6.2.1)
minitest (5.14.0)
mocha (1.11.2)
parallel (1.19.1)
parser (2.7.1.0)
ast (~> 2.4.0)
power_assert (1.1.3)
power_assert (1.1.7)
powerpack (0.1.2)
pry (0.12.2)
coderay (~> 1.1.0)
Expand All @@ -34,7 +32,7 @@ GEM
byebug (~> 10.0)
pry (~> 0.10)
rainbow (3.0.0)
rake (12.3.2)
rake (13.0.1)
rubocop (0.64.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
Expand All @@ -43,11 +41,11 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
ruby-progressbar (1.10.0)
ruby-progressbar (1.10.1)
snowglobe (0.3.0)
test-unit (3.3.0)
test-unit (3.3.5)
power_assert
thor (0.20.3)
thor (1.0.1)
unicode-display_width (1.4.1)
warnings_logger (0.1.0)

Expand All @@ -57,10 +55,12 @@ PLATFORMS
DEPENDENCIES
appraisal
bundler (~> 1.0)
byebug
m
minitest
mocha
pry-byebug
pry (~> 0.12.0)
pry-byebug (~> 3.6.0)
rake
rubocop (= 0.64.0)
shoulda-context!
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ If this is too cumbersome, consider using the [m] gem to run tests instead:

## Compatibility

Shoulda Context is tested and supported against Rails 5.x, Rails 4.2, Minitest
5, Test::Unit 3, and Ruby 2.3+.
Shoulda Context is tested and supported against Rails 4.x+, Minitest 4.x,
Test::Unit 3.x, and Ruby 2.3+.

## Credits

Expand Down
3 changes: 2 additions & 1 deletion gemfiles/rails_4_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ source "https://rubygems.org"
gem "minitest"
gem "test-unit"
gem "warnings_logger"
gem "sqlite3", "~> 1.3.6"
gem "rails", "~> 4.2.0"
gem "sprockets", "~> 3.0"
gem "sqlite3", "~> 1.3.6"

gemspec path: "../"
Loading

0 comments on commit a8dcab4

Please sign in to comment.