Selaa lähdekoodia

[AsseticBundle] renamed some test files to respect the exclude of Resources in phpunit.xml.dist

Kris Wallsmith 14 vuotta sitten
vanhempi
commit
8fedd8d067

+ 3 - 4
src/Symfony/Bundle/AsseticBundle/Tests/FunctionalTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\AsseticBundle\Tests;
 
-use Symfony\Bundle\AsseticBundle\Tests\Kernel\TestKernel;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -23,17 +22,17 @@ class FunctionalTest extends \PHPUnit_Framework_TestCase
             $this->markTestSkipped('Assetic is not available.');
         }
 
-        $cache = __DIR__.'/Kernel/cache';
+        $cache = __DIR__.'/Resources/cache';
         if (!is_dir($cache)) {
             mkdir($cache);
         } else {
-            shell_exec('rm -rf '.escapeshellarg(__DIR__.'/Kernel/cache/*'));
+            shell_exec('rm -rf '.escapeshellarg(__DIR__.'/Resources/cache/*'));
         }
     }
 
     protected function tearDown()
     {
-        shell_exec('rm -rf '.escapeshellarg(__DIR__.'/Kernel/cache'));
+        shell_exec('rm -rf '.escapeshellarg(__DIR__.'/Resources/cache'));
     }
 
     /**

src/Symfony/Bundle/AsseticBundle/Tests/Kernel/config/config.yml → src/Symfony/Bundle/AsseticBundle/Tests/Resources/config/config.yml


src/Symfony/Bundle/AsseticBundle/Tests/Kernel/config/routing.yml → src/Symfony/Bundle/AsseticBundle/Tests/Resources/config/routing.yml


src/Symfony/Bundle/AsseticBundle/Tests/Kernel/views/base.html.php → src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/base.html.php


src/Symfony/Bundle/AsseticBundle/Tests/Kernel/views/base.html.twig → src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/base.html.twig


src/Symfony/Bundle/AsseticBundle/Tests/Kernel/views/layout.html.php → src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/layout.html.php


src/Symfony/Bundle/AsseticBundle/Tests/Kernel/views/layout.html.twig → src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/layout.html.twig


src/Symfony/Bundle/AsseticBundle/Tests/Kernel/web/javascript1.js → src/Symfony/Bundle/AsseticBundle/Tests/Resources/web/javascript1.js


src/Symfony/Bundle/AsseticBundle/Tests/Kernel/web/javascript2.js → src/Symfony/Bundle/AsseticBundle/Tests/Resources/web/javascript2.js


src/Symfony/Bundle/AsseticBundle/Tests/Kernel/web/stylesheet1.css → src/Symfony/Bundle/AsseticBundle/Tests/Resources/web/stylesheet1.css


src/Symfony/Bundle/AsseticBundle/Tests/Kernel/web/stylesheet2.css → src/Symfony/Bundle/AsseticBundle/Tests/Resources/web/stylesheet2.css


src/Symfony/Bundle/AsseticBundle/Tests/Kernel/bundle/Resources/css/bundle.css → src/Symfony/Bundle/AsseticBundle/Tests/TestBundle/Resources/css/bundle.css


+ 1 - 5
src/Symfony/Bundle/AsseticBundle/Tests/Kernel/TestBundle.php

@@ -9,14 +9,10 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Symfony\Bundle\AsseticBundle\Tests\Kernel;
+namespace Symfony\Bundle\AsseticBundle\Tests\TestBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class TestBundle extends Bundle
 {
-    public function getPath()
-    {
-        return parent::getPath().'/bundle';
-    }
 }

+ 4 - 4
src/Symfony/Bundle/AsseticBundle/Tests/Kernel/TestKernel.php

@@ -9,7 +9,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Symfony\Bundle\AsseticBundle\Tests\Kernel;
+namespace Symfony\Bundle\AsseticBundle\Tests;
 
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Kernel;
@@ -18,7 +18,7 @@ class TestKernel extends Kernel
 {
     public function registerRootDir()
     {
-        return __DIR__;
+        return __DIR__.'/Resources';
     }
 
     public function registerBundles()
@@ -27,12 +27,12 @@ class TestKernel extends Kernel
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new \Symfony\Bundle\TwigBundle\TwigBundle(),
             new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
-            new TestBundle(),
+            new \Symfony\Bundle\AsseticBundle\Tests\TestBundle\TestBundle(),
         );
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/config.yml');
+        $loader->load(__DIR__.'/Resources/config/config.yml');
     }
 }