Fix Servers#add_host port handling

See previous commit for details.
capistrano · Feb 12, 2017 · 5aea6dc · 5aea6dc
1 parent aa13725
commit 5aea6dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/capistrano/configuration/servers.rb b/lib/capistrano/configuration/servers.rb
@@ -9,6 +9,7 @@ class Servers
 
       def add_host(host, properties={})
         new_host = Server[host]
+        new_host.port = properties[:port] if properties.key?(:port)
         if (server = servers.find { |s| s.matches? new_host })
           server.user = new_host.user if new_host.user
           server.with(properties)

diff --git a/spec/lib/capistrano/configuration/servers_spec.rb b/spec/lib/capistrano/configuration/servers_spec.rb
@@ -137,7 +137,7 @@ class Configuration
           servers.add_host("1", roles: [:app, "web"], test: :value, user: "root", port: 34)
           servers.add_host("1", roles: [:app, "web"], test: :value, user: "deployer", port: 34)
           servers.add_host("1", roles: [:app, "web"], test: :value, user: "deployer", port: 56)
-          expect(servers.count).to eq(5)
+          expect(servers.count).to eq(4)
         end
 
         describe "with a :user property" do