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.0 support #1428

Merged
merged 4 commits into from
Mar 23, 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:
- rails_6_0
- rails_5_2
- rails_5_1
- rails_5_0
adapter:
- sqlite3
- postgresql
Expand Down
19 changes: 0 additions & 19 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -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)
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.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].
Expand Down
35 changes: 0 additions & 35 deletions gemfiles/rails_5_0.gemfile

This file was deleted.

253 changes: 0 additions & 253 deletions gemfiles/rails_5_0.gemfile.lock

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.0.0')
s.add_dependency('activesupport', '>= 5.1.0')
end
6 changes: 1 addition & 5 deletions spec/support/acceptance/helpers/rails_migration_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ module RailsMigrationHelpers
include RailsVersionHelpers

def migration_class_name
if rails_version >= 5
"ActiveRecord::Migration[#{rails_version_for_migration}]"
else
'ActiveRecord::Migration'
end
"ActiveRecord::Migration[#{rails_version_for_migration}]"
end

private
Expand Down
8 changes: 0 additions & 8 deletions spec/support/unit/helpers/rails_versions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ def rails_version
Tests::Version.new(Rails::VERSION::STRING)
end

def rails_lt_5?
rails_version < 5
end

def rails_5_x?
rails_version =~ '~> 5.0'
end

def rails_gte_5_2?
rails_version >= 5.2
end
Expand Down
4 changes: 1 addition & 3 deletions spec/support/unit/rails_application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,7 @@ def generate
write_activerecord_model_with_default_connection
write_activerecord_model_with_different_connection

if rails_version >= 5
add_initializer_for_time_zone_aware_types
end
add_initializer_for_time_zone_aware_types
end

def rails_new
Expand Down
Loading