Skip to content

Commit 3b8d4da

Browse files
authored
Merge pull request rails#55085 from Earlopain/namespaced
Avoid a module named `Namespace` for Ruby 3.5
2 parents 9eb52bf + 8eb2c6f commit 3b8d4da

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

activemodel/test/cases/validations/validates_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require "models/person"
55
require "models/topic"
66
require "models/person_with_validator"
7-
require "validators/namespace/email_validator"
7+
require "validators/namespaced/email_validator"
88

99
class ValidatesTest < ActiveModel::TestCase
1010
setup :reset_callbacks
@@ -55,7 +55,7 @@ def test_validates_with_validator_class
5555
end
5656

5757
def test_validates_with_namespaced_validator_class
58-
Person.validates :karma, 'namespace/email': true
58+
Person.validates :karma, 'namespaced/email': true
5959
person = Person.new
6060
person.valid?
6161
assert_equal ["is not an email"], person.errors[:karma]

activemodel/test/validators/namespace/email_validator.rb renamed to activemodel/test/validators/namespaced/email_validator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require "validators/email_validator"
44

5-
module Namespace
5+
module Namespaced
66
class EmailValidator < ::EmailValidator
77
end
88
end

0 commit comments

Comments
 (0)