Merge commit 'djanowski/fix_logger'

This commit is contained in:
Bryan Helmkamp 2009-08-29 15:57:58 -04:00
commit b9466df773
2 changed files with 12 additions and 5 deletions

View File

@ -1,3 +1,5 @@
require "logger"
module Webrat
module Logging #:nodoc:
@ -13,10 +15,7 @@ module Webrat
when :merb
::Merb.logger
else
@logger ||= begin
require "logger"
::Logger.new("webrat.log")
end
@logger ||= ::Logger.new("webrat.log")
end
end

View File

@ -2,9 +2,17 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
describe Webrat::Logging do
it "should not log if there is no logger" do
it "should always log outside of Rails and Merb" do
FileUtils.rm("webrat.log")
Webrat.configure do |config|
config.mode = :rack
end
klass = Class.new
klass.send(:include, Webrat::Logging)
klass.new.debug_log "Testing"
File.read("webrat.log").should match(/Testing/)
end
end