'}),n.prototype=e.extend({},e.fn.tooltip.Constructor.prototype),n.prototype.constructor=n,n.prototype.getDefaults=function(){return n.DEFAULTS},n.prototype.setContent=function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof n?"html":"append":"text"](n),e.removeClass("fade top bottom left right in"),e.find(".popover-title").html()||e.find(".popover-title").hide()},n.prototype.hasContent=function(){return this.getTitle()||this.getContent()},n.prototype.getContent=function(){var e=this.$element,t=this.options;return e.attr("data-content")||("function"==typeof t.content?t.content.call(e[0]):t.content)},n.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var i=e.fn.popover;e.fn.popover=t,e.fn.popover.Constructor=n,e.fn.popover.noConflict=function(){return e.fn.popover=i,this}}(e),function(e){"use strict";function t(n,i){this.$body=e(document.body),this.$scrollElement=e(e(n).is(document.body)?window:n),this.options=e.extend({},t.DEFAULTS,i),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",e.proxy(this.process,this)),this.refresh(),this.process()}function n(n){return this.each(function(){var i=e(this),a=i.data("bs.scrollspy"),r="object"==typeof n&&n;a||i.data("bs.scrollspy",a=new t(this,r)),"string"==typeof n&&a[n]()})}t.VERSION="3.3.7",t.DEFAULTS={offset:10},t.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},t.prototype.refresh=function(){var t=this,n="offset",i=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),e.isWindow(this.$scrollElement[0])||(n="position",i=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var t=e(this),a=t.data("target")||t.attr("href"),r=/^#./.test(a)&&e(a);return r&&r.length&&r.is(":visible")&&[[r[n]().top+i,a]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},t.prototype.process=function(){var e,t=this.$scrollElement.scrollTop()+this.options.offset,n=this.getScrollHeight(),i=this.options.offset+n-this.$scrollElement.height(),a=this.offsets,r=this.targets,o=this.activeTarget;if(this.scrollHeight!=n&&this.refresh(),t>=i)return o!=(e=r[r.length-1])&&this.activate(e);if(o&&t
'}),n.prototype=e.extend({},e.fn.tooltip.Constructor.prototype),n.prototype.constructor=n,n.prototype.getDefaults=function(){return n.DEFAULTS},n.prototype.setContent=function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof n?"html":"append":"text"](n),e.removeClass("fade top bottom left right in"),e.find(".popover-title").html()||e.find(".popover-title").hide()},n.prototype.hasContent=function(){return this.getTitle()||this.getContent()},n.prototype.getContent=function(){var e=this.$element,t=this.options;return e.attr("data-content")||("function"==typeof t.content?t.content.call(e[0]):t.content)},n.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var i=e.fn.popover;e.fn.popover=t,e.fn.popover.Constructor=n,e.fn.popover.noConflict=function(){return e.fn.popover=i,this}}(e),function(e){"use strict";function t(n,i){this.$body=e(document.body),this.$scrollElement=e(e(n).is(document.body)?window:n),this.options=e.extend({},t.DEFAULTS,i),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",e.proxy(this.process,this)),this.refresh(),this.process()}function n(n){return this.each(function(){var i=e(this),a=i.data("bs.scrollspy"),r="object"==typeof n&&n;a||i.data("bs.scrollspy",a=new t(this,r)),"string"==typeof n&&a[n]()})}t.VERSION="3.3.7",t.DEFAULTS={offset:10},t.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},t.prototype.refresh=function(){var t=this,n="offset",i=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),e.isWindow(this.$scrollElement[0])||(n="position",i=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var t=e(this),a=t.data("target")||t.attr("href"),r=/^#./.test(a)&&e(a);return r&&r.length&&r.is(":visible")&&[[r[n]().top+i,a]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},t.prototype.process=function(){var e,t=this.$scrollElement.scrollTop()+this.options.offset,n=this.getScrollHeight(),i=this.options.offset+n-this.$scrollElement.height(),a=this.offsets,r=this.targets,o=this.activeTarget;if(this.scrollHeight!=n&&this.refresh(),t>=i)return o!=(e=r[r.length-1])&&this.activate(e);if(o&&t
+
+{% endblock %}
diff --git a/templates/about/license.html.twig b/templates/about/license.html.twig
new file mode 100644
index 00000000..a70cc90b
--- /dev/null
+++ b/templates/about/license.html.twig
@@ -0,0 +1,39 @@
+{% extends 'about/layout.html.twig' %}
+
+{% block about %}
+ {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
+ {% block box_title %}{{ constant('App\\Constants::SOFTWARE') }} is published under{% endblock %}
+ {% block box_body %}
+
+
+
+
+
+
+ {% block about_box %}{% endblock %}
+
+
+  }})
+
+ + + +
+ +
+
+ {{ constant('App\\Constants::SOFTWARE') }}
+ ++ {{ constant('App\\Constants::VERSION') }} + {{ constant('App\\Constants::STATUS') }} + ({{ constant('App\\Constants::NAME') }}) +
+ ++ + + +
+ +
+ Made with ♥ by Kevin Papst and great contributors. +
+
+ {% block about %}{% endblock %}
+
+
+ {{ license }}
+
+ {% endblock %}
+ {% block box_footer %}
+ choosealicense.com
+ wikipedia.org
+ {% endblock %}
+ {% endembed %}
+
+ {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
+ {% block box_title %}Special thanks ...{% endblock %}
+ {% block box_body %}
+ ... to the authors of the following libraries, Kimai wouldn't be possible without them:
+-
+
- AdminLTE: https://adminlte.io +
- Bootstrap: https://getbootstrap.com +
- Bootstrap-Select: https://developer.snapappointments.com/bootstrap-select +
- chart.js: https://www.chartjs.org +
- DateRangePicker: http://www.daterangepicker.com/ +
- Doctrine: https://www.doctrine-project.org +
- FontAwesome: https://fontawesome.com +
- FullCalendar: https://fullcalendar.io +
- jQuery: https://jquery.com +
- jQuery UI: http://jqueryui.com +
- MomentJS: https://momentjs.com +
- PHPOffice: https://github.com/PHPOffice +
- Symfony: https://symfony.com +
- ... +
+ {{ content_action }}
+
+ {% endif %}
- {{ widgets.callout('info', 'Thank you for using Kimai ' ~ constant('App\\Constants::VERSION') ~ ' ' ~ constant('App\\Constants::STATUS') ~ ' - ' ~ constant('App\\Constants::NAME'), 'Kimai ' ~ constant('App\\Constants::VERSION'), 'fas fa-thumbs-up') }}
-
-
-
+
-
-
-
- + Clear cache +
+ {% endblock %} + {% endembed %} + {% endif %} +{% endblock %} + +{% block about %} + {% embed '@AdminLTE/Widgets/box-widget.html.twig' %} + {% block box_title %}Environment{% endblock %} + {% block box_body %} +-
+ {% for name, value in dotenv %}
+
- {{ name }} +
- {{ value }} + {% endfor %} +
-
+
- Version
- {{ constant('PHP_VERSION') }} +
- Modules
- {{ modules|join(', ') }} + {% for name, value in settings %} +
- {{ name }} +
- + {% if value is empty %} + unknown + {% else %} + {{ value }} + {% endif %} + + {% endfor %} +
-
+ {% for name, value in info %}
+
- {{ name }} +
- {{ value|raw }} + {% endfor %} +
-
+{% block error_icon %}
+
{% endblock %}
-
-{% block avanzu_control_sidebar %}{% endblock %}
-{% block avanzu_navbar_control_sidebar_toggle %}{% endblock %}
diff --git a/templates/bundles/TwigBundle/Exception/error404.html.twig b/templates/bundles/TwigBundle/Exception/error404.html.twig
index 523616bc..5239fac3 100644
--- a/templates/bundles/TwigBundle/Exception/error404.html.twig
+++ b/templates/bundles/TwigBundle/Exception/error404.html.twig
@@ -1,31 +1 @@
-{% extends 'base.html.twig' %}
-{% block page_title %}{{ 'http_error.title'|trans({}, 'exceptions') }}{% endblock %}
-{% block page_subtitle %}{{ status_code }}{% endblock %}
-
-{% block main %}
- {% set errorTitleKey = "http_error_#{status_code}.description" %}
- {% set errorTitleTrans = errorTitleKey|trans({ '%status_code%': status_code }, 'exceptions') %}
- {% if errorTitleKey == errorTitleTrans %}
- {% set errorTitleKey = 'http_error.description' %}
- {% set errorTitleTrans = errorTitleKey|trans({ '%status_code%': status_code }, 'exceptions') %}
- {% endif %}
-
- {% set errorMessageKey = "http_error_#{status_code}.suggestion" %}
- {% set errorMessageTrans = errorMessageKey|trans({ '%status_code%': status_code }, 'exceptions') %}
- {% if errorMessageKey == errorMessageTrans %}
- {% set errorMessageKey = 'http_error.suggestion' %}
- {% set errorMessageTrans = errorMessageKey|trans({ '%status_code%': status_code }, 'exceptions') %}
- {% endif %}
-
- {{ status_code }}
- -
-
- {{ errorTitleTrans }}
-{{ errorMessageTrans }}
-
-
-{% endblock %}
-
-{% block avanzu_control_sidebar %}{% endblock %}
-{% block avanzu_navbar_control_sidebar_toggle %}{% endblock %}
+{% extends 'error.html.twig' %}
diff --git a/templates/default/_form_delete_modal.html.twig b/templates/default/_form_delete_modal.html.twig
index f1c39827..4571c933 100644
--- a/templates/default/_form_delete_modal.html.twig
+++ b/templates/default/_form_delete_modal.html.twig
@@ -17,8 +17,8 @@
{% endif %}
{% endblock %}
{% block modal_footer %}
+
-
{% endblock %}
{% block modal_end %}{{ form_end(form) }}{% endblock %}
{% endembed %}
diff --git a/templates/default/_form_modal.html.twig b/templates/default/_form_modal.html.twig
index 7ba38b3f..367204ff 100644
--- a/templates/default/_form_modal.html.twig
+++ b/templates/default/_form_modal.html.twig
@@ -11,8 +11,8 @@
{{ form_widget(form) }}
{% endblock %}
{% block modal_footer %}
+
-
{% endblock %}
{% block modal_end %}{{ form_end(form) }}{% endblock %}
{% endembed %}
diff --git a/templates/error.html.twig b/templates/error.html.twig
new file mode 100644
index 00000000..64efb577
--- /dev/null
+++ b/templates/error.html.twig
@@ -0,0 +1,33 @@
+{% extends 'base.html.twig' %}
+
+{% block page_title %}{{ 'http_error.title'|trans({}, 'exceptions') }}{% endblock %}
+{% block page_subtitle %}{{ status_code }}{% endblock %}
+
+{% block main %}
+ {% set errorTitleKey = "http_error_#{status_code}.description" %}
+ {% set errorTitleTrans = errorTitleKey|trans({ '%status_code%': status_code }, 'exceptions') %}
+ {% if errorTitleKey == errorTitleTrans %}
+ {% set errorTitleKey = 'http_error.description' %}
+ {% set errorTitleTrans = errorTitleKey|trans({ '%status_code%': status_code }, 'exceptions') %}
+ {% endif %}
+
+ {% set errorMessageKey = "http_error_#{status_code}.suggestion" %}
+ {% set errorMessageTrans = errorMessageKey|trans({ '%status_code%': status_code }, 'exceptions') %}
+ {% if errorMessageKey == errorMessageTrans %}
+ {% set errorMessageKey = 'http_error.suggestion' %}
+ {% set errorMessageTrans = errorMessageKey|trans({ '%status_code%': status_code }, 'exceptions') %}
+ {% endif %}
+
+ {{ status_code }}
- -
-
- {{ errorTitleTrans }}
-{{ errorMessageTrans }}
-
+
+{% endblock %}
diff --git a/templates/export/index.html.twig b/templates/export/index.html.twig
index 1c8b751d..cc7ae2ff 100644
--- a/templates/export/index.html.twig
+++ b/templates/export/index.html.twig
@@ -8,6 +8,7 @@
{% block page_actions %}
{% set actions = {
'filter': '#collapseExport',
+ 'visibility': '#modal_export',
'off': {'id':'export-toggle-button'}
} %}
{{ widgets.page_actions(actions) }}
@@ -27,13 +28,13 @@
{{ widgets.callout('warning', 'error.no_entries_found') }}
{% else %}
{% set columns = {
- 'date': '',
+ 'date': 'alwaysVisible',
'user': 'hidden-xs hidden-sm',
'customer': 'hidden-xs hidden-sm',
'project': 'hidden-xs hidden-sm',
'activity': 'hidden-xs hidden-sm',
'description': 'hidden-xs hidden-sm',
- 'unit_price': '',
+ 'unit_price': 'hidden-xs',
'duration': '',
'total_rate': '',
'exported': 'alwaysVisible',
@@ -55,20 +56,20 @@
{% endif %}
{{ status_code }}
+ + {% block error_content %} +
+
+ {% endblock %}
+
+ {% block error_icon %}{% endblock %} {{ errorTitleTrans }}
+{{ errorMessageTrans }}
+ {{ 'action.back'|trans }} +{{ 'modal.columns.description'|trans }}
diff --git a/templates/project/index.html.twig b/templates/project/index.html.twig index 174530c4..dd078d98 100644 --- a/templates/project/index.html.twig +++ b/templates/project/index.html.twig @@ -19,10 +19,10 @@ {% else %} {% set columns = { 'name': 'alwaysVisible', - 'customer': '', + 'customer': 'hidden-xs', 'comment': 'hidden-xs hidden-sm', 'budget': 'hidden-xs', - 'visible': 'hidden-xs', + 'visible': '', 'actions': 'alwaysVisible', } %} diff --git a/templates/sidebar/home.html.twig b/templates/sidebar/home.html.twig deleted file mode 100644 index c341c4a5..00000000 --- a/templates/sidebar/home.html.twig +++ /dev/null @@ -1,45 +0,0 @@ -{% import "macros/widgets.html.twig" as widgets %} - -{% set version = constant('App\\Constants::VERSION') ~ ' ' ~ constant('App\\Constants::STATUS') %} - -Kimai v2 - {{ version }}
-
- {{ 'home.betainfo'|trans({'%version%': version}, 'sidebar')|raw|nl2br }}
-
-
-
-
-
Made with ♥ by Kevin Papst and great contributors.
+
+{% endblock %}
+
+{% macro profile_infos(user, stats) %}
+
+
+ {% block profile_content %}{% endblock %}
+
+
+
+
+ {{ macro.profile_box(user, stats) }}
+ {{ macro.profile_infos(user, stats) }}
+
+
+
+{% endmacro %}
+
+{% macro profile_box(user, stats) %}
+ {% import "@AdminLTE/Macros/default.html.twig" as macro %}
+ {% import "macros/widgets.html.twig" as widgets %}
+
+
+
+ {{ 'profile.about_me'|trans }}
+
+
+
+
+
+{% endmacro %}
+
+{# -------------------------------- UNUSED FOR NOW -------------------------------- #}
+{% macro profile_list_unused(user, items, color) %}
+ {% import "@AdminLTE/Macros/default.html.twig" as macro %}
+ {% import "macros/widgets.html.twig" as widgets %}
+
+
+{% endmacro %}
+
+{# -------------------------------- UNUSED FOR NOW -------------------------------- #}
+{% macro profile_box_unused(user, stats, color) %}
+ {% import "@AdminLTE/Macros/default.html.twig" as macro %}
+ {% import "macros/widgets.html.twig" as widgets %}
+
+
+{% endmacro %}
\ No newline at end of file
diff --git a/templates/user/profile.html.twig b/templates/user/profile.html.twig
index bb2c8699..7dacaefd 100644
--- a/templates/user/profile.html.twig
+++ b/templates/user/profile.html.twig
@@ -1,117 +1,24 @@
-{% extends 'base.html.twig' %}
-
-{% block page_title %}{{ 'profile.title'|trans }}{% endblock %}
-{% block page_subtitle %}{{ 'profile.subtitle'|trans }}{% endblock %}
+{% extends 'user/layout.html.twig' %}
+{% import "macros/actions.html.twig" as actions %}
{% block main %}
{% import _self as macro %}
{% import "macros/widgets.html.twig" as widgets %}
+ {{ macro.avatar(user.avatar, user.username, 'profile-user-img img-responsive img-circle') }}
+
+ {{ widgets.username(user) }}
+ +{{ user.title }}
+ +-
+
+
- + {{ 'stats.durationMonth'|trans }} {{ stats.durationThisMonth|duration }} + + + {% if is_granted('view_rate_own_timesheet') %} +
- + {{ 'stats.amountMonth'|trans }} {{ stats.amountThisMonth|money }} + + {% endif %} + +
- + {{ 'stats.durationTotal'|trans }} {{ stats.durationTotal|duration }} + + + {% if is_granted('view_rate_own_timesheet') %} +
- + {{ 'stats.amountTotal'|trans }} {{ stats.amountTotal|money }} + + {% endif %} + +
-
- {{ macro.profile_box(user, stats) }}
- {{ macro.profile_infos(user, stats, local_time) }}
-
-
-
+
{% endblock %}
-
-{% macro profile_infos(user, stats, local_time) %}
- ', $content);
+ $this->assertContains('', $content);
+ $this->assertContains('', $content);
+ $this->assertContains('', $content);
+ }
}
diff --git a/tests/Controller/ProfileControllerTest.php b/tests/Controller/ProfileControllerTest.php
index 2965c77b..6ac35aab 100644
--- a/tests/Controller/ProfileControllerTest.php
+++ b/tests/Controller/ProfileControllerTest.php
@@ -12,6 +12,8 @@ namespace App\Tests\Controller;
use App\DataFixtures\UserFixtures;
use App\Entity\User;
use App\Entity\UserPreference;
+use App\Tests\DataFixtures\TimesheetFixtures;
+use Symfony\Bundle\FrameworkBundle\Client;
use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
/**
@@ -25,12 +27,75 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertUrlIsSecured('/profile/' . UserFixtures::USERNAME_USER);
}
+ public function testIndexActionWithoutData()
+ {
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->request($client, '/profile/' . UserFixtures::USERNAME_USER);
+ $this->assertTrue($client->getResponse()->isSuccessful());
+
+ $this->assertHasNoEntriesWithFilter($client);
+ $this->assertHasProfileBox($client, UserFixtures::USERNAME_USER);
+ $this->assertHasAboutMeBox($client, UserFixtures::USERNAME_USER);
+ }
+
+ public function testIndexAction()
+ {
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+
+ $dates = [
+ new \DateTime('-10 days'),
+ new \DateTime('-1 year'),
+ ];
+
+ $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+
+ foreach ($dates as $start) {
+ $fixture = new TimesheetFixtures();
+ $fixture->setAmount(10);
+ $fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
+ $fixture->setStartDate($start);
+ $this->importFixture($em, $fixture);
+ }
+
+ $this->request($client, '/profile/' . UserFixtures::USERNAME_USER);
+ $this->assertTrue($client->getResponse()->isSuccessful());
+ $content = $client->getResponse()->getContent();
+
+ foreach ($dates as $start) {
+ $year = $start->format('Y');
+ $this->assertContains('
-
-{% endmacro %}
-
-{% macro profile_box(user, stats) %}
- {% import "@AdminLTE/Macros/default.html.twig" as macro %}
- {% import "macros/widgets.html.twig" as widgets %}
-
-
-
- {{ 'profile.about_me'|trans }}
-
-
-
-
-
-{% endmacro %}
-
-{# -------------------------------- UNUSED FOR NOW -------------------------------- #}
-{% macro profile_list_unused(user, items, color) %}
- {% import "@AdminLTE/Macros/default.html.twig" as macro %}
- {% import "macros/widgets.html.twig" as widgets %}
-
-
-{% endmacro %}
-
-{# -------------------------------- UNUSED FOR NOW -------------------------------- #}
-{% macro profile_box_unused(user, stats, color) %}
- {% import "@AdminLTE/Macros/default.html.twig" as macro %}
- {% import "macros/widgets.html.twig" as widgets %}
-
-
-{% endmacro %}
\ No newline at end of file
diff --git a/templates/user/stats.html.twig b/templates/user/stats.html.twig
new file mode 100644
index 00000000..d2e993c0
--- /dev/null
+++ b/templates/user/stats.html.twig
@@ -0,0 +1,97 @@
+{% extends 'user/layout.html.twig' %}
+{% import "macros/actions.html.twig" as actions %}
+{% import "macros/widgets.html.twig" as widgets %}
+
+{% block profile_content %}
+
+ {% if years is empty %}
+ {{ widgets.callout('warning', 'error.no_entries_found') }}
+ {% endif %}
+
+
+
+ {% for year,yearStat in years %}
+
+ {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
+ {% block box_title %}{{ year }}{% endblock %}
+ {% block box_body %}
+
+
- {{ macro.avatar(user.avatar, user.username, 'profile-user-img img-responsive img-circle') }}
-
- {{ widgets.username(user) }}
- -{{ user.title }}
- --
-
-
- - {{ 'stats.durationMonth'|trans }} {{ stats.durationThisMonth|duration }} - - - {% if is_granted('view_rate_own_timesheet') %} -
- - {{ 'stats.amountMonth'|trans }} {{ stats.amountThisMonth|money }} - - {% endif %} - -
- - {{ 'stats.durationTotal'|trans }} {{ stats.durationTotal|duration }} - - - {% if is_granted('view_rate_own_timesheet') %} -
- - {{ 'stats.amountTotal'|trans }} {{ stats.amountTotal|money }} - - {% endif %} - -
+
+
+
+ {% endblock %}
+ {% endembed %}
+
+ {% endfor %}
+
+{% endblock %}
diff --git a/tests/API/TimesheetControllerTest.php b/tests/API/TimesheetControllerTest.php
index 01479eb8..afa399a9 100644
--- a/tests/API/TimesheetControllerTest.php
+++ b/tests/API/TimesheetControllerTest.php
@@ -38,7 +38,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
->setHourlyRate(true)
->setAmount(10)
->setUser($this->getUserByRole($em, $role))
- ->setStartDate((new \DateTime('-10 days'))->setTime(0, 0, 1))
+ ->setStartDate((new \DateTime('first day of this month'))->setTime(0, 0, 1))
->setAllowEmptyDescriptions(false)
;
$this->importFixture($em, $fixture);
@@ -124,9 +124,9 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testGetCollectionWithQuery()
{
- $begin = new \DateTime('-10 days');
+ $begin = new \DateTime('first day of this month');
$begin->setTime(0, 0, 0);
- $end = new \DateTime();
+ $end = new \DateTime('last day of this month');
$end->setTime(23, 59, 59);
$query = [
@@ -162,14 +162,14 @@ class TimesheetControllerTest extends APIControllerBaseTest
->setExported(true)
->setAmount(7)
->setUser($this->getUserByRole($em, User::ROLE_USER))
- ->setStartDate(new \DateTime('-10 days'))
+ ->setStartDate(new \DateTime('first day of this month'))
->setAllowEmptyDescriptions(false)
;
$this->importFixture($em, $fixture);
- $begin = new \DateTime('-10 days');
+ $begin = new \DateTime('first day of this month');
$begin->setTime(0, 0, 0);
- $end = new \DateTime();
+ $end = new \DateTime('last day of this month');
$end->setTime(23, 59, 59);
$query = [
diff --git a/tests/Controller/AboutControllerTest.php b/tests/Controller/AboutControllerTest.php
index 3d7a9831..3a18a230 100644
--- a/tests/Controller/AboutControllerTest.php
+++ b/tests/Controller/AboutControllerTest.php
@@ -17,21 +17,38 @@ use App\Entity\User;
*/
class AboutControllerTest extends ControllerBaseTest
{
- public function testIsSecure()
+ public function testDebugIsSecure()
{
- $this->assertUrlIsSecured('/admin/about');
- $this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/about');
+ $this->assertUrlIsSecured('/about/debug');
+ $this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/about/debug');
}
public function testIndexAction()
+ {
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->assertAccessIsGranted($client, '/about');
+
+ $result = $client->getCrawler()->filter('ul.nav.nav-stacked li a');
+ $this->assertEquals(3, count($result));
+
+ $result = $client->getCrawler()->filter('div.box-body pre');
+ $this->assertEquals(1, count($result));
+ $this->assertContains('MIT License', $result->text());
+ }
+
+ public function testDebugAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
- $this->assertAccessIsGranted($client, '/admin/about');
+ $this->assertAccessIsGranted($client, '/about/debug');
- $result = $client->getCrawler()->filter('div.nav-tabs-custom ul.nav.nav-tabs li');
- $this->assertEquals(3, count($result));
+ $content = $client->getResponse()->getContent();
+ $this->assertContains('