actionpack/test/fixtures/test/backup_files/item.html.erb.orig @@ -255,6 +255,12 @@ module RenderTestCases assert_equal Encoding::UTF_8, result.encoding end end + + def test_render_with_backup_files + result = @view.render :file => "/test/backup_files/item" + assert_equal "The correct item.erb was loaded.\n", result + end + end module TemplatesSetupTeardown actionpack/test/template/render_test.rb @@ -19,6 +19,8 @@ class TemplateTest < Test::Unit::TestCase t.assert_parses_template_path 'abc', :extension => nil, :format => nil, :name => nil t.assert_parses_template_path 'abc.xxx', :extension => nil, :format => 'xxx', :name => 'abc' t.assert_parses_template_path 'abc.html.xxx', :extension => nil, :format => 'xxx', :name => 'abc' + + t.assert_parses_template_path 'abc.html.erb.orig', :format => 'orig', :extension => nil end end actionpack/test/template/template_test.rb @@ -27,6 +27,11 @@ module ActiveSupport Thread.current[:#{thread_local_key}] = nil end EOS + + def klass.to_s + "ActiveSupport::Cache::Strategy::LocalCache" + end + klass end end activesupport/lib/active_support/cache/strategy/local_cache.rb @@ -56,7 +56,12 @@ module Rails returning table = '<table>' do properties.each do |(name, value)| table << %(<tr><td class="name">#{CGI.escapeHTML(name.to_s)}</td>) - table << %(<td class="value">#{CGI.escapeHTML(value.to_s)}</td></tr>) + formatted_value = if value.kind_of?(Array) + "<ul>" + value.map { |v| "<li>#{CGI.escapeHTML(v.to_s)}</li>" }.join + "</ul>" + else + CGI.escapeHTML(value.to_s) + end + table << %(<td class="value">#{formatted_value}</td></tr>) end table << '</table>' end @@ -102,6 +107,10 @@ module Rails end end + property 'Middleware' do + ActionController::Dispatcher.middleware.active.map(&:inspect) + end + # The Rails Git revision, if it's checked out into vendor/rails. property 'Edge Rails revision' do edge_rails_revision railties/builtin/rails_info/rails/info.rb @@ -99,7 +99,12 @@ } #about-content td.name {color: #555} #about-content td.value {color: #000} - + + #about-content ul { + padding: 0; + list-style-type: none; + } + #about-content.failure { background-color: #fcc; border: 1px solid #f00; railties/html/index.html 6abeba535ae03d1997f979eb2485cf0d22b5bcff 0e9efae4745e232b1c778fda69ee110e42a223a7 Lourens Naude lourens@methodmissing.com http://github.com/methodmissing/rails/commit/106ff8f552240b8f3bf2b29c90952e7f11c4b032 106ff8f552240b8f3bf2b29c90952e7f11c4b032 2009-04-04T03:00:31-07:00 2009-04-04T03:00:31-07:00 Merge branch 'master' of git://github.com/rails/rails ddcafdcd7a007180e633d69fa173d1ceb82798ee Lourens Naude lourens@methodmissing.com