From 052132d55999ca529e7631fbe4c4c50f7e1d99d6 Mon Sep 17 00:00:00 2001
From: Vinicius Stock <vinicius.stock@shopify.com>
Date: Mon, 30 Mar 2020 16:45:19 -0400
Subject: [PATCH] Upgrade rspec-rails

---
 Gemfile      |  2 +-
 Gemfile.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 38aa5439..e942d360 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem "byebug", platforms: %i[mri mingw x64_mingw]
 gem "codecov", require: false, group: :test unless ENV["ON_CI"].nil?
 gem "sassc-rails"
 gem "rails", (ENV["RAILS_VERSION"] || ">= 4.0.0") # rubocop:disable Bundler/OrderedGems
-gem "rspec-rails", (ENV["RAILS_VERSION"].nil? || ENV["RAILS_VERSION"].to_s >= "6.0.0" ? "4.0.0.beta4" : ">= 3.8.0")
+gem "rspec-rails", (ENV["RAILS_VERSION"].nil? || ENV["RAILS_VERSION"].to_s >= "6.0.0" ? "4.0.0" : ">= 3.8.0")
 gem "sqlite3",
     (ENV["RAILS_VERSION"].nil? || ENV["RAILS_VERSION"].to_s >= "6.0.0" ? ">= 1.4.0" : "< 1.4.0"),
     platforms: %i[mri mingw x64_mingw]
diff --git a/Gemfile.lock b/Gemfile.lock
index dfed4cb6..fbdf6a10 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,7 +90,7 @@ GEM
     docile (1.3.2)
     erubi (1.9.0)
     erubis (2.7.0)
-    et-orbi (1.2.2)
+    et-orbi (1.2.4)
       tzinfo
     ffi (1.12.2)
     fugit (1.3.3)
@@ -168,13 +168,13 @@ GEM
     rexml (3.2.4)
     rspec-core (3.9.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (4.0.0.beta4)
+    rspec-rails (4.0.0)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
@@ -200,7 +200,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     ruby-progressbar (1.10.1)
-    rubyzip (2.2.0)
+    rubyzip (2.3.0)
     sassc (2.2.1)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -216,7 +216,7 @@ GEM
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.1)
+    simplecov-html (0.12.2)
     sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -255,7 +255,7 @@ DEPENDENCIES
   rack-mini-profiler
   rails (>= 4.0.0)
   rails_best_practices
-  rspec-rails (= 4.0.0.beta4)
+  rspec-rails (= 4.0.0)
   rspec-retry
   rubocop
   rubocop-performance