Drop support for Rails 4.0 and Ruby 2.0.0

This commit is contained in:
Ben Mills
2016-03-04 09:15:18 -07:00
parent 0e82f6b5c0
commit 89e0a39fbb
7 changed files with 20 additions and 68 deletions

View File

@@ -10,9 +10,8 @@ module ActiveModelSerializers
render json: Profile.new(name: 'Name 1', description: 'Description 1', comments: 'Comments 1')
end
# For Rails4.0
def render_some_text
Rails.version > '4.1' ? render(plain: 'ok') : render(text: 'ok')
render(plain: 'ok')
end
end

View File

@@ -3,34 +3,19 @@ require_relative 'collection_serializer_test'
module ActiveModel
class Serializer
# Minitest.run_one_method isn't present in minitest 4
if $minitest_version > 4 # rubocop:disable Style/GlobalVars
class ArraySerializerTest < CollectionSerializerTest
extend Minitest::Assertions
def self.run_one_method(*)
_, stderr = capture_io do
super
end
if stderr !~ /NOTE: ActiveModel::Serializer::ArraySerializer.new is deprecated/
fail Minitest::Assertion, stderr
end
class ArraySerializerTest < CollectionSerializerTest
extend Minitest::Assertions
def self.run_one_method(*)
_, stderr = capture_io do
super
end
def collection_serializer
ArraySerializer
if stderr !~ /NOTE: ActiveModel::Serializer::ArraySerializer.new is deprecated/
fail Minitest::Assertion, stderr
end
end
else
class ArraySerializerTest < ActiveSupport::TestCase
def test_json_key_with_root_warns_when_using_array_serializer
_, stderr = capture_io do
comment = Comment.new
post = Post.new
serializer = ArraySerializer.new([comment, post])
assert_equal 'comments', serializer.json_key
end
assert_match(/NOTE: ActiveModel::Serializer::ArraySerializer.new is deprecated/, stderr)
end
def collection_serializer
ArraySerializer
end
end
end

View File

@@ -20,27 +20,9 @@ require 'fileutils'
FileUtils.mkdir_p(File.expand_path('../../tmp/cache', __FILE__))
gem 'minitest'
begin
require 'minitest'
rescue LoadError
# Minitest 4
require 'minitest/autorun'
$minitest_version = 4
# https://github.com/seattlerb/minitest/blob/644a52fd0/lib/minitest/autorun.rb
# https://github.com/seattlerb/minitest/blob/644a52fd0/lib/minitest/unit.rb#L768-L787
# Ensure backward compatibility with Minitest 4
Minitest = MiniTest unless defined?(Minitest)
Minitest::Test = MiniTest::Unit::TestCase
else
# Minitest 5
require 'minitest/autorun'
$minitest_version = 5
# https://github.com/seattlerb/minitest/blob/e21fdda9d/lib/minitest/autorun.rb
# https://github.com/seattlerb/minitest/blob/e21fdda9d/lib/minitest.rb#L45-L59
# Filter out Minitest backtrace while allowing backtrace from other libraries
# to be shown.
Minitest.backtrace_filter = Minitest::BacktraceFilter.new
end
require 'minitest'
require 'minitest/autorun'
Minitest.backtrace_filter = Minitest::BacktraceFilter.new
require 'support/rails_app'