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

toolbar dropdown and visibility improvements (#933)

Browse Source
This commit is contained in:
Kevin Papst
2019-07-09 16:34:11 +02:00
committed by GitHub
parent b833e1ce27
commit c33a87a07c
74 changed files with 1317 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Repository/Query/ActivityQueryTest.php
View File

@@ -23,7 +23,7 @@ class ActivityQueryTest extends BaseQueryTest
{
$sut = new ActivityQuery();
$this->assertBaseQuery($sut);
$this->assertBaseQuery($sut, 'name');
$this->assertInstanceOf(VisibilityQuery::class, $sut);
$this->assertNull($sut->getCustomer());

17
tests/Repository/Query/BaseQueryTest.php
View File

@@ -9,7 +9,6 @@
namespace App\Tests\Repository\Query;
use App\Entity\User;
use App\Repository\Query\BaseQuery;
use PHPUnit\Framework\TestCase;
@@ -23,13 +22,12 @@ class BaseQueryTest extends TestCase
$this->assertBaseQuery(new BaseQuery());
}
protected function assertBaseQuery(BaseQuery $sut)
protected function assertBaseQuery(BaseQuery $sut, $orderBy = 'id')
{
$this->assertResultType($sut);
$this->assertHiddenEntity($sut);
$this->assertPage($sut);
$this->assertPageSize($sut);
$this->assertOrderBy($sut);
$this->assertOrderBy($sut, $orderBy);
$this->assertOrder($sut);
}
@@ -51,17 +49,6 @@ class BaseQueryTest extends TestCase
}
}
protected function assertHiddenEntity(BaseQuery $sut)
{
$this->assertNull($sut->getHiddenEntity());
$actual = new User();
$actual->setUsername('foo-bar');
$sut->setHiddenEntity($actual);
$this->assertEquals($actual, $sut->getHiddenEntity());
}
protected function assertPage(BaseQuery $sut)
{
$this->assertEquals(BaseQuery::DEFAULT_PAGE, $sut->getPage());

2
tests/Repository/Query/CustomerQueryTest.php
View File

@@ -21,7 +21,7 @@ class CustomerQueryTest extends BaseQueryTest
{
$sut = new CustomerQuery();
$this->assertBaseQuery($sut);
$this->assertBaseQuery($sut, 'name');
$this->assertInstanceOf(VisibilityQuery::class, $sut);
}
}

1
tests/Repository/Query/ExportQueryTest.php
View File

@@ -25,7 +25,6 @@ class ExportQueryTest extends BaseQueryTest
$sut = new ExportQuery();
$this->assertResultType($sut);
$this->assertHiddenEntity($sut);
$this->assertPage($sut);
$this->assertPageSize($sut);
$this->assertOrderBy($sut, 'begin');

2
tests/Repository/Query/ProjectQueryTest.php
View File

@@ -22,7 +22,7 @@ class ProjectQueryTest extends BaseQueryTest
{
$sut = new ProjectQuery();
$this->assertBaseQuery($sut);
$this->assertBaseQuery($sut, 'name');
$this->assertInstanceOf(VisibilityQuery::class, $sut);
$this->assertNull($sut->getCustomer());

1
tests/Repository/Query/TimesheetQueryTest.php
View File

@@ -25,7 +25,6 @@ class TimesheetQueryTest extends BaseQueryTest
$sut = new TimesheetQuery();
$this->assertResultType($sut);
$this->assertHiddenEntity($sut);
$this->assertPage($sut);
$this->assertPageSize($sut);
$this->assertOrderBy($sut, 'begin');

4
tests/Repository/Query/VisibilityQueryTest.php
View File

@@ -21,12 +21,8 @@ class VisibilityQueryTest extends TestCase
{
$sut = new VisibilityQuery();
$this->assertFalse($sut->isExclusiveVisibility());
$this->assertEquals(VisibilityQuery::SHOW_VISIBLE, $sut->getVisibility());
$sut->setExclusiveVisibility(true);
$this->assertTrue($sut->isExclusiveVisibility());
$sut->setVisibility('foo-bar');
$this->assertEquals(VisibilityQuery::SHOW_VISIBLE, $sut->getVisibility());