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

Release 2.0.33 (#4273)

Browse Source 
* added function to check if meta-field is defined by a plugin
* hide un-defined meta-fields in details view
* fix default charset = utf8mb4
* remove broken DATABASE_VERSION fallback
* split off upgrade infos for version 1.x
* fix page out of range #4279
This commit is contained in:
Kevin Papst
2023-09-07 22:24:08 +02:00
committed by GitHub
parent 31348da4c0
commit 6e1207578e
27 changed files with 495 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Repository/TimesheetRepositoryTest.php
View File

@@ -18,7 +18,7 @@ use App\Repository\ActivityRepository;
use App\Repository\ProjectRepository;
use App\Repository\Query\TimesheetQuery;
use App\Repository\TimesheetRepository;
use Pagerfanta\Pagerfanta;
use App\Utils\Pagination;
/**
* @covers \App\Repository\TimesheetRepository
@@ -35,7 +35,7 @@ class TimesheetRepositoryTest extends AbstractRepositoryTest
$query = new TimesheetQuery();
$result = $repository->getPagerfantaForQuery($query);
$this->assertInstanceOf(Pagerfanta::class, $result);
$this->assertInstanceOf(Pagination::class, $result);
$result = $repository->getTimesheetsForQuery($query);
$this->assertIsArray($result);

50
tests/Utils/PaginationTest.php Normal file
View File

@@ -0,0 +1,50 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\Utils;
use App\Repository\Query\TimesheetQuery;
use App\Utils\Pagination;
use Pagerfanta\Adapter\ArrayAdapter;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\Utils\Pagination
*/
class PaginationTest extends TestCase
{
public function testDefaults(): void
{
$sut = new Pagination(new ArrayAdapter([]));
$this->assertEquals(1, $sut->getCurrentPage());
$this->assertEquals(10, $sut->getMaxPerPage());
$this->assertTrue($sut->getNormalizeOutOfRangePages());
}
public function testDefaultQuery(): void
{
$query = new TimesheetQuery();
$sut = new Pagination(new ArrayAdapter([]), $query);
$this->assertEquals(1, $sut->getCurrentPage());
$this->assertEquals(50, $sut->getMaxPerPage());
$this->assertTrue($sut->getNormalizeOutOfRangePages());
}
public function testWithParams(): void
{
$query = new TimesheetQuery();
$query->setPage(3);
$query->setPageSize(1);
$query->setIsApiCall(true);
$sut = new Pagination(new ArrayAdapter([1, 2, 3, 4, 5]), $query);
$this->assertFalse($sut->getNormalizeOutOfRangePages());
$this->assertEquals(1, $sut->getMaxPerPage());
$this->assertEquals(3, $sut->getCurrentPage());
}
}