diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 71f71c40f6..b778c6b6d9 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -77,5 +77,6 @@ jobs: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | composer global require php-coveralls/php-coveralls - mkdir build/logs + sudo mkdir -p build/logs + sudo chmod -R 777 build php-coveralls --coverage_clover=clover.xml -v \ No newline at end of file diff --git a/tests/CoreBundle/Repository/Node/UserRepositoryTest.php b/tests/CoreBundle/Repository/Node/UserRepositoryTest.php index d88fdb19f3..365d10afb8 100644 --- a/tests/CoreBundle/Repository/Node/UserRepositoryTest.php +++ b/tests/CoreBundle/Repository/Node/UserRepositoryTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace Chamilo\Tests\CoreBundle\Repository\Node; +use Chamilo\CoreBundle\Entity\Group; use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Repository\Node\UserRepository; use Chamilo\Tests\AbstractApiTest; @@ -70,8 +71,10 @@ class UserRepositoryTest extends AbstractApiTest $admin = $this->createUser('admin2'); $userRepo = self::getContainer()->get(UserRepository::class); + $em = $this->getManager(); + $this->assertHasNoEntityViolations($admin); - $admin->addRole('ROLE_ADMIN'); + $admin->addUserAsAdmin(); $userRepo->update($admin); $this->assertTrue($admin->isActive()); @@ -80,11 +83,31 @@ class UserRepositoryTest extends AbstractApiTest $this->assertFalse($admin->isStudentBoss()); $this->assertFalse($admin->isSuperAdmin()); $this->assertTrue($admin->isCredentialsNonExpired()); + $this->assertFalse($admin->getCredentialsExpired()); + $this->assertFalse($admin->getLocked()); + + // Group. + $this->assertEmpty($admin->getGroupNames()); + $this->assertFalse($admin->hasGroup('test')); + + $group = (new Group('test')) + ->setCode('test') + ; + $em->persist($group); + $em->flush(); + + $admin->addGroup($group); + $userRepo->update($admin); + /** @var User $admin */ + $admin = $userRepo->find($admin->getId()); + + $this->assertTrue($admin->hasGroup('test')); + $this->assertSame(2, \count($admin->getRoles())); } public function testCreateUserSkipResourceNode(): void { - $manager = $this->getManager(); + $em = $this->getManager(); $userRepo = self::getContainer()->get(UserRepository::class); $user = (new User()) @@ -100,11 +123,11 @@ class UserRepositoryTest extends AbstractApiTest ->addUserAsAdmin()//->addGroup($group) ; - $manager->persist($user); + $em->persist($user); $userRepo->updateUser($user); $userRepo->addUserToResourceNode($user->getId(), $user->getId()); - $manager->flush(); + $em->flush(); //$this->assertTrue($user->isAdmin()); //$this->assertTrue($user->isSuperAdmin()); diff --git a/tests/CoreBundle/Repository/TagRepositoryTest.php b/tests/CoreBundle/Repository/TagRepositoryTest.php index da734249db..f16c96fa6a 100644 --- a/tests/CoreBundle/Repository/TagRepositoryTest.php +++ b/tests/CoreBundle/Repository/TagRepositoryTest.php @@ -43,5 +43,9 @@ class TagRepositoryTest extends AbstractApiTest $em->flush(); $this->assertSame($defaultCount + 1, $repo->count([])); + + $tags = $repo->findTagsByField('php', $extraField->getId()); + + $this->assertSame(1, \count($tags)); } }