Permalink
Browse files

Dispatcher: fix that to_prepare should only run once in production. C…

…loses #9889.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7944 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent f575757 commit a2172e75f589f038ed10806e9a32be99d4d69f89 @jeremy jeremy committed Oct 16, 2007
View
@@ -1,5 +1,7 @@
*SVN*
+* Dispatcher: fix that to_prepare should only run once in production. #9889 [Nathaniel Talbott]
+
* Memcached sessions: add session data on initialization; don't silently discard exceptions; add unit tests. #9823 [kamk]
* error_messages_for also takes :message and :header_message options which defaults to the old "There were problems with the following fields:" and "<count> errors prohibited this <object_name> from being saved". #8270 [rmm5t, zach-inglis-lt3]
@@ -91,7 +91,8 @@ def failsafe_logger
cattr_accessor :callbacks
self.callbacks = Hash.new { |h, k| h[k] = [] }
- attr_accessor_with_default :unprepared, true
+ cattr_accessor :unprepared
+ self.unprepared = true
before_dispatch :reload_application
@@ -96,6 +96,14 @@ def test_to_prepare_with_identifier_replaces
assert_equal nil, b
end
+ def test_to_prepare_only_runs_once_if_not_loading_dependencies
+ Dependencies.stubs(:load?).returns(false)
+ called = 0
+ Dispatcher.to_prepare(:unprepared_test) { called += 1 }
+ 2.times { dispatch }
+ assert_equal 1, called
+ end
+
private
def dispatch(output = @output)
controller = mock

0 comments on commit a2172e7

Please sign in to comment.