Merge pull request #134 from bamarni/composer-tests

composified tests
KnpLabs · Aug 29, 2012 · dcbbf95 · dcbbf95
2 parents 4389efd + fef81bd
commit dcbbf95
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,2 @@
-/phpunit.xml
-/Tests/autoload.php
-/vendor/knp-menu
-/vendor/symfony
+composer.lock
+vendor/*
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,7 @@ language: php
 php:
     - 5.3
     - 5.4
-env:
-  - SYMFONY_VERSION=v2.0.10
-  - SYMFONY_VERSION=origin/2.0
-  - SYMFONY_VERSION=origin/master
-before_script: php vendor/vendors.php
+
+before_script:
+    - wget -nc http://getcomposer.org/composer.phar
+    - php composer.phar install --dev
diff --git a/Tests/DependencyInjection/KnpMenuExtensionTest.php b/Tests/DependencyInjection/KnpMenuExtensionTest.php
@@ -8,7 +8,7 @@
 use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\Reference;
 
-class FOSAdvancedEncoderExtensionTest extends \PHPUnit_Framework_TestCase
+class KnpMenuExtensionTest extends \PHPUnit_Framework_TestCase
 {
     public function testDefault()
     {

diff --git a/Tests/Stubs/TestKernel.php b/Tests/Stubs/TestKernel.php
@@ -13,7 +13,7 @@ public function __construct(array $bundles)
     {
         $this->mockBundles = $bundles;
 
-        parent::__construct('test', true);
+        parent::__construct('test', false);
     }
 
     public function registerBundles()

diff --git a/Tests/autoload.php.dist b/Tests/autoload.php.dist
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
diff --git a/composer.json b/composer.json
@@ -25,5 +25,6 @@
     "autoload":     {
         "psr-0": { "Knp\\Bundle\\MenuBundle": "" }
     },
-    "target-dir": "Knp/Bundle/MenuBundle"
+    "target-dir": "Knp/Bundle/MenuBundle",
+    "minimum-stability": "dev"
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit colors="false" bootstrap="Tests/bootstrap.php">
+<phpunit colors="false" bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="KnpMenuBundle Test Suite">
             <directory suffix="Test.php">./Tests/</directory>

diff --git a/vendor/vendors.php b/vendor/vendors.php