diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-02-23 22:59:15 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-02-23 22:59:15 +0000 |
| commit | 6047a99ecc6815fa37cfa33aeba1d0dce8f6c6e1 (patch) | |
| tree | 965876128f30f1a582d0778be06581a4ba6f94c5 | |
| parent | af5da29df51088eedab440f9355a3428cbf36511 (diff) | |
| parent | c14cb5bff64b72456a1d6072e6b481b0d4969810 (diff) | |
| download | gitlab-ce-6047a99ecc6815fa37cfa33aeba1d0dce8f6c6e1.tar.gz | |
Merge branch '43570-localstorage-clear-error-when-feature-test-fails-before-visiting-page' into 'master'
Resolve "localStorage.clear() error when Capybara test fails before visiting page"
Closes #43570
See merge request gitlab-org/gitlab-ce!17339
| -rw-r--r-- | spec/support/capybara.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 5189c57b7db..8603b7f3e2c 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -78,8 +78,10 @@ RSpec.configure do |config| end config.after(:example, :js) do |example| - # prevent localstorage from introducing side effects based on test order - execute_script("localStorage.clear();") + # prevent localStorage from introducing side effects based on test order + unless ['', 'about:blank', 'data:,'].include? Capybara.current_session.driver.browser.current_url + execute_script("localStorage.clear();") + end # capybara/rspec already calls Capybara.reset_sessions! in an `after` hook, # but `block_and_wait_for_requests_complete` is called before it so by |