diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-06 15:57:21 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-10 07:15:37 +0000 |
| commit | 1a2e3b72e8948a4da0a440bfd09f7617982a37cc (patch) | |
| tree | cc15f1ac553901ddafe91a00384aa3d9b24b4831 | |
| parent | 7ca780009544ae1c6f96a32113abd2dc6178a53e (diff) | |
| download | gitlab-ce-1a2e3b72e8948a4da0a440bfd09f7617982a37cc.tar.gz | |
Merge branch '58882-update-rspec-retry' into 'master'
Update rspec-retry to fix Selenium NoSuchDriverError errors
Closes #58882
See merge request gitlab-org/gitlab-ce!29276
(cherry picked from commit 70a717daf9457e3400d7d519a97dc189e55685ca)
91895eac Update rspec-retry to fix Selenium NoSuchDriverError errors
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -333,7 +333,7 @@ group :development, :test do gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 4.8.2' gem 'rspec-rails', '~> 3.7.0' - gem 'rspec-retry', '~> 0.4.5' + gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.5' gem 'rspec-set', '~> 0.1.3' gem 'rspec-parameterized', require: false diff --git a/Gemfile.lock b/Gemfile.lock index ddff7e56968..3cd8ea5f708 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -780,8 +780,8 @@ GEM rspec-expectations (~> 3.7.0) rspec-mocks (~> 3.7.0) rspec-support (~> 3.7.0) - rspec-retry (0.4.5) - rspec-core + rspec-retry (0.6.1) + rspec-core (> 3.3) rspec-set (0.1.3) rspec-support (3.7.1) rspec_junit_formatter (0.4.1) @@ -1175,7 +1175,7 @@ DEPENDENCIES rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 3.7.0) - rspec-retry (~> 0.4.5) + rspec-retry (~> 0.6.1) rspec-set (~> 0.1.3) rspec_junit_formatter rspec_profiling (~> 0.0.5) |