fix generated components dir

rmosolgo · rmosolgo · commit 88a90af761f9 · 2017-04-10T17:52:08.000-04:00
diff --git a/lib/generators/react/install_generator.rb b/lib/generators/react/install_generator.rb
@@ -18,9 +18,14 @@ class InstallGenerator < ::Rails::Generators::Base
 
       # Make an empty `components/` directory in the right place:
       def create_directory
-        empty_directory File.join(javascript_dir, 'components')
+        components_dir = if webpacker?
+          Pathname.new(javascript_dir).parent.to_s
+        else
+          javascript_dir
+        end
+        empty_directory File.join(components_dir, 'components')
         if !options[:skip_git]
-          create_file File.join(javascript_dir, 'components/.gitkeep')
+          create_file File.join(components_dir, 'components/.gitkeep')
         end
       end
 
diff --git a/test/generators/install_generator_webpacker_test.rb b/test/generators/install_generator_webpacker_test.rb
@@ -26,6 +26,7 @@ def copy_directory(dir)
     test "adds requires to `application.js`" do
       run_generator
       assert_file "app/javascript/packs/application.js", EXPECTED_SETUP
+      assert_file "app/javascript/components"
     end
 
     test "creates server_rendering.js with default requires" do
