Skip to content

Commit 36dc7e6

Browse files
authored
Merge pull request rails#53733 from eval/fix/pretend-devcontainer
Fix rails new with --devcontainer --pretend
2 parents 5cd6dd9 + 4726956 commit 36dc7e6

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

railties/lib/rails/generators/rails/app/app_generator.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ def devcontainer
272272
dev: options[:dev],
273273
node: using_node?,
274274
app_name: app_name,
275-
skip_solid: options[:skip_solid]
275+
skip_solid: options[:skip_solid],
276+
pretend: options[:pretend]
276277
}
277-
278278
Rails::Generators::DevcontainerGenerator.new([], devcontainer_options).invoke_all
279279
end
280280
end

railties/test/generators/app_generator_test.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,6 +1296,12 @@ def test_name_option
12961296
assert_file "config/application.rb", /^module MyApp$/
12971297
end
12981298

1299+
def test_devcontainer_supports_pretend
1300+
run_generator [ destination_root, "--devcontainer", "--pretend" ]
1301+
1302+
assert_no_file(".devcontainer/devcontainer.json")
1303+
end
1304+
12991305
def test_devcontainer
13001306
run_generator [destination_root, "--devcontainer", "--name=my-app"]
13011307

0 commit comments

Comments
 (0)