diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-04-26 23:51:05 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-06-12 18:40:18 +0800 |
| commit | 96ed5a8bd78f90b0c7a8b044c4bd99e3af46dd71 (patch) | |
| tree | df517f916e5bfcbf1420c092ebf55ac3e1bab5ee /Gemfile.lock | |
| parent | 06e89d786c4ac67d9262c576b9aadb7d40dee9c2 (diff) | |
| download | gitlab-ce-96ed5a8bd78f90b0c7a8b044c4bd99e3af46dd71.tar.gz | |
Upgrade to Capybara 3
Fix whitespace in specs because normalize_ws is slightly
different from Capybara 2 behavior
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 785a77bc202..1f6c8d05992 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) |