Tests: Don't load Hautelook in the default configuration,

it replaced NelmioAlice loader during all the tests See #246
liip · Mar 20, 2016 · 97cedfc · 97cedfc
1 parent 3a67aa2
commit 97cedfc
Show file tree

Hide file tree

Showing 7 changed files with 145 additions and 135 deletions.
diff --git a/Tests/App/AppKernel.php b/Tests/App/AppKernel.php
@@ -28,7 +28,6 @@ public function registerBundles()
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             new Liip\FunctionalTestBundle\LiipFunctionalTestBundle(),
-            new Hautelook\AliceBundle\HautelookAliceBundle(),
         );
 
         return $bundles;

diff --git a/Tests/App/config.yml b/Tests/App/config.yml
@@ -78,8 +78,3 @@ security:
     access_control:
         - { path: ^/, roles: IS_AUTHENTICATED_ANONYMOUSLY }
 
-# HautelookAliceBundle: custom Faker provider
-services:
-    faker.provider.foo:
-        class: Liip\FunctionalTestBundle\Tests\App\DataFixtures\Faker\Provider\FooProvider
-        tags: [ { name: hautelook_alice.faker.provider } ]
diff --git a/Tests/AppConfig/AppConfigKernel.php b/Tests/AppConfig/AppConfigKernel.php
@@ -17,6 +17,16 @@
 
 class AppConfigKernel extends AppKernel
 {
+    public function registerBundles()
+    {
+        return array_merge(
+            parent::registerBundles(),
+            array(
+                new Hautelook\AliceBundle\HautelookAliceBundle(),
+            )
+        );
+    }
+
     /**
      * Load the config.yml from the current directory.
      */

diff --git a/...taFixtures/Faker/Provider/FooProvider.php → ...taFixtures/Faker/Provider/FooProvider.php b/...taFixtures/Faker/Provider/FooProvider.php → ...taFixtures/Faker/Provider/FooProvider.php
@@ -9,7 +9,7 @@
 * with this source code in the file LICENSE.
 */
 
-namespace Liip\FunctionalTestBundle\Tests\App\DataFixtures\Faker\Provider;
+namespace Liip\FunctionalTestBundle\Tests\AppConfig\DataFixtures\Faker\Provider;
 
 class FooProvider
 {

diff --git a/Tests/AppConfig/config.yml b/Tests/AppConfig/config.yml
@@ -21,3 +21,9 @@ liip_functional_test:
         ignores_extract:
             - 'ignore_extract_1'
             - 'ignore_extract_2'
+
+# HautelookAliceBundle: custom Faker provider
+services:
+    faker.provider.foo:
+        class: Liip\FunctionalTestBundle\Tests\AppConfig\DataFixtures\Faker\Provider\FooProvider
+        tags: [ { name: hautelook_alice.faker.provider } ]
diff --git a/Tests/Test/WebTestCaseConfigTest.php b/Tests/Test/WebTestCaseConfigTest.php
@@ -198,4 +198,132 @@ public function testAnnotationAndException()
 
         $this->client->request('GET', $path);
     }
+
+    /**
+     * Test if there is a call-out to the service if defined.
+     */
+    public function testHautelookServiceUsage()
+    {
+        $hautelookLoaderMock = $this->getMockBuilder('\Hautelook\AliceBundle\Alice\DataFixtures\Loader')
+            ->disableOriginalConstructor()
+            ->setMethods(array('load'))
+            ->getMock();
+        $hautelookLoaderMock->expects(self::once())->method('load');
+
+        $this->getContainer()->set('hautelook_alice.fixtures.loader', $hautelookLoaderMock);
+
+        $this->loadFixtureFiles(array(
+            '@LiipFunctionalTestBundle/Tests/App/DataFixtures/ORM/user.yml',
+        ));
+    }
+
+    /**
+     * Use hautelook.
+     */
+    public function testLoadFixturesFilesWithHautelook()
+    {
+        if (!class_exists('Hautelook\AliceBundle\Faker\Provider\ProviderChain')) {
+            self::markTestSkipped('Please use hautelook/alice-bundle >=1.2');
+        }
+
+        $fakerProcessorChain = new \Hautelook\AliceBundle\Faker\Provider\ProviderChain(array());
+        $aliceProcessorChain = new \Hautelook\AliceBundle\Alice\ProcessorChain(array());
+        $fixtureLoader = new \Hautelook\AliceBundle\Alice\DataFixtures\Fixtures\Loader('en_US', $fakerProcessorChain);
+        $loader = new \Hautelook\AliceBundle\Alice\DataFixtures\Loader($fixtureLoader, $aliceProcessorChain, true, 10);
+        $this->getContainer()->set('hautelook_alice.fixtures.loader', $loader);
+
+        $fixtures = $this->loadFixtureFiles(array(
+            '@LiipFunctionalTestBundle/Tests/App/DataFixtures/ORM/user.yml',
+        ));
+
+        $this->assertInternalType(
+            'array',
+            $fixtures
+        );
+
+        // 10 users are loaded
+        $this->assertCount(
+            10,
+            $fixtures
+        );
+
+        $em = $this->getContainer()
+            ->get('doctrine.orm.entity_manager');
+
+        $users = $em->getRepository('LiipFunctionalTestBundle:User')
+            ->findAll();
+
+        $this->assertSame(
+            10,
+            count($users)
+        );
+
+        /** @var \Liip\FunctionalTestBundle\Tests\App\Entity\User $user */
+        $user = $em->getRepository('LiipFunctionalTestBundle:User')
+            ->findOneBy(array(
+                'id' => 1,
+            ));
+
+        $this->assertTrue(
+            $user->getEnabled()
+        );
+
+        $user = $em->getRepository('LiipFunctionalTestBundle:User')
+            ->findOneBy(array(
+                'id' => 10,
+            ));
+
+        $this->assertTrue(
+            $user->getEnabled()
+        );
+    }
+
+    /**
+     * Load Data Fixtures with hautelook and custom loader defined in configuration.
+     */
+    public function testLoadFixturesFilesWithHautelookCustomProvider()
+    {
+        if (!class_exists('Hautelook\AliceBundle\Faker\Provider\ProviderChain')) {
+            self::markTestSkipped('Please use hautelook/alice-bundle >=1.2');
+        }
+
+        // Load default Data Fixtures.
+        $fixtures = $this->loadFixtureFiles(array(
+            '@LiipFunctionalTestBundle/Tests/App/DataFixtures/ORM/user.yml',
+        ));
+
+        $this->assertInternalType(
+            'array',
+            $fixtures
+        );
+
+        // 10 users are loaded
+        $this->assertCount(
+            10,
+            $fixtures
+        );
+
+        /** @var \Liip\FunctionalTestBundle\Tests\App\Entity\User $user */
+        $user = $fixtures['id1'];
+
+        // The custom provider has not been used successfully.
+        $this->assertStringStartsNotWith(
+            'foo',
+            $user->getName()
+        );
+
+        // Load Data Fixtures with custom loader defined in configuration.
+        $fixtures = $this->loadFixtureFiles(array(
+            '@LiipFunctionalTestBundle/Tests/App/DataFixtures/ORM/user_with_custom_provider.yml',
+        ));
+
+        /** @var \Liip\FunctionalTestBundle\Tests\App\Entity\User $user */
+        $user = $fixtures['id1'];
+
+        // The custom provider "foo" has been loaded and used successfully.
+        $this->assertSame(
+            'fooa string',
+            $user->getName()
+        );
+    }
 }
diff --git a/Tests/Test/WebTestCaseTest.php b/Tests/Test/WebTestCaseTest.php
@@ -413,134 +413,6 @@ public function testLoadFixturesFiles()
         );
     }
 
-    /**
-     * Test if there is a call-out to the service if defined.
-     */
-    public function testHautelookServiceUsage()
-    {
-        $hautelookLoaderMock = $this->getMockBuilder('\Hautelook\AliceBundle\Alice\DataFixtures\Loader')
-            ->disableOriginalConstructor()
-            ->setMethods(array('load'))
-            ->getMock();
-        $hautelookLoaderMock->expects(self::once())->method('load');
-
-        $this->getContainer()->set('hautelook_alice.fixtures.loader', $hautelookLoaderMock);
-
-        $this->loadFixtureFiles(array(
-            '@LiipFunctionalTestBundle/Tests/App/DataFixtures/ORM/user.yml',
-        ));
-    }
-
-    /**
-     * Use hautelook.
-     */
-    public function testLoadFixturesFilesWithHautelook()
-    {
-        if (!class_exists('Hautelook\AliceBundle\Faker\Provider\ProviderChain')) {
-            self::markTestSkipped('Please use hautelook/alice-bundle >=1.2');
-        }
-
-        $fakerProcessorChain = new \Hautelook\AliceBundle\Faker\Provider\ProviderChain(array());
-        $aliceProcessorChain = new \Hautelook\AliceBundle\Alice\ProcessorChain(array());
-        $fixtureLoader = new \Hautelook\AliceBundle\Alice\DataFixtures\Fixtures\Loader('en_US', $fakerProcessorChain);
-        $loader = new \Hautelook\AliceBundle\Alice\DataFixtures\Loader($fixtureLoader, $aliceProcessorChain, true, 10);
-        $this->getContainer()->set('hautelook_alice.fixtures.loader', $loader);
-
-        $fixtures = $this->loadFixtureFiles(array(
-            '@LiipFunctionalTestBundle/Tests/App/DataFixtures/ORM/user.yml',
-        ));
-
-        $this->assertInternalType(
-            'array',
-            $fixtures
-        );
-
-        // 10 users are loaded
-        $this->assertCount(
-            10,
-            $fixtures
-        );
-
-        $em = $this->client->getContainer()
-            ->get('doctrine.orm.entity_manager');
-
-        $users = $em->getRepository('LiipFunctionalTestBundle:User')
-            ->findAll();
-
-        $this->assertSame(
-            10,
-            count($users)
-        );
-
-        /** @var \Liip\FunctionalTestBundle\Tests\App\Entity\User $user */
-        $user = $em->getRepository('LiipFunctionalTestBundle:User')
-            ->findOneBy(array(
-                'id' => 1,
-            ));
-
-        $this->assertTrue(
-            $user->getEnabled()
-        );
-
-        $user = $em->getRepository('LiipFunctionalTestBundle:User')
-            ->findOneBy(array(
-                'id' => 10,
-            ));
-
-        $this->assertTrue(
-            $user->getEnabled()
-        );
-    }
-
-    /**
-     * Load Data Fixtures with hautelook and custom loader defined in configuration.
-     */
-    public function testLoadFixturesFilesWithHautelookCustomProvider()
-    {
-        if (!class_exists('Hautelook\AliceBundle\Faker\Provider\ProviderChain')) {
-            self::markTestSkipped('Please use hautelook/alice-bundle >=1.2');
-        }
-
-        // Load default Data Fixtures.
-        $fixtures = $this->loadFixtureFiles(array(
-            '@LiipFunctionalTestBundle/Tests/App/DataFixtures/ORM/user.yml',
-        ));
-
-        $this->assertInternalType(
-            'array',
-            $fixtures
-        );
-
-        // 10 users are loaded
-        $this->assertCount(
-            10,
-            $fixtures
-        );
-
-        /** @var \Liip\FunctionalTestBundle\Tests\App\Entity\User $user */
-        $user = $fixtures['id1'];
-
-        // The custom provider has not been used successfully.
-        $this->assertStringStartsNotWith(
-            'foo',
-            $user->getName()
-        );
-
-        // Load Data Fixtures with custom loader defined in configuration.
-        $fixtures = $this->loadFixtureFiles(array(
-            '@LiipFunctionalTestBundle/Tests/App/DataFixtures/ORM/user_with_custom_provider.yml',
-        ));
-
-        /** @var \Liip\FunctionalTestBundle\Tests\App\Entity\User $user */
-        $user = $fixtures['id1'];
-
-        // The custom provider "foo" has been loaded and used successfully.
-        $this->assertSame(
-            'fooa string',
-            $user->getName()
-        );
-    }
-
     /**
      * Use nelmio/alice with full path to the file.
      */