kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix some railties test warnings

Browse source
This commit is contained in:
Vipul A M 2013-04-03 22:49:30 +05:30
parent db924e1257
commit 2282964de7
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
activesupport/lib/active_support/log_subscriber.rb
View file

@ -53,10 +53,9 @@ module ActiveSupport
class << self class << self
def logger def logger
if defined?(Rails) && Rails.respond_to?(:logger) @logger ||= if defined?(Rails) && Rails.respond_to?(:logger)
@logger ||= Rails.logger Rails.logger
end end
@logger
end end
attr_writer :logger attr_writer :logger

2
railties/test/generators/plugin_new_generator_test.rb
View file

@ -124,7 +124,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
run_generator [destination_root, "--skip_active_record"] run_generator [destination_root, "--skip_active_record"]
assert_no_file "test/dummy/config/database.yml" assert_no_file "test/dummy/config/database.yml"
assert_file "test/test_helper.rb" do |contents| assert_file "test/test_helper.rb" do |contents|
assert_no_match /ActiveRecord/, contents assert_no_match(/ActiveRecord/, contents)
end end
end end