Merge pull request #1148 from kylemellander/fix-testing

BookOfGreg · web-flow · commit 7f46d7698db5 · 2021-12-03T22:32:41.000Z
Fix test suite
diff --git a/gemfiles/rails_5.2_no_sprockets.gemfile.lock b/gemfiles/rails_5.2_no_sprockets.gemfile.lock
@@ -127,7 +127,7 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.3)
+    mimemagic (0.3.10)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.13.0)
diff --git a/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile.lock b/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile.lock
@@ -128,7 +128,7 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.3)
+    mimemagic (0.3.10)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     mini_racer (0.2.8)
diff --git a/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile.lock b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile.lock
@@ -128,7 +128,7 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.3)
+    mimemagic (0.3.10)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     mini_racer (0.2.8)
diff --git a/gemfiles/rails_5.2_sprockets_3.gemfile.lock b/gemfiles/rails_5.2_sprockets_3.gemfile.lock
@@ -128,7 +128,7 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.3)
+    mimemagic (0.3.10)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     mini_racer (0.2.8)
diff --git a/gemfiles/rails_5.2_sprockets_4.gemfile.lock b/gemfiles/rails_5.2_sprockets_4.gemfile.lock
@@ -115,7 +115,7 @@ GEM
     jbuilder (2.9.1)
       activesupport (>= 4.2.0)
     json (2.3.0)
-    libv8 (7.3.492.27.1-x86_64-darwin-18)
+    libv8 (7.3.492.27.1)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -128,7 +128,9 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.3)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     mini_racer (0.2.8)
@@ -242,4 +244,4 @@ DEPENDENCIES
   webdrivers
 
 BUNDLED WITH
-   2.1.2
+   2.2.26
diff --git a/package.json b/package.json
@@ -14,6 +14,6 @@
     "webpack": "^2.3.3"
   },
   "dependencies": {
-    "react_ujs": "^2.6.0"
+    "react_ujs": "^2.6.1"
   }
 }
diff --git a/test/dummy_webpacker3/package.json b/test/dummy_webpacker3/package.json
@@ -9,6 +9,6 @@
     "react_ujs": "^2.2.1"
   },
   "devDependencies": {
-    "webpack-dev-server": "^3.1.11"
+    "webpack-dev-server": "^2.11.5"
   }
 }
diff --git a/test/dummy_webpacker3/yarn.lock b/test/dummy_webpacker3/yarn.lock
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@`
`14`	`14`	`"webpack": "^2.3.3"`
`15`	`15`	`},`
`16`	`16`	`"dependencies": {`
`17`		`- "react_ujs": "^2.6.0"`
	`17`	`+ "react_ujs": "^2.6.1"`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`"react_ujs": "^2.2.1"`
`10`	`10`	`},`
`11`	`11`	`"devDependencies": {`
`12`		`- "webpack-dev-server": "^3.1.11"`
	`12`	`+ "webpack-dev-server": "^2.11.5"`
`13`	`13`	`}`
`14`	`14`	`}`