From bc6c027315625c1f6f2a02db883e17aec7e68655 Mon Sep 17 00:00:00 2001
From: Aleksandr Nigomatulin <nigomatulin@gmail.com>
Date: Fri, 16 Feb 2024 11:56:58 +0600
Subject: [PATCH] Upds according remarks

---
 lib/kamal/cli/main.rb |  8 +++-----
 test/cli/main_test.rb | 20 +++-----------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/lib/kamal/cli/main.rb b/lib/kamal/cli/main.rb
index b66073e4..62416bbc 100644
--- a/lib/kamal/cli/main.rb
+++ b/lib/kamal/cli/main.rb
@@ -4,15 +4,13 @@ class Kamal::Cli::Main < Kamal::Cli::Base
   def setup
     print_runtime do
       mutating do
-        invoke_options = deploy_options
-
         say "Ensure Docker is installed...", :magenta
-        invoke "kamal:cli:server:bootstrap", [], invoke_options
+        invoke "kamal:cli:server:bootstrap"
 
         say "Push env files...", :magenta
-        invoke "kamal:cli:env:push", [], invoke_options
+        invoke "kamal:cli:env:push"
 
-        invoke "kamal:cli:accessory:boot", [ "all" ], invoke_options
+        invoke "kamal:cli:accessory:boot", [ "all" ]
         deploy
       end
     end
diff --git a/test/cli/main_test.rb b/test/cli/main_test.rb
index e13da92e..10deda5c 100644
--- a/test/cli/main_test.rb
+++ b/test/cli/main_test.rb
@@ -4,9 +4,9 @@ class CliMainTest < CliTestCase
   test "setup" do
     invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
 
-    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:server:bootstrap", [], invoke_options)
-    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:env:push", [], invoke_options)
-    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:accessory:boot", [ "all" ], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:server:bootstrap")
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:env:push")
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:accessory:boot", [ "all" ])
     Kamal::Cli::Main.any_instance.expects(:deploy)
 
     run_command("setup").tap do |output|
@@ -15,20 +15,6 @@ class CliMainTest < CliTestCase
     end
   end
 
-  test "setup with skip_push" do
-    invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
-
-    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:server:bootstrap", [], invoke_options)
-    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:env:push", [], invoke_options)
-    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:accessory:boot", [ "all" ], invoke_options)
-    Kamal::Cli::Main.any_instance.expects(:deploy)
-
-    run_command("setup", "--skip_push").tap do |output|
-      assert_match /Ensure Docker is installed.../, output
-      assert_match /Push env files.../, output
-    end
-  end
-
   test "deploy" do
     invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }