public
Fork of rails/rails
Description: Ruby on Rails - forked for implementing I18n patch
Homepage: http://rubyonrails.org
Clone URL: git://github.com/svenfuchs/rails.git
The 'rails' command was broken by the last commit. Fix that.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
Hongli Lai (Phusion (author)
Tue Aug 26 06:59:03 -0700 2008
NZKoz (committer)
Tue Aug 26 07:28:41 -0700 2008
commit  c111522d5b8cd108756240a0348d515d6acee46c
tree    22d11cb429aae9fbe439beb9435966fcdce5877b
parent  f9f1ab4e3ddeacadf2a7bce021d742f08f67905f
...
12
13
14
 
15
...
12
13
14
15
16
0
@@ -12,4 +12,5 @@ actionpack/pkg
0
 actionmailer/pkg
0
 activesupport/pkg
0
 railties/pkg
0
+railties/test/500.html
0
 *.rbc
...
26
27
28
29
 
 
30
31
32
33
 
...
26
27
28
 
29
30
31
32
 
33
34
0
@@ -26,7 +26,8 @@
0
     <h1>We're sorry, but something went wrong.</h1>
0
     <p>We've been notified about this issue and we'll take a look at it shortly.</p>
0
     <p><small>(If you're the administrator of this website, then please read
0
- the log file "<%=h RAILS_ENV %>.log" to find out what went wrong.)</small></p>
0
+ the log file "<%= "<%s>" % "%=h RAILS_ENV %" %>.log"
0
+ to find out what went wrong.)</small></p>
0
   </div>
0
 </body>
0
-</html>
0
\ No newline at end of file
0
+</html>
...
3
4
5
 
 
6
7
8
9
 
10
11
12
...
30
31
32
 
 
 
 
33
34
35
...
3
4
5
6
7
8
9
10
 
11
12
13
14
...
32
33
34
35
36
37
38
39
40
41
0
@@ -3,10 +3,12 @@ require 'action_controller'
0
 require 'action_controller/test_process'
0
 
0
 RAILS_ENV = "test"
0
+CURRENT_DIR = File.expand_path(File.dirname(__FILE__))
0
+HTML_DIR = File.expand_path(File.join(CURRENT_DIR, "..", "html"))
0
 
0
 module Rails
0
   def self.public_path
0
- File.expand_path(File.join(File.dirname(__FILE__), "..", "html"))
0
+ CURRENT_DIR
0
   end
0
 end
0
 
0
@@ -30,6 +32,10 @@ class ErrorPageControllerTest < Test::Unit::TestCase
0
   end
0
 
0
   def test_500_error_page_instructs_system_administrator_to_check_log_file
0
+ template = ERB.new(File.read(File.join(HTML_DIR, "500.html")))
0
+ File.open(File.join(CURRENT_DIR, "500.html"), "w") do |f|
0
+ f.write(template.result)
0
+ end
0
     get :crash
0
     expected_log_file = "#{RAILS_ENV}.log"
0
     assert_not_nil @response.body.index(expected_log_file)

Comments

    No one has commented yet.