aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-02-12 12:09:03 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2015-02-12 12:09:03 -0800
commit4cf3b8ac47f109fa83a6f66eb97d6cb0eace0d05 (patch)
tree2a0bc722354fee16944342d18408ba5beaedb566 /actionpack/lib
parent303567e554de26822f3107be55c471d6477a745f (diff)
downloadrails-4cf3b8ac47f109fa83a6f66eb97d6cb0eace0d05.tar.gz
rails-4cf3b8ac47f109fa83a6f66eb97d6cb0eace0d05.tar.bz2
rails-4cf3b8ac47f109fa83a6f66eb97d6cb0eace0d05.zip
there is always an integration session, so remove the check
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 79aadaad53..5ff418e677 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -457,7 +457,6 @@ module ActionDispatch
# Copy the instance variables from the current session instance into the
# test instance.
def copy_session_variables! #:nodoc:
- return unless integration_session
%w(controller response request).each do |var|
instance_variable_set("@#{var}", @integration_session.__send__(var))
end