Merge pull request #27601 from y-yagi/make_work_all_commands_from_engine

Make all rails commands work in engine

4 files changed, 100 insertions, 27 deletions

diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index 527529aa52..e3dfc3e82b 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -122,11 +122,11 @@ class Rails::ServerTest < ActiveSupport::TestCase
   end
 
   def test_default_options
-    old_default_options = parse_arguments
+    server = Rails::Server.new
+    old_default_options = server.default_options
 
     Dir.chdir("..") do
-      default_options = parse_arguments
-      assert_equal old_default_options, default_options
+      assert_equal old_default_options, server.default_options
     end
   end
 
diff --git a/railties/test/engine/commands_tasks_test.rb b/railties/test/engine/commands_tasks_test.rb
deleted file mode 100644
index 817175b9ef..0000000000
--- a/railties/test/engine/commands_tasks_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require "abstract_unit"
-
-class Rails::Engine::CommandsTasksTest < ActiveSupport::TestCase
-  def setup
-    @destination_root = Dir.mktmpdir("bukkits")
-    Dir.chdir(@destination_root) { `bundle exec rails plugin new bukkits --mountable` }
-  end
-
-  def teardown
-    FileUtils.rm_rf(@destination_root)
-  end
-
-  def test_help_command_work_inside_engine
-    output = capture(:stderr) do
-      Dir.chdir(plugin_path) { `bin/rails --help` }
-    end
-    assert_no_match "NameError", output
-  end
-
-  private
-    def plugin_path
-      "#{@destination_root}/bukkits"
-    end
-end
diff --git a/railties/test/engine/commands_test.rb b/railties/test/engine/commands_test.rb
new file mode 100644
index 0000000000..b1c937143f
--- /dev/null
+++ b/railties/test/engine/commands_test.rb
@@ -0,0 +1,96 @@
+require "abstract_unit"
+begin
+  require "pty"
+rescue LoadError
+end
+
+class Rails::Engine::CommandsTest < ActiveSupport::TestCase
+  def setup
+    @destination_root = Dir.mktmpdir("bukkits")
+    Dir.chdir(@destination_root) { `bundle exec rails plugin new bukkits --mountable` }
+  end
+
+  def teardown
+    FileUtils.rm_rf(@destination_root)
+  end
+
+  def test_help_command_work_inside_engine
+    output = capture(:stderr) do
+      Dir.chdir(plugin_path) { `bin/rails --help` }
+    end
+    assert_no_match "NameError", output
+  end
+
+  def test_runner_command_work_inside_engine
+    output = capture(:stdout) do
+      Dir.chdir(plugin_path) { system("bin/rails runner 'puts Rails.env'") }
+    end
+
+    assert_equal "test", output.strip
+  end
+
+  def test_console_command_work_inside_engine
+    skip "PTY unavailable" unless available_pty?
+
+    master, slave = PTY.open
+    spawn_command("console", slave)
+    assert_output(">", master)
+  ensure
+    master.puts "quit"
+  end
+
+  def test_dbconsole_command_work_inside_engine
+    skip "PTY unavailable" unless available_pty?
+
+    master, slave = PTY.open
+    spawn_command("dbconsole", slave)
+    assert_output("sqlite>", master)
+  ensure
+    master.puts ".exit"
+  end
+
+  def test_server_command_work_inside_engine
+    skip "PTY unavailable" unless available_pty?
+
+    master, slave = PTY.open
+    pid = spawn_command("server", slave)
+    assert_output("Listening on", master)
+  ensure
+    kill(pid)
+  end
+
+  private
+    def plugin_path
+      "#{@destination_root}/bukkits"
+    end
+
+    def assert_output(expected, io, timeout = 10)
+      timeout = Time.now + timeout
+
+      output = ""
+      until output.include?(expected) || Time.now > timeout
+        if IO.select([io], [], [], 0.1)
+          output << io.read(1)
+        end
+      end
+
+      assert_includes output, expected, "#{expected.inspect} expected, but got:\n\n#{output}"
+    end
+
+    def spawn_command(command, fd)
+      Process.spawn(
+        "#{plugin_path}/bin/rails #{command}",
+        in: fd, out: fd, err: fd
+      )
+    end
+
+    def available_pty?
+      defined?(PTY) && PTY.respond_to?(:open)
+    end
+
+    def kill(pid)
+      Process.kill("TERM", pid)
+      Process.wait(pid)
+    rescue Errno::ESRCH
+    end
+end
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 9921a80342..ddfbc1a698 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -421,6 +421,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     run_generator [destination_root, "--full"]
     assert_file "bin/rails", /ENGINE_PATH = File.expand_path\('..\/..\/lib\/bukkits\/engine', __FILE__\)/
     assert_file "bin/rails", /ENGINE_ROOT = File.expand_path\('..\/..', __FILE__\)/
+    assert_file "bin/rails", %r|APP_PATH = File.expand_path\('../../test/dummy/config/application', __FILE__\)|
     assert_file "bin/rails", /require 'rails\/all'/
     assert_file "bin/rails", /require 'rails\/engine\/commands'/
   end