ci: fix old import paths and generator examples

Author: ihabadham

spec/react_on_rails/generators/install_generator_spec.rb

@@ -17,14 +17,14 @@
   context "with --redux" do
     before(:all) { run_generator_test_with_args(%w[--redux], package_json: true) }
 
-    include_examples "base_generator", application_js: true
+    include_examples "base_generator_common", application_js: true
     include_examples "react_with_redux_generator"
   end
 
   context "with -R" do
     before(:all) { run_generator_test_with_args(%w[-R], package_json: true) }
 
-    include_examples "base_generator", application_js: true
+    include_examples "base_generator_common", application_js: true
     include_examples "react_with_redux_generator"
   end
 

spec/react_on_rails/support/shared_examples/base_generator_examples.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples "base_generator" do
+shared_examples "base_generator_common" do
   it "adds a route for get 'hello_world' to 'hello_world#index'" do
     match = <<-MATCH.strip_heredoc
       Rails.application.routes.draw do
@@ -10,20 +10,29 @@
     assert_file "config/routes.rb", match
   end
 
-  it "creates react directories" do
-    # Auto-registration structure is always created
-    assert_directory "app/javascript/src/HelloWorld/ror_components"
-  end
-
-  it "copies react files" do
+  it "copies common files" do
     %w[app/controllers/hello_world_controller.rb
        config/initializers/react_on_rails.rb
        Procfile.dev
        Procfile.dev-static-assets
        Procfile.dev-prod-assets].each { |file| assert_file(file) }
+  end
+end
 
-    # Auto-registration components are always created
+shared_examples "react_component_structure" do
+  it "creates react directories" do
+    # Auto-registration structure for non-Redux components
+    assert_directory "app/javascript/src/HelloWorld/ror_components"
+  end
+
+  it "copies react files" do
+    # Auto-registration components for non-Redux
     assert_file "app/javascript/src/HelloWorld/ror_components/HelloWorld.client.jsx"
     assert_file "app/javascript/src/HelloWorld/ror_components/HelloWorld.server.jsx"
   end
 end
+
+shared_examples "base_generator" do
+  include_examples "base_generator_common"
+  include_examples "react_component_structure"
+end

spec/react_on_rails/support/shared_examples/react_with_redux_generator_examples.rb

@@ -2,25 +2,25 @@
 
 shared_examples "react_with_redux_generator" do
   it "creates redux directories" do
-    %w[actions constants reducers store].each { |dir| assert_directory("app/javascript/bundles/HelloWorld/#{dir}") }
+    assert_directory "app/javascript/src/HelloWorldApp/ror_components"
+    %w[actions constants containers reducers store].each do |dir|
+      assert_directory("app/javascript/src/HelloWorldApp/#{dir}")
+    end
   end
 
   it "creates appropriate templates" do
-    assert_file("app/javascript/packs/hello-world-bundle.js") do |contents|
-      expect(contents).to match("import HelloWorld from '../bundles/HelloWorld/startup/HelloWorldApp.client';")
-    end
     assert_file("app/views/hello_world/index.html.erb") do |contents|
-      expect(contents).to match(/"HelloWorld"/)
+      expect(contents).to match(/"HelloWorldApp"/)
     end
   end
 
   it "copies base redux files" do
-    %w[app/javascript/bundles/HelloWorld/actions/helloWorldActionCreators.js
-       app/javascript/bundles/HelloWorld/containers/HelloWorldContainer.js
-       app/javascript/bundles/HelloWorld/constants/helloWorldConstants.js
-       app/javascript/bundles/HelloWorld/reducers/helloWorldReducer.js
-       app/javascript/bundles/HelloWorld/store/helloWorldStore.js
-       app/javascript/bundles/HelloWorld/startup/HelloWorldApp.client.jsx
-       app/javascript/bundles/HelloWorld/startup/HelloWorldApp.server.jsx].each { |file| assert_file(file) }
+    %w[app/javascript/src/HelloWorldApp/actions/helloWorldActionCreators.js
+       app/javascript/src/HelloWorldApp/containers/HelloWorldContainer.js
+       app/javascript/src/HelloWorldApp/constants/helloWorldConstants.js
+       app/javascript/src/HelloWorldApp/reducers/helloWorldReducer.js
+       app/javascript/src/HelloWorldApp/store/helloWorldStore.js
+       app/javascript/src/HelloWorldApp/ror_components/HelloWorldApp.client.jsx
+       app/javascript/src/HelloWorldApp/ror_components/HelloWorldApp.server.jsx].each { |file| assert_file(file) }
   end
 end