aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2017-03-03 07:52:56 -0500
committerGitHub <noreply@github.com>2017-03-03 07:52:56 -0500
commitcf11ea0f0de1d1befda8a9b266bb764497b6c4fb (patch)
treeafa18f2d8349c41916088605e45685f05e074c6f /actionpack
parentc9bc4de19850ce3e66d0bf1f9ef70468c0366670 (diff)
parent5edbdca5c0db00b0724bc0c9202c83194b688ae8 (diff)
downloadrails-cf11ea0f0de1d1befda8a9b266bb764497b6c4fb.tar.gz
rails-cf11ea0f0de1d1befda8a9b266bb764497b6c4fb.tar.bz2
rails-cf11ea0f0de1d1befda8a9b266bb764497b6c4fb.zip
Merge pull request #28223 from mtsmfm/fix-random-fail-on-system-test-with-ajax
Fix random failure on system test with ajax
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb b/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb
index 1c89bfacfa..187ba2cc5f 100644
--- a/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb
+++ b/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb
@@ -11,8 +11,8 @@ module ActionDispatch
def after_teardown
take_failed_screenshot
- super
Capybara.reset_sessions!
+ super
end
end
end