From 8be0587f17b17e4830dd57a80cc68b7c1e608432 Mon Sep 17 00:00:00 2001 From: Heitor Cardozo Date: Thu, 23 Mar 2023 09:44:07 -0300 Subject: [PATCH 1/2] refactor: remove Rails 6.0.z support --- .github/workflows/ci.yml | 1 - gemfiles/rails_6_0.gemfile | 39 ---- gemfiles/rails_6_0.gemfile.lock | 321 -------------------------------- 3 files changed, 361 deletions(-) delete mode 100644 gemfiles/rails_6_0.gemfile delete mode 100644 gemfiles/rails_6_0.gemfile.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98a42d161..9f09af732 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,6 @@ jobs: appraisal: - rails_7_0 - rails_6_1 - - rails_6_0 adapter: - sqlite3 - postgresql diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile deleted file mode 100644 index b1c0f5c9c..000000000 --- a/gemfiles/rails_6_0.gemfile +++ /dev/null @@ -1,39 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "2.2.0" -gem "bundler", "~> 2.0" -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-watcher-listen", "~> 2.0.0" -gem "rspec-rails", "~> 5.0" -gem "shoulda-context", "~> 2.0.0" -gem "rails-controller-testing", ">= 1.0.1" -gem "rails", "6.0.6.1" -gem "puma", "~> 4.1" -gem "sass-rails", ">= 6" -gem "turbolinks", "~> 5" -gem "jbuilder", "~> 2.7" -gem "bcrypt", "~> 3.1.7" -gem "bootsnap", ">= 1.4.2", require: false -gem "capybara", ">= 2.15" -gem "listen", "~> 3.3.0" -gem "selenium-webdriver" -gem "webdrivers" -gem "psych", "~> 3.0" -gem "net-smtp", require: false -gem "pg", ">= 0.18", "< 2.0" -gem "sqlite3", "~> 1.4" diff --git a/gemfiles/rails_6_0.gemfile.lock b/gemfiles/rails_6_0.gemfile.lock deleted file mode 100644 index b66900312..000000000 --- a/gemfiles/rails_6_0.gemfile.lock +++ /dev/null @@ -1,321 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actioncable (6.0.6.1) - actionpack (= 6.0.6.1) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.0.6.1) - actionpack (= 6.0.6.1) - activejob (= 6.0.6.1) - activerecord (= 6.0.6.1) - activestorage (= 6.0.6.1) - activesupport (= 6.0.6.1) - mail (>= 2.7.1) - actionmailer (6.0.6.1) - actionpack (= 6.0.6.1) - actionview (= 6.0.6.1) - activejob (= 6.0.6.1) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.0.6.1) - actionview (= 6.0.6.1) - activesupport (= 6.0.6.1) - rack (~> 2.0, >= 2.0.8) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.6.1) - actionpack (= 6.0.6.1) - activerecord (= 6.0.6.1) - activestorage (= 6.0.6.1) - activesupport (= 6.0.6.1) - nokogiri (>= 1.8.5) - actionview (6.0.6.1) - activesupport (= 6.0.6.1) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.6.1) - activesupport (= 6.0.6.1) - globalid (>= 0.3.6) - activemodel (6.0.6.1) - activesupport (= 6.0.6.1) - activerecord (6.0.6.1) - activemodel (= 6.0.6.1) - activesupport (= 6.0.6.1) - activestorage (6.0.6.1) - actionpack (= 6.0.6.1) - activejob (= 6.0.6.1) - activerecord (= 6.0.6.1) - marcel (~> 1.0) - activesupport (6.0.6.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - ast (2.4.2) - bcrypt (3.1.18) - bootsnap (1.15.0) - msgpack (~> 1.2) - builder (3.2.4) - byebug (11.1.3) - capybara (3.36.0) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - childprocess (4.1.0) - coderay (1.1.3) - concurrent-ruby (1.1.10) - crass (1.0.6) - date (3.3.3) - diff-lcs (1.5.0) - erubi (1.12.0) - ffi (1.15.5) - fssm (0.2.10) - globalid (1.0.1) - activesupport (>= 5.0) - i18n (1.12.0) - concurrent-ruby (~> 1.0) - jbuilder (2.11.5) - actionview (>= 5.0.0) - activesupport (>= 5.0.0) - json (2.6.3) - listen (3.3.4) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.19.1) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.8.0.1) - mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.0.2) - matrix (0.4.2) - method_source (1.0.0) - mini_mime (1.1.2) - mini_portile2 (2.8.1) - minitest (5.17.0) - msgpack (1.6.0) - net-imap (0.3.4) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.2.1) - timeout - net-smtp (0.3.3) - net-protocol - nio4r (2.5.8) - nokogiri (1.13.10-x86_64-linux) - racc (~> 1.4) - parallel (1.22.1) - parser (3.2.0.0) - ast (~> 2.4.1) - pg (1.4.5) - pry (0.13.1) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) - psych (3.3.4) - public_suffix (5.0.1) - puma (4.3.12) - nio4r (~> 2.0) - racc (1.6.2) - rack (2.2.5) - rack-test (2.0.2) - rack (>= 1.3) - rails (6.0.6.1) - actioncable (= 6.0.6.1) - actionmailbox (= 6.0.6.1) - actionmailer (= 6.0.6.1) - actionpack (= 6.0.6.1) - actiontext (= 6.0.6.1) - actionview (= 6.0.6.1) - activejob (= 6.0.6.1) - activemodel (= 6.0.6.1) - activerecord (= 6.0.6.1) - activestorage (= 6.0.6.1) - activesupport (= 6.0.6.1) - bundler (>= 1.3.0) - railties (= 6.0.6.1) - 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.4.4) - loofah (~> 2.19, >= 2.19.1) - railties (6.0.6.1) - actionpack (= 6.0.6.1) - activesupport (= 6.0.6.1) - method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) - rainbow (3.1.1) - rake (13.0.1) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - redcarpet (3.5.1) - regexp_parser (2.6.1) - rexml (3.2.5) - rouge (3.30.0) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.0) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.12.0) - rubocop (1.43.0) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.2.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) - rubocop-packaging (0.5.2) - rubocop (>= 1.33, < 2.0) - rubocop-rails (2.17.4) - activesupport (>= 4.2.0) - rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) - ruby-progressbar (1.11.0) - rubyzip (2.3.2) - sass-rails (6.0.0) - sassc-rails (~> 2.1, >= 2.1.1) - sassc (2.4.0) - ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - selenium-webdriver (4.1.0) - childprocess (>= 0.5, < 5.0) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2) - shoulda-context (2.0.0) - spring (2.1.1) - spring-watcher-listen (2.0.1) - listen (>= 2.7, < 4.0) - spring (>= 1.2, < 3.0) - sprockets (4.2.0) - concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - sqlite3 (1.6.0) - mini_portile2 (~> 2.8.0) - thor (1.2.1) - thread_safe (0.3.6) - tilt (2.0.11) - timeout (0.3.1) - turbolinks (5.2.1) - turbolinks-source (~> 5.2) - turbolinks-source (5.2.0) - tzinfo (1.2.10) - thread_safe (~> 0.1) - unicode-display_width (2.4.2) - warnings_logger (0.1.1) - webdrivers (5.2.0) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (~> 4.0) - webrick (1.7.0) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - xpath (3.2.0) - nokogiri (~> 1.8) - yard (0.9.28) - webrick (~> 1.7.0) - zeitwerk (2.6.6) - zeus (0.15.14) - method_source (>= 0.6.7) - -PLATFORMS - x86_64-linux - -DEPENDENCIES - appraisal (= 2.2.0) - bcrypt (~> 3.1.7) - bootsnap (>= 1.4.2) - bundler (~> 2.0) - capybara (>= 2.15) - fssm - jbuilder (~> 2.7) - listen (~> 3.3.0) - net-smtp - pg (>= 0.18, < 2.0) - pry - pry-byebug - psych (~> 3.0) - puma (~> 4.1) - rails (= 6.0.6.1) - rails-controller-testing (>= 1.0.1) - rake (= 13.0.1) - redcarpet - rouge - rspec (~> 3.9) - rspec-rails (~> 5.0) - rubocop - rubocop-packaging - rubocop-rails - sass-rails (>= 6) - selenium-webdriver - shoulda-context (~> 2.0.0) - spring - spring-watcher-listen (~> 2.0.0) - sqlite3 (~> 1.4) - turbolinks (~> 5) - warnings_logger - webdrivers - yard - zeus - -BUNDLED WITH - 2.3.22 From d0230fb9c5003f9cd53d994cbab984ebcd049f97 Mon Sep 17 00:00:00 2001 From: Heitor Cardozo Date: Wed, 29 Mar 2023 16:32:37 -0300 Subject: [PATCH 2/2] fix: update the readme compatibility session --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 631ed64d8..35a687ff5 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 3.0+, Rails -5.2+, RSpec 3.x, and Minitest 5.x. +6.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].