diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-18 13:16:21 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-18 13:16:21 -0700 |
| commit | 906009cc18e8f9a7db1151fa4537dadd7c7f810a (patch) | |
| tree | 322c127a9bf84bed3a6a7f6ae1ee7e1d1832ac9f /actionpack/test | |
| parent | dcc576df8f4e6dfb2ef9891454b771c7d47ea219 (diff) | |
| parent | 130b0d215d491d328ebf0fa40e2e356065d19a78 (diff) | |
| download | rails-906009cc18e8f9a7db1151fa4537dadd7c7f810a.tar.gz rails-906009cc18e8f9a7db1151fa4537dadd7c7f810a.tar.bz2 rails-906009cc18e8f9a7db1151fa4537dadd7c7f810a.zip | |
Merge pull request #6387 from kennyj/fix_test_20120519
Fix build: can't convert Regexp to String
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/template/benchmark_helper_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/benchmark_helper_test.rb b/actionpack/test/template/benchmark_helper_test.rb index 1bdda22959..8c198d2562 100644 --- a/actionpack/test/template/benchmark_helper_test.rb +++ b/actionpack/test/template/benchmark_helper_test.rb @@ -19,6 +19,6 @@ class BenchmarkHelperTest < ActionView::TestCase 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 |