diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-12 11:50:45 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-12 11:50:45 +0100 |
| commit | 839362fa07de3f7bdf1fc1a361ff456cd02efc4e (patch) | |
| tree | a42bf1eeba5db1428d2ddabb2c1ec2650a907071 /actionpack/test/lib | |
| parent | f10631e13d373523c1ede9c73a5d7eb2e0529a27 (diff) | |
| download | rails-839362fa07de3f7bdf1fc1a361ff456cd02efc4e.tar.gz rails-839362fa07de3f7bdf1fc1a361ff456cd02efc4e.tar.bz2 rails-839362fa07de3f7bdf1fc1a361ff456cd02efc4e.zip | |
Make all AP tests pass for Ruby 1.9.1.
Diffstat (limited to 'actionpack/test/lib')
| -rw-r--r-- | actionpack/test/lib/fixture_template.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb index eda76ddfd0..02248d84ad 100644 --- a/actionpack/test/lib/fixture_template.rb +++ b/actionpack/test/lib/fixture_template.rb @@ -12,7 +12,7 @@ module ActionView #:nodoc: def query(partial, path, exts) query = Regexp.escape(path) exts.each do |ext| - query << '(?:' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << ')' + query << '(' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << ')' end templates = [] @@ -21,7 +21,8 @@ module ActionView #:nodoc: templates << Template.new(source, path, handler, :partial => partial, :virtual_path => path, :format => format) end - templates.sort_by {|t| -t.formats.size } + + templates.sort_by {|t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size } end end |