From 37ff011d4fb39db15b42f8b25a14429e3a38dd72 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Tue, 23 Mar 2021 14:18:28 -0300 Subject: [PATCH] Remove Rails 5.0 support (#1428) * Remove rails_lt_5? method * Remove rails_5_x? method * Remove conditionals for rails version equal to or greater than 5 * Remove Rails 5.0 support --- .github/workflows/ci.yml | 1 - Appraisals | 19 --- README.md | 2 +- gemfiles/rails_5_0.gemfile | 35 ----- gemfiles/rails_5_0.gemfile.lock | 253 -------------------------------- shoulda-matchers.gemspec | 2 +- 6 files changed, 2 insertions(+), 310 deletions(-) delete mode 100644 gemfiles/rails_5_0.gemfile delete mode 100644 gemfiles/rails_5_0.gemfile.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 580c449f2..e8f4acd4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,6 @@ jobs: - rails_6_0 - rails_5_2 - rails_5_1 - - rails_5_0 adapter: - sqlite3 - postgresql diff --git a/Appraisals b/Appraisals index 53a4418af..a410a7946 100644 --- a/Appraisals +++ b/Appraisals @@ -23,25 +23,6 @@ shared_dependencies = proc do instance_eval(&shared_test_dependencies) end -appraise 'rails_5_0' do - instance_eval(&shared_dependencies) - instance_eval(&controller_test_dependency) - - gem 'rails', '5.0.7.2' - gem 'puma', '~> 3.0' - gem 'sass-rails', '~> 5.0' - gem 'jquery-rails' - gem 'turbolinks', '~> 5' - gem 'jbuilder', '~> 2.5' - gem 'bcrypt', '~> 3.1.7' - gem 'listen', '~> 3.0.5' - gem 'spring-watcher-listen', '~> 2.0.0' - - # Database adapters - gem 'pg', '~> 0.18' - gem 'sqlite3', '~> 1.3.6' -end - appraise 'rails_5_1' do instance_eval(&shared_dependencies) instance_eval(&controller_test_dependency) diff --git a/README.md b/README.md index 17bf50a3e..4f6f5c3e4 100644 --- a/README.md +++ b/README.md @@ -469,7 +469,7 @@ machine, understanding the codebase, and creating a good pull request. ## Compatibility Shoulda Matchers is tested and supported against Ruby 2.6+, Rails -5.0+, RSpec 3.x, and Minitest 5.x. +5.1+, RSpec 3.x, and Minitest 5.x. - For Ruby < 2.4 and Rails < 4.1 compatibility, please use [v3.1.3][v3.1.3]. - For Ruby < 3.0 and Rails < 6.1 compatibility, please use [v4.5.1][v4.5.1]. diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0.gemfile deleted file mode 100644 index e8f320c1d..000000000 --- a/gemfiles/rails_5_0.gemfile +++ /dev/null @@ -1,35 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "2.2.0" -gem "bundler", "~> 1.1" -gem "pry" -gem "pry-byebug" -gem "rake", "13.0.1" -gem "rspec", "~> 3.9" -gem "rubocop", require: false -gem "rubocop-packaging", require: false -gem "rubocop-rails", require: false -gem "warnings_logger" -gem "zeus", require: false -gem "fssm" -gem "redcarpet" -gem "rouge" -gem "yard" -gem "spring" -gem "spring-commands-rspec" -gem "rspec-rails", "~> 4.0" -gem "shoulda-context", "~> 1.2.0" -gem "rails-controller-testing", ">= 1.0.1" -gem "rails", "5.0.7.2" -gem "puma", "~> 3.0" -gem "sass-rails", "~> 5.0" -gem "jquery-rails" -gem "turbolinks", "~> 5" -gem "jbuilder", "~> 2.5" -gem "bcrypt", "~> 3.1.7" -gem "listen", "~> 3.0.5" -gem "spring-watcher-listen", "~> 2.0.0" -gem "pg", "~> 0.18" -gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails_5_0.gemfile.lock b/gemfiles/rails_5_0.gemfile.lock deleted file mode 100644 index 23f9b4899..000000000 --- a/gemfiles/rails_5_0.gemfile.lock +++ /dev/null @@ -1,253 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.0.7.2) - actionpack (= 5.0.7.2) - nio4r (>= 1.2, < 3.0) - websocket-driver (~> 0.6.1) - actionmailer (5.0.7.2) - actionpack (= 5.0.7.2) - actionview (= 5.0.7.2) - activejob (= 5.0.7.2) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.0.7.2) - actionview (= 5.0.7.2) - activesupport (= 5.0.7.2) - rack (~> 2.0) - rack-test (~> 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7.2) - activesupport (= 5.0.7.2) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7.2) - activesupport (= 5.0.7.2) - globalid (>= 0.3.6) - activemodel (5.0.7.2) - activesupport (= 5.0.7.2) - activerecord (5.0.7.2) - activemodel (= 5.0.7.2) - activesupport (= 5.0.7.2) - arel (~> 7.0) - activesupport (5.0.7.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - arel (7.1.4) - ast (2.4.2) - bcrypt (3.1.16) - builder (3.2.4) - byebug (11.1.3) - coderay (1.1.3) - concurrent-ruby (1.1.8) - crass (1.0.6) - diff-lcs (1.4.4) - erubis (2.7.0) - ffi (1.14.2) - fssm (0.2.10) - globalid (0.4.2) - activesupport (>= 4.2.0) - i18n (1.8.9) - concurrent-ruby (~> 1.0) - jbuilder (2.11.2) - activesupport (>= 5.0.0) - jquery-rails (4.4.0) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.9.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - method_source (1.0.0) - mini_mime (1.0.2) - mini_portile2 (2.5.0) - minitest (5.14.4) - nio4r (2.5.5) - nokogiri (1.11.1) - mini_portile2 (~> 2.5.0) - racc (~> 1.4) - parallel (1.20.1) - parser (3.0.0.0) - ast (~> 2.4.1) - pg (0.21.0) - pry (0.13.1) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) - puma (3.12.6) - racc (1.5.2) - rack (2.2.3) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.7.2) - actioncable (= 5.0.7.2) - actionmailer (= 5.0.7.2) - actionpack (= 5.0.7.2) - actionview (= 5.0.7.2) - activejob (= 5.0.7.2) - activemodel (= 5.0.7.2) - activerecord (= 5.0.7.2) - activesupport (= 5.0.7.2) - bundler (>= 1.3.0) - railties (= 5.0.7.2) - sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.5) - actionpack (>= 5.0.1.rc1) - actionview (>= 5.0.1.rc1) - activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) - loofah (~> 2.3) - railties (5.0.7.2) - actionpack (= 5.0.7.2) - activesupport (= 5.0.7.2) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (3.0.0) - rake (13.0.1) - rb-fsevent (0.10.4) - rb-inotify (0.10.1) - ffi (~> 1.0) - redcarpet (3.5.1) - regexp_parser (2.1.1) - rexml (3.2.4) - rouge (3.26.0) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (4.0.2) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.10.2) - rubocop (1.10.0) - parallel (~> 1.10) - parser (>= 3.0.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) - rubocop-packaging (0.5.1) - rubocop (>= 0.89, < 2.0) - rubocop-rails (2.9.1) - activesupport (>= 4.2.0) - rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) - ruby-progressbar (1.11.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - shoulda-context (1.2.2) - spring (2.1.1) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) - spring-watcher-listen (2.0.1) - listen (>= 2.7, < 4.0) - spring (>= 1.2, < 3.0) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.3.13) - thor (1.1.0) - thread_safe (0.3.6) - tilt (2.0.10) - turbolinks (5.2.1) - turbolinks-source (~> 5.2) - turbolinks-source (5.2.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) - unicode-display_width (2.0.0) - warnings_logger (0.1.1) - websocket-driver (0.6.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - yard (0.9.26) - zeus (0.15.14) - method_source (>= 0.6.7) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal (= 2.2.0) - bcrypt (~> 3.1.7) - bundler (~> 1.1) - fssm - jbuilder (~> 2.5) - jquery-rails - listen (~> 3.0.5) - pg (~> 0.18) - pry - pry-byebug - puma (~> 3.0) - rails (= 5.0.7.2) - rails-controller-testing (>= 1.0.1) - rake (= 13.0.1) - redcarpet - rouge - rspec (~> 3.9) - rspec-rails (~> 4.0) - rubocop - rubocop-packaging - rubocop-rails - sass-rails (~> 5.0) - shoulda-context (~> 1.2.0) - spring - spring-commands-rspec - spring-watcher-listen (~> 2.0.0) - sqlite3 (~> 1.3.6) - turbolinks (~> 5) - warnings_logger - yard - zeus - -BUNDLED WITH - 1.17.3 diff --git a/shoulda-matchers.gemspec b/shoulda-matchers.gemspec index 01bc13b04..b9203ed28 100644 --- a/shoulda-matchers.gemspec +++ b/shoulda-matchers.gemspec @@ -37,5 +37,5 @@ Gem::Specification.new do |s| s.require_paths = ['lib'] s.required_ruby_version = '>= 2.6.0' - s.add_dependency('activesupport', '>= 5.0.0') + s.add_dependency('activesupport', '>= 5.1.0') end