Merge branch '6.10'

ezpublishlegacy · Jul 18, 2017 · 6a2976f · 6a2976f
2 parents 5201d7c + f79c6b0
commit 6a2976f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Repository/Tests/BaseTest.php b/Repository/Tests/BaseTest.php
@@ -269,9 +269,11 @@ private function assertPropertiesEqual($propertyName, $expectedValue, $actualVal
     /**
      * Create a user in editor user group.
      *
+     * @param string $login
+     *
      * @return \eZ\Publish\API\Repository\Values\User\User
      */
-    protected function createUserVersion1()
+    protected function createUserVersion1($login = 'user')
     {
         $repository = $this->getRepository();
 
@@ -283,8 +285,8 @@ protected function createUserVersion1()
 
         // Instantiate a create struct with mandatory properties
         $userCreate = $userService->newUserCreateStruct(
-            'user',
-            'user@example.com',
+            $login,
+            "{$login}@example.com",
             'secret',
             'eng-US'
         );

diff --git a/Repository/Tests/UserServiceTest.php b/Repository/Tests/UserServiceTest.php
@@ -1353,10 +1353,10 @@ public function testLoadUserByLogin()
         $userService = $repository->getUserService();
 
         /* BEGIN: Use Case */
-        $user = $this->createUserVersion1();
+        $user = $this->createUserVersion1('User');
 
         // Load the newly created user
-        $userReloaded = $userService->loadUserByLogin('user');
+        $userReloaded = $userService->loadUserByLogin('User');
         /* END: Use Case */
 
         $this->assertPropertiesCorrect(