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

do not display admin menu if it has no children (#500)

Browse Source
This commit is contained in:
Kevin Papst
2019-01-17 01:25:00 +01:00
committed by GitHub
parent 825d31af20
commit 5d5b971f57
9 changed files with 87 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Event/ConfigureAdminMenuEventTest.php
View File

@@ -10,7 +10,6 @@
namespace App\Tests\EventSubscriber;
use App\Event\ConfigureAdminMenuEvent;
use KevinPapst\AdminLTEBundle\Event\SidebarMenuEvent;
use KevinPapst\AdminLTEBundle\Model\MenuItemModel;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\Request;
@@ -25,15 +24,10 @@ class ConfigureAdminMenuEventTest extends TestCase
$request = new Request();
$request->setLocale('de');
$event = new SidebarMenuEvent($request);
$admin = new MenuItemModel('admin', 'foo', 'bar');
$event->addItem($admin);
$event->addItem(new MenuItemModel('foo', 'foo', 'bar'));
$sut = new ConfigureAdminMenuEvent($request, $event);
$sut = new ConfigureAdminMenuEvent($request, $admin);
$this->assertEquals($request, $sut->getRequest());
$this->assertEquals($event, $sut->getMenu());
$this->assertEquals($admin, $sut->getAdminMenu());
}
}

5
tests/Invoice/Calculator/ActivityInvoiceCalculatorTest.php
View File

@@ -52,7 +52,6 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser($user)
->setActivity($activity1)
->setProject((new Project())->setName('bar'));
;
$timesheet2 = new Timesheet();
$timesheet2
@@ -61,7 +60,6 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser($user)
->setActivity($activity2)
->setProject((new Project())->setName('bar'));
;
$timesheet3 = new Timesheet();
$timesheet3
@@ -70,7 +68,6 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser($user)
->setActivity($activity1)
->setProject((new Project())->setName('bar'));
;
$timesheet4 = new Timesheet();
$timesheet4
@@ -79,7 +76,6 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser($user)
->setActivity($activity2)
->setProject((new Project())->setName('bar'));
;
$timesheet5 = new Timesheet();
$timesheet5
@@ -88,7 +84,6 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser(new User())
->setActivity(new Activity())
->setProject((new Project())->setName('bar'));
;
$entries = [$timesheet, $timesheet2, $timesheet3, $timesheet4, $timesheet5];

5
tests/Invoice/Calculator/UserInvoiceCalculatorTest.php
View File

@@ -52,7 +52,6 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser($user1)
->setActivity($activity)
->setProject((new Project())->setName('bar'));
;
$timesheet2 = new Timesheet();
$timesheet2
@@ -61,7 +60,6 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser($user2)
->setActivity($activity)
->setProject((new Project())->setName('bar'));
;
$timesheet3 = new Timesheet();
$timesheet3
@@ -70,7 +68,6 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser($user1)
->setActivity($activity)
->setProject((new Project())->setName('bar'));
;
$timesheet4 = new Timesheet();
$timesheet4
@@ -79,7 +76,6 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser($user2)
->setActivity($activity)
->setProject((new Project())->setName('bar'));
;
$timesheet5 = new Timesheet();
$timesheet5
@@ -88,7 +84,6 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser(new User())
->setActivity($activity)
->setProject((new Project())->setName('bar'));
;
$entries = [$timesheet, $timesheet2, $timesheet3, $timesheet4, $timesheet5];