From 67c3a23bbb334e8ab0dfda36b66c3df13d38a5b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Monta=C3=B1ez?= Date: Sat, 11 Feb 2017 02:01:49 -0300 Subject: [PATCH] [Nostromo] Refactor Composer SelfUpdate --- src/Task/BuiltIn/Composer/SelfUpdateTask.php | 4 +-- .../BuiltIn/Composer/SelfUpdateTaskTest.php | 34 ------------------- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/Task/BuiltIn/Composer/SelfUpdateTask.php b/src/Task/BuiltIn/Composer/SelfUpdateTask.php index ea11164..f07fd51 100644 --- a/src/Task/BuiltIn/Composer/SelfUpdateTask.php +++ b/src/Task/BuiltIn/Composer/SelfUpdateTask.php @@ -52,7 +52,7 @@ class SelfUpdateTask extends AbstractTask throw new SkipException(); } - $cmdUpdate = sprintf('%s self-update %s', $options['path'], $options['version']); + $cmdUpdate = sprintf('%s self-update', $options['path']); /** @var Process $process */ $process = $this->runtime->runCommand(trim($cmdUpdate)); @@ -83,7 +83,7 @@ class SelfUpdateTask extends AbstractTask protected function getOptions() { $options = array_merge( - ['path' => 'composer', 'version' => '', 'days' => 60], + ['path' => 'composer', 'days' => 60], $this->runtime->getMergedOption('composer'), $this->options ); diff --git a/tests/Task/BuiltIn/Composer/SelfUpdateTaskTest.php b/tests/Task/BuiltIn/Composer/SelfUpdateTaskTest.php index 6d8abee..72c5543 100644 --- a/tests/Task/BuiltIn/Composer/SelfUpdateTaskTest.php +++ b/tests/Task/BuiltIn/Composer/SelfUpdateTaskTest.php @@ -104,40 +104,6 @@ class SelfUpdateTaskTest extends TestCase } } - public function testSelfUpdateMustUpdateToVersionTask() - { - $runtime = new RuntimeMockup(); - $runtime->setConfiguration(['environments' => ['test' => []]]); - $runtime->setEnvironment('test'); - - $task = new SelfUpdateTask(); - $task->setOptions(['path' => 'composer.phar', 'version' => '1.2.0']); - $task->setRuntime($runtime); - - try { - $result = $task->execute(); - $this->assertTrue($result, 'Result should be successful'); - } catch (Exception $exception) { - if ($exception instanceof SkipException) { - $this->assertTrue(false, 'Update should not have been skipped'); - } - } - - $ranCommands = $runtime->getRanCommands(); - $testCase = array( - 0 => 'composer.phar --version', - 1 => 'composer.phar self-update 1.2.0', - ); - - // Check total of Executed Commands - $this->assertEquals(count($testCase), count($ranCommands)); - - // Check Generated Commands - foreach ($testCase as $index => $command) { - $this->assertEquals($command, $ranCommands[$index]); - } - } - public function testSelfUpdateWrongOutputTask() { $runtime = new RuntimeMockup();