ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-22 22:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2290 from rails-api/minitest_ci

Browse Source 
Minitest 5.11 breaks; needs something like ::Minitest::Result.from
This commit is contained in:
Benjamin Fleischer 2018-10-10 10:59:37 -05:00 committed by GitHub
commit fce8be0dc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -40,6 +40,8 @@ matrix:
# - { rvm: jruby-head, jdk: oraclejdk8, env: "RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } # - { rvm: jruby-head, jdk: oraclejdk8, env: "RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
exclude: exclude:
- { rvm: 2.1.10, env: RAILS_VERSION=master } - { rvm: 2.1.10, env: RAILS_VERSION=master }
- { rvm: 2.2.8, env: RAILS_VERSION=master }
- { rvm: 2.3.5, env: RAILS_VERSION=master }
- { rvm: 2.1.10, env: RAILS_VERSION=5.0 } - { rvm: 2.1.10, env: RAILS_VERSION=5.0 }
- { rvm: 2.1.10, env: RAILS_VERSION=5.1 } - { rvm: 2.1.10, env: RAILS_VERSION=5.1 }
- { rvm: 2.4.2, env: RAILS_VERSION=4.1 } - { rvm: 2.4.2, env: RAILS_VERSION=4.1 }

2
active_model_serializers.gemspec
View File

@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
# 'activesupport', rails_versions # 'activesupport', rails_versions
# 'i18n, # 'i18n,
# 'tzinfo' # 'tzinfo'
# 'minitest' spec.add_development_dependency 'minitest', ['~> 5.0', '< 5.11']
# 'thread_safe' # 'thread_safe'
spec.add_runtime_dependency 'jsonapi-renderer', ['>= 0.1.1.beta1', '< 0.3'] spec.add_runtime_dependency 'jsonapi-renderer', ['>= 0.1.1.beta1', '< 0.3']

12
test/action_controller/serialization_test.rb
View File

@ -457,13 +457,19 @@ module ActionController
end end
def test_render_event_is_emitted def test_render_event_is_emitted
subscriber = ::ActiveSupport::Notifications.subscribe('render.active_model_serializers') do |name| subscriber = ::ActiveSupport::Notifications.subscribe('render.active_model_serializers') do |subscribed_event|
@name = name @subscribed_event = subscribed_event
end end
get :render_using_implicit_serializer get :render_using_implicit_serializer
assert_equal 'render.active_model_serializers', @name subscribed_event_name =
if @subscribed_event.is_a?(String)
@subscribed_event
else
@subscribed_event.name # is a ActiveSupport::Notifications::Event
end
assert_equal 'render.active_model_serializers', subscribed_event_name
ensure ensure
ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber
end end