Skip to content

Commit 4173a0f

Browse files
Workflows / CI: updated to Rails 7
Updated _dummy_ application to Rails 7.2. Loading process has changed in Rails 7.
1 parent e9a5b36 commit 4173a0f

24 files changed

+403
-169
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jobs:
2525
- 3.2
2626
- 3.1
2727
rails:
28-
- 6.1 # TODO: move to 7.2
28+
- 7.2
2929
include:
3030
# Edge
3131
- { ruby: 'head', rails: 'edge', allow-fail: true }
3232
# Outdated
33-
- { ruby: '3.0', rails: '6.1' } # TODO: move to 7.1
33+
- { ruby: '3.0', rails: '7.1' }
3434
- { ruby: '2.7', rails: '6' } # RSpec AR Expectations support Rails 7.1 since Ruby 3.0
3535
- { ruby: '2.6', rails: '6' }
3636
- { ruby: '2.5', rails: '6' }

.rspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
--color
2-
--order rand
1+
--format progress

Gemfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ gem 'puma'
66

77
platforms :ruby do
88
if RUBY_VERSION >= "2.5.0"
9-
gem 'sqlite3', '~> 1.4'
9+
gem 'sqlite3'
1010
else
1111
gem 'sqlite3', '~> 1.3.6'
1212
end
@@ -17,8 +17,6 @@ platforms :jruby do
1717
gem "activerecord-jdbcsqlite3-adapter"
1818
end
1919

20-
gem 'mongoid'
21-
2220
case rails_version = ENV['RAILS_VERSION']
2321
when nil
2422
gem 'rails'
@@ -28,6 +26,10 @@ else
2826
gem 'rails', "~> #{rails_version}.0"
2927
end
3028

29+
gem 'mongoid' unless
30+
rails_version == 'edge'
31+
gem 'active_model_serializers'
32+
3133
case RUBY_VERSION
3234
when '2.6'...'3.0'
3335
gem "turbo-rails", "<= 2.0.7"

draper.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
2929
s.add_development_dependency 'rspec-activerecord-expectations'
3030
s.add_development_dependency 'minitest-rails'
3131
s.add_development_dependency 'capybara'
32-
s.add_development_dependency 'active_model_serializers', '>= 0.10'
3332
s.add_development_dependency 'rubocop'
3433
s.add_development_dependency 'simplecov'
3534
end

spec/dummy/.rspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
--color
21
--format progress
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
if defined?(Mongoid)
2-
class MongoidPostDecorator < Draper::Decorator
3-
end
1+
class MongoidPostDecorator < Draper::Decorator
42
end

spec/dummy/app/models/admin.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
if defined?(Devise)
2-
class Admin
3-
extend Devise::Models
4-
end
1+
class Admin
2+
extend Devise::Models if defined? Devise
53
end

spec/dummy/app/models/mongoid_post.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
if defined?(Mongoid)
2-
class MongoidPost
3-
include Mongoid::Document
4-
end
1+
class MongoidPost
2+
include Mongoid::Document if defined? Mongoid
53
end

spec/dummy/app/models/post.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
require 'turbo/broadcastable' if defined? Turbo::Broadcastable # HACK: looks weird, but works
2-
31
class Post < ApplicationRecord
42
# attr_accessible :title, :body
53

spec/dummy/app/models/user.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
if defined?(Devise)
2-
class User
3-
extend Devise::Models
4-
end
1+
class User
2+
extend Devise::Models if defined? Devise
53
end

0 commit comments

Comments
 (0)