Merge pull request rails#52772 from rails/rm-fix-script-setup

Allow to skip the server in `bin/setup`

Author: rafaelfranca

railties/lib/rails/generators/rails/app/templates/bin/setup.tt

@@ -38,6 +38,9 @@ FileUtils.chdir APP_ROOT do
   puts "\n== Removing old logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"
 
-  puts "\n== Starting development server =="
-  exec "bin/dev"
+  unless ARGV.include?("--skip-server")
+    puts "\n== Starting development server =="
+    STDOUT.flush # flush the output before exec(2) so that it displays
+    exec "bin/dev"
+  end
 end

railties/lib/rails/generators/rails/devcontainer/templates/devcontainer/devcontainer.json.tt

@@ -33,5 +33,5 @@
 <%- end -%>
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "bin/setup"
+  "postCreateCommand": "bin/setup --skip-server"
 }

railties/test/application/bin_setup_test.rb

@@ -20,10 +20,9 @@ def test_bin_setup
         assert_equal 5, File.size("log/test.log")
         assert_not File.exist?("tmp/restart.txt")
 
-        `bin/setup 2>&1`
+        `bin/setup --skip-server 2>&1`
         assert_equal 0, File.size("log/test.log")
         assert_equal '["ar_internal_metadata", "articles", "schema_migrations"]', list_tables.call
-        assert File.exist?("tmp/restart.txt")
       end
     end
 
@@ -35,7 +34,7 @@ def test_bin_setup_output
 
         app_file "db/schema.rb", ""
 
-        output = `bin/setup 2>&1`
+        output = `bin/setup --skip-server 2>&1`
 
         # Ignore line that's only output by Bundler < 1.14
         output.sub!(/^Resolving dependencies\.\.\.\n/, "")
@@ -58,8 +57,6 @@ def test_bin_setup_output
           Created database 'app_test'
 
           == Removing old logs and tempfiles ==
-
-          == Restarting application server ==
         OUTPUT
       end
     end

railties/test/fixtures/.devcontainer/devcontainer.json

@@ -27,5 +27,5 @@
   // "remoteUser": "root",
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "bin/setup"
+  "postCreateCommand": "bin/setup --skip-server"
 }