Skip to content

Commit 7bc66c5

Browse files
committed
Merge pull request #1385 from bf4/remove_raw_minitest_test
Favor ActiveSupport::TestCase over Minitest::Test
2 parents a4d5e38 + 419faf0 commit 7bc66c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+50
-50
lines changed

test/active_model_serializers/logging_test.rb

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

33
module ActiveModel
44
class Serializer
5-
class LoggingTest < Minitest::Test
5+
class LoggingTest < ActiveSupport::TestCase
66
class TestLogger < ActiveSupport::Logger
77
def initialize
88
@file = StringIO.new

test/active_model_serializers/model_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'test_helper'
22

3-
class ActiveModelSerializers::ModelTest < Minitest::Test
3+
class ActiveModelSerializers::ModelTest < ActiveSupport::TestCase
44
include ActiveModel::Serializer::Lint::Tests
55

66
def setup

test/active_model_serializers/serialization_context_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'test_helper'
22

3-
class ActiveModelSerializers::SerializationContextTest < Minitest::Test
3+
class ActiveModelSerializers::SerializationContextTest < ActiveSupport::TestCase
44
def create_context
55
request = Minitest::Mock.new
66
request.expect(:original_url, 'original_url')

test/active_record_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'test_helper'
22

3-
class ActiveRecordTest < Minitest::Test
3+
class ActiveRecordTest < ActiveSupport::TestCase
44
include ActiveModel::Serializer::Lint::Tests
55

66
def setup

test/adapter/fragment_cache_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
module ActiveModel
33
class Serializer
44
module Adapter
5-
class FragmentCacheTest < Minitest::Test
5+
class FragmentCacheTest < ActiveSupport::TestCase
66
def setup
77
super
88
@spam = Spam::UnrelatedLink.new(id: 'spam-id-1')

test/adapter/json/belongs_to_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class Json
7-
class BelongsToTest < Minitest::Test
7+
class BelongsToTest < ActiveSupport::TestCase
88
def setup
99
@post = Post.new(id: 42, title: 'New Post', body: 'Body')
1010
@anonymous_post = Post.new(id: 43, title: 'Hello!!', body: 'Hello, world!!')

test/adapter/json/collection_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class Json
7-
class Collection < Minitest::Test
7+
class Collection < ActiveSupport::TestCase
88
def setup
99
@author = Author.new(id: 1, name: 'Steve K.')
1010
@first_post = Post.new(id: 1, title: 'Hello!!', body: 'Hello, world!!')

test/adapter/json/has_many_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class Json
7-
class HasManyTestTest < Minitest::Test
7+
class HasManyTestTest < ActiveSupport::TestCase
88
def setup
99
ActionController::Base.cache_store.clear
1010
@author = Author.new(id: 1, name: 'Steve K.')

test/adapter/json_api/belongs_to_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class JsonApi
7-
class BelongsToTest < Minitest::Test
7+
class BelongsToTest < ActiveSupport::TestCase
88
def setup
99
@author = Author.new(id: 1, name: 'Steve K.')
1010
@author.bio = nil

test/adapter/json_api/collection_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class JsonApi
7-
class CollectionTest < Minitest::Test
7+
class CollectionTest < ActiveSupport::TestCase
88
def setup
99
@author = Author.new(id: 1, name: 'Steve K.')
1010
@author.bio = nil

test/adapter/json_api/fields_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class JsonApi
7-
class FieldsTest < Minitest::Test
7+
class FieldsTest < ActiveSupport::TestCase
88
Post = Class.new(::Model)
99
class PostSerializer < ActiveModel::Serializer
1010
type 'posts'

test/adapter/json_api/has_many_embed_ids_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class JsonApi
7-
class HasManyEmbedIdsTest < Minitest::Test
7+
class HasManyEmbedIdsTest < ActiveSupport::TestCase
88
def setup
99
@author = Author.new(name: 'Steve K.')
1010
@author.bio = nil

test/adapter/json_api/has_many_explicit_serializer_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class Serializer
55
module Adapter
66
class JsonApi
77
# Test 'has_many :assocs, serializer: AssocXSerializer'
8-
class HasManyExplicitSerializerTest < Minitest::Test
8+
class HasManyExplicitSerializerTest < ActiveSupport::TestCase
99
def setup
1010
@post = Post.new(title: 'New Post', body: 'Body')
1111
@author = Author.new(name: 'Jane Blogger')

test/adapter/json_api/has_many_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class JsonApi
7-
class HasManyTest < Minitest::Test
7+
class HasManyTest < ActiveSupport::TestCase
88
def setup
99
ActionController::Base.cache_store.clear
1010
@author = Author.new(id: 1, name: 'Steve K.')

test/adapter/json_api/has_one_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class JsonApi
7-
class HasOneTest < Minitest::Test
7+
class HasOneTest < ActiveSupport::TestCase
88
def setup
99
@author = Author.new(id: 1, name: 'Steve K.')
1010
@bio = Bio.new(id: 43, content: 'AMS Contributor')

test/adapter/json_api/json_api_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module ActiveModel
44
class Serializer
55
module Adapter
6-
class JsonApiTest < Minitest::Test
6+
class JsonApiTest < ActiveSupport::TestCase
77
def setup
88
ActionController::Base.cache_store.clear
99
@author = Author.new(id: 1, name: 'Steve K.')

test/adapter/json_api/linked_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module ActiveModel
99
class Serializer
1010
module Adapter
1111
class JsonApi
12-
class LinkedTest < Minitest::Test
12+
class LinkedTest < ActiveSupport::TestCase
1313
def setup
1414
@author1 = Author.new(id: 1, name: 'Steve K.')
1515
@author2 = Author.new(id: 2, name: 'Tenderlove')
@@ -283,7 +283,7 @@ def test_nil_link_with_specified_serializer
283283
end
284284
end
285285

286-
class NoDuplicatesTest < Minitest::Test
286+
class NoDuplicatesTest < ActiveSupport::TestCase
287287
Post = Class.new(::Model)
288288
Author = Class.new(::Model)
289289

test/adapter/json_api/links_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class JsonApi
7-
class LinksTest < Minitest::Test
7+
class LinksTest < ActiveSupport::TestCase
88
LinkAuthor = Class.new(::Model)
99
class LinkAuthorSerializer < ActiveModel::Serializer
1010
link :self do

test/adapter/json_api/pagination_links_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module ActiveModel
88
class Serializer
99
module Adapter
1010
class JsonApi
11-
class PaginationLinksTest < Minitest::Test
11+
class PaginationLinksTest < ActiveSupport::TestCase
1212
URI = 'http://example.com'
1313

1414
def setup

test/adapter/json_api/resource_type_config_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class JsonApi
7-
class ResourceTypeConfigTest < Minitest::Test
7+
class ResourceTypeConfigTest < ActiveSupport::TestCase
88
class ProfileTypeSerializer < ActiveModel::Serializer
99
attributes :name
1010
type 'profile'

test/adapter/json_api/toplevel_jsonapi_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModel
44
class Serializer
55
module Adapter
66
class JsonApi
7-
class TopLevelJsonApiTest < Minitest::Test
7+
class TopLevelJsonApiTest < ActiveSupport::TestCase
88
def setup
99
@author = Author.new(id: 1, name: 'Steve K.')
1010
@author.bio = nil

test/adapter/json_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module ActiveModel
44
class Serializer
55
module Adapter
6-
class JsonTest < Minitest::Test
6+
class JsonTest < ActiveSupport::TestCase
77
def setup
88
ActionController::Base.cache_store.clear
99
@author = Author.new(id: 1, name: 'Steve K.')

test/adapter/null_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module ActiveModel
44
class Serializer
55
module Adapter
6-
class NullTest < Minitest::Test
6+
class NullTest < ActiveSupport::TestCase
77
def setup
88
profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
99
serializer = ProfileSerializer.new(profile)

test/adapter_test.rb

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

33
module ActiveModel
44
class Serializer
5-
class AdapterTest < Minitest::Test
5+
class AdapterTest < ActiveSupport::TestCase
66
def setup
77
profile = Profile.new
88
@serializer = ProfileSerializer.new(profile)

test/array_serializer_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def collection_serializer
2121
end
2222
end
2323
else
24-
class ArraySerializerTest < Minitest::Test
24+
class ArraySerializerTest < ActiveSupport::TestCase
2525
extend ActiveSupport::Testing::Stream
2626
def test_json_key_with_root_warns_when_using_array_serializer
2727
stderr = (capture(:stderr) do

test/collection_serializer_test.rb

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

33
module ActiveModel
44
class Serializer
5-
class CollectionSerializerTest < Minitest::Test
5+
class CollectionSerializerTest < ActiveSupport::TestCase
66
def setup
77
@comment = Comment.new
88
@post = Post.new

test/grape_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'grape'
33
require 'grape/active_model_serializers'
44

5-
class ActiveModelSerializers::GrapeTest < Minitest::Test
5+
class ActiveModelSerializers::GrapeTest < ActiveSupport::TestCase
66
include Rack::Test::Methods
77
module Models
88
def self.model1

test/include_tree/from_include_args_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module ActiveModel
44
class Serializer
55
class IncludeTree
6-
class FromStringTest < Minitest::Test
6+
class FromStringTest < ActiveSupport::TestCase
77
def test_simple_array
88
input = [:comments, :author]
99
actual = ActiveModel::Serializer::IncludeTree.from_include_args(input)

test/include_tree/from_string_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module ActiveModel
44
class Serializer
55
class IncludeTree
6-
class FromStringTest < Minitest::Test
6+
class FromStringTest < ActiveSupport::TestCase
77
def test_single_string
88
input = 'author'
99
actual = ActiveModel::Serializer::IncludeTree.from_string(input)

test/lint_test.rb

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

33
module ActiveModel
44
class Serializer
5-
class LintTest < Minitest::Test
5+
class LintTest < ActiveSupport::TestCase
66
include ActiveModel::Serializer::Lint::Tests
77

88
class CompliantResource

test/logger_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'test_helper'
22

3-
class ActiveModelSerializers::LoggerTest < Minitest::Test
3+
class ActiveModelSerializers::LoggerTest < ActiveSupport::TestCase
44
def test_logger_is_set_to_action_controller_logger_when_initializer_runs
55
assert_equal $action_controller_logger, ActionController::Base.logger # rubocop:disable Style/GlobalVars
66
end

test/poro_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'test_helper'
22

3-
class PoroTest < Minitest::Test
3+
class PoroTest < ActiveSupport::TestCase
44
include ActiveModel::Serializer::Lint::Tests
55

66
def setup

test/serializable_resource_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'test_helper'
22

33
module ActiveModel
4-
class SerializableResourceTest < Minitest::Test
4+
class SerializableResourceTest < ActiveSupport::TestCase
55
def setup
66
@resource = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
77
@serializer = ProfileSerializer.new(@resource)

test/serializers/adapter_for_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module ActiveModel
22
class Serializer
3-
class AdapterForTest < Minitest::Test
3+
class AdapterForTest < ActiveSupport::TestCase
44
UnknownAdapterError = ::ActiveModel::Serializer::Adapter::UnknownAdapterError
55

66
def setup

test/serializers/association_macros_test.rb

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

33
module ActiveModel
44
class Serializer
5-
class AssociationMacrosTest < Minitest::Test
5+
class AssociationMacrosTest < ActiveSupport::TestCase
66
AuthorSummarySerializer = Class.new
77
class AssociationsTestSerializer < Serializer
88
belongs_to :author, serializer: AuthorSummarySerializer

test/serializers/associations_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module ActiveModel
44
class Serializer
5-
class AssociationsTest < Minitest::Test
5+
class AssociationsTest < ActiveSupport::TestCase
66
def setup
77
@author = Author.new(name: 'Steve K.')
88
@author.bio = nil
@@ -158,7 +158,7 @@ def test_virtual_attribute_block
158158
::ARModels::Comment.delete_all
159159
end
160160

161-
class NamespacedResourcesTest < Minitest::Test
161+
class NamespacedResourcesTest < ActiveSupport::TestCase
162162
class ResourceNamespace
163163
Post = Class.new(::Model)
164164
Comment = Class.new(::Model)
@@ -200,7 +200,7 @@ def test_associations_namespaced_resources
200200
end
201201
end
202202

203-
class NestedSerializersTest < Minitest::Test
203+
class NestedSerializersTest < ActiveSupport::TestCase
204204
Post = Class.new(::Model)
205205
Comment = Class.new(::Model)
206206
Author = Class.new(::Model)

test/serializers/attribute_test.rb

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

33
module ActiveModel
44
class Serializer
5-
class AttributeTest < Minitest::Test
5+
class AttributeTest < ActiveSupport::TestCase
66
def setup
77
@blog = Blog.new({ id: 1, name: 'AMS Hints', type: 'stuff' })
88
@blog_serializer = AlternateBlogSerializer.new(@blog)

test/serializers/attributes_test.rb

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

33
module ActiveModel
44
class Serializer
5-
class AttributesTest < Minitest::Test
5+
class AttributesTest < ActiveSupport::TestCase
66
def setup
77
@profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
88
@profile_serializer = ProfileSerializer.new(@profile)

test/serializers/cache_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'tempfile'
44
module ActiveModel
55
class Serializer
6-
class CacheTest < Minitest::Test
6+
class CacheTest < ActiveSupport::TestCase
77
include ActiveSupport::Testing::Stream
88

99
def setup

test/serializers/configuration_test.rb

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

33
module ActiveModel
44
class Serializer
5-
class ConfigurationTest < Minitest::Test
5+
class ConfigurationTest < ActiveSupport::TestCase
66
def test_collection_serializer
77
assert_equal ActiveModel::Serializer::CollectionSerializer, ActiveModelSerializers.config.collection_serializer
88
end

test/serializers/fieldset_test.rb

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

33
module ActiveModel
44
class Serializer
5-
class FieldsetTest < Minitest::Test
5+
class FieldsetTest < ActiveSupport::TestCase
66
def test_fieldset_with_hash
77
fieldset = ActiveModel::Serializer::Fieldset.new('post' => %w(id title), 'comment' => ['body'])
88
expected = { :post => [:id, :title], :comment => [:body] }

test/serializers/meta_test.rb

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

33
module ActiveModel
44
class Serializer
5-
class MetaTest < Minitest::Test
5+
class MetaTest < ActiveSupport::TestCase
66
def setup
77
@blog = Blog.new(id: 1,
88
name: 'AMS Hints',

0 commit comments

Comments
 (0)