Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove rails 5.1 support #1429

Merged
merged 3 commits into from
Apr 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
appraisal:
- rails_6_0
- rails_5_2
- rails_5_1
adapter:
- sqlite3
- postgresql
Expand Down
20 changes: 0 additions & 20 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,6 @@ shared_dependencies = proc do
instance_eval(&shared_test_dependencies)
end

appraise 'rails_5_1' do
instance_eval(&shared_dependencies)
instance_eval(&controller_test_dependency)

gem 'rails', '5.1.7'
gem 'puma', '~> 3.7'
gem 'sass-rails', '~> 5.0'
gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.5'
gem 'bcrypt', '~> 3.1.7'
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
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_2' do
instance_eval(&shared_dependencies)
instance_eval(&controller_test_dependency)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.1+, RSpec 3.x, and Minitest 5.x.
5.2+, 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].
Expand Down
36 changes: 0 additions & 36 deletions gemfiles/rails_5_1.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion shoulda-matchers.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.0')
s.add_dependency('activesupport', '>= 5.2.0')
end
4 changes: 0 additions & 4 deletions spec/support/unit/helpers/active_record_versions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ def active_record_version
Tests::Version.new(::ActiveRecord::VERSION::STRING)
end

def active_record_supports_active_storage?
active_record_version >= 5.2
end

def active_record_supports_validate_presence_on_active_storage?
active_record_version >= '6.0.0.beta1'
end
Expand Down
4 changes: 0 additions & 4 deletions spec/support/unit/helpers/rails_versions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,5 @@ def self.configure_example_group(example_group)
def rails_version
Tests::Version.new(Rails::VERSION::STRING)
end

def rails_gte_5_2?
rails_version >= 5.2
end
end
end
Loading