Fixed tests that were failing

* All tests work as expected
elcodi · Jun 14, 2015 · 58fad92 · 58fad92
1 parent 6a8bcc8
commit 58fad92
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 11 deletions.
diff --git a/src/Elcodi/Bridge/BehatBridgeBundle/DoctrineContext.php b/src/Elcodi/Bridge/BehatBridgeBundle/DoctrineContext.php
@@ -157,7 +157,7 @@ private function loadCommonFixtures()
             ->getRootDir();
 
         $command =
-            'doc:fix:load ' .
+            'doctrine:fixtures:load ' .
             '--fixtures=' . $rootDir . '/../src/Elcodi/Plugin/ ' .
             '--fixtures=' . $rootDir . '/../src/Elcodi/Fixtures ' .
             '--env=test ' .

diff --git a/src/Elcodi/Bridge/VisithorBridgeBundle/Environment/EnvironmentBuilder.php b/src/Elcodi/Bridge/VisithorBridgeBundle/Environment/EnvironmentBuilder.php
@@ -17,9 +17,11 @@
 
 namespace Elcodi\Bridge\VisithorBridgeBundle\Environment;
 
+use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Visithor\Bundle\Environment\SymfonyEnvironmentBuilder;
 
+use Elcodi\Component\Geo\Entity\Interfaces\LocationInterface;
 use Elcodi\Component\User\Repository\AdminUserRepository;
 use Elcodi\Component\User\Repository\CustomerRepository;
 
@@ -68,11 +70,8 @@ public function setUp(KernelInterface $kernel)
         parent::setUp($kernel);
 
         $this
-            ->executeCommand('doctrine:fixtures:load', [
-                '--no-booster' => true,
-                '--fixtures'   => $kernel
-                        ->getRootDir() . '/../src/Elcodi/Fixtures',
-            ])
+            ->loadCommonFixtures($kernel)
+            ->loadLocationFixtures($kernel)
             ->executeCommand('elcodi:plugins:load');
     }
 
@@ -97,4 +96,92 @@ public function getAuthenticationUser($role)
                     'email' => 'customer@customer.com',
                 ]);
     }
+
+    /**
+     * Load common fixtures
+     *
+     * @param KernelInterface $kernel Kernel
+     *
+     * @return $this Self object
+     */
+    private function loadCommonFixtures(KernelInterface $kernel)
+    {
+        $rootDir = $kernel->getRootDir();
+
+        $command =
+            'doctrine:fixtures:load ' .
+            '--fixtures=' . $rootDir . '/../src/Elcodi/Plugin/ ' .
+            '--fixtures=' . $rootDir . '/../src/Elcodi/Fixtures ' .
+            '--env=test ' .
+            '--no-interaction ' .
+            '--quiet ';
+
+        $input = new StringInput($command);
+        $this
+            ->application
+            ->run($input);
+
+        return $this;
+    }
+
+    /**
+     * Load location fixtures
+     *
+     * @return $this Self object
+     */
+    private function loadLocationFixtures(KernelInterface $kernel)
+    {
+        $locationDirector = $kernel
+            ->getContainer()
+            ->get('elcodi.director.location');
+
+        /**
+         * @var LocationInterface $locationBarcelonaCity
+         */
+        $locationBarcelonaCity = $locationDirector
+            ->create()
+            ->setId('ES_CT_B_Barcelona')
+            ->setName('Barcelona')
+            ->setCode('Barcelona')
+            ->setType('city');
+        $locationDirector->save($locationBarcelonaCity);
+
+        /**
+         * @var LocationInterface $locationBarcelonaProvince
+         */
+        $locationBarcelonaProvince = $locationDirector
+            ->create()
+            ->setId('ES_CT_B')
+            ->setName('Barcelona')
+            ->setCode('B')
+            ->setType('province')
+            ->addChildren($locationBarcelonaCity);
+        $locationDirector->save($locationBarcelonaProvince);
+
+        /**
+         * @var LocationInterface $locationCatalunya
+         */
+        $locationCatalunya = $locationDirector
+            ->create()
+            ->setId('ES_CT')
+            ->setName('Catalunya')
+            ->setCode('CT')
+            ->setType('state')
+            ->addChildren($locationBarcelonaProvince);
+        $locationDirector->save($locationCatalunya);
+
+        /**
+         * @var LocationInterface $locationSpain
+         */
+        $locationSpain = $locationDirector
+            ->create()
+            ->setId('ES')
+            ->setName('Spain')
+            ->setCode('ES')
+            ->setType('country')
+            ->addChildren($locationCatalunya);
+        $locationDirector->save($locationSpain);
+
+        return $this;
+    }
 }
diff --git a/src/Elcodi/Plugin/PaypalWebCheckoutBundle/Resources/translations/messages.en.yml b/src/Elcodi/Plugin/PaypalWebCheckoutBundle/Resources/translations/messages.en.yml
@@ -5,4 +5,4 @@ elcodi_plugin:
         field:
             business:
                 label: Paypal account
-                placeholder: john@doo.com
+                placeholder: john@doo.com
diff --git a/visithor.yml.dist b/visithor.yml.dist
@@ -188,10 +188,7 @@ urls:
     #
     # Miscelania
     #
-    - [admin_configuration_list, 200, {profile: admin}]
-    - [admin_homepage, 302, {profile: admin}]
-    - [admin_payment_configuration_list, 200, {profile: admin}]
+    - [admin_homepage, 200, {profile: admin}]
     - [admin_template_list, 200, {profile: admin}]
     - [admin_plugin_list, 200, {profile: admin}]
-    - [admin_store_setup_wizard, 200, {profile: admin}]