Permalink
Browse files

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

Signed-off-by: Michael Koziarski <michael@koziarski.com>
  • Loading branch information...
1 parent f9f1ab4 commit c111522d5b8cd108756240a0348d515d6acee46c @FooBarWidget FooBarWidget committed with NZKoz Aug 26, 2008
Showing with 11 additions and 3 deletions.
  1. +1 −0 .gitignore
  2. +3 −2 railties/html/500.html
  3. +7 −1 railties/test/error_page_test.rb
View
@@ -12,4 +12,5 @@ actionpack/pkg
actionmailer/pkg
activesupport/pkg
railties/pkg
+railties/test/500.html
*.rbc
@@ -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>
+</html>
@@ -3,10 +3,12 @@
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 @@ def setup
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)

0 comments on commit c111522

Please sign in to comment.