From cd700ab9bbd8217124fc40e9636d48e726113782 Mon Sep 17 00:00:00 2001
From: Adrianna Chang <adrianna.chang@shopify.com>
Date: Tue, 30 Mar 2021 12:11:00 -0400
Subject: [PATCH] Update lockfiles to support linux, ruby platforms

---
 Gemfile                          | 2 +-
 Gemfile.lock                     | 6 ++++++
 gemfiles/rails_6_0.gemfile       | 2 +-
 gemfiles/rails_6_0.gemfile.lock  | 8 ++++++++
 gemfiles/rails_edge.gemfile      | 2 +-
 gemfiles/rails_edge.gemfile.lock | 8 ++++++++
 6 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index a2a04fd7..b325ba97 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem "capybara"
 gem "mocha"
 gem "pry-byebug"
 gem "puma"
-gem "rails", $rails_gem_requirement
+gem "rails", defined?(@rails_gem_requirement) && @rails_gem_requirement
 gem "rubocop-shopify"
 gem "selenium-webdriver"
 gem "sqlite3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 93b0b82a..7fed5745 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,6 +109,10 @@ GEM
     nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
+    nokogiri (1.11.2-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.11.2-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -199,6 +203,8 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-darwin-19
+  x86_64-linux
 
 DEPENDENCIES
   capybara
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
index 6416ef64..d59c71e1 100644
--- a/gemfiles/rails_6_0.gemfile
+++ b/gemfiles/rails_6_0.gemfile
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-$rails_gem_requirement = "~> 6.0.0"
+@rails_gem_requirement = "~> 6.0.0"
 
 eval_gemfile "../Gemfile"
diff --git a/gemfiles/rails_6_0.gemfile.lock b/gemfiles/rails_6_0.gemfile.lock
index aca3ec77..2fcd76b3 100644
--- a/gemfiles/rails_6_0.gemfile.lock
+++ b/gemfiles/rails_6_0.gemfile.lock
@@ -98,11 +98,17 @@ GEM
     marcel (1.0.0)
     method_source (1.0.0)
     mini_mime (1.0.3)
+    mini_portile2 (2.5.0)
     minitest (5.14.4)
     mocha (1.12.0)
     nio4r (2.5.7)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     nokogiri (1.11.2-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.11.2-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -193,7 +199,9 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
+  ruby
   x86_64-darwin-19
+  x86_64-linux
 
 DEPENDENCIES
   capybara
diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
index e8569839..cf31c938 100644
--- a/gemfiles/rails_edge.gemfile
+++ b/gemfiles/rails_edge.gemfile
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-$rails_gem_requirement = { github: "rails/rails" }
+@rails_gem_requirement = { github: "rails/rails" }
 
 eval_gemfile "../Gemfile"
diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock
index 386f7bf4..defa8a13 100644
--- a/gemfiles/rails_edge.gemfile.lock
+++ b/gemfiles/rails_edge.gemfile.lock
@@ -128,11 +128,17 @@ GEM
     marcel (1.0.0)
     method_source (1.0.0)
     mini_mime (1.0.3)
+    mini_portile2 (2.5.0)
     minitest (5.14.4)
     mocha (1.12.0)
     nio4r (2.5.7)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     nokogiri (1.11.2-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.11.2-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -201,7 +207,9 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
+  ruby
   x86_64-darwin-19
+  x86_64-linux
 
 DEPENDENCIES
   capybara