Skip to content

Commit f85ff96

Browse files
AlexKovynevAlexKovynevcomandeo-mongo
authored
MONGOID-5806 Rails 7.2 Support (#5852)
Co-authored-by: AlexKovynev <alexkovynev@gmail.com> Co-authored-by: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
1 parent 69eaf1d commit f85ff96

File tree

6 files changed

+40
-14
lines changed

6 files changed

+40
-14
lines changed

.evergreen/config.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,10 @@ axes:
583583
display_name: "Rails 7.1"
584584
variables:
585585
RAILS: "7.1"
586+
- id: "7.2"
587+
display_name: "Rails 7.2"
588+
variables:
589+
RAILS: "7.2"
586590

587591
- id: "test-i18n-fallbacks"
588592
display_name: Test i18n fallbacks
@@ -717,7 +721,7 @@ buildvariants:
717721
driver: ["current"]
718722
mongodb-version: "6.0"
719723
topology: "standalone"
720-
rails: ['7.0', '7.1']
724+
rails: ['7.0', '7.1', '7.2']
721725
os: ubuntu-22.04
722726
fle: helper
723727
display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
@@ -778,7 +782,7 @@ buildvariants:
778782
mongodb-version: '6.0'
779783
topology: standalone
780784
app-tests: yes
781-
rails: ['6.1', '7.0', '7.1']
785+
rails: ['6.1', '7.0', '7.1', '7.2']
782786
os: ubuntu-20.04
783787
display_name: "app tests ${driver}, ${ruby}, ${rails}"
784788
tasks:

.evergreen/config/axes.yml.erb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,10 @@ axes:
210210
display_name: "Rails 7.1"
211211
variables:
212212
RAILS: "7.1"
213+
- id: "7.2"
214+
display_name: "Rails 7.2"
215+
variables:
216+
RAILS: "7.2"
213217

214218
- id: "test-i18n-fallbacks"
215219
display_name: Test i18n fallbacks

.evergreen/config/variants.yml.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ buildvariants:
104104
driver: ["current"]
105105
mongodb-version: "6.0"
106106
topology: "standalone"
107-
rails: ['7.0', '7.1']
107+
rails: ['7.0', '7.1', '7.2']
108108
os: ubuntu-22.04
109109
fle: helper
110110
display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
@@ -165,7 +165,7 @@ buildvariants:
165165
mongodb-version: '6.0'
166166
topology: standalone
167167
app-tests: yes
168-
rails: ['6.1', '7.0', '7.1']
168+
rails: ['6.1', '7.0', '7.1', '7.2']
169169
os: ubuntu-20.04
170170
display_name: "app tests ${driver}, ${ruby}, ${rails}"
171171
tasks:

gemfiles/rails-7.2.gemfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# rubocop:todo all
2+
source 'https://rubygems.org'
3+
4+
gem 'actionpack', '~> 7.2'
5+
gem 'activemodel', '~> 7.2'
6+
7+
gemspec path: '..'
8+
9+
require_relative './standard'
10+
11+
standard_dependencies

mongoid.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
3838
# Ruby 3.0 requires ActiveModel 6.0 or higher.
3939
# activemodel 7.0.0 cannot be used due to Class#descendants issue
4040
# See: https://github.com/rails/rails/pull/43951
41-
s.add_dependency("activemodel", ['>=5.1', '<7.2', '!= 7.0.0'])
41+
s.add_dependency("activemodel", ['>=5.1', '<7.3', '!= 7.0.0'])
4242
s.add_dependency("mongo", ['>=2.18.0', '<3.0.0'])
4343
s.add_dependency("concurrent-ruby", ['>= 1.0.5', '< 2.0'])
4444

spec/mongoid/serializable_spec.rb

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -511,13 +511,15 @@
511511
end
512512

513513
it "includes the first relation" do
514-
expect(relation_hash[0]).to include
514+
expect(relation_hash[0]).to include(
515515
{ "_id" => "kudamm", "street" => "Kudamm" }
516+
)
516517
end
517518

518519
it "includes the second relation" do
519-
expect(relation_hash[1]).to include
520+
expect(relation_hash[1]).to include(
520521
{ "_id" => "tauentzienstr", "street" => "Tauentzienstr" }
522+
)
521523
end
522524
end
523525

@@ -528,13 +530,15 @@
528530
end
529531

530532
it "includes the first relation" do
531-
expect(relation_hash[0]).to include
533+
expect(relation_hash[0]).to include(
532534
{ "_id" => "kudamm", "street" => "Kudamm" }
535+
)
533536
end
534537

535538
it "includes the second relation" do
536-
expect(relation_hash[1]).to include
539+
expect(relation_hash[1]).to include(
537540
{ "_id" => "tauentzienstr", "street" => "Tauentzienstr" }
541+
)
538542
end
539543
end
540544

@@ -653,8 +657,9 @@
653657
end
654658

655659
it "includes the specified relation" do
656-
expect(relation_hash).to include
657-
{ "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" }
660+
expect(relation_hash).to include(
661+
{ "_id" => "Leo-Marvin", "first_name" => "Leo", "last_name" => "Marvin" }
662+
)
658663
end
659664
end
660665

@@ -665,8 +670,9 @@
665670
end
666671

667672
it "includes the specified relation" do
668-
expect(relation_hash).to include
669-
{ "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" }
673+
expect(relation_hash).to include(
674+
{ "_id" => "Leo-Marvin", "first_name" => "Leo", "last_name" => "Marvin" }
675+
)
670676
end
671677
end
672678

@@ -677,8 +683,9 @@
677683
end
678684

679685
it "includes the specified relation sans exceptions" do
680-
expect(relation_hash).to include
686+
expect(relation_hash).to include(
681687
{ "first_name" => "Leo", "last_name" => "Marvin" }
688+
)
682689
end
683690
end
684691
end

0 commit comments

Comments
 (0)