aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2018-03-21 09:38:52 -0400
committerGitHub <noreply@github.com>2018-03-21 09:38:52 -0400
commit3791180d7764325e227e895d45c3b37d2a3b8f3d (patch)
tree0f397a0a944d1b5563c0546c7566f4fc18dd4d66 /actionpack
parent5368f2508651c92fbae40cd679afbafdd7e98e77 (diff)
parent5c4e1338e264ada11a8d5c8b7ebd71c534d98c2d (diff)
downloadrails-3791180d7764325e227e895d45c3b37d2a3b8f3d.tar.gz
rails-3791180d7764325e227e895d45c3b37d2a3b8f3d.tar.bz2
rails-3791180d7764325e227e895d45c3b37d2a3b8f3d.zip
Merge pull request #32293 from dzirtusss/fix-system-tests-transactions
Fix system tests transactions not closed between examples
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb1
1 files changed, 1 insertions, 0 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 ffa85f4e14..e47d5020f4 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
@@ -19,6 +19,7 @@ module ActionDispatch
def after_teardown
take_failed_screenshot
Capybara.reset_sessions!
+ ensure
super
end
end