Skip to content

Commit b0c8944

Browse files
committed
Fix Rubobop issue in Ruby v3
1 parent 0e270ff commit b0c8944

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

lib/generators/react/install_generator.rb

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ class InstallGenerator < ::Rails::Generators::Base
2121
# Make an empty `components/` directory in the right place:
2222
def create_directory
2323
components_dir = if shakapacker?
24-
Pathname.new(javascript_dir).parent.to_s
25-
else
26-
javascript_dir
27-
end
28-
empty_directory File.join(components_dir, 'components')
29-
unless options[:skip_git]
30-
create_file File.join(components_dir, 'components/.keep')
31-
end
24+
Pathname.new(javascript_dir).parent.to_s
25+
else
26+
javascript_dir
27+
end
28+
empty_directory File.join(components_dir, "components")
29+
return if options[:skip_git]
30+
31+
create_file File.join(components_dir, "components/.keep")
3232
end
3333

3434
# Add requires, setup UJS
@@ -42,10 +42,10 @@ def setup_react
4242

4343
def create_server_rendering
4444
if options[:skip_server_rendering]
45-
return
45+
nil
4646
elsif shakapacker?
47-
ssr_manifest_path = File.join(javascript_dir, 'server_rendering.js')
48-
template('server_rendering_pack.js', ssr_manifest_path)
47+
ssr_manifest_path = File.join(javascript_dir, "server_rendering.js")
48+
template("server_rendering_pack.js", ssr_manifest_path)
4949
else
5050
ssr_manifest_path = File.join(javascript_dir, "server_rendering.js")
5151
template("server_rendering.js", ssr_manifest_path)
@@ -112,8 +112,6 @@ def setup_react_shakapacker
112112
end
113113
end
114114

115-
private
116-
117115
def shakapacker_source_path
118116
Shakapacker.config.source_entry_path
119117
end

test/react/server_rendering/bundle_renderer_test.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ class BundleRendererTest < ActiveSupport::TestCase
105105
test ".new accepts any filenames" do
106106
limited_renderer = React::ServerRendering::BundleRenderer.new(files: ["react-server.js", "react_ujs.js",
107107
"components/Todo.js"])
108+
108109
assert_match(%r{get a real job</li>}, limited_renderer.render("Todo", { todo: "get a real job" }, nil))
109110
err = assert_raises React::ServerRendering::PrerenderError do
110111
limited_renderer.render("TodoList", { todos: [] }, nil)

test/server_rendered_html_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def wait_to_ensure_asset_pipeline_detects_changes
9595
# Make sure console messages are replayed when requested
9696
React::ServerRendering.renderer_options = { replay_console: true }
9797
React::ServerRendering.reset_pool
98-
get "/server/console_example"
98+
get "/server/console_example"
9999

100100
assert_match(/Console Logged/, response.body)
101101
assert_match(/console.log.apply\(console, \["got initial state"\]\)/, response.body)

0 commit comments

Comments
 (0)