diff options
| author | Sam Phippen <samphippen@googlemail.com> | 2016-08-21 14:08:59 +0100 |
|---|---|---|
| committer | Sam Phippen <samphippen@googlemail.com> | 2016-08-21 14:54:30 +0100 |
| commit | 25c2bde7117241226d6e140e3a036c707f9ed14a (patch) | |
| tree | 97fc61f9ff841949439e7bd93ae88f416660af06 /actionpack | |
| parent | a887c9cbb0fbac2689fc4129d3d99af5302f9356 (diff) | |
| download | rails-25c2bde7117241226d6e140e3a036c707f9ed14a.tar.gz rails-25c2bde7117241226d6e140e3a036c707f9ed14a.tar.bz2 rails-25c2bde7117241226d6e140e3a036c707f9ed14a.zip | |
Move setting of integration session to constructor.
This allows us to not `||=` in `before_setup`.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 8ab490642e..f5ec28a9c2 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -420,9 +420,13 @@ module ActionDispatch attr_reader :app + def initialize(*args, &blk) + super(*args, &blk) + @integration_session = nil + end + def before_setup # :nodoc: @app = nil - @integration_session ||= nil super end |