Merge pull request #1533 from ojs/travis-elastic-bugfix

travis elastic problem parallel admin user creation probably 🐛 fix

Author: behram

src/Ojs/CoreBundle/Service/SampleObjectLoader.php

@@ -507,4 +507,25 @@ public function loadUser()
 
         return $objects['user']->getId();
     }
+
+    /**
+     * @return User
+     */
+    public function loadAdminUser()
+    {
+        $entity = new User();
+        $entity
+            ->setUsername('admin'.rand(0, 9999))
+            ->setPassword('$2y$13$f7YsOYlVTlvauEhV.wTnUO1Q76CuZjcg1Ukf5tLHC8j8IlQ1V4p5S')
+            ->setFirstName('admin '.rand(0,10))
+            ->setLastName('admin last'.rand(0,10))
+            ->setEmail('admin.email.'.rand(0,9999).'@test.com')
+            ->setEnabled(true)
+            ->addRole('ROLE_SUPER_ADMIN')
+        ;
+        $this->em->persist($entity);
+        $this->em->flush();
+
+        return $entity;
+    }
 }

src/Ojs/CoreBundle/Tests/BaseTestSetup.php

@@ -4,6 +4,7 @@
 
 use Liip\FunctionalTestBundle\Test\WebTestCase;
 use Ojs\CoreBundle\Service\SampleObjectLoader;
+use Ojs\UserBundle\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Client;
 use Doctrine\ORM\EntityManager;
@@ -53,6 +54,11 @@ abstract class BaseTestSetup extends WebTestCase
      */
     protected static $isFirstTest = true;
 
+    /**
+     * @var bool | User
+     */
+    protected static $testAdminUser = false;
+
     protected function setUp()
     {
         static::$kernel = static::createKernel();
@@ -153,8 +159,20 @@ protected function runConsole($command, Array $options = array())
         return $this->app->run(new ArrayInput($options));
     }
 
-    protected function logIn($username = 'admin', $password = 'admin')
+    protected function logIn($username = null, $password = 'admin')
     {
+        if($username === null && self::$testAdminUser === false){
+            self::$testAdminUser = $this->sampleObjectLoader->loadAdminUser();
+            $username = self::$testAdminUser->getUsername();
+
+            echo 'Created Admin User -> username -> '. $username."\n";
+        }elseif(self::$testAdminUser instanceof User){
+
+            $username = self::$testAdminUser->getUsername();
+        }else{
+            $username = 'admin';
+        }
+
         $this->client->setServerParameter('PHP_AUTH_USER', $username);
         $this->client->setServerParameter('PHP_AUTH_PW', $password);
     }