jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

polish detail pages (#1817)

Browse Source
This commit is contained in:
Kevin Papst
2020-07-12 20:11:13 +02:00
committed by GitHub
parent 164af7ae02
commit f2dd2331a5
31 changed files with 136 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Controller/CustomerControllerTest.php
View File

@@ -88,7 +88,7 @@ class CustomerControllerTest extends ControllerBaseTest
self::assertEquals(1, $node->count());
$node = $client->getCrawler()->filter('div.box#comments_box');
self::assertEquals(1, $node->count());
$node = $client->getCrawler()->filter('div.box#team_listing_box a.btn-box-tool');
$node = $client->getCrawler()->filter('div.box#team_listing_box a.btn.btn-default');
self::assertEquals(2, $node->count());
$node = $client->getCrawler()->filter('div.box#customer_rates_box');
self::assertEquals(1, $node->count());
@@ -189,7 +189,7 @@ class CustomerControllerTest extends ControllerBaseTest
$this->request($client, '/admin/customer/1/create_team');
$this->assertIsRedirect($client, $this->createUrl('/admin/customer/1/details'));
$client->followRedirect();
$node = $client->getCrawler()->filter('div.box#team_listing_box .box-body');
$node = $client->getCrawler()->filter('div.box#team_listing_box .box-title');
self::assertStringContainsString('Only visible to the following teams and all admins.', $node->text(null, true));
$node = $client->getCrawler()->filter('div.box#team_listing_box .box-body table tbody tr');
self::assertEquals(1, $node->count());

9
tests/Controller/ProjectControllerTest.php
View File

@@ -113,7 +113,7 @@ class ProjectControllerTest extends ControllerBaseTest
self::assertEquals(1, $node->count());
$node = $client->getCrawler()->filter('div.box#comments_box');
self::assertEquals(1, $node->count());
$node = $client->getCrawler()->filter('div.box#team_listing_box a.btn-box-tool');
$node = $client->getCrawler()->filter('div.box#team_listing_box a.btn.btn-default');
self::assertEquals(2, $node->count());
$node = $client->getCrawler()->filter('div.box#project_rates_box');
self::assertEquals(1, $node->count());
@@ -257,7 +257,7 @@ class ProjectControllerTest extends ControllerBaseTest
$this->request($client, '/admin/project/1/create_team');
$this->assertIsRedirect($client, $this->createUrl('/admin/project/1/details'));
$client->followRedirect();
$node = $client->getCrawler()->filter('div.box#team_listing_box .box-body');
$node = $client->getCrawler()->filter('div.box#team_listing_box .box-title');
self::assertStringContainsString('Only visible to the following teams and all admins.', $node->text(null, true));
$node = $client->getCrawler()->filter('div.box#team_listing_box .box-body table tbody tr');
self::assertEquals(1, $node->count());
@@ -267,7 +267,10 @@ class ProjectControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/project/1/activities/1');
self::assertEquals('', $client->getResponse()->getContent());
$node = $client->getCrawler()->filter('div.box#activity_list_box .box-tools ul.pagination li');
self::assertEquals(0, $node->count());
$node = $client->getCrawler()->filter('div.box#activity_list_box .box-tools a.modal-ajax-form.open-edit');
self::assertEquals(1, $node->count());
/** @var EntityManager $em */
$em = $this->getEntityManager();

4
tests/Entity/ActivityTest.php
View File

@@ -27,7 +27,7 @@ class ActivityTest extends TestCase
$this->assertNull($sut->getProject());
$this->assertNull($sut->getName());
$this->assertNull($sut->getComment());
$this->assertTrue($sut->getVisible());
$this->assertTrue($sut->isVisible());
$this->assertTrue($sut->isGlobal());
$this->assertNull($sut->getColor());
$this->assertEquals(0.0, $sut->getBudget());
@@ -45,7 +45,7 @@ class ActivityTest extends TestCase
$this->assertEquals('foo-bar', (string) $sut);
$this->assertInstanceOf(Activity::class, $sut->setVisible(false));
$this->assertFalse($sut->getVisible());
$this->assertFalse($sut->isVisible());
$this->assertInstanceOf(Activity::class, $sut->setComment('hello world'));
$this->assertEquals('hello world', $sut->getComment());

4
tests/Entity/CustomerTest.php
View File

@@ -27,7 +27,7 @@ class CustomerTest extends TestCase
self::assertNull($sut->getName());
self::assertNull($sut->getNumber());
self::assertNull($sut->getComment());
self::assertTrue($sut->getVisible());
self::assertTrue($sut->isVisible());
self::assertNull($sut->getCompany());
self::assertNull($sut->getVatId());
@@ -61,7 +61,7 @@ class CustomerTest extends TestCase
self::assertEquals('foo-bar', (string) $sut);
self::assertInstanceOf(Customer::class, $sut->setVisible(false));
self::assertFalse($sut->getVisible());
self::assertFalse($sut->isVisible());
self::assertInstanceOf(Customer::class, $sut->setComment('hello world'));
self::assertEquals('hello world', $sut->getComment());

3
tests/Entity/ProjectTest.php
View File

@@ -32,7 +32,6 @@ class ProjectTest extends TestCase
self::assertNull($sut->getStart());
self::assertNull($sut->getEnd());
self::assertNull($sut->getComment());
self::assertTrue($sut->getVisible());
self::assertTrue($sut->isVisible());
self::assertNull($sut->getColor());
self::assertEquals(0.0, $sut->getBudget());
@@ -81,7 +80,7 @@ class ProjectTest extends TestCase
self::assertEquals('#fffccc', $sut->getColor());
self::assertInstanceOf(Project::class, $sut->setVisible(false));
self::assertFalse($sut->getVisible());
self::assertFalse($sut->isVisible());
self::assertInstanceOf(Project::class, $sut->setBudget(12345.67));
self::assertEquals(12345.67, $sut->getBudget());