summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-06-06 15:57:21 +0000
committerStan Hu <stanhu@gmail.com>2019-06-06 15:57:21 +0000
commit70a717daf9457e3400d7d519a97dc189e55685ca (patch)
tree6bbc1cf33c56ac463853fb670e79c9821665f808
parent9cbfcf9b2a9e70821568d802a9c8b3fb0c5a73ee (diff)
parent91895eacfeb1bdcb615e7d20a83eb70a7658a075 (diff)
downloadgitlab-ce-70a717daf9457e3400d7d519a97dc189e55685ca.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
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 195d06502a4..53856e4fae3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -336,7 +336,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 11e71cfb80e..c8a090e7053 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -798,8 +798,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)
@@ -1199,7 +1199,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)