Remove unused code + add tests.

pull/4020/head^2
Julio 4 years ago
parent 221c0f2832
commit 4ba5f63b2e
  1. 13
      src/CoreBundle/Form/Type/IllustrationType.php
  2. 5
      src/CoreBundle/Form/Type/YesNoNumericType.php
  3. 5
      src/CoreBundle/Form/Type/YesNoType.php
  4. 2
      src/CoreBundle/Resources/config/services.yml
  5. 39
      tests/CoreBundle/Repository/SysAnnouncementRepositoryTest.php

@ -14,23 +14,10 @@ class IllustrationType extends AbstractType
{
public function configureOptions(OptionsResolver $resolver): void
{
/*$resolver->setDefaults(
[
'choices' => [
'Yes' => 'true',
'No' => 'false',
],
]
);*/
}
public function getParent()
{
return FileType::class;
}
public function getName(): string
{
return 'illustration';
}
}

@ -44,9 +44,4 @@ class YesNoNumericType extends AbstractType
{
return ChoiceType::class;
}
public function getName(): string
{
return 'yes_no_numeric';
}
}

@ -28,9 +28,4 @@ class YesNoType extends AbstractType
{
return ChoiceType::class;
}
public function getName(): string
{
return 'yes_no';
}
}

@ -40,7 +40,7 @@ services:
# Custom yes/no form type, use in the platform settings
Chamilo\CoreBundle\Form\Type\YesNoType:
tags:
- {name: form.type, alias: yes_no}
- {name: form.type}
Chamilo\CoreBundle\Component\Editor\CkEditor\CkEditor:
arguments: ['@translator', '@router']

@ -89,19 +89,6 @@ class SysAnnouncementRepositoryTest extends WebTestCase
->setName('Doctor')
;
$em->persist($career);
$promotion = (new Promotion())
->setName('2000')
->setDescription('Promotion of 2000')
->setCareer($career)
->setStatus(1)
;
$promotion->getSessions()->add($session);
$em->persist($promotion);
$em->flush();
$this->assertSame(1, $promotion->getSessions()->count());
$sysAnnouncement = (new SysAnnouncement())
->setTitle('Welcome to Chamilo!')
@ -110,13 +97,37 @@ class SysAnnouncementRepositoryTest extends WebTestCase
->setDateStart(new DateTime())
->setDateEnd(new DateTime('now +30 days'))
->setCareer($career)
->setPromotion($promotion)
->addRole('ROLE_ANONYMOUS')
->addRole('ROLE_USER') // connected users
;
$em->persist($sysAnnouncement);
$em->flush();
// Test with no promotions.
$items = $repo->getAnnouncements($user, $this->getAccessUrl(), '');
$this->assertCount(1, $items);
$promotion = (new Promotion())
->setName('2000')
->setDescription('Promotion of 2000')
->setCareer($career)
->setStatus(1)
;
$em->persist($promotion);
$em->flush();
$sysAnnouncement = $repo->find($sysAnnouncement->getId());
$sysAnnouncement->setPromotion($promotion);
$em->persist($sysAnnouncement);
$em->flush();
$promotion->getSessions()->add($session);
$em->persist($promotion);
$em->flush();
$this->assertSame(1, $promotion->getSessions()->count());
// Test with promotions.
$items = $repo->getAnnouncements($user, $this->getAccessUrl(), '');
$this->assertCount(1, $items);
}

Loading…
Cancel
Save