From 3e41977be7f1a6775b5f49f73c4c319c1c813057 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 13 Aug 2013 15:59:26 +0200 Subject: [PATCH] Plugin tests are no longer strictly installer tests --- .../Fixtures/plugin-v1}/Installer/Plugin.php | 0 .../installer-v1 => Plugin/Fixtures/plugin-v1}/composer.json | 0 .../Fixtures/plugin-v2}/Installer/Plugin2.php | 0 .../installer-v2 => Plugin/Fixtures/plugin-v2}/composer.json | 0 .../Fixtures/plugin-v3}/Installer/Plugin2.php | 0 .../installer-v3 => Plugin/Fixtures/plugin-v3}/composer.json | 0 .../Fixtures/plugin-v4}/Installer/Plugin1.php | 0 .../Fixtures/plugin-v4}/Installer/Plugin2.php | 0 .../installer-v4 => Plugin/Fixtures/plugin-v4}/composer.json | 0 .../Test/{Installer => Plugin}/PluginInstallerTest.php | 4 ++-- 10 files changed, 2 insertions(+), 2 deletions(-) rename tests/Composer/Test/{Installer/Fixtures/installer-v1 => Plugin/Fixtures/plugin-v1}/Installer/Plugin.php (100%) rename tests/Composer/Test/{Installer/Fixtures/installer-v1 => Plugin/Fixtures/plugin-v1}/composer.json (100%) rename tests/Composer/Test/{Installer/Fixtures/installer-v2 => Plugin/Fixtures/plugin-v2}/Installer/Plugin2.php (100%) rename tests/Composer/Test/{Installer/Fixtures/installer-v2 => Plugin/Fixtures/plugin-v2}/composer.json (100%) rename tests/Composer/Test/{Installer/Fixtures/installer-v3 => Plugin/Fixtures/plugin-v3}/Installer/Plugin2.php (100%) rename tests/Composer/Test/{Installer/Fixtures/installer-v3 => Plugin/Fixtures/plugin-v3}/composer.json (100%) rename tests/Composer/Test/{Installer/Fixtures/installer-v4 => Plugin/Fixtures/plugin-v4}/Installer/Plugin1.php (100%) rename tests/Composer/Test/{Installer/Fixtures/installer-v4 => Plugin/Fixtures/plugin-v4}/Installer/Plugin2.php (100%) rename tests/Composer/Test/{Installer/Fixtures/installer-v4 => Plugin/Fixtures/plugin-v4}/composer.json (100%) rename tests/Composer/Test/{Installer => Plugin}/PluginInstallerTest.php (98%) diff --git a/tests/Composer/Test/Installer/Fixtures/installer-v1/Installer/Plugin.php b/tests/Composer/Test/Plugin/Fixtures/plugin-v1/Installer/Plugin.php similarity index 100% rename from tests/Composer/Test/Installer/Fixtures/installer-v1/Installer/Plugin.php rename to tests/Composer/Test/Plugin/Fixtures/plugin-v1/Installer/Plugin.php diff --git a/tests/Composer/Test/Installer/Fixtures/installer-v1/composer.json b/tests/Composer/Test/Plugin/Fixtures/plugin-v1/composer.json similarity index 100% rename from tests/Composer/Test/Installer/Fixtures/installer-v1/composer.json rename to tests/Composer/Test/Plugin/Fixtures/plugin-v1/composer.json diff --git a/tests/Composer/Test/Installer/Fixtures/installer-v2/Installer/Plugin2.php b/tests/Composer/Test/Plugin/Fixtures/plugin-v2/Installer/Plugin2.php similarity index 100% rename from tests/Composer/Test/Installer/Fixtures/installer-v2/Installer/Plugin2.php rename to tests/Composer/Test/Plugin/Fixtures/plugin-v2/Installer/Plugin2.php diff --git a/tests/Composer/Test/Installer/Fixtures/installer-v2/composer.json b/tests/Composer/Test/Plugin/Fixtures/plugin-v2/composer.json similarity index 100% rename from tests/Composer/Test/Installer/Fixtures/installer-v2/composer.json rename to tests/Composer/Test/Plugin/Fixtures/plugin-v2/composer.json diff --git a/tests/Composer/Test/Installer/Fixtures/installer-v3/Installer/Plugin2.php b/tests/Composer/Test/Plugin/Fixtures/plugin-v3/Installer/Plugin2.php similarity index 100% rename from tests/Composer/Test/Installer/Fixtures/installer-v3/Installer/Plugin2.php rename to tests/Composer/Test/Plugin/Fixtures/plugin-v3/Installer/Plugin2.php diff --git a/tests/Composer/Test/Installer/Fixtures/installer-v3/composer.json b/tests/Composer/Test/Plugin/Fixtures/plugin-v3/composer.json similarity index 100% rename from tests/Composer/Test/Installer/Fixtures/installer-v3/composer.json rename to tests/Composer/Test/Plugin/Fixtures/plugin-v3/composer.json diff --git a/tests/Composer/Test/Installer/Fixtures/installer-v4/Installer/Plugin1.php b/tests/Composer/Test/Plugin/Fixtures/plugin-v4/Installer/Plugin1.php similarity index 100% rename from tests/Composer/Test/Installer/Fixtures/installer-v4/Installer/Plugin1.php rename to tests/Composer/Test/Plugin/Fixtures/plugin-v4/Installer/Plugin1.php diff --git a/tests/Composer/Test/Installer/Fixtures/installer-v4/Installer/Plugin2.php b/tests/Composer/Test/Plugin/Fixtures/plugin-v4/Installer/Plugin2.php similarity index 100% rename from tests/Composer/Test/Installer/Fixtures/installer-v4/Installer/Plugin2.php rename to tests/Composer/Test/Plugin/Fixtures/plugin-v4/Installer/Plugin2.php diff --git a/tests/Composer/Test/Installer/Fixtures/installer-v4/composer.json b/tests/Composer/Test/Plugin/Fixtures/plugin-v4/composer.json similarity index 100% rename from tests/Composer/Test/Installer/Fixtures/installer-v4/composer.json rename to tests/Composer/Test/Plugin/Fixtures/plugin-v4/composer.json diff --git a/tests/Composer/Test/Installer/PluginInstallerTest.php b/tests/Composer/Test/Plugin/PluginInstallerTest.php similarity index 98% rename from tests/Composer/Test/Installer/PluginInstallerTest.php rename to tests/Composer/Test/Plugin/PluginInstallerTest.php index d9e1133d6..28a9a768a 100644 --- a/tests/Composer/Test/Installer/PluginInstallerTest.php +++ b/tests/Composer/Test/Plugin/PluginInstallerTest.php @@ -35,7 +35,7 @@ class PluginInstallerTest extends \PHPUnit_Framework_TestCase $loader = new JsonLoader(new ArrayLoader()); $this->packages = array(); for ($i = 1; $i <= 4; $i++) { - $this->packages[] = $loader->load(__DIR__.'/Fixtures/installer-v'.$i.'/composer.json'); + $this->packages[] = $loader->load(__DIR__.'/Fixtures/plugin-v'.$i.'/composer.json'); } $dm = $this->getMockBuilder('Composer\Downloader\DownloadManager') @@ -183,6 +183,6 @@ class PluginInstallerMock extends PluginInstaller { $version = $package->getVersion(); - return __DIR__.'/Fixtures/installer-v'.$version[0].'/'; + return __DIR__.'/Fixtures/plugin-v'.$version[0].'/'; } }