update webpacker path helper; fix some tests

rmosolgo · rmosolgo · commit d16c932788e7 · 2017-04-11T11:04:03.000-04:00
diff --git a/lib/react/server_rendering/webpacker_manifest_container.rb b/lib/react/server_rendering/webpacker_manifest_container.rb
@@ -7,18 +7,15 @@ module ServerRendering
     # Get a compiled file from Webpacker
     class WebpackerManifestContainer
       def find_asset(logical_path)
-        asset_path = Webpacker::Manifest.lookup(logical_path) # raises if not found
+        # raises if not found
+        asset_path = Webpacker::Manifest.lookup(logical_path).to_s
         if asset_path.start_with?("http")
           # this includes `webpack-dev-server/client/index.js` code which causes ExecJS to 💥
           dev_server_asset = open(asset_path).read
           dev_server_asset.sub!(CLIENT_REQUIRE, '//\0')
           dev_server_asset
         else
-          full_path = File.join(
-            # TODO: using `.parent` here won't work for nonstandard configurations
-            Webpacker::Configuration.output_path.parent,
-            asset_path
-          )
+          full_path = Webpacker::Manifest.lookup_path(logical_path).to_s
           File.read(full_path)
         end
       end
diff --git a/test/generators/install_generator_webpacker_test.rb b/test/generators/install_generator_webpacker_test.rb
@@ -10,7 +10,7 @@ class InstallGeneratorWebpackerTest < Rails::Generators::TestCase
     EXPECTED_SETUP = %|// Support component names relative to this directory:
 var componentRequireContext = require.context("components", true)
 var ReactRailsUJS = require("react_ujs")
-ReactRailsUJS.loadContext(componentRequireContext)
+ReactRailsUJS.useContext(componentRequireContext)
 |
 
     DEFAULT_SERVER_RENDERING_PACK_PATH = "app/javascript/packs/server_rendering.js"
@@ -34,7 +34,7 @@ def copy_directory(dir)
       assert_file DEFAULT_SERVER_RENDERING_PACK_PATH do |contents|
         assert_includes contents, "var componentRequireContext = require.context(\"components\", true)\n"
         assert_includes contents, "var ReactRailsUJS = require(\"react_ujs\")\n"
-        assert_includes contents, "ReactRailsUJS.loadContext(componentRequireContext)\n"
+        assert_includes contents, "ReactRailsUJS.useContext(componentRequireContext)\n"
       end
     end
 
diff --git a/test/react/server_rendering/bundle_renderer_test.rb b/test/react/server_rendering/bundle_renderer_test.rb
@@ -68,12 +68,8 @@ class BundleRendererTest < ActiveSupport::TestCase
         @renderer.render("NonExistentComponent", {}, nil)
       end
 
-      if WebpackerHelpers.available?
-        assert_includes err.message, "Cannot find module './NonExistentComponent'"
-      else
-        assert_match(/ReferenceError/, err.to_s)
-        assert_match(/NonExistentComponent/, err.to_s, "it names the component")
-      end
+      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
