diff options
author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-20 17:22:29 -0700 |
---|---|---|
committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-20 17:22:29 -0700 |
commit | c8eda9ade49700abce104de1ce7e8e1a754fc97e (patch) | |
tree | 03d20be229bf87eb5e854a3bea2e68068de4aac0 /actionpack/test | |
parent | c4a6109286909c394e8c5bfc471a1eb9de245d2b (diff) | |
download | rails-c8eda9ade49700abce104de1ce7e8e1a754fc97e.tar.gz rails-c8eda9ade49700abce104de1ce7e8e1a754fc97e.tar.bz2 rails-c8eda9ade49700abce104de1ce7e8e1a754fc97e.zip |
Fixed new_base tests on ruby 1.9
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/lib/fixture_template.rb | 2 | ||||
-rw-r--r-- | actionpack/test/new_base/etag_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb index e43e329a9e..59fb6819ed 100644 --- a/actionpack/test/lib/fixture_template.rb +++ b/actionpack/test/lib/fixture_template.rb @@ -46,7 +46,7 @@ class Template end end - %r'#{Regexp.escape(path)}#{extensions}#{handler_regexp}' + %r'^#{Regexp.escape(path)}#{extensions}#{handler_regexp}$' end # TODO: fix me diff --git a/actionpack/test/new_base/etag_test.rb b/actionpack/test/new_base/etag_test.rb index c77636bb64..a40d3c936a 100644 --- a/actionpack/test/new_base/etag_test.rb +++ b/actionpack/test/new_base/etag_test.rb @@ -12,7 +12,7 @@ module Etags end def with_layout - render :action => "base", :layout => "etag" + render :action => "base", :layout => "etags" end end |