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

Ensure multiple anonymous modules are not included into test classes #35968

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 32 additions & 18 deletions activemodel/test/cases/validations/acceptance_validation_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,23 @@
require "models/person"

class AcceptanceValidationTest < ActiveModel::TestCase
def teardown
Topic.clear_validators!
teardown do
self.class.send(:remove_const, :TestClass)
end

def test_terms_of_service_agreement_no_acceptance
Topic.validates_acceptance_of(:terms_of_service)
klass = define_test_class(Topic)
klass.validates_acceptance_of(:terms_of_service)

t = Topic.new("title" => "We should not be confirmed")
t = klass.new("title" => "We should not be confirmed")
assert_predicate t, :valid?
end

def test_terms_of_service_agreement
Topic.validates_acceptance_of(:terms_of_service)
klass = define_test_class(Topic)
klass.validates_acceptance_of(:terms_of_service)

t = Topic.new("title" => "We should be confirmed", "terms_of_service" => "")
t = klass.new("title" => "We should be confirmed", "terms_of_service" => "")
assert_predicate t, :invalid?
assert_equal ["must be accepted"], t.errors[:terms_of_service]

Expand All @@ -30,9 +32,10 @@ def test_terms_of_service_agreement
end

def test_eula
Topic.validates_acceptance_of(:eula, message: "must be abided")
klass = define_test_class(Topic)
klass.validates_acceptance_of(:eula, message: "must be abided")

t = Topic.new("title" => "We should be confirmed", "eula" => "")
t = klass.new("title" => "We should be confirmed", "eula" => "")
assert_predicate t, :invalid?
assert_equal ["must be abided"], t.errors[:eula]

Expand All @@ -41,9 +44,10 @@ def test_eula
end

def test_terms_of_service_agreement_with_accept_value
Topic.validates_acceptance_of(:terms_of_service, accept: "I agree.")
klass = define_test_class(Topic)
klass.validates_acceptance_of(:terms_of_service, accept: "I agree.")

t = Topic.new("title" => "We should be confirmed", "terms_of_service" => "")
t = klass.new("title" => "We should be confirmed", "terms_of_service" => "")
assert_predicate t, :invalid?
assert_equal ["must be accepted"], t.errors[:terms_of_service]

Expand All @@ -52,9 +56,10 @@ def test_terms_of_service_agreement_with_accept_value
end

def test_terms_of_service_agreement_with_multiple_accept_values
Topic.validates_acceptance_of(:terms_of_service, accept: [1, "I concur."])
klass = define_test_class(Topic)
klass.validates_acceptance_of(:terms_of_service, accept: [1, "I concur."])

t = Topic.new("title" => "We should be confirmed", "terms_of_service" => "")
t = klass.new("title" => "We should be confirmed", "terms_of_service" => "")
assert_predicate t, :invalid?
assert_equal ["must be accepted"], t.errors[:terms_of_service]

Expand All @@ -66,23 +71,32 @@ def test_terms_of_service_agreement_with_multiple_accept_values
end

def test_validates_acceptance_of_for_ruby_class
Person.validates_acceptance_of :karma
klass = define_test_class(Person)
klass.validates_acceptance_of :karma

p = Person.new
p = klass.new
p.karma = ""

assert_predicate p, :invalid?
assert_equal ["must be accepted"], p.errors[:karma]

p.karma = "1"
assert_predicate p, :valid?
ensure
Person.clear_validators!
end

def test_validates_acceptance_of_true
Topic.validates_acceptance_of(:terms_of_service)
klass = define_test_class(Topic)
klass.validates_acceptance_of(:terms_of_service)

assert_predicate Topic.new(terms_of_service: true), :valid?
assert_predicate klass.new(terms_of_service: true), :valid?
end

private

# Acceptance validator includes anonymous module into class, which cannot
# be cleared, so to avoid multiple inclusions we use a named subclass which
# we can remove in teardown.
def define_test_class(parent)
self.class.const_set(:TestClass, Class.new(parent))
end
end