Skip to content
Browse files

Merge pull request #10078 from vipulnsward/railties_warning_fix_v1

Fix some railties test warnings
  • Loading branch information...
2 parents e632d03 + 2282964 commit 77a3bc476800a666dc89c40ddd73fe505fa5959b @carlosantoniodasilva carlosantoniodasilva committed Apr 3, 2013
View
5 activesupport/lib/active_support/log_subscriber.rb
@@ -53,10 +53,9 @@ class LogSubscriber
class << self
def logger
- if defined?(Rails) && Rails.respond_to?(:logger)
- @logger ||= Rails.logger
+ @logger ||= if defined?(Rails) && Rails.respond_to?(:logger)
+ Rails.logger
end
- @logger
end
attr_writer :logger
View
2 railties/test/generators/plugin_new_generator_test.rb
@@ -124,7 +124,7 @@ def test_ensure_that_skip_active_record_option_is_passed_to_app_generator
run_generator [destination_root, "--skip_active_record"]
assert_no_file "test/dummy/config/database.yml"
assert_file "test/test_helper.rb" do |contents|
- assert_no_match /ActiveRecord/, contents
+ assert_no_match(/ActiveRecord/, contents)
end
end

0 comments on commit 77a3bc4

Please sign in to comment.
Something went wrong with that request. Please try again.