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

added toolbar to user screen #56 (#66)

Browse Source 
* added toolbar to user screen # 56
* added filter for user role in user admin toolbar # 56
* added unit tests for queries # 56
This commit is contained in:
Kevin Papst
2018-01-09 17:15:07 +01:00
committed by GitHub
parent 56fca32845
commit 03896e3a1a
26 changed files with 684 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
tests/AppBundle/Repository/Query/BaseQueryTest.php Normal file
View File

@@ -0,0 +1,99 @@
<?php
/*
* This file is part of the Kimai package.
*
* (c) Kevin Papst <kevin@kevinpapst.de>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace KimaiTest\AppBundle\Repository\Query;
use AppBundle\Entity\User;
use AppBundle\Repository\Query\BaseQuery;
use \PHPUnit\Framework\TestCase;
/**
* @covers \AppBundle\Repository\Query\BaseQuery
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class BaseQueryTest extends TestCase
{
public function testQuery()
{
$this->assertBaseQuery(new BaseQuery());
}
protected function assertBaseQuery(BaseQuery $sut)
{
$this->assertResultType($sut);
$this->assertHiddenEntity($sut);
$this->assertPage($sut);
$this->assertPageSize($sut);
$this->assertOrderBy($sut);
$this->assertOrder($sut);
}
protected function assertResultType(BaseQuery $sut)
{
$this->assertEquals(BaseQuery::RESULT_TYPE_PAGER, $sut->getResultType());
$sut->setResultType('foo-bar');
$this->assertEquals(BaseQuery::RESULT_TYPE_PAGER, $sut->getResultType());
$sut->setResultType(BaseQuery::RESULT_TYPE_QUERYBUILDER);
$this->assertEquals(BaseQuery::RESULT_TYPE_QUERYBUILDER, $sut->getResultType());
}
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());
$sut->setPage(42);
$this->assertEquals(42, $sut->getPage());
}
protected function assertPageSize(BaseQuery $sut)
{
$this->assertEquals(BaseQuery::DEFAULT_PAGESIZE, $sut->getPageSize());
$sut->setPageSize(100);
$this->assertEquals(100, $sut->getPageSize());
}
protected function assertOrderBy(BaseQuery $sut, $column = 'id')
{
$this->assertEquals($column, $sut->getOrderBy());
$sut->setOrderBy('foo');
$this->assertEquals('foo', $sut->getOrderBy());
}
protected function assertOrder(BaseQuery $sut, $order = BaseQuery::ORDER_ASC)
{
$this->assertEquals($order, $sut->getOrder());
$sut->setOrder('foo');
$this->assertEquals($order, $sut->getOrder());
$sut->setOrder(BaseQuery::ORDER_ASC);
$this->assertEquals(BaseQuery::ORDER_ASC, $sut->getOrder());
$sut->setOrder(BaseQuery::ORDER_DESC);
$this->assertEquals(BaseQuery::ORDER_DESC, $sut->getOrder());
}
}

43
tests/AppBundle/Repository/Query/UserQueryTest.php Normal file
View File

@@ -0,0 +1,43 @@
<?php
/*
* This file is part of the Kimai package.
*
* (c) Kevin Papst <kevin@kevinpapst.de>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace KimaiTest\AppBundle\Repository\Query;
use AppBundle\Repository\Query\UserQuery;
use AppBundle\Repository\Query\VisibilityInterface;
use AppBundle\Repository\Query\VisibilityTrait;
/**
* @covers \AppBundle\Repository\Query\UserQuery
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class UserQueryTest extends BaseQueryTest
{
public function testQuery()
{
$sut = new UserQuery();
$this->assertBaseQuery($sut);
$this->assertInstanceOf(VisibilityInterface::class, $sut);
$this->assertArrayHasKey(VisibilityTrait::class, class_uses($sut));
$this->assertRole($sut);
}
protected function assertRole(UserQuery $sut)
{
$this->assertNull($sut->getRole());
$sut->setRole('foo-bar');
$this->assertNull($sut->getRole());
$sut->setRole('ROLE_USER');
$this->assertEquals('ROLE_USER', $sut->getRole());
}
}

23
tests/AppBundle/Repository/Query/VisibilityTraitImplementation.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
/*
* This file is part of the Kimai package.
*
* (c) Kevin Papst <kevin@kevinpapst.de>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace KimaiTest\AppBundle\Repository\Query;
use AppBundle\Repository\Query\VisibilityInterface;
use AppBundle\Repository\Query\VisibilityTrait;
/**
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class VisibilityTraitImplementation implements VisibilityInterface
{
use VisibilityTrait;
}

46
tests/AppBundle/Repository/Query/VisibilityTraitTest.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
/*
* This file is part of the Kimai package.
*
* (c) Kevin Papst <kevin@kevinpapst.de>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace KimaiTest\AppBundle\Repository\Query;
use AppBundle\Repository\Query\VisibilityInterface;
use AppBundle\Repository\Query\VisibilityTrait;
use PHPUnit\Framework\TestCase;
/**
* @covers \AppBundle\Repository\Query\VisibilityTrait
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class VisibilityTraitTest extends TestCase
{
public function testVisibilityTrait()
{
$sut = new VisibilityTraitImplementation();
$this->assertFalse($sut->isExclusiveVisibility());
$this->assertEquals(VisibilityTraitImplementation::SHOW_VISIBLE, $sut->getVisibility());
$sut->setExclusiveVisibility(true);
$this->assertTrue($sut->isExclusiveVisibility());
$sut->setVisibility('foo-bar');
$this->assertEquals(VisibilityTraitImplementation::SHOW_VISIBLE, $sut->getVisibility());
$sut->setVisibility(VisibilityTraitImplementation::SHOW_BOTH);
$this->assertEquals(VisibilityTraitImplementation::SHOW_BOTH, $sut->getVisibility());
$sut->setVisibility(VisibilityTraitImplementation::SHOW_HIDDEN);
$this->assertEquals(VisibilityTraitImplementation::SHOW_HIDDEN, $sut->getVisibility());
$sut->setVisibility(VisibilityTraitImplementation::SHOW_VISIBLE);
$this->assertEquals(VisibilityTraitImplementation::SHOW_VISIBLE, $sut->getVisibility());
}
}

50
tests/TimesheetBundle/Repository/Query/ActivityQueryTest.php Normal file
View File

@@ -0,0 +1,50 @@
<?php
/*
* This file is part of the Kimai package.
*
* (c) Kevin Papst <kevin@kevinpapst.de>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace KimaiTest\TimesheetBundle\Repository\Query;
use AppBundle\Repository\Query\VisibilityInterface;
use AppBundle\Repository\Query\VisibilityTrait;
use KimaiTest\AppBundle\Repository\Query\BaseQueryTest;
use TimesheetBundle\Entity\Customer;
use TimesheetBundle\Entity\Project;
use TimesheetBundle\Repository\Query\ActivityQuery;
/**
* @covers \TimesheetBundle\Repository\Query\ActivityQuery
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class ActivityQueryTest extends BaseQueryTest
{
public function testQuery()
{
$sut = new ActivityQuery();
$this->assertBaseQuery($sut);
$this->assertInstanceOf(VisibilityInterface::class, $sut);
$this->assertArrayHasKey(VisibilityTrait::class, class_uses($sut));
$this->assertNull($sut->getCustomer());
$this->assertNull($sut->getProject());
$expected = new Customer();
$expected->setName('foo-bar');
$sut->setCustomer($expected);
$this->assertEquals($expected, $sut->getCustomer());
$expected = new Project();
$expected->setName('foo-bar');
$sut->setProject($expected);
$this->assertEquals($expected, $sut->getProject());
}
}

33
tests/TimesheetBundle/Repository/Query/CustomerQueryTest.php Normal file
View File

@@ -0,0 +1,33 @@
<?php
/*
* This file is part of the Kimai package.
*
* (c) Kevin Papst <kevin@kevinpapst.de>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace KimaiTest\TimesheetBundle\Repository\Query;
use AppBundle\Repository\Query\VisibilityInterface;
use AppBundle\Repository\Query\VisibilityTrait;
use KimaiTest\AppBundle\Repository\Query\BaseQueryTest;
use TimesheetBundle\Repository\Query\CustomerQuery;
/**
* @covers \TimesheetBundle\Repository\Query\CustomerQuery
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class CustomerQueryTest extends BaseQueryTest
{
public function testQuery()
{
$sut = new CustomerQuery();
$this->assertBaseQuery($sut);
$this->assertInstanceOf(VisibilityInterface::class, $sut);
$this->assertArrayHasKey(VisibilityTrait::class, class_uses($sut));
}
}

42
tests/TimesheetBundle/Repository/Query/ProjectQueryTest.php Normal file
View File

@@ -0,0 +1,42 @@
<?php
/*
* This file is part of the Kimai package.
*
* (c) Kevin Papst <kevin@kevinpapst.de>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace KimaiTest\TimesheetBundle\Repository\Query;
use AppBundle\Repository\Query\VisibilityInterface;
use AppBundle\Repository\Query\VisibilityTrait;
use KimaiTest\AppBundle\Repository\Query\BaseQueryTest;
use TimesheetBundle\Entity\Customer;
use TimesheetBundle\Repository\Query\ProjectQuery;
/**
* @covers \TimesheetBundle\Repository\Query\ProjectQuery
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class ProjectQueryTest extends BaseQueryTest
{
public function testQuery()
{
$sut = new ProjectQuery();
$this->assertBaseQuery($sut);
$this->assertInstanceOf(VisibilityInterface::class, $sut);
$this->assertArrayHasKey(VisibilityTrait::class, class_uses($sut));
$this->assertNull($sut->getCustomer());
$expected = new Customer();
$expected->setName('foo-bar');
$sut->setCustomer($expected);
$this->assertEquals($expected, $sut->getCustomer());
}
}

89
tests/TimesheetBundle/Repository/Query/TimesheetQueryTest.php
View File

@@ -11,32 +11,91 @@
namespace KimaiTest\TimesheetBundle\Repository\Query;
use AppBundle\Repository\Query\BaseQuery;
use \PHPUnit\Framework\TestCase;
use AppBundle\Entity\User;
use KimaiTest\AppBundle\Repository\Query\BaseQueryTest;
use TimesheetBundle\Entity\Activity;
use TimesheetBundle\Entity\Customer;
use TimesheetBundle\Entity\Project;
use TimesheetBundle\Repository\Query\TimesheetQuery;
/**
* @covers \TimesheetBundle\Repository\Query\TimesheetQuery
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class TimesheetQueryTest extends TestCase
class TimesheetQueryTest extends BaseQueryTest
{
public function testSetOrder()
public function testQuery()
{
$class = new \ReflectionClass(new BaseQuery());
$this->assertTrue($class->hasProperty('order'));
$this->assertTrue($class->hasProperty('orderBy'));
$sut = new TimesheetQuery();
$this->assertEquals(TimesheetQuery::ORDER_DESC, $sut->getOrder());
$this->assertEquals('begin', $sut->getOrderBy());
$this->assertResultType($sut);
$this->assertHiddenEntity($sut);
$this->assertPage($sut);
$this->assertPageSize($sut);
$this->assertOrderBy($sut, 'begin');
$this->assertOrder($sut, TimesheetQuery::ORDER_DESC);
$sut->setOrder(TimesheetQuery::ORDER_ASC);
$sut->setOrderBy('id');
$this->assertUser($sut);
$this->assertCustomer($sut);
$this->assertProject($sut);
$this->assertActivity($sut);
$this->assertState($sut);
}
$this->assertEquals(TimesheetQuery::ORDER_ASC, $sut->getOrder());
$this->assertEquals('id', $sut->getOrderBy());
protected function assertUser(TimesheetQuery $sut)
{
$this->assertNull($sut->getUser());
$expected = new User();
$expected->setUsername('foo-bar');
$sut->setUser($expected);
$this->assertEquals($expected, $sut->getUser());
}
protected function assertCustomer(TimesheetQuery $sut)
{
$this->assertNull($sut->getCustomer());
$expected = new Customer();
$expected->setName('foo-bar');
$sut->setCustomer($expected);
$this->assertEquals($expected, $sut->getCustomer());
}
protected function assertProject(TimesheetQuery $sut)
{
$this->assertNull($sut->getProject());
$expected = new Project();
$expected->setName('foo-bar');
$sut->setProject($expected);
$this->assertEquals($expected, $sut->getProject());
}
protected function assertActivity(TimesheetQuery $sut)
{
$this->assertNull($sut->getActivity());
$expected = new Activity();
$expected->setName('foo-bar');
$sut->setActivity($expected);
$this->assertEquals($expected, $sut->getActivity());
}
protected function assertState(TimesheetQuery $sut)
{
$this->assertEquals(TimesheetQuery::STATE_ALL, $sut->getState());
$sut->setState('foo-bar');
$this->assertEquals(TimesheetQuery::STATE_ALL, $sut->getState());
$sut->setState(TimesheetQuery::STATE_STOPPED);
$this->assertEquals(TimesheetQuery::STATE_STOPPED, $sut->getState());
$sut->setState(TimesheetQuery::STATE_RUNNING);
$this->assertEquals(TimesheetQuery::STATE_RUNNING, $sut->getState());
$sut->setState(TimesheetQuery::STATE_ALL);
$this->assertEquals(TimesheetQuery::STATE_ALL, $sut->getState());
}
}