From 4d0fb54976aecf324412f9a259511f3f25bd5fc2 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Wed, 8 Mar 2023 15:14:39 -0300 Subject: [PATCH] Remove Rails 5.2 support --- .github/workflows/ci.yml | 1 - Appraisals | 18 -- README.md | 2 +- gemfiles/rails_5_2.gemfile | 36 --- gemfiles/rails_5_2.gemfile.lock | 264 ------------------ test/shoulda/test_framework_detection_test.rb | 6 - 6 files changed, 1 insertion(+), 326 deletions(-) delete mode 100644 gemfiles/rails_5_2.gemfile delete mode 100644 gemfiles/rails_5_2.gemfile.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04a59f7f..1f096c24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,6 @@ jobs: ruby: - 2.7.7 appraisal: - - rails_5_2 - rails_6_0 test_framework: - minitest diff --git a/Appraisals b/Appraisals index 271d4ef1..cd6834ba 100644 --- a/Appraisals +++ b/Appraisals @@ -22,24 +22,6 @@ shared_dependencies = proc do instance_eval(&shared_test_dependencies) end -appraise "rails_5_2" do - instance_eval(&shared_dependencies) - - gem "rails", "~> 5.2.2" - gem "rails-controller-testing", ">= 1.0.1" - gem "puma", "~> 3.11" - gem "bootsnap", ">= 1.1.0", require: false - gem "sass-rails", "~> 5.0" - gem "turbolinks", "~> 5" - gem "jbuilder", "~> 2.5" - gem "bcrypt", "~> 3.1.7" - gem "capybara", "~> 3.1.1" - gem "selenium-webdriver" - gem "chromedriver-helper" - gem "listen", ">= 3.0.5", "< 3.2" - gem "spring-watcher-listen", "~> 2.0.0" -end - appraise "rails_6_0" do instance_eval(&shared_dependencies) diff --git a/README.md b/README.md index fff1b531..7a077ad6 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,7 @@ may be of use: ## Compatibility -Shoulda Context is [tested][travis] and supported against Ruby 2.7+, Rails 5.2+, +Shoulda Context is [tested][travis] and supported against Ruby 2.7+, Rails 6.0+, Minitest 4.x, and Test::Unit 3.x. ## Versioning diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile deleted file mode 100644 index ab91a5ba..00000000 --- a/gemfiles/rails_5_2.gemfile +++ /dev/null @@ -1,36 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal" -gem "bundler", "~> 1.0" -gem "byebug" -gem "m" -gem "minitest" -gem "mocha" -gem "pry", "~> 0.12.0" -gem "pry-byebug", "~> 3.6.0" -gem "rake" -gem "rubocop", "0.71.0" -gem "snowglobe", ">= 0.3.0" -gem "test-unit" -gem "warnings_logger" -gem "sqlite3", "~> 1.3.6" -gem "spring" -gem "spring-commands-rspec" -gem "minitest-reporters" -gem "rails", "~> 5.2.2" -gem "rails-controller-testing", ">= 1.0.1" -gem "puma", "~> 3.11" -gem "bootsnap", ">= 1.1.0", require: false -gem "sass-rails", "~> 5.0" -gem "turbolinks", "~> 5" -gem "jbuilder", "~> 2.5" -gem "bcrypt", "~> 3.1.7" -gem "capybara", "~> 3.1.1" -gem "selenium-webdriver" -gem "chromedriver-helper" -gem "listen", ">= 3.0.5", "< 3.2" -gem "spring-watcher-listen", "~> 2.0.0" - -gemspec path: "../" diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock deleted file mode 100644 index 9c3490a6..00000000 --- a/gemfiles/rails_5_2.gemfile.lock +++ /dev/null @@ -1,264 +0,0 @@ -PATH - remote: .. - specs: - shoulda-context (2.0.0) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.2.8.1) - actionpack (= 5.2.8.1) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailer (5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.2.8.1) - actionview (= 5.2.8.1) - activesupport (= 5.2.8.1) - rack (~> 2.0, >= 2.0.8) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.8.1) - activesupport (= 5.2.8.1) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.8.1) - activesupport (= 5.2.8.1) - globalid (>= 0.3.6) - activemodel (5.2.8.1) - activesupport (= 5.2.8.1) - activerecord (5.2.8.1) - activemodel (= 5.2.8.1) - activesupport (= 5.2.8.1) - arel (>= 9.0) - activestorage (5.2.8.1) - actionpack (= 5.2.8.1) - activerecord (= 5.2.8.1) - marcel (~> 1.0.0) - activesupport (5.2.8.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) - ansi (1.5.0) - appraisal (2.4.1) - bundler - rake - thor (>= 0.14.0) - archive-zip (0.12.0) - io-like (~> 0.3.0) - arel (9.0.0) - ast (2.4.2) - bcrypt (3.1.18) - bootsnap (1.12.0) - msgpack (~> 1.2) - builder (3.2.4) - byebug (10.0.2) - capybara (3.1.1) - addressable - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - xpath (~> 3.0) - childprocess (3.0.0) - chromedriver-helper (2.1.1) - archive-zip (~> 0.10) - nokogiri (~> 1.8) - coderay (1.1.3) - concurrent-ruby (1.2.2) - crass (1.0.6) - erubi (1.12.0) - ffi (1.15.5) - globalid (0.4.2) - activesupport (>= 4.2.0) - i18n (1.12.0) - concurrent-ruby (~> 1.0) - io-like (0.3.1) - jaro_winkler (1.5.4) - jbuilder (2.11.5) - actionview (>= 5.0.0) - activesupport (>= 5.0.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.19.1) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - m (1.6.1) - method_source (>= 0.6.7) - rake (>= 0.9.2.2) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (1.0.2) - method_source (0.9.2) - mini_mime (1.1.2) - mini_portile2 (2.6.1) - minitest (5.15.0) - minitest-reporters (1.6.0) - ansi - builder - minitest (>= 5.0) - ruby-progressbar - mocha (2.0.2) - ruby2_keywords (>= 0.0.5) - msgpack (1.6.0) - nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) - racc (~> 1.4) - parallel (1.20.1) - parser (3.2.1.0) - ast (~> 2.4.1) - power_assert (2.0.3) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) - pry (~> 0.10) - public_suffix (4.0.7) - puma (3.12.6) - racc (1.6.2) - rack (2.2.6.2) - rack-test (2.0.2) - rack (>= 1.3) - rails (5.2.8.1) - actioncable (= 5.2.8.1) - actionmailer (= 5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) - activemodel (= 5.2.8.1) - activerecord (= 5.2.8.1) - activestorage (= 5.2.8.1) - activesupport (= 5.2.8.1) - bundler (>= 1.3.0) - railties (= 5.2.8.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.5.0) - loofah (~> 2.19, >= 2.19.1) - railties (5.2.8.1) - actionpack (= 5.2.8.1) - activesupport (= 5.2.8.1) - method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) - rainbow (3.1.1) - rake (13.0.6) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - rubocop (0.71.0) - jaro_winkler (~> 1.5.1) - parallel (~> 1.10) - parser (>= 2.6) - rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - ruby-progressbar (1.12.0) - ruby2_keywords (0.0.5) - ruby_dep (1.5.0) - rubyzip (2.3.2) - 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.1.0) - railties (>= 5.2.0) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) - rubyzip (>= 1.2.2) - snowglobe (0.3.0) - 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) - test-unit (3.5.7) - power_assert - thor (1.2.1) - thread_safe (0.3.6) - tilt (2.1.0) - turbolinks (5.2.1) - turbolinks-source (~> 5.2) - turbolinks-source (5.2.0) - tzinfo (1.2.11) - thread_safe (~> 0.1) - unicode-display_width (1.6.1) - warnings_logger (0.1.1) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - xpath (3.2.0) - nokogiri (~> 1.8) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal - bcrypt (~> 3.1.7) - bootsnap (>= 1.1.0) - bundler (~> 1.0) - byebug - capybara (~> 3.1.1) - chromedriver-helper - jbuilder (~> 2.5) - listen (>= 3.0.5, < 3.2) - m - minitest - minitest-reporters - mocha - pry (~> 0.12.0) - pry-byebug (~> 3.6.0) - puma (~> 3.11) - rails (~> 5.2.2) - rails-controller-testing (>= 1.0.1) - rake - rubocop (= 0.71.0) - sass-rails (~> 5.0) - selenium-webdriver - shoulda-context! - snowglobe (>= 0.3.0) - spring - spring-commands-rspec - spring-watcher-listen (~> 2.0.0) - sqlite3 (~> 1.3.6) - test-unit - turbolinks (~> 5) - warnings_logger - -BUNDLED WITH - 1.17.3 diff --git a/test/shoulda/test_framework_detection_test.rb b/test/shoulda/test_framework_detection_test.rb index ddeca299..06094f13 100644 --- a/test/shoulda/test_framework_detection_test.rb +++ b/test/shoulda/test_framework_detection_test.rb @@ -2,12 +2,6 @@ require "tempfile" class TestFrameworkDetectionTest < PARENT_TEST_CASE - if Tests::CurrentBundle.instance.current_appraisal == "rails_5_2" - should "detect Minitest 5.x w/ Rails 5.2" do - assert_integration_with_rails_and "Minitest::Test" - end - end - if TEST_FRAMEWORK == "minitest" should "detect Minitest 5.x when it is loaded standalone" do assert_integration_with "Minitest::Test", setup: <<-RUBY