diff options
50 files changed, 57 insertions, 57 deletions
diff --git a/activemodel/test/cases/attribute_assignment_test.rb b/activemodel/test/cases/attribute_assignment_test.rb index 30e8419685..36e279f06b 100644 --- a/activemodel/test/cases/attribute_assignment_test.rb +++ b/activemodel/test/cases/attribute_assignment_test.rb @@ -4,7 +4,7 @@ require "cases/helper" require "active_support/core_ext/hash/indifferent_access" require "active_support/hash_with_indifferent_access" -class AttributeAssignmentTest < ActiveModel::TestCase +class AttributeAssignmentTest < ActiveSupport::TestCase class Model include ActiveModel::AttributeAssignment diff --git a/activemodel/test/cases/attribute_methods_test.rb b/activemodel/test/cases/attribute_methods_test.rb index e3b3b15f25..09161dd719 100644 --- a/activemodel/test/cases/attribute_methods_test.rb +++ b/activemodel/test/cases/attribute_methods_test.rb @@ -94,7 +94,7 @@ class ModelWithoutAttributesMethod include ActiveModel::AttributeMethods end -class AttributeMethodsTest < ActiveModel::TestCase +class AttributeMethodsTest < ActiveSupport::TestCase test "method missing works correctly even if attributes method is not defined" do assert_raises(NoMethodError) { ModelWithoutAttributesMethod.new.foo } end diff --git a/activemodel/test/cases/attribute_set_test.rb b/activemodel/test/cases/attribute_set_test.rb index 62feb9074e..d1f0cd36a7 100644 --- a/activemodel/test/cases/attribute_set_test.rb +++ b/activemodel/test/cases/attribute_set_test.rb @@ -4,7 +4,7 @@ require "cases/helper" require "active_model/attribute_set" module ActiveModel - class AttributeSetTest < ActiveModel::TestCase + class AttributeSetTest < ActiveSupport::TestCase test "building a new set from raw attributes" do builder = AttributeSet::Builder.new(foo: Type::Integer.new, bar: Type::Float.new) attributes = builder.build_from_database(foo: "1.1", bar: "2.2") diff --git a/activemodel/test/cases/attribute_test.rb b/activemodel/test/cases/attribute_test.rb index 097db2e923..e11783e492 100644 --- a/activemodel/test/cases/attribute_test.rb +++ b/activemodel/test/cases/attribute_test.rb @@ -3,7 +3,7 @@ require "cases/helper" module ActiveModel - class AttributeTest < ActiveModel::TestCase + class AttributeTest < ActiveSupport::TestCase setup do @type = Minitest::Mock.new end diff --git a/activemodel/test/cases/attributes_dirty_test.rb b/activemodel/test/cases/attributes_dirty_test.rb index f9693a23cd..58244e7b79 100644 --- a/activemodel/test/cases/attributes_dirty_test.rb +++ b/activemodel/test/cases/attributes_dirty_test.rb @@ -2,7 +2,7 @@ require "cases/helper" -class AttributesDirtyTest < ActiveModel::TestCase +class AttributesDirtyTest < ActiveSupport::TestCase class DirtyModel include ActiveModel::Model include ActiveModel::Attributes diff --git a/activemodel/test/cases/attributes_test.rb b/activemodel/test/cases/attributes_test.rb index af0ddcb92f..335f151e31 100644 --- a/activemodel/test/cases/attributes_test.rb +++ b/activemodel/test/cases/attributes_test.rb @@ -3,7 +3,7 @@ require "cases/helper" module ActiveModel - class AttributesTest < ActiveModel::TestCase + class AttributesTest < ActiveSupport::TestCase class ModelForAttributesTest include ActiveModel::Model include ActiveModel::Attributes diff --git a/activemodel/test/cases/callbacks_test.rb b/activemodel/test/cases/callbacks_test.rb index 0711dc56ca..d38f773afd 100644 --- a/activemodel/test/cases/callbacks_test.rb +++ b/activemodel/test/cases/callbacks_test.rb @@ -2,7 +2,7 @@ require "cases/helper" -class CallbacksTest < ActiveModel::TestCase +class CallbacksTest < ActiveSupport::TestCase class CallbackValidator def around_create(model) model.callbacks << :before_around_create diff --git a/activemodel/test/cases/conversion_test.rb b/activemodel/test/cases/conversion_test.rb index 347896ed50..e46a2ac622 100644 --- a/activemodel/test/cases/conversion_test.rb +++ b/activemodel/test/cases/conversion_test.rb @@ -4,7 +4,7 @@ require "cases/helper" require "models/contact" require "models/helicopter" -class ConversionTest < ActiveModel::TestCase +class ConversionTest < ActiveSupport::TestCase test "to_model default implementation returns self" do contact = Contact.new assert_equal contact, contact.to_model diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb index 0edbbffa86..44f11751a0 100644 --- a/activemodel/test/cases/dirty_test.rb +++ b/activemodel/test/cases/dirty_test.rb @@ -2,7 +2,7 @@ require "cases/helper" -class DirtyTest < ActiveModel::TestCase +class DirtyTest < ActiveSupport::TestCase class DirtyModel include ActiveModel::Dirty define_attribute_methods :name, :color, :size, :status diff --git a/activemodel/test/cases/error_test.rb b/activemodel/test/cases/error_test.rb index d74321fee5..fad85cbb80 100644 --- a/activemodel/test/cases/error_test.rb +++ b/activemodel/test/cases/error_test.rb @@ -3,7 +3,7 @@ require "cases/helper" require "active_model/error" -class ErrorTest < ActiveModel::TestCase +class ErrorTest < ActiveSupport::TestCase class Person extend ActiveModel::Naming def initialize diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb index a6cd1da717..62b14df4a4 100644 --- a/activemodel/test/cases/errors_test.rb +++ b/activemodel/test/cases/errors_test.rb @@ -3,7 +3,7 @@ require "cases/helper" require "yaml" -class ErrorsTest < ActiveModel::TestCase +class ErrorsTest < ActiveSupport::TestCase class Person extend ActiveModel::Naming def initialize diff --git a/activemodel/test/cases/lint_test.rb b/activemodel/test/cases/lint_test.rb index d62c80b71a..4b1e32d506 100644 --- a/activemodel/test/cases/lint_test.rb +++ b/activemodel/test/cases/lint_test.rb @@ -2,7 +2,7 @@ require "cases/helper" -class LintTest < ActiveModel::TestCase +class LintTest < ActiveSupport::TestCase include ActiveModel::Lint::Tests class CompliantModel diff --git a/activemodel/test/cases/model_test.rb b/activemodel/test/cases/model_test.rb index b24d7e3571..c8f598306e 100644 --- a/activemodel/test/cases/model_test.rb +++ b/activemodel/test/cases/model_test.rb @@ -2,7 +2,7 @@ require "cases/helper" -class ModelTest < ActiveModel::TestCase +class ModelTest < ActiveSupport::TestCase include ActiveModel::Lint::Tests module DefaultValue diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb index 4693da434c..d1f5bc2b82 100644 --- a/activemodel/test/cases/naming_test.rb +++ b/activemodel/test/cases/naming_test.rb @@ -6,7 +6,7 @@ require "models/sheep" require "models/track_back" require "models/blog_post" -class NamingTest < ActiveModel::TestCase +class NamingTest < ActiveSupport::TestCase def setup @model_name = ActiveModel::Name.new(Post::TrackBack) end @@ -44,7 +44,7 @@ class NamingTest < ActiveModel::TestCase end end -class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveModel::TestCase +class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveSupport::TestCase def setup @model_name = ActiveModel::Name.new(Blog::Post, Blog) end @@ -82,7 +82,7 @@ class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveModel::TestCase end end -class NamingWithNamespacedModelInSharedNamespaceTest < ActiveModel::TestCase +class NamingWithNamespacedModelInSharedNamespaceTest < ActiveSupport::TestCase def setup @model_name = ActiveModel::Name.new(Blog::Post) end @@ -120,7 +120,7 @@ class NamingWithNamespacedModelInSharedNamespaceTest < ActiveModel::TestCase end end -class NamingWithSuppliedModelNameTest < ActiveModel::TestCase +class NamingWithSuppliedModelNameTest < ActiveSupport::TestCase def setup @model_name = ActiveModel::Name.new(Blog::Post, nil, "Article") end @@ -158,7 +158,7 @@ class NamingWithSuppliedModelNameTest < ActiveModel::TestCase end end -class NamingUsingRelativeModelNameTest < ActiveModel::TestCase +class NamingUsingRelativeModelNameTest < ActiveSupport::TestCase def setup @model_name = Blog::Post.model_name end @@ -196,7 +196,7 @@ class NamingUsingRelativeModelNameTest < ActiveModel::TestCase end end -class NamingHelpersTest < ActiveModel::TestCase +class NamingHelpersTest < ActiveSupport::TestCase def setup @klass = Contact @record = @klass.new @@ -262,7 +262,7 @@ class NamingHelpersTest < ActiveModel::TestCase end end -class NameWithAnonymousClassTest < ActiveModel::TestCase +class NameWithAnonymousClassTest < ActiveSupport::TestCase def test_anonymous_class_without_name_argument assert_raises(ArgumentError) do ActiveModel::Name.new(Class.new) @@ -275,7 +275,7 @@ class NameWithAnonymousClassTest < ActiveModel::TestCase end end -class NamingMethodDelegationTest < ActiveModel::TestCase +class NamingMethodDelegationTest < ActiveSupport::TestCase def test_model_name assert_equal Blog::Post.model_name, Blog::Post.new.model_name end diff --git a/activemodel/test/cases/nested_error_test.rb b/activemodel/test/cases/nested_error_test.rb index 6c2458ba83..c53355baff 100644 --- a/activemodel/test/cases/nested_error_test.rb +++ b/activemodel/test/cases/nested_error_test.rb @@ -5,7 +5,7 @@ require "active_model/nested_error" require "models/topic" require "models/reply" -class NestedErrorTest < ActiveModel::TestCase +class NestedErrorTest < ActiveSupport::TestCase def test_initialize topic = Topic.new inner_error = ActiveModel::Error.new(topic, :title, :not_enough, count: 2) diff --git a/activemodel/test/cases/railtie_test.rb b/activemodel/test/cases/railtie_test.rb index f5ff1a3fd7..53f326a36b 100644 --- a/activemodel/test/cases/railtie_test.rb +++ b/activemodel/test/cases/railtie_test.rb @@ -3,7 +3,7 @@ require "cases/helper" require "active_support/testing/isolation" -class RailtieTest < ActiveModel::TestCase +class RailtieTest < ActiveSupport::TestCase include ActiveSupport::Testing::Isolation def setup diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb index 0aca714bd2..9ce9f696f0 100644 --- a/activemodel/test/cases/secure_password_test.rb +++ b/activemodel/test/cases/secure_password_test.rb @@ -4,7 +4,7 @@ require "cases/helper" require "models/user" require "models/visitor" -class SecurePasswordTest < ActiveModel::TestCase +class SecurePasswordTest < ActiveSupport::TestCase setup do # Used only to speed up tests @original_min_cost = ActiveModel::SecurePassword.min_cost diff --git a/activemodel/test/cases/serialization_test.rb b/activemodel/test/cases/serialization_test.rb index 6826d2bbd1..c2484aaa37 100644 --- a/activemodel/test/cases/serialization_test.rb +++ b/activemodel/test/cases/serialization_test.rb @@ -3,7 +3,7 @@ require "cases/helper" require "active_support/core_ext/object/instance_variables" -class SerializationTest < ActiveModel::TestCase +class SerializationTest < ActiveSupport::TestCase class User include ActiveModel::Serialization diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb index 84efc8de0d..871eab36e2 100644 --- a/activemodel/test/cases/serializers/json_serialization_test.rb +++ b/activemodel/test/cases/serializers/json_serialization_test.rb @@ -4,7 +4,7 @@ require "cases/helper" require "models/contact" require "active_support/core_ext/object/instance_variables" -class JsonSerializationTest < ActiveModel::TestCase +class JsonSerializationTest < ActiveSupport::TestCase def setup @contact = Contact.new @contact.name = "Konata Izumi" diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb index cd75afec9e..1cc7246477 100644 --- a/activemodel/test/cases/translation_test.rb +++ b/activemodel/test/cases/translation_test.rb @@ -3,7 +3,7 @@ require "cases/helper" require "models/person" -class ActiveModelI18nTests < ActiveModel::TestCase +class ActiveModelI18nTests < ActiveSupport::TestCase def setup I18n.backend = I18n::Backend::Simple.new end diff --git a/activemodel/test/cases/type/big_integer_test.rb b/activemodel/test/cases/type/big_integer_test.rb index 0fa0200df4..1ab0abe9ce 100644 --- a/activemodel/test/cases/type/big_integer_test.rb +++ b/activemodel/test/cases/type/big_integer_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class BigIntegerTest < ActiveModel::TestCase + class BigIntegerTest < ActiveSupport::TestCase def test_type_cast_big_integer type = Type::BigInteger.new assert_equal 1, type.cast(1) diff --git a/activemodel/test/cases/type/binary_test.rb b/activemodel/test/cases/type/binary_test.rb index 3221a73e49..b04b59f8dd 100644 --- a/activemodel/test/cases/type/binary_test.rb +++ b/activemodel/test/cases/type/binary_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class BinaryTest < ActiveModel::TestCase + class BinaryTest < ActiveSupport::TestCase def test_type_cast_binary type = Type::Binary.new assert_nil type.cast(nil) diff --git a/activemodel/test/cases/type/boolean_test.rb b/activemodel/test/cases/type/boolean_test.rb index 7f8490b2fe..30c41ca80c 100644 --- a/activemodel/test/cases/type/boolean_test.rb +++ b/activemodel/test/cases/type/boolean_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class BooleanTest < ActiveModel::TestCase + class BooleanTest < ActiveSupport::TestCase def test_type_cast_boolean type = Type::Boolean.new assert_predicate type.cast(""), :nil? diff --git a/activemodel/test/cases/type/date_test.rb b/activemodel/test/cases/type/date_test.rb index 2dd1a55616..38649c4471 100644 --- a/activemodel/test/cases/type/date_test.rb +++ b/activemodel/test/cases/type/date_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class DateTest < ActiveModel::TestCase + class DateTest < ActiveSupport::TestCase def test_type_cast_date type = Type::Date.new assert_nil type.cast(nil) diff --git a/activemodel/test/cases/type/date_time_test.rb b/activemodel/test/cases/type/date_time_test.rb index 4a63eee0cf..68dd4995d0 100644 --- a/activemodel/test/cases/type/date_time_test.rb +++ b/activemodel/test/cases/type/date_time_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class DateTimeTest < ActiveModel::TestCase + class DateTimeTest < ActiveSupport::TestCase def test_type_cast_datetime_and_timestamp type = Type::DateTime.new assert_nil type.cast(nil) diff --git a/activemodel/test/cases/type/decimal_test.rb b/activemodel/test/cases/type/decimal_test.rb index be60c4f7fa..af89ef309b 100644 --- a/activemodel/test/cases/type/decimal_test.rb +++ b/activemodel/test/cases/type/decimal_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class DecimalTest < ActiveModel::TestCase + class DecimalTest < ActiveSupport::TestCase def test_type_cast_decimal type = Decimal.new assert_equal BigDecimal("0"), type.cast(BigDecimal("0")) diff --git a/activemodel/test/cases/type/float_test.rb b/activemodel/test/cases/type/float_test.rb index 230a8dda32..2b2c99b8ce 100644 --- a/activemodel/test/cases/type/float_test.rb +++ b/activemodel/test/cases/type/float_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class FloatTest < ActiveModel::TestCase + class FloatTest < ActiveSupport::TestCase def test_type_cast_float type = Type::Float.new assert_equal 1.0, type.cast("1") diff --git a/activemodel/test/cases/type/immutable_string_test.rb b/activemodel/test/cases/type/immutable_string_test.rb index 751f753ddb..b3140c2682 100644 --- a/activemodel/test/cases/type/immutable_string_test.rb +++ b/activemodel/test/cases/type/immutable_string_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class ImmutableStringTest < ActiveModel::TestCase + class ImmutableStringTest < ActiveSupport::TestCase test "cast strings are frozen" do s = "foo" type = Type::ImmutableString.new diff --git a/activemodel/test/cases/type/integer_test.rb b/activemodel/test/cases/type/integer_test.rb index 6c02c01237..79bd7ee95d 100644 --- a/activemodel/test/cases/type/integer_test.rb +++ b/activemodel/test/cases/type/integer_test.rb @@ -5,7 +5,7 @@ require "active_support/core_ext/numeric/time" module ActiveModel module Type - class IntegerTest < ActiveModel::TestCase + class IntegerTest < ActiveSupport::TestCase test "simple values" do type = Type::Integer.new assert_nil type.cast("") diff --git a/activemodel/test/cases/type/registry_test.rb b/activemodel/test/cases/type/registry_test.rb index 0633ea2538..2afc54f1f5 100644 --- a/activemodel/test/cases/type/registry_test.rb +++ b/activemodel/test/cases/type/registry_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class RegistryTest < ActiveModel::TestCase + class RegistryTest < ActiveSupport::TestCase test "a class can be registered for a symbol" do registry = Type::Registry.new registry.register(:foo, ::String) diff --git a/activemodel/test/cases/type/string_test.rb b/activemodel/test/cases/type/string_test.rb index 9cc530e8db..999368fd13 100644 --- a/activemodel/test/cases/type/string_test.rb +++ b/activemodel/test/cases/type/string_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class StringTest < ActiveModel::TestCase + class StringTest < ActiveSupport::TestCase test "type casting" do type = Type::String.new assert_equal "t", type.cast(true) diff --git a/activemodel/test/cases/type/time_test.rb b/activemodel/test/cases/type/time_test.rb index 5c6271241d..095dbd6d83 100644 --- a/activemodel/test/cases/type/time_test.rb +++ b/activemodel/test/cases/type/time_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class TimeTest < ActiveModel::TestCase + class TimeTest < ActiveSupport::TestCase def test_type_cast_time type = Type::Time.new assert_nil type.cast(nil) diff --git a/activemodel/test/cases/type/value_test.rb b/activemodel/test/cases/type/value_test.rb index 55b5d9d584..6edacb9833 100644 --- a/activemodel/test/cases/type/value_test.rb +++ b/activemodel/test/cases/type/value_test.rb @@ -4,7 +4,7 @@ require "cases/helper" module ActiveModel module Type - class ValueTest < ActiveModel::TestCase + class ValueTest < ActiveSupport::TestCase def test_type_equality assert_equal Type::Value.new, Type::Value.new assert_not_equal Type::Value.new, Type::Integer.new diff --git a/activemodel/test/cases/validations/absence_validation_test.rb b/activemodel/test/cases/validations/absence_validation_test.rb index 8bc4f4723a..1701acd568 100644 --- a/activemodel/test/cases/validations/absence_validation_test.rb +++ b/activemodel/test/cases/validations/absence_validation_test.rb @@ -5,7 +5,7 @@ require "models/topic" require "models/person" require "models/custom_reader" -class AbsenceValidationTest < ActiveModel::TestCase +class AbsenceValidationTest < ActiveSupport::TestCase teardown do Topic.clear_validators! Person.clear_validators! diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb index 6bd3d292f8..3cdebec1ac 100644 --- a/activemodel/test/cases/validations/acceptance_validation_test.rb +++ b/activemodel/test/cases/validations/acceptance_validation_test.rb @@ -6,7 +6,7 @@ require "models/topic" require "models/reply" require "models/person" -class AcceptanceValidationTest < ActiveModel::TestCase +class AcceptanceValidationTest < ActiveSupport::TestCase teardown do self.class.send(:remove_const, :TestClass) end diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb index ff3cf61746..65b5ee1e57 100644 --- a/activemodel/test/cases/validations/callbacks_test.rb +++ b/activemodel/test/cases/validations/callbacks_test.rb @@ -85,7 +85,7 @@ class DogValidatorWithIfCondition < Dog def set_after_validation_marker2; history << "after_validation_marker2" ; end end -class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase +class CallbacksWithMethodNamesShouldBeCalled < ActiveSupport::TestCase def test_if_condition_is_respected_for_before_validation d = DogValidatorWithIfCondition.new d.valid? diff --git a/activemodel/test/cases/validations/conditional_validation_test.rb b/activemodel/test/cases/validations/conditional_validation_test.rb index 9674068aff..e82aa2eacb 100644 --- a/activemodel/test/cases/validations/conditional_validation_test.rb +++ b/activemodel/test/cases/validations/conditional_validation_test.rb @@ -4,7 +4,7 @@ require "cases/helper" require "models/topic" -class ConditionalValidationTest < ActiveModel::TestCase +class ConditionalValidationTest < ActiveSupport::TestCase def teardown Topic.clear_validators! end diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb index 7bf15e4bee..9a289e77ea 100644 --- a/activemodel/test/cases/validations/confirmation_validation_test.rb +++ b/activemodel/test/cases/validations/confirmation_validation_test.rb @@ -5,7 +5,7 @@ require "cases/helper" require "models/topic" require "models/person" -class ConfirmationValidationTest < ActiveModel::TestCase +class ConfirmationValidationTest < ActiveSupport::TestCase def teardown Topic.clear_validators! end diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb index 50bd47065c..389195a8ad 100644 --- a/activemodel/test/cases/validations/exclusion_validation_test.rb +++ b/activemodel/test/cases/validations/exclusion_validation_test.rb @@ -6,7 +6,7 @@ require "active_support/core_ext/numeric/time" require "models/topic" require "models/person" -class ExclusionValidationTest < ActiveModel::TestCase +class ExclusionValidationTest < ActiveSupport::TestCase def teardown Topic.clear_validators! end diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb index 2a7088b3e8..feae66602c 100644 --- a/activemodel/test/cases/validations/format_validation_test.rb +++ b/activemodel/test/cases/validations/format_validation_test.rb @@ -5,7 +5,7 @@ require "cases/helper" require "models/topic" require "models/person" -class FormatValidationTest < ActiveModel::TestCase +class FormatValidationTest < ActiveSupport::TestCase def teardown Topic.clear_validators! end diff --git a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb index d3e44945db..e9adc7d446 100644 --- a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb +++ b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb @@ -4,7 +4,7 @@ require "cases/helper" require "models/person" -class I18nGenerateMessageValidationTest < ActiveModel::TestCase +class I18nGenerateMessageValidationTest < ActiveSupport::TestCase def setup Person.clear_validators! @person = Person.new diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb index c81649f493..aaa3e4909d 100644 --- a/activemodel/test/cases/validations/i18n_validation_test.rb +++ b/activemodel/test/cases/validations/i18n_validation_test.rb @@ -3,7 +3,7 @@ require "cases/helper" require "models/person" -class I18nValidationTest < ActiveModel::TestCase +class I18nValidationTest < ActiveSupport::TestCase def setup Person.clear_validators! @person = person_class.new diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb index 6669d028a0..3469dd5e9d 100644 --- a/activemodel/test/cases/validations/inclusion_validation_test.rb +++ b/activemodel/test/cases/validations/inclusion_validation_test.rb @@ -5,7 +5,7 @@ require "cases/helper" require "models/topic" require "models/person" -class InclusionValidationTest < ActiveModel::TestCase +class InclusionValidationTest < ActiveSupport::TestCase def teardown Topic.clear_validators! end diff --git a/activemodel/test/cases/validations/length_validation_test.rb b/activemodel/test/cases/validations/length_validation_test.rb index 37e10f783c..7d59b9a035 100644 --- a/activemodel/test/cases/validations/length_validation_test.rb +++ b/activemodel/test/cases/validations/length_validation_test.rb @@ -5,7 +5,7 @@ require "cases/helper" require "models/topic" require "models/person" -class LengthValidationTest < ActiveModel::TestCase +class LengthValidationTest < ActiveSupport::TestCase def teardown Topic.clear_validators! end diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb index 191af033df..c8afc02894 100644 --- a/activemodel/test/cases/validations/numericality_validation_test.rb +++ b/activemodel/test/cases/validations/numericality_validation_test.rb @@ -8,7 +8,7 @@ require "models/person" require "bigdecimal" require "active_support/core_ext/big_decimal" -class NumericalityValidationTest < ActiveModel::TestCase +class NumericalityValidationTest < ActiveSupport::TestCase def teardown Topic.clear_validators! end diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb index c3eca41070..ca91b49528 100644 --- a/activemodel/test/cases/validations/presence_validation_test.rb +++ b/activemodel/test/cases/validations/presence_validation_test.rb @@ -6,7 +6,7 @@ require "models/topic" require "models/person" require "models/custom_reader" -class PresenceValidationTest < ActiveModel::TestCase +class PresenceValidationTest < ActiveSupport::TestCase teardown do Topic.clear_validators! Person.clear_validators! diff --git a/activemodel/test/cases/validations/validates_test.rb b/activemodel/test/cases/validations/validates_test.rb index ae5a875c24..090274c0b5 100644 --- a/activemodel/test/cases/validations/validates_test.rb +++ b/activemodel/test/cases/validations/validates_test.rb @@ -6,7 +6,7 @@ require "models/topic" require "models/person_with_validator" require "validators/namespace/email_validator" -class ValidatesTest < ActiveModel::TestCase +class ValidatesTest < ActiveSupport::TestCase setup :reset_callbacks teardown :reset_callbacks diff --git a/activemodel/test/cases/validations/validations_context_test.rb b/activemodel/test/cases/validations/validations_context_test.rb index 3d2dea9828..0f5aee0751 100644 --- a/activemodel/test/cases/validations/validations_context_test.rb +++ b/activemodel/test/cases/validations/validations_context_test.rb @@ -4,7 +4,7 @@ require "cases/helper" require "models/topic" -class ValidationsContextTest < ActiveModel::TestCase +class ValidationsContextTest < ActiveSupport::TestCase def teardown Topic.clear_validators! end diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb index e6ae6603f2..6d00ece108 100644 --- a/activemodel/test/cases/validations/with_validation_test.rb +++ b/activemodel/test/cases/validations/with_validation_test.rb @@ -4,7 +4,7 @@ require "cases/helper" require "models/topic" -class ValidatesWithTest < ActiveModel::TestCase +class ValidatesWithTest < ActiveSupport::TestCase def teardown Topic.clear_validators! end diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb index 0b9e1b7005..6565560e29 100644 --- a/activemodel/test/cases/validations_test.rb +++ b/activemodel/test/cases/validations_test.rb @@ -9,7 +9,7 @@ require "models/custom_reader" require "active_support/json" require "active_support/xml_mini" -class ValidationsTest < ActiveModel::TestCase +class ValidationsTest < ActiveSupport::TestCase class CustomStrictValidationException < StandardError; end def teardown |