diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-09-01 15:54:29 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-09-01 15:54:29 -0700 |
| commit | 66a4585f8830d8f37e62a63df3d095b6284b2a35 (patch) | |
| tree | fe57b170898264bb91eadbfe8d091cf7acf17b74 /actionpack/test/lib | |
| parent | bd53ebde72316abe2f4cdfd959a4e05bc0732b02 (diff) | |
| download | rails-66a4585f8830d8f37e62a63df3d095b6284b2a35.tar.gz rails-66a4585f8830d8f37e62a63df3d095b6284b2a35.tar.bz2 rails-66a4585f8830d8f37e62a63df3d095b6284b2a35.zip | |
Fix the */* with Net::HTTP bug [#3100 state:resolved]
Diffstat (limited to 'actionpack/test/lib')
| -rw-r--r-- | actionpack/test/lib/fixture_template.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb index 8da92180d1..9a9abb691d 100644 --- a/actionpack/test/lib/fixture_template.rb +++ b/actionpack/test/lib/fixture_template.rb @@ -38,10 +38,13 @@ module ActionView #:nodoc: extensions = "" [:locales, :formats].each do |k| - extensions << if exts = details[k] - '(?:' + exts.map {|e| "\\.#{Regexp.escape(e.to_s)}"}.join('|') + ')?' + # TODO: OMG NO + if details[k] == [:"*/*"] + extensions << formats_regexp if k == :formats + elsif exts = details[k] + extensions << '(?:' + exts.map {|e| "\\.#{Regexp.escape(e.to_s)}"}.join('|') + ')?' else - k == :formats ? formats_regexp : '' + extensions << formats_regexp if k == :formats end end |