Fix tests

Author: rmosolgo

test/react/rails/view_helper_test.rb

@@ -129,7 +129,6 @@ class ViewHelperTest < ActionDispatch::IntegrationTest
   test 'react server rendering also gets mounted on client' do
     visit '/server/1'
     assert_match(/data-react-class=\"TodoList\"/, page.html)
-    assert_match(/data-react-checksum/, page.html)
     assert_match(/yep/, page.find("#status").text)
   end
 

test/react/server_rendering/sprockets_renderer_test.rb

@@ -24,34 +24,34 @@ class SprocketsRendererTest < ActiveSupport::TestCase
 
   test '#render replays console messages' do
     result = @renderer.render("TodoListWithConsoleLog", {todos: ["log some messages"]})
-    assert_match('console.log.apply(console, ["got initial state"])', result)
-    assert_match('console.warn.apply(console, ["mounted component"])', result)
-    assert_match('console.error.apply(console, ["rendered!","foo"])', result)
+    assert_match(/console.log.apply\(console, \["got initial state"\]\)/, result)
+    assert_match(/console.warn.apply\(console, \["mounted component"\]\)/, result)
+    assert_match(/console.error.apply\(console, \["rendered!","foo"\]\)/, result)
   end
 
   test '#render console messages can be disabled' do
     no_log_renderer = React::ServerRendering::SprocketsRenderer.new({replay_console: false})
     result = no_log_renderer.render("TodoListWithConsoleLog", {todos: ["log some messages"]})
-    assert_no_match('console.log.apply(console, ["got initial state"])', result)
-    assert_no_match('console.warn.apply(console, ["mounted component"])', result)
-    assert_no_match('console.error.apply(console, ["rendered!","foo"])', result)
+    assert_no_match(/console.log.apply\(console, \["got initial state"\]\)/, result)
+    assert_no_match(/console.warn.apply\(console, \["mounted component"\]\)/, result)
+    assert_no_match(/console.error.apply\(console, \["rendered!","foo"\]\)/, result)
   end
 
   test '#render errors include stack traces' do
     err = assert_raises React::ServerRendering::SprocketsRenderer::PrerenderError do
       @renderer.render("NonExistentComponent", {})
     end
-    assert_match("ReferenceError", err.to_s)
-    assert_match("NonExistentComponent", err.to_s, "it names the component")
+    assert_match(/ReferenceError/, err.to_s)
+    assert_match(/NonExistentComponent/, err.to_s, "it names the component")
     assert_match(/\n/, err.to_s, "it includes the multi-line backtrace")
   end
 
   test '.new accepts any filenames' do
     limited_renderer = React::ServerRendering::SprocketsRenderer.new(files: ["react.js", "components/Todo.js"])
-    assert_match("get a real job</li>", limited_renderer.render("Todo", {todo: "get a real job"}))
+    assert_match(/get a real job<\/li>/, limited_renderer.render("Todo", {todo: "get a real job"}))
     err = assert_raises React::ServerRendering::SprocketsRenderer::PrerenderError do
       limited_renderer.render("TodoList", {todos: []})
     end
-    assert_match("ReferenceError", err.to_s, "it doesnt load other files")
+    assert_match(/ReferenceError/, err.to_s, "it doesnt load other files")
   end
 end

test/react/server_rendering_test.rb

@@ -26,7 +26,7 @@ class ReactServerRenderingTest < ActiveSupport::TestCase
   end
 
   test '.create_renderer makes a renderer with initialization options' do
-    mock_renderer = MiniTest::Mock.new
+    mock_renderer = Minitest::Mock.new
     mock_renderer.expect(:new, :fake_renderer, [{mock: true}])
     React::ServerRendering.renderer = mock_renderer
     React::ServerRendering.renderer_options = {mock: true}

test/react_test.rb

@@ -2,19 +2,26 @@
 require 'fileutils'
 
 class ReactTest < ActionDispatch::IntegrationTest
+  setup do
+    Rails.application.assets.send(:expire_index!)
+    FileUtils.rm_r(CACHE_PATH) if CACHE_PATH.exist?
+  end
+
   test 'asset pipeline should deliver drop-in react file replacement' do
     app_react_file_path = File.expand_path("../dummy/vendor/assets/javascripts/react.js",  __FILE__)
 
     react_file_token = "'test_confirmation_token_react_content_non_production';\n";
     File.write(app_react_file_path, react_file_token)
 
+    asset_pipeline_length = Rails.application.assets.find_asset('react').to_s.length
     get '/assets/react.js'
 
     File.unlink(app_react_file_path)
     FileUtils.rm_r CACHE_PATH if CACHE_PATH.exist?
 
     assert_response :success
-    assert_equal react_file_token, @response.body
+    assert_equal react_file_token.length, asset_pipeline_length, "The asset pipeline serves the drop-in file"
+    assert_equal react_file_token.length, @response.body.length, "The asset route serves the drop-in file"
   end
 
   test 'precompiling assets works' do

test/server_rendered_html_test.rb

@@ -46,7 +46,7 @@ def wait_to_ensure_asset_pipeline_detects_changes
 
     # Make sure they're not when we don't ask for them
     get '/server/console_example_suppressed'
-    assert_match('Console Logged', response.body)
+    assert_match(/Console Logged/, response.body)
     assert_no_match(/console.log/, response.body)
     assert_no_match(/console.warn/, response.body)
     assert_no_match(/console.error/, response.body)

test/test_helper.rb

@@ -5,6 +5,7 @@
 require "rails/test_help"
 require "rails/generators"
 require "pathname"
+require 'minitest/mock'
 
 CACHE_PATH = Pathname.new File.expand_path("../dummy/tmp/cache",  __FILE__)