@@ -28,8 +28,8 @@ module Merb end def matches?(target) - target.log.rewind - @text = target.log.read + target.rewind + @text = target.read @text =~ (String === @expected ? /#{Regexp.escape @expected}/ : @expected) end @@ -108,9 +108,11 @@ Spec::Runner.configure do |config| end def with_level(level) - Merb.logger = Merb::Logger.new(StringIO.new, level) + Merb::Config[:log_stream] = StringIO.new + Merb::Config[:log_level] = level + Merb.logger = nil yield - Merb.logger + Merb::Config[:log_stream] end def capture(stream) spec/spec_helper.rb d22b8e6c60b48718e7484a1154a2211c5fa17404 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/fdc4ec0c04073e4ffca7d484152dbaedf02f1f97 fdc4ec0c04073e4ffca7d484152dbaedf02f1f97 2008-09-27T18:27:11-07:00 2008-09-26T23:38:57-07:00 Fix logger helper 5bb7382bc73d4c13eee8616ebe23541a835f956c Yehuda Katz wycats@gmail.com