From c34c3811149a9dc030a7a3ce8a68c6df68d831ab Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <heinrich@gitlab.com>
Date: Wed, 20 Nov 2019 00:23:07 +0800
Subject: [PATCH] Upgrade rspec-rails to 4.0.0.beta3
We need this to support Rails 6
---
Gemfile | 2 +-
Gemfile.lock | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Gemfile b/Gemfile
index d27bc276088c8..acc296b8b43b4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -356,7 +356,7 @@ group :development, :test do
gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 5.1.0'
- gem 'rspec-rails', '~> 3.8.0'
+ gem 'rspec-rails', '~> 4.0.0.beta3'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 15465cd6b03a1..cf78043b1acb5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -881,14 +881,14 @@ GEM
proc_to_ast
rspec (>= 2.13, < 4)
unparser
- rspec-rails (3.8.2)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec-core (~> 3.8.0)
- rspec-expectations (~> 3.8.0)
- rspec-mocks (~> 3.8.0)
- rspec-support (~> 3.8.0)
+ rspec-rails (4.0.0.beta3)
+ actionpack (>= 4.2)
+ activesupport (>= 4.2)
+ railties (>= 4.2)
+ rspec-core (~> 3.8)
+ rspec-expectations (~> 3.8)
+ rspec-mocks (~> 3.8)
+ rspec-support (~> 3.8)
rspec-retry (0.6.1)
rspec-core (> 3.3)
rspec-set (0.1.3)
@@ -1307,7 +1307,7 @@ DEPENDENCIES
rouge (~> 3.11.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
- rspec-rails (~> 3.8.0)
+ rspec-rails (~> 4.0.0.beta3)
rspec-retry (~> 0.6.1)
rspec-set (~> 0.1.3)
rspec_junit_formatter
--
GitLab