Permalink
Browse files

Merge pull request #6387 from kennyj/fix_test_20120519

Fix build: can't convert Regexp to String
  • Loading branch information...
2 parents dcc576d + 130b0d2 commit 906009cc18e8f9a7db1151fa4537dadd7c7f810a @rafaelfranca rafaelfranca committed May 18, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/test/template/benchmark_helper_test.rb
@@ -19,6 +19,6 @@ def test_default_message
log = StringIO.new
self.stubs(:logger).returns(Logger.new(log))
benchmark {}
- assert_match(log.rewind && log.read, /Benchmarking \(\d+.\d+ms\)/)
+ assert_match(/Benchmarking \(\d+.\d+ms\)/, log.rewind && log.read)
end
end

0 comments on commit 906009c

Please sign in to comment.