Merge pull request #1154 from NullVoxPopuli/rubocop-fixes

Rubocop fixes for issues introduced by #1089
This commit is contained in:
João Moura 2015-09-15 15:59:38 -03:00
commit 0c42e32499
2 changed files with 2 additions and 3 deletions

View File

@ -1,8 +1,8 @@
require 'logger'
require 'active_model'
require "active_support/railtie"
require 'active_support/railtie'
require 'action_controller'
require "action_controller/railtie"
require 'action_controller/railtie'
module ActiveModelSerializers
mattr_accessor :logger
self.logger = Rails.logger || Logger.new(IO::NULL)

View File

@ -1,7 +1,6 @@
require 'test_helper'
class ActiveModelSerializers::LoggerTest < Minitest::Test
def test_logger_is_set_to_action_controller_logger_when_initializer_runs
assert_equal ActiveModelSerializers.logger, ActionController::Base.logger
end