Merge branch…

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

Merge branch…
6047a99e · Stan Hu · af5da29d · c14cb5bf · 6047a99e
Commit 6047a99e authored Feb 23, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

capybara.rb spec/support/capybara.rb +4 -2

No files found.
--- 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