Merge branch 'master' into chore/update-appraisals

Author: BookOfGreg

test/react/rails/pages_controller_test.rb

@@ -13,26 +13,26 @@ class PagesControllerTest < ActionController::TestCase
 
   when_stateful_js_context_available do
     test 'it sets up and tears down a react context' do
-      get :show, id: 1, prerender: true
+      get :show, query_params(id: 1, prerender: true)
       assert_includes(response.body, 'Hello')
 
-      get :show, id: 1, prerender: true, greeting: 'Howdy'
+      get :show, query_params(id: 1, prerender: true, greeting: 'Howdy')
       assert_includes(response.body, 'Howdy')
 
-      get :show, id: 1, prerender: true, greeting: '👋'
+      get :show, query_params(id: 1, prerender: true, greeting: '👋')
       assert_includes(response.body, '👋')
 
-      get :show, id: 1, prerender: true
+      get :show, query_params(id: 1, prerender: true)
       assert_includes(response.body, 'Hello')
     end
   end
 
   WebpackerHelpers.when_webpacker_available do
     test 'it mounts components from the dev server' do
       WebpackerHelpers.with_dev_server do
-        get :show, id: 1, prerender: true
+        get :show, query_params(id: 1, prerender: true)
         assert_match /Hello<!--.*--> from Webpacker/, response.body
-        get :show, id: 1, prerender: true, greeting: 'Howdy'
+        get :show, query_params(id: 1, prerender: true, greeting: 'Howdy')
         assert_match /Howdy<!--.*--> from Webpacker/, response.body
       end
     end