Fix warnings

JRuby-specific: fix 'warning: (...) interpreted as grouped expression'
This commit is contained in:
Benjamin Fleischer
2015-08-21 02:23:37 -04:00
parent 9aad8b4d29
commit d315151e8a
16 changed files with 77 additions and 54 deletions

View File

@@ -4,8 +4,10 @@ require 'pathname'
class DefaultScopeNameTest < ActionController::TestCase
class UserSerializer < ActiveModel::Serializer
attributes :admin?
def admin?
current_user.admin
ActiveModelSerializers.silence_warnings do
def admin?
current_user.admin
end
end
end
@@ -34,8 +36,10 @@ end
class SerializationScopeNameTest < ActionController::TestCase
class AdminUserSerializer < ActiveModel::Serializer
attributes :admin?
def admin?
current_admin.admin
ActiveModelSerializers.silence_warnings do
def admin?
current_admin.admin
end
end
end
@@ -60,4 +64,4 @@ class SerializationScopeNameTest < ActionController::TestCase
get :render_new_user
assert_equal '{"data":{"id":"1","type":"users","attributes":{"admin?":true}}}', @response.body
end
end
end

View File

@@ -129,7 +129,6 @@ module ActionController
def render_fragment_changed_object_with_relationship
comment = Comment.new({ id: 1, body: 'ZOMG A COMMENT' })
comment2 = Comment.new({ id: 1, body: 'ZOMG AN UPDATED-BUT-NOT-CACHE-EXPIRED COMMENT' })
author = Author.new(id: 1, name: 'Joao Moura.')
like = Like.new({ id: 1, likeable: comment, time: 3.days.ago })
generate_cached_serializer(like)
@@ -215,14 +214,16 @@ module ActionController
get :render_json_object_without_serializer
assert_equal 'application/json', @response.content_type
assert_equal ({error: 'Result is Invalid'}).to_json, @response.body
expected_body = {error: 'Result is Invalid'}
assert_equal expected_body.to_json, @response.body
end
def test_render_json_array_object_without_serializer
get :render_json_array_object_without_serializer
assert_equal 'application/json', @response.content_type
assert_equal ([{error: 'Result is Invalid'}]).to_json, @response.body
expected_body = [{error: 'Result is Invalid'}]
assert_equal expected_body.to_json, @response.body
end
def test_render_array_using_implicit_serializer
@@ -405,9 +406,9 @@ module ActionController
false
end
}.new
assert_match /adapter: false/, (capture(:stderr) {
assert_match(/adapter: false/, (capture(:stderr) {
controller.get_serializer(Profile.new)
})
}))
end
def test_dont_warn_overridding_use_adapter_as_truthy_on_controller_instance