Make LocalStrategyTest more reliable

composer.json

@@ -35,7 +35,7 @@
     "fabpot/php-cs-fixer": "2.0.*@dev",
     "phpunit/phpunit": "~4.0",
     "mockery/mockery": "^0.9.1",
-    "nesbot/carbon": "~1.4",
+    "nesbot/carbon": "~1.18",
     "phpseclib/phpseclib": "~0.3.5",
     "johnkary/phpunit-speedtrap": "dev-master",
     "symfony/var-dumper": "~2.6"

src/Rocketeer/Strategies/Deploy/LocalCloneStrategy.php

@@ -10,6 +10,7 @@
  */
 namespace Rocketeer\Strategies\Deploy;
 
+use Carbon\Carbon;
 use Exception;
 
 class LocalCloneStrategy extends SyncStrategy
@@ -81,7 +82,8 @@ protected function cloneLocally($directory)
     protected function getCloneDirectory()
     {
         $storagePath = $this->paths->getStoragePath();
+        $timestamp   = Carbon::now()->timestamp;
 
-        return $storagePath.'/checkout/tmp/'.time().'/';
+        return $storagePath.'/checkout/tmp/'.$timestamp.'/';
     }
 }

tests/Strategies/Deploy/LocalCloneStrategyTest.php

@@ -10,6 +10,7 @@
  */
 namespace Rocketeer\Strategies\Deploy;
 
+use Carbon\Carbon;
 use Rocketeer\TestCases\RocketeerTestCase;
 
 class LocalCloneStrategyTest extends RocketeerTestCase
@@ -30,12 +31,11 @@ public function setUp()
 
     public function testCanDeployRepository()
     {
+        $time = $this->getCurrentTime();
+
         $task = $this->pretendTask('Deploy');
         $task->getStrategy('Deploy', 'LocalClone')->deploy();
 
-        // We just have to pray that second do not change during test
-        $time = time();
-
         $matcher = [
             'mkdir {server}/releases/{release}',
             'git clone "https://github.com/Anahkiasen/html-object.git" "app/storage/checkout/tmp/'.$time.'/" --branch="master" --depth="1"',
@@ -47,6 +47,8 @@ public function testCanDeployRepository()
 
     public function testCanSpecifyKey()
     {
+        $time = $this->getCurrentTime();
+
         $this->swapConfig([
             'rocketeer::connections' => [
                 'production' => [
@@ -60,9 +62,6 @@ public function testCanSpecifyKey()
         $task = $this->pretendTask('Deploy');
         $task->getStrategy('Deploy', 'LocalClone')->deploy();
 
-        // We just have to pray that second do not change during test
-        $time = time();
-
         $matcher = [
             'mkdir {server}/releases/{release}',
             'git clone "https://github.com/Anahkiasen/html-object.git" "app/storage/checkout/tmp/'.$time.'/" --branch="master" --depth="1"',
@@ -71,4 +70,17 @@ public function testCanSpecifyKey()
 
         $this->assertHistory($matcher);
     }
+
+    /**
+     * Mock the current time
+     *
+     * @return int
+     */
+    protected function getCurrentTime()
+    {
+        Carbon::setTestNow(new Carbon(1234567890));
+        $time = Carbon::now()->timestamp;
+
+        return $time;
+    }
 }