diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-04-22 08:28:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-22 08:28:57 -0400 |
| commit | 2db5895a5e8880915dfab08bd02f60a8ff2ad223 (patch) | |
| tree | 1c55501dd28861eb1ab3f18f4b59257796442f6a /actionpack | |
| parent | 89b86640901be4f423cef4059d970c0aa0adb648 (diff) | |
| parent | ef12ccfd8bc42d88611dea1190988214836b951c (diff) | |
| download | rails-2db5895a5e8880915dfab08bd02f60a8ff2ad223.tar.gz rails-2db5895a5e8880915dfab08bd02f60a8ff2ad223.tar.bz2 rails-2db5895a5e8880915dfab08bd02f60a8ff2ad223.zip | |
Merge pull request #36047 from rmacklin/take-screenshot-sooner
Make system tests take failed screenshots in `before_teardown` hook
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 9 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb | 12 |
2 files changed, 16 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 4109ae7006..4502c6a2f9 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,12 @@ +* Make system tests take a failed screenshot in a `before_teardown` hook + rather than an `after_teardown` hook. + + This helps minimize the time gap between when an assertion fails and when + the screenshot is taken (reducing the time in which the page could have + been dynamically updated after the assertion failed). + + *Richard Macklin* + * Introduce `ActionDispatch::ActionableExceptions`. The `ActionDispatch::ActionableExceptions` middleware dispatches actions 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 600e9c733b..7080dbe022 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 @@ -16,12 +16,14 @@ module ActionDispatch super end + def before_teardown + take_failed_screenshot + ensure + super + end + def after_teardown - begin - take_failed_screenshot - ensure - Capybara.reset_sessions! - end + Capybara.reset_sessions! ensure super end |