Changeset 17 for trunk/test

Timestamp:

10/15/07 16:13:50 (15 months ago)

Author:

jweiss

Message:

remove usage of DEFAULT_SSH_PORT for each role as the port can now be set through ssh_port

Location:

trunk/test

Files:

• test_helper.rb (modified) (1 diff)
• unit/role_test.rb (modified) (1 diff)
• unit/webistrano_deployer_test.rb (modified) (2 diffs)

trunk/test/test_helper.rb

@@ -131 +131 @@
       :host => create_new_host,
       :primary => 0,
-      :no_release => 0
+      :no_release => 0,
+      :no_symlink => 0
     }.update(options)
     

trunk/test/unit/role_test.rb

@@ -182 +182 @@
     
     assert_nil role.ssh_port
-    assert_equal Role::DEFAULT_SSH_PORT, role.port
-    assert_equal "schaka.com:22", role.hostname_and_port
-    
-    role.ssh_port = 2222
-    assert_equal 2222, role.port
-    
+    assert_equal "schaka.com", role.hostname_and_port
+    
+    role.ssh_port = 2222    
     assert_equal "schaka.com:2222", role.hostname_and_port
+    
+    role.ssh_port = nil
+    assert_equal "schaka.com", role.hostname_and_port
   end
   

trunk/test/unit/webistrano_deployer_test.rb

@@ -92 +92 @@
             
     # roles
-    mock_cap_config.expects(:role).with('www', @host.name + ":22")
-    mock_cap_config.expects(:role).with('app', @host.name + ":22", {:primary => true})
+    mock_cap_config.expects(:role).with('www', @host.name)
+    mock_cap_config.expects(:role).with('app', @host.name, {:primary => true})
     
     # main mock install
@@ -144 +144 @@
     # now check the roles        
     # 
-    mock_cap_config.expects(:role).with('www', @host.name + ":22", {:primary => true})
+    mock_cap_config.expects(:role).with('www', @host.name, {:primary => true})
     mock_cap_config.expects(:role).with('app', @host.name + ":99", {:no_release => true})
     mock_cap_config.expects(:role).with('db', @host.name + ":44", {:no_release => true, :primary => true})