aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing/integration.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-09-29 10:04:42 +0200
committerJosé Valim <jose.valim@gmail.com>2010-09-29 10:04:42 +0200
commit0bbf9029e8089356aed0e3be2f859d56951a89cf (patch)
tree38e41ef8b63140a91c828bec03e06e83f38899b6 /actionpack/lib/action_dispatch/testing/integration.rb
parent006cef7107b648882cfc09f56904c601454cfc77 (diff)
parent17599abc9c06f30ff23d7ad47a3f029e32c26c88 (diff)
downloadrails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.gz
rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.bz2
rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.zip
Merge remote branch 'miloops/warnings'
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 3204115e9f..8c05462d0d 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -308,7 +308,7 @@ module ActionDispatch
include ActionDispatch::Assertions
def app
- @app
+ @app ||= nil
end
# Reset the current session. This is useful for testing multiple sessions