diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-08-24 12:43:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 12:43:19 -0400 |
| commit | dd77e1bbfe36cfa002b009e9596ae0c706fabd11 (patch) | |
| tree | 53c8cfc924812a096388d1bc12bec6e3ba592bdb /actionpack/lib/action_dispatch/testing | |
| parent | ae570a2ead7aa5fb78ef823a95ebbc7ed764a467 (diff) | |
| parent | 25c2bde7117241226d6e140e3a036c707f9ed14a (diff) | |
| download | rails-dd77e1bbfe36cfa002b009e9596ae0c706fabd11.tar.gz rails-dd77e1bbfe36cfa002b009e9596ae0c706fabd11.tar.bz2 rails-dd77e1bbfe36cfa002b009e9596ae0c706fabd11.zip | |
Merge pull request #26235 from samphippen/allow-early-setting-of-integration-session
Allow the `integration_sesion` to be set early on ActionDispatch::Integration::Runner.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
| -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 13f7fc6fa6..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 |