diff options
| author | George Ogata <george.ogata@gmail.com> | 2009-08-30 23:46:48 -0400 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2009-10-15 11:01:42 +1300 |
| commit | 3de8b44b26ecb64dc73661deb8dde1c5de92b496 (patch) | |
| tree | 46604dcaae7d67dfe2a193a9e844328745bce860 /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | 316f4704eaa8aaba11e7ecebc1da9aa926fdd2d0 (diff) | |
| download | rails-3de8b44b26ecb64dc73661deb8dde1c5de92b496.tar.gz rails-3de8b44b26ecb64dc73661deb8dde1c5de92b496.tar.bz2 rails-3de8b44b26ecb64dc73661deb8dde1c5de92b496.zip | |
Make IntegrationTest::Runner propagate method_missing to ancestors.
Fixes RSpec integration example groups, which mixes its Matchers
module into ActiveSupport::TestCase.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 2c4a3a356d..58ebe94a5b 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -396,8 +396,12 @@ module ActionDispatch # Delegate unhandled messages to the current session instance. def method_missing(sym, *args, &block) reset! unless @integration_session - returning @integration_session.__send__(sym, *args, &block) do - copy_session_variables! + if @integration_session.respond_to?(sym) + returning @integration_session.__send__(sym, *args, &block) do + copy_session_variables! + end + else + super end end end |