The 'rails' command was broken by the last commit. Fix that.

Signed-off-by: Michael Koziarski <michael@koziarski.com>

2 files changed, 10 insertions, 3 deletions

diff --git a/railties/html/500.html b/railties/html/500.html
index 328fdcc3bc..74142cb04a 100644
--- a/railties/html/500.html
+++ b/railties/html/500.html
@@ -26,7 +26,8 @@
     <h1>We're sorry, but something went wrong.</h1>
     <p>We've been notified about this issue and we'll take a look at it shortly.</p>
     <p><small>(If you're the administrator of this website, then please read
-    the log file "<%=h RAILS_ENV %>.log" to find out what went wrong.)</small></p>
+    the log file "<%= "<%s>" % "%=h RAILS_ENV %" %>.log"
+    to find out what went wrong.)</small></p>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/railties/test/error_page_test.rb b/railties/test/error_page_test.rb
index 0e43700eb6..844f889aad 100644
--- a/railties/test/error_page_test.rb
+++ b/railties/test/error_page_test.rb
@@ -3,10 +3,12 @@ require 'action_controller'
 require 'action_controller/test_process'
 
 RAILS_ENV = "test"
+CURRENT_DIR = File.expand_path(File.dirname(__FILE__))
+HTML_DIR = File.expand_path(File.join(CURRENT_DIR, "..", "html"))
 
 module Rails
   def self.public_path
-    File.expand_path(File.join(File.dirname(__FILE__), "..", "html"))
+    CURRENT_DIR
   end
 end
 
@@ -30,6 +32,10 @@ class ErrorPageControllerTest < Test::Unit::TestCase
   end
 
   def test_500_error_page_instructs_system_administrator_to_check_log_file
+    template = ERB.new(File.read(File.join(HTML_DIR, "500.html")))
+    File.open(File.join(CURRENT_DIR, "500.html"), "w") do |f|
+      f.write(template.result)
+    end
     get :crash
     expected_log_file = "#{RAILS_ENV}.log"
     assert_not_nil @response.body.index(expected_log_file)