Merge pull request #144 from niels-nijens/tests

Improved tests and testability of SSHConnectionAdapter::getCurrentUsername
accompli · May 4, 2016 · e9f7fab · e9f7fab
2 parents d758de7 + 2e4c87e
commit e9f7fab
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 9 deletions.
diff --git a/src/Deployment/Connection/SSHConnectionAdapter.php b/src/Deployment/Connection/SSHConnectionAdapter.php
@@ -406,14 +406,7 @@ public function delete($remoteTarget, $recursive = false)
      */
     private function getCurrentUsername()
     {
-        if (function_exists('posix_getpwuid')) {
-            $username = posix_getpwuid(posix_geteuid())['name'];
-        } else {
-            // Fallback when POSIX functions are not available.
-            $username = get_current_user();
-        }
-
-        return $username;
+        return $_SERVER['USER'];
     }
 
     /**

diff --git a/tests/Deployment/Connection/ConnectionAdapterTestCase.php b/tests/Deployment/Connection/ConnectionAdapterTestCase.php
@@ -45,7 +45,9 @@ public function tearDown()
             $this->connectionAdapter->disconnect();
         }
 
-        $this->workspaceUtility->remove();
+        if ($this->workspaceUtility instanceof WorkspaceUtility) {
+            $this->workspaceUtility->remove();
+        }
     }
 
     /**

diff --git a/tests/Deployment/Connection/SSHConnectionAdapterTest.php b/tests/Deployment/Connection/SSHConnectionAdapterTest.php
@@ -76,6 +76,10 @@ public function testConnectWithAuthenticationTypePasswordReturnsTrue()
      */
     public function testConnectWithAuthenticationTypeSSHAgentReturnsTrue()
     {
+        if (isset($_SERVER['SSH_AUTH_SOCK']) === false) {
+            $this->markTestSkipped('No running SSH agent found.');
+        }
+
         $this->connectionAdapter = new SSHConnectionAdapter('localhost', SSHConnectionAdapter::AUTHENTICATION_SSH_AGENT, $this->getSSHUsername());
 
         $this->assertTrue($this->connectionAdapter->connect());

diff --git a/tests/EventDispatcher/Event/HostEventTest.php b/tests/EventDispatcher/Event/HostEventTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Accompli\Test\EventDispatcher\Event;
+
+use Accompli\EventDispatcher\Event\HostEvent;
+use PHPUnit_Framework_TestCase;
+
+/**
+ * HostEventTest.
+ *
+ * @author Niels Nijens <nijens.niels@gmail.com>
+ */
+class HostEventTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Tests if constructing a new HostEvent sets the properties.
+     */
+    public function testConstruct()
+    {
+        $hostMock = $this->getMockBuilder('Accompli\Deployment\Host')
+                ->disableOriginalConstructor()
+                ->getMock();
+
+        $event = new HostEvent($hostMock);
+
+        $this->assertAttributeSame($hostMock, 'host', $event);
+    }
+
+    /**
+     * Tests if HostEvent::getHost returns the same value as during construction of HostEvent.
+     */
+    public function testGetHost()
+    {
+        $hostMock = $this->getMockBuilder('Accompli\Deployment\Host')
+                ->disableOriginalConstructor()
+                ->getMock();
+
+        $event = new HostEvent($hostMock);
+
+        $this->assertSame($hostMock, $event->getHost());
+    }
+}