Skip to content

Commit 96e6670

Browse files
committed
Fix redux install success banner on incomplete setup
1 parent 9a4eb58 commit 96e6670

3 files changed

Lines changed: 20 additions & 7 deletions

File tree

react_on_rails/lib/generators/react_on_rails/install_generator.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ def run_generators
102102
if installation_prerequisites_met? || options.ignore_warnings?
103103
invoke_generators
104104
add_bin_scripts
105-
# Only add the post install message if not using Redux
106-
# Redux generator handles its own messages
107-
add_post_install_message unless options.redux?
105+
add_post_install_message
108106
else
109107
error = <<~MSG.strip
110108
🚫 React on Rails generator prerequisites not met!

react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,7 @@ def add_redux_npm_dependencies
9090
end
9191

9292
def add_redux_specific_messages
93-
# Append Redux-specific post-install instructions
94-
GeneratorMessages.add_info(
95-
GeneratorMessages.helpful_message_after_installation(component_name: "HelloWorldApp", route: "hello_world")
96-
)
93+
# InstallGenerator handles post-install messaging for all install modes.
9794
end
9895

9996
private

react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1673,6 +1673,24 @@ class ActiveSupport::TestCase
16731673
expect(output_text).not_to include("🎉 React on Rails Successfully Installed!")
16741674
expect(output_text).not_to include("📋 QUICK START:")
16751675
end
1676+
1677+
specify "shows incomplete-installation guidance for redux installs when shakapacker setup fails" do
1678+
install_generator = described_class.new([], { redux: true, ignore_warnings: true })
1679+
allow(install_generator).to receive(:installation_prerequisites_met?).and_return(true)
1680+
allow(install_generator).to receive(:invoke_generators) do
1681+
install_generator.instance_variable_set(:@shakapacker_setup_incomplete, true)
1682+
end
1683+
allow(install_generator).to receive(:add_bin_scripts)
1684+
allow(install_generator).to receive(:print_generator_messages)
1685+
1686+
install_generator.run_generators
1687+
output_text = GeneratorMessages.output.join("\n")
1688+
1689+
expect(output_text).to include("React on Rails installation is incomplete")
1690+
expect(output_text).to include("Avoid running ./bin/dev")
1691+
expect(output_text).not_to include("🎉 React on Rails Successfully Installed!")
1692+
expect(output_text).not_to include("📋 QUICK START:")
1693+
end
16761694
end
16771695

16781696
describe "--pretend mode behavior" do

0 commit comments

Comments
 (0)