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

Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

Browse Source
This commit is contained in:
Kevin Papst
2022-12-31 21:19:55 +01:00
committed by GitHub
parent 95e06746bd
commit 90a0fd8a22
2164 changed files with 83700 additions and 86426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Controller/Reporting/AbstractUserPeriodControllerTest.php
View File

@@ -42,7 +42,7 @@ abstract class AbstractUserPeriodControllerTest extends ControllerBaseTest
return [
[4, 'duration', 'Working hours total'],
[4, 'rate', 'Total revenue'],
[4, 'internalRate', 'Internal rate'],
[4, 'internalRate', 'Internal price'],
];
}
@@ -54,7 +54,7 @@ abstract class AbstractUserPeriodControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$this->importReportingFixture(User::ROLE_SUPER_ADMIN);
$this->assertAccessIsGranted($client, sprintf('%s?user=%s&date=12999119191&sumType=%s', $this->getReportUrl(), $user, $dataType));
self::assertStringContainsString(sprintf('<div class="box-body %s', $this->getBoxId()), $client->getResponse()->getContent());
self::assertStringContainsString(sprintf('<div class="card-body %s', $this->getBoxId()), $client->getResponse()->getContent());
$option = $client->getCrawler()->filterXPath("//select[@id='user']/option[@selected]");
self::assertEquals($user, $option->attr('value'));
$cell = $client->getCrawler()->filterXPath("//th[contains(@class, 'reportDataTypeTitle')]");
@@ -66,7 +66,7 @@ abstract class AbstractUserPeriodControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$this->importReportingFixture(User::ROLE_USER);
$this->assertAccessIsGranted($client, sprintf('%s?date=12999119191', $this->getReportUrl()));
self::assertStringContainsString(sprintf('<div class="box-body %s', $this->getBoxId()), $client->getResponse()->getContent());
self::assertStringContainsString(sprintf('<div class="card-body %s', $this->getBoxId()), $client->getResponse()->getContent());
$select = $client->getCrawler()->filterXPath("//select[@id='user']");
self::assertEquals(0, $select->count());
$cell = $client->getCrawler()->filterXPath("//th[contains(@class, 'reportDataTypeTitle')]");

6
tests/Controller/Reporting/AbstractUsersPeriodControllerTest.php
View File

@@ -45,7 +45,7 @@ abstract class AbstractUsersPeriodControllerTest extends ControllerBaseTest
return [
['duration', 'Working hours total'],
['rate', 'Total revenue'],
['internalRate', 'Internal rate'],
['internalRate', 'Internal price'],
];
}
@@ -57,7 +57,7 @@ abstract class AbstractUsersPeriodControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$this->importReportingFixture(User::ROLE_SUPER_ADMIN);
$this->assertAccessIsGranted($client, sprintf('%s?date=12999119191&sumType=%s', $this->getReportUrl(), $dataType));
self::assertStringContainsString(sprintf('<div class="box-body %s', $this->getBoxId()), $client->getResponse()->getContent());
self::assertStringContainsString(sprintf('<div class="card-body %s', $this->getBoxId()), $client->getResponse()->getContent());
$cell = $client->getCrawler()->filterXPath("//th[contains(@class, 'reportDataTypeTitle')]");
self::assertEquals($title, $cell->text());
}
@@ -70,7 +70,7 @@ abstract class AbstractUsersPeriodControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
$this->importReportingFixture(User::ROLE_TEAMLEAD);
$this->assertAccessIsGranted($client, sprintf('%s?date=12999119191&sumType=%s', $this->getReportUrl(), $dataType));
self::assertStringContainsString(sprintf('<div class="box-body %s', $this->getBoxId()), $client->getResponse()->getContent());
self::assertStringContainsString(sprintf('<div class="card-body %s', $this->getBoxId()), $client->getResponse()->getContent());
$select = $client->getCrawler()->filterXPath("//select[@id='user']");
self::assertEquals(0, $select->count());
$cell = $client->getCrawler()->filterXPath("//th[contains(@class, 'reportDataTypeTitle')]");

2
tests/Controller/Reporting/CustomerMonthlyProjectsControllerTest.php
View File

@@ -78,7 +78,7 @@ class CustomerMonthlyProjectsControllerTest extends ControllerBaseTest
$client = $this->prepareReport();
$this->assertAccessIsGranted($client, '/reporting/customer/monthly_projects/view');
self::assertStringContainsString('<form method="get" class="form-inline form-reporting" id="report-toolbar-form">', $client->getResponse()->getContent());
self::assertStringContainsString('<form method="get" class="form-reporting" id="report-form">', $client->getResponse()->getContent());
$rows = $client->getCrawler()->filterXPath("//table[contains(@class, 'dataTable')]/tbody/tr[not(@class='summary')]");
self::assertGreaterThan(0, $rows->count());
}

12
tests/Controller/Reporting/ProjectDateRangeControllerTest.php
View File

@@ -16,6 +16,7 @@ use App\Tests\DataFixtures\ActivityFixtures;
use App\Tests\DataFixtures\CustomerFixtures;
use App\Tests\DataFixtures\ProjectFixtures;
use App\Tests\DataFixtures\TimesheetFixtures;
use App\Timesheet\DateTimeFactory;
/**
* @group integration
@@ -50,15 +51,20 @@ class ProjectDateRangeControllerTest extends ControllerBaseTest
$activities->setIsGlobal(true);
$activities = $this->importFixture($activities);
$user = $this->getUserByRole(User::ROLE_TEAMLEAD);
$dateTimeFactory = DateTimeFactory::createByUser($user);
$startMonth = $dateTimeFactory->getStartOfMonth();
$startDate = $startMonth->add(new \DateInterval('P10D'));
$timesheets = new TimesheetFixtures();
$timesheets->setStartDate(new \DateTime('first day of this month'));
$timesheets->setStartDate($startDate);
$timesheets->setAmount(50);
$timesheets->setActivities($activities);
$timesheets->setUser($this->getUserByRole(User::ROLE_TEAMLEAD));
$timesheets->setUser($user);
$this->importFixture($timesheets);
$this->assertAccessIsGranted($client, '/reporting/project_daterange');
self::assertStringContainsString('<div class="box-body project_daterange_reporting-box', $client->getResponse()->getContent());
self::assertStringContainsString('<div class="card-body project_daterange_reporting-box', $client->getResponse()->getContent());
$rows = $client->getCrawler()->filterXPath("//table[contains(@class, 'dataTable')]/tbody/tr[not(@class='summary')]");
self::assertGreaterThan(0, $rows->count());
}

4
tests/Controller/Reporting/ProjectDetailsControllerTest.php
View File

@@ -55,10 +55,10 @@ class ProjectDetailsControllerTest extends ControllerBaseTest
$this->assertHasNoEntriesWithFilter($client);
$this->assertAccessIsGranted($client, '/reporting/project_details?project=' . $projects[0]->getId());
$rows = $client->getCrawler()->filterXPath("//form[@id='project-details-form']");
$rows = $client->getCrawler()->filterXPath("//form[@id='report-form']");
self::assertEquals(1, $rows->count());
$rows = $client->getCrawler()->filterXPath("//div[@id='reporting-content']/div[@class='nav-tabs-custom']");
$rows = $client->getCrawler()->filterXPath("//div[@id='reporting-content']//ul[contains(@class, 'nav-pills')]");
self::assertGreaterThan(1, $rows->count());
}
}

2
tests/Controller/Reporting/ProjectInactiveControllerTest.php
View File

@@ -53,7 +53,7 @@ class ProjectInactiveControllerTest extends ControllerBaseTest
$this->importFixture($timesheets);
$this->assertAccessIsGranted($client, '/reporting/project_inactive');
self::assertStringContainsString('<div class="box-body inactive_project_reporting-box', $client->getResponse()->getContent());
self::assertStringContainsString('<div class="card-body inactive_project_reporting-box', $client->getResponse()->getContent());
$rows = $client->getCrawler()->filterXPath("//table[contains(@class, 'dataTable')]/tbody/tr[not(@class='summary')]");
self::assertGreaterThan(0, $rows->count());
}

2
tests/Controller/Reporting/ProjectViewControllerTest.php
View File

@@ -53,7 +53,7 @@ class ProjectViewControllerTest extends ControllerBaseTest
$this->importFixture($timesheets);
$this->assertAccessIsGranted($client, '/reporting/project_view');
self::assertStringContainsString('<div class="box-body project_view_reporting-box', $client->getResponse()->getContent());
self::assertStringContainsString('<div class="card-body project_view_reporting-box', $client->getResponse()->getContent());
$rows = $client->getCrawler()->filterXPath("//table[contains(@class, 'dataTable')]/tbody/tr[not(@class='summary')]");
self::assertGreaterThan(0, $rows->count());
}