diff options
| author | ddavison <ddavison@gitlab.com> | 2019-06-05 12:00:05 -0700 |
|---|---|---|
| committer | ddavison <ddavison@gitlab.com> | 2019-06-05 12:17:37 -0700 |
| commit | 7691bde418ba3a868d132fd36d9a567dce240a45 (patch) | |
| tree | a2ef824911a6c5949554271d6fec9b9f5e79cf53 | |
| parent | 92b06c13bd12abf85f6beb18b3b5c2f0e38c2760 (diff) | |
| download | gitlab-ce-qa-update-capybara.tar.gz | |
Upgrade capybara to version 3.22.0update-capybaraqa-update-capybara
Version 2 is almost a year old
Dont take screenshots on failure
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 17 | ||||
| -rw-r--r-- | spec/support/capybara.rb | 3 |
3 files changed, 13 insertions, 9 deletions
@@ -347,7 +347,7 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'capybara', '~> 2.18.0' + gem 'capybara', '~> 3.22.0' gem 'capybara-screenshot', '~> 1.0.22' gem 'selenium-webdriver', '~> 3.141' diff --git a/Gemfile.lock b/Gemfile.lock index 11e71cfb80e..dba76a3673d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,13 +110,14 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (9.1.0) - capybara (2.18.0) + capybara (3.22.0) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy @@ -658,7 +659,7 @@ GEM pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (3.0.3) + public_suffix (3.1.0) puma (3.12.0) puma_worker_killer (0.1.0) get_process_mem (~> 0.2) @@ -750,7 +751,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.6.0) redis (>= 2.2, < 5) - regexp_parser (1.4.0) + regexp_parser (1.5.1) regexp_property_values (0.3.4) representable (3.0.4) declarative (< 0.1.0) @@ -1040,7 +1041,7 @@ DEPENDENCIES browser (~> 2.5) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) - capybara (~> 2.18.0) + capybara (~> 3.22.0) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 875a9a76e12..7882417ee3a 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -54,6 +54,9 @@ Capybara.javascript_driver = :chrome Capybara.default_max_wait_time = timeout Capybara.ignore_hidden_elements = true +# Disable screenshots to be automatically taken when a test fails. +Capybara::Screenshot.autosave_on_failure = false + # Keep only the screenshots generated from the last failing test suite Capybara::Screenshot.prune_strategy = :keep_last_run # From https://github.com/mattheworiordan/capybara-screenshot/issues/84#issuecomment-41219326 |