get tests running again after rebase

Author: David Verholen

src/MagentoHackathon/Composer/Magento/Installer/ModuleInstaller.php

@@ -5,12 +5,9 @@
 
 namespace MagentoHackathon\Composer\Magento\Installer;
 
-<<<<<<< HEAD
 use Composer\Composer;
 use Composer\IO\IOInterface;
 
-=======
->>>>>>> 	modified:   src/MagentoHackathon/Composer/Magento/DeployManager.php
 /**
  * Class ModuleInstaller
  *
@@ -24,7 +21,6 @@ class ModuleInstaller extends MagentoInstallerAbstract
     const PACKAGE_TYPE = 'magento-module';
 
     /**
-<<<<<<< HEAD
      * @param IOInterface $io
      * @param Composer    $composer
      * @param string      $type
@@ -37,8 +33,6 @@ public function __construct(IOInterface $io, Composer $composer, $type = self::P
     }
 
     /**
-=======
->>>>>>> 	modified:   src/MagentoHackathon/Composer/Magento/DeployManager.php
      * Decides if the installer supports the given type
      *
      * @param  string $packageType
@@ -49,4 +43,4 @@ public function supports($packageType)
     {
         return self::PACKAGE_TYPE === $packageType;
     }
-}
+}

tests/FullStackTest/home/composer.json

@@ -13,6 +13,6 @@
         "magento-hackathon/magento-composer-installer": "*"
     },
     "extra": {
-
+        "magento-root-dir": "root"
     }
 }

tests/MagentoHackathon/Composer/Magento/FullStack/GlobalPluginTest.php

@@ -31,7 +31,7 @@ protected function prepareCleanDirectories()
     public function testGlobalInstall()
     {
         $process = new Process(
-            self::getComposerCommand().' global install',
+            self::getComposerCommand().' global install ' . self::getComposerArgs(),
             self::getProjectRoot()
         );
         $process->setEnv( array('COMPOSER_HOME'=>self::getBasePath().'/home'));
@@ -44,7 +44,7 @@ public function testGlobalUpdate()
     {
 
         $process = new Process(
-            self::getComposerCommand().' global update',
+            self::getComposerCommand().' global update ' . self::getComposerArgs(),
             self::getProjectRoot()
         );
         $process->setEnv( array('COMPOSER_HOME'=>self::getBasePath().'/home'));
@@ -53,4 +53,4 @@ public function testGlobalUpdate()
         $this->assertProcess($process);
     }
 
-}
+}