diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..5a0d5e480 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto eol=lf diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ac180fea..441c0f9f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: DBNAME: autotest DBUSER: drtikol DBPWD: w,6TmB - TESTDIR: app/module/autotest + TESTDIR: tests AUTOTEST: 1 steps: - name: "Mock database environment" diff --git a/app/Bootstrap.php b/app/Bootstrap.php index 83c0e9bc5..79f355cdd 100644 --- a/app/Bootstrap.php +++ b/app/Bootstrap.php @@ -60,6 +60,9 @@ public static function boot(): Container $configurator->addConfig(TEAM_DIR . '/app/config/config.neon'); $configurator->addConfig(TEAM_DIR . '/local/' . ($autotestMode ? 'config.autotest.neon' : 'config.neon')); + if ($autotestMode) { + $configurator->addConfig(TEAM_DIR . '/tests/config/config.neon'); + } $configurator->addParameters(["team" => getenv("team") ?: substr($_SERVER["HTTP_HOST"], 0, strpos($_SERVER["HTTP_HOST"], "."))]); diff --git a/app/module/autotest/app/discussion/DiscussionPresenterTest.phpt b/app/module/autotest/app/discussion/DiscussionPresenterTest.phpt deleted file mode 100644 index b11b1e58a..000000000 --- a/app/module/autotest/app/discussion/DiscussionPresenterTest.phpt +++ /dev/null @@ -1,94 +0,0 @@ -authorizeUser(); - $request = new Nette\Application\Request($this->getPresenterName(), 'GET', array('action' => 'default')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string) $response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container')); - Assert::true($dom->has('ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 1); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 2); //last item aint link - - Assert::true($dom->has('div.container.discussions')); - Assert::true(count($dom->find('div.container.discussions div.row')) >= 1); - } - - function testActionDiscussion($discussionName, $canWrite) - { - $this->authorizeAdmin(); - $discussion = $this->recordManager->createDiscussion(); - $discussionName = $discussion["name"]; - - $this->authorizeUser(); - $request = new Nette\Application\Request($this->getPresenterName(), 'GET', ['action' => 'discussion', 'discussion' => $discussionName]); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $re = '/&(?!(?:apos|quot|[gl]t|amp);|#)/'; - - $dom = NULL; - $html = (string)$response->getSource(); - //replace unescaped ampersands in html to prevent tests from failing - $html = preg_replace($re, "&", $html); - - $dom = DomQuery::fromHtml($html); - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - - //has breadcrumbs - - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 2); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 3); //last item aint link - - Assert::equal(count($dom->find('div.container.my-2 div.row.justify-content-md-center')), $canWrite ? 2 : 1); - if($canWrite){ - Assert::true($dom->has('div.container.my-2 div.row.justify-content-md-center div.col-md-10 textarea#addPost')); - Assert::true($dom->has('div.container.my-2 div.row.justify-content-md-center div.col-md-10 div.addPost form.form-inline input.form-control.mr-sm-2')); - Assert::true($dom->has('div.container.my-2 div.row.justify-content-md-center div.col-md-10 div.addPost form.form-inline span.mr-auto input.form-control.btn.btn-outline-success.mr-sm-2')); - Assert::true($dom->has('div.container.my-2 div.row.justify-content-md-center div.col-md-10 div.addPost form.form-inline button.btn.btn-primary')); - } - - Assert::true($dom->has('div.container.discussion#snippet--discussion')); - Assert::true(count($dom->find('div.container.discussion#snippet--discussion div.row'))<=20); - } - - protected function getPresenterName(): string - { - return "Discussion:Default"; - } - - public function getModule(): string - { - return "Discussion"; - } -} - -(new DiscussionPresenterTest($container))->run(); diff --git a/app/module/autotest/entity/UITest.php b/app/module/autotest/entity/UITest.php deleted file mode 100644 index b6fddb909..000000000 --- a/app/module/autotest/entity/UITest.php +++ /dev/null @@ -1,23 +0,0 @@ -getPresenterName() != "undefined") { - $this->presenter = $this->presenterFactory->createPresenter($this->getPresenterName()); - $this->presenter->autoCanonicalize = false; - } - - parent::setUp(); - } - -} diff --git a/app/module/autotest/php.ini b/app/module/autotest/php.ini deleted file mode 100644 index 54e0a7b04..000000000 --- a/app/module/autotest/php.ini +++ /dev/null @@ -1,30 +0,0 @@ -extension=pdo.so -extension=curl.so -extension=mysqlnd.so -extension=pdo_mysql.so -extension=pdo_sqlite.so -extension=tokenizer.so -extension=gmp.so -extension=fileinfo.so -extension=gd.so -extension=iconv.so -extension=sqlite3 -extension=intl.so -extension=mbstring.so -;extension=xml.so -;extension=dom.so -extension=simplexml.so -extension=igbinary.so -;extension=msgpack.so -;igbinary.compact_strings=On -;extension=memcache.so -;extension=memcached.so -memcached.serializer=php -session.gc_probability = 0 -output_buffering=Off - -max_execution_time=300 -max_input_time=300 -upload_max_filesize=2G -post_max_size=256M -memory_limit=1024M diff --git a/app/module/autotest/router/Router.php b/app/module/autotest/router/Router.php deleted file mode 100644 index 80bb6e660..000000000 --- a/app/module/autotest/router/Router.php +++ /dev/null @@ -1,17 +0,0 @@ -addRoute('autotest[/]', ['module' => 'Autotest', 'presenter' => 'Default', 'action' => 'default']); - } -} diff --git a/app/module/autotest/setup.php b/app/module/autotest/setup.php deleted file mode 100644 index a3e5957de..000000000 --- a/app/module/autotest/setup.php +++ /dev/null @@ -1,20 +0,0 @@ -setEnvironmentVariable("AUTOTEST", true); -} diff --git a/app/module/core/component/templates/blocks/report.latte b/app/module/core/component/templates/blocks/report.latte index f6a6fcd1a..3e1ce99d7 100644 --- a/app/module/core/component/templates/blocks/report.latte +++ b/app/module/core/component/templates/blocks/report.latte @@ -1,4 +1,4 @@ -
  • +
  • {_event.attendance, 1} diff --git a/app/module/team/presenter/front/DefaultPresenter.php b/app/module/team/presenter/front/DefaultPresenter.php index c9f99eae8..d87b2e756 100644 --- a/app/module/team/presenter/front/DefaultPresenter.php +++ b/app/module/team/presenter/front/DefaultPresenter.php @@ -11,8 +11,6 @@ class DefaultPresenter extends SecuredPresenter { - private string $userType; - public function beforeRender(): void { parent::beforeRender(); @@ -41,41 +39,42 @@ public function beforeRender(): void return count($errFields); }); + } - $this->addBreadcrumb($this->translator->translate("team.team", 1), $this->link(":Team:Default:")); + public function renderDefault(): void + { + $this->addBreadcrumb($this->translator->translate("common.everyone"), $this->link(":Team:Default:")); + $this->statusRender(); } - public function actionPlayers(): void + public function renderPlayers(): void { $this->addBreadcrumb($this->translator->translate("team.PLAYER", 2), $this->link(":Team:Default:players")); - $this->userType = "PLAYER"; - $this->setView('default'); + $this->statusRender("PLAYER"); } - public function actionMembers(): void + public function renderMembers(): void { $this->addBreadcrumb($this->translator->translate("team.MEMBER", 2), $this->link(":Team:Default:members")); - $this->userType = "MEMBER"; - $this->setView('default'); + $this->statusRender("MEMBER"); } - public function actionSicks(): void + public function renderSicks(): void { $this->addBreadcrumb($this->translator->translate("team.SICK", 2), $this->link(":Team:Default:sicks")); - $this->userType = "SICK"; - $this->setView('default'); + $this->statusRender("SICK"); } - public function actionInits(): void + public function renderInits(): void { $this->addBreadcrumb($this->translator->translate("team.INIT", 2), $this->link(":Team:Default:inits")); - $this->userType = "INIT"; - $this->setView('default'); + $this->statusRender("INIT"); } - public function renderDefault(): void + private function statusRender(?string $userStatus = null): void { - $users = isset($this->userType) ? $this->userManager->getByStatus($this->userType) : $this->userManager->getList(); + $this->setView('default'); + $users = $userStatus ? $this->userManager->getByStatus($userStatus) : $this->userManager->getList(); $allMails = []; if ($users !== []) { foreach ($users as $u) { @@ -88,7 +87,7 @@ public function renderDefault(): void $this->flashMessage($this->translator->translate("common.alerts.nobodyFound") . "!"); } - $this->template->userType = $this->userType ?? null; + $this->template->userType = $userStatus; $this->template->users = $users; $this->template->allMails = implode(",", $allMails); } diff --git a/bin/tester.php b/bin/tester.php index 8dabc5cd0..8b908b781 100644 --- a/bin/tester.php +++ b/bin/tester.php @@ -15,8 +15,8 @@ use PDOException; use Tymy\Bootstrap; use Tymy\Module\Admin\Manager\MigrationManager; -use Tymy\Module\Autotest\Manager\MockMailer; -use Tymy\Module\Autotest\MockRequestFactory; +use Tymy\Test\Manager\MockMailer; +use Tymy\Test\MockRequestFactory; use const ROOT_DIR; use const TEST_DIR; @@ -47,7 +47,7 @@ public function __construct() { define("ROOT_DIR", FileSystem::normalizePath(Common::getCwdUnresolved() . "/..")); define("TEAM_DIR", ROOT_DIR); - define("TEST_DIR", ROOT_DIR . "/app/module/autotest"); + define("TEST_DIR", ROOT_DIR . "/tests"); putenv("team=autotest"); $this->configFile = ROOT_DIR . "/local/config.neon"; $this->autotestConfigFile = ROOT_DIR . "/local/config.autotest.neon"; @@ -353,7 +353,7 @@ private function createAutotestConfigFile(array $configuration, string $dbHost, private function symlinkTestDir() { $symlink = __DIR__ . "/tests"; - $target = "../app/module/autotest/app"; + $target = "../tests/app"; $this->logg("Creating symlink $symlink to $target directory"); @@ -365,7 +365,7 @@ private function rmTestsSymlink() { $symlink = __DIR__ . "/tests"; if (file_exists($symlink) && is_link($symlink)) { - $target = "../app/module/autotest/app"; + $target = "../tests/app"; $this->logg("Removing symlink $symlink to $target directory"); unlink($symlink); $this->logg("Symlink succesfully removed"); diff --git a/composer.json b/composer.json index fafa8023d..c0222205b 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "lcobucci/jwt": "4.1.5", "vojir/nette-csv-response": "v1.2", "contributte/sentry": "^0.3.0", - "phpoffice/phpspreadsheet": "^2" + "phpoffice/phpspreadsheet": "^3" }, "suggest": { "ext-memcached": "To use Memcached as CacheStorage (default for tymy.cz). If you dont want to use MemCached, override cache storage in your local/config.neon" @@ -55,7 +55,7 @@ "classmap": ["app/"] }, "autoload-dev": { - "classmap": ["app/"] + "classmap": ["app/", "tests/"] }, "minimum-stability": "stable", "config": { diff --git a/composer.lock b/composer.lock index aabbd58b6..0f6290cde 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7475f6734dc94563ec1d3a6c265d7655", + "content-hash": "bc63a164b1853c024b5542d3ea1edc47", "packages": [ { "name": "brick/math", @@ -405,16 +405,16 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8" + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", + "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "shasum": "" }, "require": { @@ -468,7 +468,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.3" + "source": "https://github.com/guzzle/promises/tree/2.0.4" }, "funding": [ { @@ -484,7 +484,7 @@ "type": "tidelift" } ], - "time": "2024-07-18T10:29:17+00:00" + "time": "2024-10-17T10:06:22+00:00" }, { "name": "guzzlehttp/psr7", @@ -604,28 +604,28 @@ }, { "name": "jean85/pretty-package-versions", - "version": "2.0.6", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4" + "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/f9fdd29ad8e6d024f52678b570e5593759b550b4", - "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4", + "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/3c4e5f62ba8d7de1734312e4fff32f67a8daaf10", + "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10", "shasum": "" }, "require": { - "composer-runtime-api": "^2.0.0", - "php": "^7.1|^8.0" + "composer-runtime-api": "^2.1.0", + "php": "^7.4|^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "jean85/composer-provided-replaced-stub-package": "^1.0", "phpstan/phpstan": "^1.4", - "phpunit/phpunit": "^7.5|^8.5|^9.4", - "vimeo/psalm": "^4.3" + "phpunit/phpunit": "^7.5|^8.5|^9.6", + "vimeo/psalm": "^4.3 || ^5.0" }, "type": "library", "extra": { @@ -657,22 +657,22 @@ ], "support": { "issues": "https://github.com/Jean85/pretty-package-versions/issues", - "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.6" + "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.0" }, - "time": "2024-03-08T09:58:59+00:00" + "time": "2024-11-18T16:19:46+00:00" }, { "name": "latte/latte", - "version": "v3.0.18", + "version": "v3.0.20", "source": { "type": "git", "url": "https://github.com/nette/latte.git", - "reference": "fca0a3eddd70213201b3b3abec0cb8dde7bbc259" + "reference": "4db7a5502f8cef02fffa84fc9c34a635d9c79d4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/latte/zipball/fca0a3eddd70213201b3b3abec0cb8dde7bbc259", - "reference": "fca0a3eddd70213201b3b3abec0cb8dde7bbc259", + "url": "https://api.github.com/repos/nette/latte/zipball/4db7a5502f8cef02fffa84fc9c34a635d9c79d4d", + "reference": "4db7a5502f8cef02fffa84fc9c34a635d9c79d4d", "shasum": "" }, "require": { @@ -743,9 +743,9 @@ ], "support": { "issues": "https://github.com/nette/latte/issues", - "source": "https://github.com/nette/latte/tree/v3.0.18" + "source": "https://github.com/nette/latte/tree/v3.0.20" }, - "time": "2024-08-06T07:58:55+00:00" + "time": "2024-10-08T00:58:27+00:00" }, { "name": "lcobucci/clock", @@ -884,16 +884,16 @@ }, { "name": "maennchen/zipstream-php", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/maennchen/ZipStream-PHP.git", - "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1" + "reference": "6187e9cc4493da94b9b63eb2315821552015fca9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b8174494eda667f7d13876b4a7bfef0f62a7c0d1", - "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/6187e9cc4493da94b9b63eb2315821552015fca9", + "reference": "6187e9cc4493da94b9b63eb2315821552015fca9", "shasum": "" }, "require": { @@ -949,19 +949,15 @@ ], "support": { "issues": "https://github.com/maennchen/ZipStream-PHP/issues", - "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.0" + "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.1" }, "funding": [ { "url": "https://github.com/maennchen", "type": "github" - }, - { - "url": "https://opencollective.com/zipstream", - "type": "open_collective" } ], - "time": "2023-06-21T14:59:35+00:00" + "time": "2024-10-10T12:33:01+00:00" }, { "name": "markbaker/complex", @@ -1384,21 +1380,21 @@ }, { "name": "nette/component-model", - "version": "v3.1.0", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/nette/component-model.git", - "reference": "4e0946a788b4ac42ea903b761c693ec7dd083a69" + "reference": "fb7608fd5f1c378ef9ef8ddc459c6ef0b63e9d77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/component-model/zipball/4e0946a788b4ac42ea903b761c693ec7dd083a69", - "reference": "4e0946a788b4ac42ea903b761c693ec7dd083a69", + "url": "https://api.github.com/repos/nette/component-model/zipball/fb7608fd5f1c378ef9ef8ddc459c6ef0b63e9d77", + "reference": "fb7608fd5f1c378ef9ef8ddc459c6ef0b63e9d77", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { "nette/tester": "^2.5", @@ -1440,9 +1436,9 @@ ], "support": { "issues": "https://github.com/nette/component-model/issues", - "source": "https://github.com/nette/component-model/tree/v3.1.0" + "source": "https://github.com/nette/component-model/tree/v3.1.1" }, - "time": "2024-02-08T20:25:40+00:00" + "time": "2024-08-07T00:35:59+00:00" }, { "name": "nette/database", @@ -1521,27 +1517,27 @@ }, { "name": "nette/di", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/nette/di.git", - "reference": "50beb3271322a7c9a7b9f76d991476c9ae5c82d6" + "reference": "9b9bfb43dac31c7804b2c8900217046cc0ca3307" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/50beb3271322a7c9a7b9f76d991476c9ae5c82d6", - "reference": "50beb3271322a7c9a7b9f76d991476c9ae5c82d6", + "url": "https://api.github.com/repos/nette/di/zipball/9b9bfb43dac31c7804b2c8900217046cc0ca3307", + "reference": "9b9bfb43dac31c7804b2c8900217046cc0ca3307", "shasum": "" }, "require": { "ext-ctype": "*", "ext-tokenizer": "*", "nette/neon": "^3.3 || ^4.0", - "nette/php-generator": "^4.1.3", + "nette/php-generator": "^4.1.6", "nette/robot-loader": "^4.0", "nette/schema": "^1.2.5", "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { "nette/tester": "^2.5.2", @@ -1588,9 +1584,9 @@ ], "support": { "issues": "https://github.com/nette/di/issues", - "source": "https://github.com/nette/di/tree/v3.2.2" + "source": "https://github.com/nette/di/tree/v3.2.3" }, - "time": "2024-05-16T13:30:24+00:00" + "time": "2024-10-05T03:14:33+00:00" }, { "name": "nette/finder", @@ -1647,16 +1643,16 @@ }, { "name": "nette/forms", - "version": "v3.2.4", + "version": "v3.2.5", "source": { "type": "git", "url": "https://github.com/nette/forms.git", - "reference": "e61535036669a78bcafb061dcfa46da827fcf377" + "reference": "7e59cee3a16e0382f83680c94babb85a0a167dd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/forms/zipball/e61535036669a78bcafb061dcfa46da827fcf377", - "reference": "e61535036669a78bcafb061dcfa46da827fcf377", + "url": "https://api.github.com/repos/nette/forms/zipball/7e59cee3a16e0382f83680c94babb85a0a167dd0", + "reference": "7e59cee3a16e0382f83680c94babb85a0a167dd0", "shasum": "" }, "require": { @@ -1718,27 +1714,27 @@ ], "support": { "issues": "https://github.com/nette/forms/issues", - "source": "https://github.com/nette/forms/tree/v3.2.4" + "source": "https://github.com/nette/forms/tree/v3.2.5" }, - "time": "2024-08-05T23:11:27+00:00" + "time": "2024-10-22T18:42:14+00:00" }, { "name": "nette/http", - "version": "v3.3.0", + "version": "v3.3.1", "source": { "type": "git", "url": "https://github.com/nette/http.git", - "reference": "c779293fb79e6d2a16d474cd19dce866615f3b9c" + "reference": "5f8f07d4242cb48c6b33d89daa3ea6ddf9668cfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/http/zipball/c779293fb79e6d2a16d474cd19dce866615f3b9c", - "reference": "c779293fb79e6d2a16d474cd19dce866615f3b9c", + "url": "https://api.github.com/repos/nette/http/zipball/5f8f07d4242cb48c6b33d89daa3ea6ddf9668cfc", + "reference": "5f8f07d4242cb48c6b33d89daa3ea6ddf9668cfc", "shasum": "" }, "require": { "nette/utils": "^4.0.4", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "conflict": { "nette/di": "<3.0.3", @@ -1799,28 +1795,28 @@ ], "support": { "issues": "https://github.com/nette/http/issues", - "source": "https://github.com/nette/http/tree/v3.3.0" + "source": "https://github.com/nette/http/tree/v3.3.1" }, - "time": "2024-01-30T18:16:20+00:00" + "time": "2024-11-04T16:30:18+00:00" }, { "name": "nette/mail", - "version": "v4.0.2", + "version": "v4.0.3", "source": { "type": "git", "url": "https://github.com/nette/mail.git", - "reference": "c0b81124284bee573ee968de98fe3dcf2c2a9b5e" + "reference": "d99839701c48031d6f35e3be95bdd9418f66ad2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/mail/zipball/c0b81124284bee573ee968de98fe3dcf2c2a9b5e", - "reference": "c0b81124284bee573ee968de98fe3dcf2c2a9b5e", + "url": "https://api.github.com/repos/nette/mail/zipball/d99839701c48031d6f35e3be95bdd9418f66ad2d", + "reference": "d99839701c48031d6f35e3be95bdd9418f66ad2d", "shasum": "" }, "require": { "ext-iconv": "*", "nette/utils": "^4.0", - "php": "8.0 - 8.3" + "php": "8.0 - 8.4" }, "require-dev": { "nette/di": "^3.1 || ^4.0", @@ -1859,7 +1855,7 @@ "homepage": "https://nette.org/contributors" } ], - "description": "📧 Nette Mail: handy email creation and transfer library for PHP with both text and MIME-compliant support.", + "description": "📧 Nette Mail: A handy library for creating and sending emails in PHP.", "homepage": "https://nette.org", "keywords": [ "mail", @@ -1870,27 +1866,27 @@ ], "support": { "issues": "https://github.com/nette/mail/issues", - "source": "https://github.com/nette/mail/tree/v4.0.2" + "source": "https://github.com/nette/mail/tree/v4.0.3" }, - "time": "2023-10-02T20:59:33+00:00" + "time": "2024-10-05T03:15:12+00:00" }, { "name": "nette/neon", - "version": "v3.4.3", + "version": "v3.4.4", "source": { "type": "git", "url": "https://github.com/nette/neon.git", - "reference": "c8481c104431c8d94cc88424a1e21f47f8c93280" + "reference": "3411aa86b104e2d5b7e760da4600865ead963c3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/c8481c104431c8d94cc88424a1e21f47f8c93280", - "reference": "c8481c104431c8d94cc88424a1e21f47f8c93280", + "url": "https://api.github.com/repos/nette/neon/zipball/3411aa86b104e2d5b7e760da4600865ead963c3c", + "reference": "3411aa86b104e2d5b7e760da4600865ead963c3c", "shasum": "" }, "require": { "ext-json": "*", - "php": "8.0 - 8.3" + "php": "8.0 - 8.4" }, "require-dev": { "nette/tester": "^2.4", @@ -1938,22 +1934,22 @@ ], "support": { "issues": "https://github.com/nette/neon/issues", - "source": "https://github.com/nette/neon/tree/v3.4.3" + "source": "https://github.com/nette/neon/tree/v3.4.4" }, - "time": "2024-06-26T14:53:59+00:00" + "time": "2024-10-04T22:00:08+00:00" }, { "name": "nette/php-generator", - "version": "v4.1.6", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/nette/php-generator.git", - "reference": "c90961e782ae86e517fe5ed732eb2b512945565b" + "reference": "d201c9bc217e0969d1b678d286be49302972fb56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/php-generator/zipball/c90961e782ae86e517fe5ed732eb2b512945565b", - "reference": "c90961e782ae86e517fe5ed732eb2b512945565b", + "url": "https://api.github.com/repos/nette/php-generator/zipball/d201c9bc217e0969d1b678d286be49302972fb56", + "reference": "d201c9bc217e0969d1b678d286be49302972fb56", "shasum": "" }, "require": { @@ -1997,7 +1993,7 @@ "homepage": "https://nette.org/contributors" } ], - "description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 8.3 features.", + "description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 8.4 features.", "homepage": "https://nette.org", "keywords": [ "code", @@ -2007,28 +2003,28 @@ ], "support": { "issues": "https://github.com/nette/php-generator/issues", - "source": "https://github.com/nette/php-generator/tree/v4.1.6" + "source": "https://github.com/nette/php-generator/tree/v4.1.7" }, - "time": "2024-09-10T09:31:55+00:00" + "time": "2024-11-29T01:41:18+00:00" }, { "name": "nette/robot-loader", - "version": "v4.0.2", + "version": "v4.0.3", "source": { "type": "git", "url": "https://github.com/nette/robot-loader.git", - "reference": "6a921e88345fc7263b89ed878c927efc7c5e6092" + "reference": "45d67753fb4865bb718e9a6c9be69cc9470137b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/robot-loader/zipball/6a921e88345fc7263b89ed878c927efc7c5e6092", - "reference": "6a921e88345fc7263b89ed878c927efc7c5e6092", + "url": "https://api.github.com/repos/nette/robot-loader/zipball/45d67753fb4865bb718e9a6c9be69cc9470137b7", + "reference": "45d67753fb4865bb718e9a6c9be69cc9470137b7", "shasum": "" }, "require": { "ext-tokenizer": "*", "nette/utils": "^4.0", - "php": "8.0 - 8.3" + "php": "8.0 - 8.4" }, "require-dev": { "nette/tester": "^2.4", @@ -2073,28 +2069,28 @@ ], "support": { "issues": "https://github.com/nette/robot-loader/issues", - "source": "https://github.com/nette/robot-loader/tree/v4.0.2" + "source": "https://github.com/nette/robot-loader/tree/v4.0.3" }, - "time": "2024-06-18T20:19:22+00:00" + "time": "2024-06-18T20:26:39+00:00" }, { "name": "nette/routing", - "version": "v3.1.0", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/nette/routing.git", - "reference": "f7419bc147164106cb03b3d331c85aff6cb81fc3" + "reference": "5b0782d3b50af68614253a373fa663ed03206a3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/routing/zipball/f7419bc147164106cb03b3d331c85aff6cb81fc3", - "reference": "f7419bc147164106cb03b3d331c85aff6cb81fc3", + "url": "https://api.github.com/repos/nette/routing/zipball/5b0782d3b50af68614253a373fa663ed03206a3f", + "reference": "5b0782d3b50af68614253a373fa663ed03206a3f", "shasum": "" }, "require": { "nette/http": "^3.2 || ~4.0.0", "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { "nette/tester": "^2.5", @@ -2135,30 +2131,30 @@ ], "support": { "issues": "https://github.com/nette/routing/issues", - "source": "https://github.com/nette/routing/tree/v3.1.0" + "source": "https://github.com/nette/routing/tree/v3.1.1" }, - "time": "2024-01-21T21:13:45+00:00" + "time": "2024-11-04T11:59:47+00:00" }, { "name": "nette/schema", - "version": "v1.3.0", + "version": "v1.3.2", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188" + "reference": "da801d52f0354f70a638673c4a0f04e16529431d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", - "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", + "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d", + "reference": "da801d52f0354f70a638673c4a0f04e16529431d", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { - "nette/tester": "^2.4", + "nette/tester": "^2.5.2", "phpstan/phpstan-nette": "^1.0", "tracy/tracy": "^2.8" }, @@ -2197,27 +2193,27 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.3.0" + "source": "https://github.com/nette/schema/tree/v1.3.2" }, - "time": "2023-12-11T11:54:22+00:00" + "time": "2024-10-06T23:10:23+00:00" }, { "name": "nette/security", - "version": "v3.2.0", + "version": "v3.2.1", "source": { "type": "git", "url": "https://github.com/nette/security.git", - "reference": "fe89d52697036fb2e14835dfb46b696d28a9ebf6" + "reference": "6e19bf604934aec0cd3343a307e28fd997e40e96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/security/zipball/fe89d52697036fb2e14835dfb46b696d28a9ebf6", - "reference": "fe89d52697036fb2e14835dfb46b696d28a9ebf6", + "url": "https://api.github.com/repos/nette/security/zipball/6e19bf604934aec0cd3343a307e28fd997e40e96", + "reference": "6e19bf604934aec0cd3343a307e28fd997e40e96", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "conflict": { "nette/di": "<3.0-stable", @@ -2268,9 +2264,9 @@ ], "support": { "issues": "https://github.com/nette/security/issues", - "source": "https://github.com/nette/security/tree/v3.2.0" + "source": "https://github.com/nette/security/tree/v3.2.1" }, - "time": "2024-01-21T21:33:53+00:00" + "time": "2024-11-04T12:25:05+00:00" }, { "name": "nette/utils", @@ -2422,16 +2418,16 @@ }, { "name": "php-http/httplug", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "625ad742c360c8ac580fcc647a1541d29e257f67" + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/625ad742c360c8ac580fcc647a1541d29e257f67", - "reference": "625ad742c360c8ac580fcc647a1541d29e257f67", + "url": "https://api.github.com/repos/php-http/httplug/zipball/5cad731844891a4c282f3f3e1b582c46839d22f4", + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4", "shasum": "" }, "require": { @@ -2473,9 +2469,9 @@ ], "support": { "issues": "https://github.com/php-http/httplug/issues", - "source": "https://github.com/php-http/httplug/tree/2.4.0" + "source": "https://github.com/php-http/httplug/tree/2.4.1" }, - "time": "2023-04-14T15:10:03+00:00" + "time": "2024-09-23T11:39:58+00:00" }, { "name": "php-http/promise", @@ -2531,16 +2527,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "2.2.2", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "ffbcee68069b073bff07a71eb321dcd9f2763513" + "reference": "fb74dcdfa5b538763ab980e977529bc783039aec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/ffbcee68069b073bff07a71eb321dcd9f2763513", - "reference": "ffbcee68069b073bff07a71eb321dcd9f2763513", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/fb74dcdfa5b538763ab980e977529bc783039aec", + "reference": "fb74dcdfa5b538763ab980e977529bc783039aec", "shasum": "" }, "require": { @@ -2629,9 +2625,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/2.2.2" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/3.5.0" }, - "time": "2024-08-08T02:31:26+00:00" + "time": "2024-11-22T06:41:00+00:00" }, { "name": "psr/clock", @@ -2988,16 +2984,16 @@ }, { "name": "sentry/sentry", - "version": "4.9.0", + "version": "4.10.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "788ec170f51ebb22f2809a1e3f78b19ccd39b70d" + "reference": "2af937d47d8aadb8dab0b1d7b9557e495dd12856" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/788ec170f51ebb22f2809a1e3f78b19ccd39b70d", - "reference": "788ec170f51ebb22f2809a1e3f78b19ccd39b70d", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/2af937d47d8aadb8dab0b1d7b9557e495dd12856", + "reference": "2af937d47d8aadb8dab0b1d7b9557e495dd12856", "shasum": "" }, "require": { @@ -3015,12 +3011,12 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.4", - "guzzlehttp/promises": "^1.0|^2.0", + "guzzlehttp/promises": "^2.0.3", "guzzlehttp/psr7": "^1.8.4|^2.1.1", "monolog/monolog": "^1.6|^2.0|^3.0", "phpbench/phpbench": "^1.0", "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^8.5.14|^9.4", + "phpunit/phpunit": "^8.5|^9.6", "symfony/phpunit-bridge": "^5.2|^6.0|^7.0", "vimeo/psalm": "^4.17" }, @@ -3061,7 +3057,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/4.9.0" + "source": "https://github.com/getsentry/sentry-php/tree/4.10.0" }, "funding": [ { @@ -3073,7 +3069,7 @@ "type": "custom" } ], - "time": "2024-08-08T14:40:50+00:00" + "time": "2024-11-06T07:44:19+00:00" }, { "name": "spomky-labs/base64url", @@ -3300,16 +3296,16 @@ }, { "name": "symfony/config", - "version": "v7.1.1", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2" + "reference": "bcd3c4adf0144dee5011bb35454728c38adec055" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2", - "reference": "2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2", + "url": "https://api.github.com/repos/symfony/config/zipball/bcd3c4adf0144dee5011bb35454728c38adec055", + "reference": "bcd3c4adf0144dee5011bb35454728c38adec055", "shasum": "" }, "require": { @@ -3355,7 +3351,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v7.1.1" + "source": "https://github.com/symfony/config/tree/v7.2.0" }, "funding": [ { @@ -3371,20 +3367,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-11-04T11:36:24+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", "shasum": "" }, "require": { @@ -3422,7 +3418,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" }, "funding": [ { @@ -3438,20 +3434,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/filesystem", - "version": "v7.1.2", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "92a91985250c251de9b947a14bb2c9390b1a562c" + "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/92a91985250c251de9b947a14bb2c9390b1a562c", - "reference": "92a91985250c251de9b947a14bb2c9390b1a562c", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b8dce482de9d7c9fe2891155035a7248ab5c7fdb", + "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb", "shasum": "" }, "require": { @@ -3488,7 +3484,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.1.2" + "source": "https://github.com/symfony/filesystem/tree/v7.2.0" }, "funding": [ { @@ -3504,20 +3500,20 @@ "type": "tidelift" } ], - "time": "2024-06-28T10:03:55+00:00" + "time": "2024-10-25T15:15:23+00:00" }, { "name": "symfony/options-resolver", - "version": "v7.1.1", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55" + "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/47aa818121ed3950acd2b58d1d37d08a94f9bf55", - "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/7da8fbac9dcfef75ffc212235d76b2754ce0cf50", + "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50", "shasum": "" }, "require": { @@ -3555,7 +3551,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v7.1.1" + "source": "https://github.com/symfony/options-resolver/tree/v7.2.0" }, "funding": [ { @@ -3571,7 +3567,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-11-20T11:17:29+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3734,20 +3730,21 @@ }, { "name": "symfony/translation", - "version": "v7.1.3", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1" + "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/8d5e50c813ba2859a6dfc99a0765c550507934a1", - "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1", + "url": "https://api.github.com/repos/symfony/translation/zipball/dc89e16b44048ceecc879054e5b7f38326ab6cc5", + "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5", "shasum": "" }, "require": { "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/translation-contracts": "^2.5|^3.0" }, @@ -3808,7 +3805,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.1.3" + "source": "https://github.com/symfony/translation/tree/v7.2.0" }, "funding": [ { @@ -3824,20 +3821,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:41:01+00:00" + "time": "2024-11-12T20:47:56+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c", + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c", "shasum": "" }, "require": { @@ -3886,7 +3883,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1" }, "funding": [ { @@ -3902,20 +3899,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "tracy/tracy", - "version": "v2.10.8", + "version": "v2.10.9", "source": { "type": "git", "url": "https://github.com/nette/tracy.git", - "reference": "0e0f3312708fb9c179a92072ebacc24aeee7e2e8" + "reference": "e7af75205b184ca8895bc57fafd331f8d5022d26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/tracy/zipball/0e0f3312708fb9c179a92072ebacc24aeee7e2e8", - "reference": "0e0f3312708fb9c179a92072ebacc24aeee7e2e8", + "url": "https://api.github.com/repos/nette/tracy/zipball/e7af75205b184ca8895bc57fafd331f8d5022d26", + "reference": "e7af75205b184ca8895bc57fafd331f8d5022d26", "shasum": "" }, "require": { @@ -3975,9 +3972,9 @@ ], "support": { "issues": "https://github.com/nette/tracy/issues", - "source": "https://github.com/nette/tracy/tree/v2.10.8" + "source": "https://github.com/nette/tracy/tree/v2.10.9" }, - "time": "2024-08-07T02:04:53+00:00" + "time": "2024-11-07T14:48:00+00:00" }, { "name": "vojir/nette-csv-response", @@ -4204,20 +4201,20 @@ }, { "name": "nette/tester", - "version": "v2.5.3", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/nette/tester.git", - "reference": "ee0a4b8402a8c1831db547ec0a56d18196906b51" + "reference": "c11863785779e87b40adebf150364f2e5938c111" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/tester/zipball/ee0a4b8402a8c1831db547ec0a56d18196906b51", - "reference": "ee0a4b8402a8c1831db547ec0a56d18196906b51", + "url": "https://api.github.com/repos/nette/tester/zipball/c11863785779e87b40adebf150364f2e5938c111", + "reference": "c11863785779e87b40adebf150364f2e5938c111", "shasum": "" }, "require": { - "php": "8.0 - 8.3" + "php": "8.0 - 8.4" }, "require-dev": { "ext-simplexml": "*", @@ -4273,22 +4270,22 @@ ], "support": { "issues": "https://github.com/nette/tester/issues", - "source": "https://github.com/nette/tester/tree/v2.5.3" + "source": "https://github.com/nette/tester/tree/v2.5.4" }, - "time": "2024-06-18T18:44:12+00:00" + "time": "2024-10-23T23:57:10+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.30.1", + "version": "1.33.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "51b95ec8670af41009e2b2b56873bad96682413e" + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/51b95ec8670af41009e2b2b56873bad96682413e", - "reference": "51b95ec8670af41009e2b2b56873bad96682413e", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140", + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140", "shasum": "" }, "require": { @@ -4320,22 +4317,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0" }, - "time": "2024-09-07T20:13:05+00:00" + "time": "2024-10-13T11:25:22+00:00" }, { "name": "phpstan/phpstan", - "version": "1.12.3", + "version": "1.12.12", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009" + "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0fcbf194ab63d8159bb70d9aa3e1350051632009", - "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0", + "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0", "shasum": "" }, "require": { @@ -4380,7 +4377,7 @@ "type": "github" } ], - "time": "2024-09-09T08:10:35+00:00" + "time": "2024-11-28T22:13:23+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -4492,21 +4489,21 @@ }, { "name": "phpstan/phpstan-strict-rules", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-strict-rules.git", - "reference": "363f921dd8441777d4fc137deb99beb486c77df1" + "reference": "daeec748b53de80a97498462513066834ec28f8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/363f921dd8441777d4fc137deb99beb486c77df1", - "reference": "363f921dd8441777d4fc137deb99beb486c77df1", + "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/daeec748b53de80a97498462513066834ec28f8b", + "reference": "daeec748b53de80a97498462513066834ec28f8b", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.11" + "phpstan/phpstan": "^1.12.4" }, "require-dev": { "nikic/php-parser": "^4.13.0", @@ -4535,9 +4532,9 @@ "description": "Extra strict and opinionated rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-strict-rules/issues", - "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.6.0" + "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.6.1" }, - "time": "2024-04-20T06:37:51+00:00" + "time": "2024-09-20T14:04:44+00:00" }, { "name": "rector/rector", @@ -4601,23 +4598,23 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "0d120db075c79583ff3746a534fc743202af380a" + "reference": "dcb2bdb48e1d9b0b5b1c333b61f49772aee879ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0d120db075c79583ff3746a534fc743202af380a", - "reference": "0d120db075c79583ff3746a534fc743202af380a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/dcb2bdb48e1d9b0b5b1c333b61f49772aee879ff", + "reference": "dcb2bdb48e1d9b0b5b1c333b61f49772aee879ff", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", - "admidio/admidio": "<4.3.10", + "admidio/admidio": "<4.3.12", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "aheinze/cockpit": "<2.2", - "aimeos/ai-admin-graphql": ">=2022.04.1,<2022.10.10|>=2023.04.1,<2023.10.6|>=2024.04.1,<2024.04.6", + "aimeos/ai-admin-graphql": ">=2022.04.1,<2022.10.10|>=2023.04.1,<2023.10.6|>=2024.04.1,<2024.07.2", "aimeos/ai-admin-jsonadm": "<2020.10.13|>=2021.04.1,<2021.10.6|>=2022.04.1,<2022.10.3|>=2023.04.1,<2023.10.4|==2024.04.1", "aimeos/ai-client-html": ">=2020.04.1,<2020.10.27|>=2021.04.1,<2021.10.22|>=2022.04.1,<2022.10.13|>=2023.04.1,<2023.10.15|>=2024.04.1,<2024.04.7", - "aimeos/ai-controller-frontend": "<2020.10.15|>=2021.04.1,<2021.10.8|>=2022.04.1,<2022.10.8|>=2023.04.1,<2023.10.9", + "aimeos/ai-controller-frontend": "<2020.10.15|>=2021.04.1,<2021.10.8|>=2022.04.1,<2022.10.8|>=2023.04.1,<2023.10.9|==2024.04.1", "aimeos/aimeos-core": ">=2022.04.1,<2022.10.17|>=2023.04.1,<2023.10.17|>=2024.04.1,<2024.04.7", "aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5", "airesvsg/acf-to-rest-api": "<=3.1", @@ -4626,6 +4623,7 @@ "alextselegidis/easyappointments": "<1.5", "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1", "amazing/media2click": ">=1,<1.3.3", + "ameos/ameos_tarteaucitron": "<1.2.23", "amphp/artax": "<1.0.6|>=2,<2.0.6", "amphp/http": "<=1.7.2|>=2,<=2.1", "amphp/http-client": ">=4,<4.4", @@ -4651,6 +4649,7 @@ "azuracast/azuracast": "<0.18.3", "backdrop/backdrop": "<1.27.3|>=1.28,<1.28.2", "backpack/crud": "<3.4.9", + "backpack/filemanager": "<2.0.2|>=3,<3.0.9", "bacula-web/bacula-web": "<8.0.0.0-RC2-dev", "badaso/core": "<2.7", "bagisto/bagisto": "<2.1", @@ -4658,7 +4657,7 @@ "barrelstrength/sprout-forms": "<3.9", "barryvdh/laravel-translation-manager": "<0.6.2", "barzahlen/barzahlen-php": "<2.0.1", - "baserproject/basercms": "<5.0.9", + "baserproject/basercms": "<=5.1.1", "bassjobsen/bootstrap-3-typeahead": ">4.0.2", "bbpress/bbpress": "<2.6.5", "bcosca/fatfree": "<3.7.2", @@ -4707,18 +4706,19 @@ "concrete5/core": "<8.5.8|>=9,<9.1", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/comments-bundle": ">=2,<4.13.40|>=5.0.0.0-RC1-dev,<5.3.4", - "contao/contao": ">=3,<3.5.37|>=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4", + "contao/contao": "<=5.4.1", "contao/core": "<3.5.39", - "contao/core-bundle": "<4.13.40|>=5,<5.3.4", + "contao/core-bundle": "<4.13.49|>=5,<5.3.15|>=5.4,<5.4.3", "contao/listing-bundle": ">=3,<=3.5.30|>=4,<4.4.8", "contao/managed-edition": "<=1.5", "corveda/phpsandbox": "<1.3.5", "cosenary/instagram": "<=2.3", - "craftcms/cms": "<4.6.2|>=5,<=5.2.2", + "craftcms/cms": "<=4.12.6.1|>=5,<=5.4.7.1", "croogo/croogo": "<4", "cuyz/valinor": "<0.12", + "czim/file-handling": "<1.5|>=2,<2.3", "czproject/git-php": "<4.0.3", - "damienharper/auditor-bundle": "<6", + "damienharper/auditor-bundle": "<5.2.6", "dapphp/securimage": "<3.6.6", "darylldoyle/safe-svg": "<1.9.10", "datadog/dd-trace": ">=0.30,<0.30.2", @@ -4729,6 +4729,7 @@ "derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3", "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1|>=7,<7.4", "desperado/xml-bundle": "<=0.1.7", + "dev-lancer/minecraft-motd-parser": "<=1.0.5", "devgroup/dotplant": "<2020.09.14-dev", "directmailteam/direct-mail": "<6.0.3|>=7,<7.0.3|>=8,<9.5.2", "doctrine/annotations": "<1.2.7", @@ -4743,9 +4744,9 @@ "dolibarr/dolibarr": "<19.0.2", "dompdf/dompdf": "<2.0.4", "doublethreedigital/guest-entries": "<3.1.2", - "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.1.8|>=10.2,<10.2.2|==11.9999999.9999999.9999999-dev", - "drupal/core-recommended": "==11.9999999.9999999.9999999-dev", - "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4|==11.9999999.9999999.9999999-dev", + "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.2.10|>=10.3,<10.3.6|>=11,<11.0.5", + "drupal/core-recommended": ">=8,<10.2.9|>=10.3,<10.3.6|>=11,<11.0.5", + "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<10.2.9|>=10.3,<10.3.6|>=11,<11.0.5", "duncanmcclean/guest-entries": "<3.1.2", "dweeves/magmi": "<=0.7.24", "ec-cube/ec-cube": "<2.4.4|>=2.11,<=2.17.1|>=3,<=3.0.18.0-patch4|>=4,<=4.1.2", @@ -4772,6 +4773,7 @@ "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26|>=3.3,<3.3.39", "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1", "ezsystems/ezplatform-graphql": ">=1.0.0.0-RC1-dev,<1.0.13|>=2.0.0.0-beta1,<2.3.12", + "ezsystems/ezplatform-http-cache": "<2.3.16", "ezsystems/ezplatform-kernel": "<1.2.5.1-dev|>=1.3,<1.3.35", "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8", "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev|>=3.3,<3.3.40", @@ -4781,13 +4783,16 @@ "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.03.5.1", "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", "ezsystems/repository-forms": ">=2.3,<2.3.2.1-dev|>=2.5,<2.5.15", - "ezyang/htmlpurifier": "<4.1.1", + "ezyang/htmlpurifier": "<=4.2", "facade/ignition": "<1.16.15|>=2,<2.4.2|>=2.5,<2.5.2", "facturascripts/facturascripts": "<=2022.08", "fastly/magento2": "<1.2.26", "feehi/cms": "<=2.1.1", "feehi/feehicms": "<=2.1.1", "fenom/fenom": "<=2.12.1", + "filament/actions": ">=3.2,<3.2.123", + "filament/infolists": ">=3,<3.2.115", + "filament/tables": ">=3,<3.2.115", "filegator/filegator": "<7.8", "filp/whoops": "<2.1.13", "fineuploader/php-traditional-server": "<=1.2.2", @@ -4822,7 +4827,7 @@ "froxlor/froxlor": "<=2.2.0.0-RC3", "frozennode/administrator": "<=5.0.12", "fuel/core": "<1.8.1", - "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3", + "funadmin/funadmin": "<=5.0.2", "gaoming13/wechat-php-sdk": "<=1.10.2", "genix/cms": "<=1.1.11", "getformwork/formwork": "<1.13.1|==2.0.0.0-beta1", @@ -4853,11 +4858,12 @@ "hov/jobfair": "<1.0.13|>=2,<2.0.2", "httpsoft/http-message": "<1.0.12", "hyn/multi-tenant": ">=5.6,<5.7.2", - "ibexa/admin-ui": ">=4.2,<4.2.3|>=4.6.0.0-beta1,<4.6.9", + "ibexa/admin-ui": ">=4.2,<4.2.3|>=4.6,<4.6.14", "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.6|>=4.6,<4.6.2", "ibexa/fieldtype-richtext": ">=4.6,<4.6.10", "ibexa/graphql": ">=2.5,<2.5.31|>=3.3,<3.3.28|>=4.2,<4.2.3", - "ibexa/post-install": "<=1.0.4", + "ibexa/http-cache": ">=4.6,<4.6.14", + "ibexa/post-install": "<1.0.16|>=4.6,<4.6.14", "ibexa/solr": ">=4.5,<4.5.4", "ibexa/user": ">=4,<4.4.3", "icecoder/icecoder": "<=8.1", @@ -4874,7 +4880,7 @@ "in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.2.3", "in2code/ipandlanguageredirect": "<5.1.2", "in2code/lux": "<17.6.1|>=18,<24.0.2", - "in2code/powermail": "<7.5|>=8,<8.5|>=9,<10.9|>=11,<12.4", + "in2code/powermail": "<7.5.1|>=8,<8.5.1|>=9,<10.9.1|>=11,<12.4.1", "innologi/typo3-appointments": "<2.0.6", "intelliants/subrion": "<4.2.2", "inter-mediator/inter-mediator": "==5.5", @@ -4904,21 +4910,24 @@ "kelvinmo/simplexrd": "<3.1.1", "kevinpapst/kimai2": "<1.16.7", "khodakhah/nodcms": "<=3", - "kimai/kimai": "<2.16", + "kimai/kimai": "<=2.20.1", "kitodo/presentation": "<3.2.3|>=3.3,<3.3.4", "klaviyo/magento2-extension": ">=1,<3", "knplabs/knp-snappy": "<=1.4.2", "kohana/core": "<3.3.3", - "krayin/laravel-crm": "<1.2.2", + "krayin/laravel-crm": "<=1.3", "kreait/firebase-php": ">=3.2,<3.8.1", "kumbiaphp/kumbiapp": "<=1.1.1", "la-haute-societe/tcpdf": "<6.2.22", "laminas/laminas-diactoros": "<2.18.1|==2.19|==2.20|==2.21|==2.22|==2.23|>=2.24,<2.24.2|>=2.25,<2.25.2", "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", + "lara-zeus/artemis": ">=1,<=1.0.6", + "lara-zeus/dynamic-dashboard": ">=3,<=3.0.1", "laravel/fortify": "<1.11.1", - "laravel/framework": "<6.20.44|>=7,<7.30.6|>=8,<8.75", + "laravel/framework": "<6.20.45|>=7,<7.30.7|>=8,<8.83.28|>=9,<9.52.17|>=10,<10.48.23|>=11,<11.31", "laravel/laravel": ">=5.4,<5.4.22", + "laravel/reverb": "<1.4", "laravel/socialite": ">=1,<2.0.10", "latte/latte": "<2.10.8", "lavalite/cms": "<=9|==10.1", @@ -4931,13 +4940,14 @@ "librenms/librenms": "<2017.08.18", "liftkit/database": "<2.13.2", "lightsaml/lightsaml": "<1.3.5", - "limesurvey/limesurvey": "<3.27.19", + "limesurvey/limesurvey": "<6.5.12", "livehelperchat/livehelperchat": "<=3.91", - "livewire/livewire": ">2.2.4,<2.2.6|>=3.3.5,<3.4.9", + "livewire/livewire": "<2.12.7|>=3.0.0.0-beta1,<3.5.2", "lms/routes": "<2.1.1", "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2", "luyadev/yii-helpers": "<1.2.1", - "magento/community-edition": "<2.4.5|==2.4.5|>=2.4.5.0-patch1,<2.4.5.0-patch9|==2.4.6|>=2.4.6.0-patch1,<2.4.6.0-patch7|==2.4.7|>=2.4.7.0-patch1,<2.4.7.0-patch2", + "maestroerror/php-heic-to-jpg": "<1.0.5", + "magento/community-edition": "<2.4.5|==2.4.5|>=2.4.5.0-patch1,<2.4.5.0-patch10|==2.4.6|>=2.4.6.0-patch1,<2.4.6.0-patch8|>=2.4.7.0-beta1,<2.4.7.0-patch3", "magento/core": "<=1.9.4.5", "magento/magento1ce": "<1.9.4.3-dev", "magento/magento1ee": ">=1,<1.14.4.3-dev", @@ -4945,12 +4955,16 @@ "magneto/core": "<1.9.4.4-dev", "maikuolan/phpmussel": ">=1,<1.6", "mainwp/mainwp": "<=4.4.3.3", - "mantisbt/mantisbt": "<2.26.2", + "mantisbt/mantisbt": "<=2.26.3", "marcwillmann/turn": "<0.3.3", "matyhtf/framework": "<3.0.6", - "mautic/core": "<4.4.12|>=5.0.0.0-alpha,<5.0.4", + "mautic/core": "<4.4.13|>=5,<5.1.1", + "mautic/core-lib": ">=1.0.0.0-beta,<4.4.13|>=5.0.0.0-alpha,<5.1.1", + "maximebf/debugbar": "<1.19", "mdanter/ecc": "<2", - "mediawiki/core": "<1.36.2", + "mediawiki/abuse-filter": "<1.39.9|>=1.40,<1.41.3|>=1.42,<1.42.2", + "mediawiki/cargo": "<3.6.1", + "mediawiki/core": "<1.39.5|==1.40", "mediawiki/matomo": "<2.4.3", "mediawiki/semantic-media-wiki": "<4.0.2", "melisplatform/melis-asset-manager": "<5.0.1", @@ -4970,7 +4984,7 @@ "mojo42/jirafeau": "<4.4", "mongodb/mongodb": ">=1,<1.9.2", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<4.3.5|>=4.4.0.0-beta,<4.4.1", + "moodle/moodle": "<4.3.8|>=4.4,<4.4.4", "mos/cimage": "<0.7.19", "movim/moxl": ">=0.8,<=0.10", "movingbytes/social-network": "<=1.2.1", @@ -5006,7 +5020,7 @@ "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", "october/backend": "<1.1.2", "october/cms": "<1.0.469|==1.0.469|==1.0.471|==1.1.1", - "october/october": "<=3.4.4", + "october/october": "<=3.6.4", "october/rain": "<1.0.472|>=1.1,<1.1.2", "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.15", "omeka/omeka-s": "<4.0.3", @@ -5018,7 +5032,7 @@ "openmage/magento-lts": "<20.10.1", "opensolutions/vimbadmin": "<=3.0.15", "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", - "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", + "orchid/platform": ">=8,<14.43", "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1", "oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1", "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", @@ -5049,7 +5063,7 @@ "phenx/php-svg-lib": "<0.5.2", "php-censor/php-censor": "<2.0.13|>=2.1,<2.1.5", "php-mod/curl": "<2.3.2", - "phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1", + "phpbb/phpbb": "<3.3.11", "phpems/phpems": ">=6,<=6.1.3", "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7", "phpmailer/phpmailer": "<6.5", @@ -5057,8 +5071,8 @@ "phpmyadmin/phpmyadmin": "<5.2.1", "phpmyfaq/phpmyfaq": "<3.2.5|==3.2.5", "phpoffice/common": "<0.2.9", - "phpoffice/phpexcel": "<1.8", - "phpoffice/phpspreadsheet": "<1.29.1|>=2,<2.1.1|>=2.2,<2.2.1", + "phpoffice/phpexcel": "<1.8.1", + "phpoffice/phpspreadsheet": "<1.29.4|>=2,<2.1.3|>=2.2,<2.3.2|>=3.3,<3.4", "phpseclib/phpseclib": "<2.0.47|>=3,<3.0.36", "phpservermon/phpservermon": "<3.6", "phpsysinfo/phpsysinfo": "<3.4.3", @@ -5095,7 +5109,7 @@ "processwire/processwire": "<=3.0.229", "propel/propel": ">=2.0.0.0-alpha1,<=2.0.0.0-alpha7", "propel/propel1": ">=1,<=1.7.1", - "pterodactyl/panel": "<1.11.6", + "pterodactyl/panel": "<1.11.8", "ptheofan/yii2-statemachine": ">=2.0.0.0-RC1-dev,<=2", "ptrofimov/beanstalk_console": "<1.7.14", "pubnub/pubnub": "<6.1", @@ -5112,7 +5126,7 @@ "rap2hpoutre/laravel-log-viewer": "<0.13", "react/http": ">=0.7,<1.9", "really-simple-plugins/complianz-gdpr": "<6.4.2", - "redaxo/source": "<=5.15.1", + "redaxo/source": "<5.18", "remdex/livehelperchat": "<4.29", "reportico-web/reportico": "<=8.1", "rhukster/dom-sanitizer": "<1.0.7", @@ -5124,6 +5138,7 @@ "s-cart/s-cart": "<6.9", "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1", "sabre/dav": ">=1.6,<1.7.11|>=1.8,<1.8.9", + "samwilson/unlinked-wikibase": "<1.39.6|>=1.40,<1.40.2|>=1.41,<1.41.1", "scheb/two-factor-bundle": "<3.26|>=4,<4.11", "sensiolabs/connect": "<4.2.3", "serluck/phpwhois": "<=4.2.6", @@ -5155,11 +5170,13 @@ "silverstripe/userforms": "<3|>=5,<5.4.2", "silverstripe/versioned-admin": ">=1,<1.11.1", "simple-updates/phpwhois": "<=1", - "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4|==5.0.0.0-alpha12", + "simplesamlphp/saml2": "<4.6.14|==5.0.0.0-alpha12", + "simplesamlphp/saml2-legacy": "<4.6.14", "simplesamlphp/simplesamlphp": "<1.18.6", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "simplesamlphp/simplesamlphp-module-openid": "<1", "simplesamlphp/simplesamlphp-module-openidprovider": "<0.9", + "simplesamlphp/xml-common": "<1.20", "simplesamlphp/xml-security": "==1.6.11", "simplito/elliptic-php": "<1.0.6", "sitegeist/fluid-components": "<3.5", @@ -5168,24 +5185,26 @@ "slim/slim": "<2.6", "slub/slub-events": "<3.0.3", "smarty/smarty": "<4.5.3|>=5,<5.1.1", - "snipe/snipe-it": "<6.4.2", + "snipe/snipe-it": "<=7.0.13", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", "spatie/browsershot": "<3.57.4", "spatie/image-optimizer": "<1.7.3", + "spencer14420/sp-php-email-handler": "<1", "spipu/html2pdf": "<5.2.8", "spoon/library": "<1.4.1", "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", "ssddanbrown/bookstack": "<24.05.1", - "statamic/cms": "<4.46|>=5.3,<5.6.2", + "starcitizentools/citizen-skin": ">=2.6.3,<2.31", + "statamic/cms": "<=5.16", "stormpath/sdk": "<9.9.99", "studio-42/elfinder": "<=2.1.64", "studiomitte/friendlycaptcha": "<0.1.4", "subhh/libconnect": "<7.0.8|>=8,<8.1", "sukohi/surpass": "<1", "sulu/form-bundle": ">=2,<2.5.3", - "sulu/sulu": "<1.6.44|>=2,<2.4.17|>=2.5,<2.5.13", + "sulu/sulu": "<1.6.44|>=2,<2.5.21|>=2.6,<2.6.5", "sumocoders/framework-user-bundle": "<1.4", "superbig/craft-audit": "<3.0.2", "swag/paypal": "<5.4.4", @@ -5207,7 +5226,8 @@ "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4", "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<5.3.15|>=5.4.3,<5.4.4|>=6.0.3,<6.0.4", - "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", + "symfony/http-client": ">=4.3,<5.4.47|>=6,<6.4.15|>=7,<7.1.8", + "symfony/http-foundation": "<5.4.46|>=6,<6.4.14|>=7,<7.1.7", "symfony/http-kernel": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/maker-bundle": ">=1.27,<1.29.2|>=1.30,<1.31.1", @@ -5215,20 +5235,22 @@ "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/polyfill": ">=1,<1.10", "symfony/polyfill-php55": ">=1,<1.10", + "symfony/process": "<5.4.46|>=6,<6.4.14|>=7,<7.1.7", "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/routing": ">=2,<2.0.19", + "symfony/runtime": ">=5.3,<5.4.46|>=6,<6.4.14|>=7,<7.1.7", "symfony/security": ">=2,<2.7.51|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.8", - "symfony/security-bundle": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", + "symfony/security-bundle": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.4.10|>=7,<7.0.10|>=7.1,<7.1.3", "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9", "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", - "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.3.2|>=5.4,<5.4.31|>=6,<6.3.8", + "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.4.47|>=6,<6.4.15|>=7,<7.1.8", "symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12", - "symfony/symfony": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8", + "symfony/symfony": "<5.4.47|>=6,<6.4.15|>=7,<7.1.8", "symfony/translation": ">=2,<2.0.17", "symfony/twig-bridge": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8", "symfony/ux-autocomplete": "<2.11.2", - "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", + "symfony/validator": "<5.4.43|>=6,<6.4.11|>=7,<7.1.4", "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", "symfony/webhook": ">=6.3,<6.3.8", @@ -5239,13 +5261,13 @@ "t3s/content-consent": "<1.0.3|>=2,<2.0.2", "tastyigniter/tastyigniter": "<3.3", "tcg/voyager": "<=1.4", - "tecnickcom/tcpdf": "<=6.7.4", + "tecnickcom/tcpdf": "<=6.7.5", "terminal42/contao-tablelookupwizard": "<3.3.5", "thelia/backoffice-default-template": ">=2.1,<2.1.2", "thelia/thelia": ">=2.1,<2.1.3", "theonedemon/phpwhois": "<=4.2.5", "thinkcmf/thinkcmf": "<6.0.8", - "thorsten/phpmyfaq": "<3.2.2", + "thorsten/phpmyfaq": "<4", "tikiwiki/tiki-manager": "<=17.1", "timber/timber": ">=0.16.6,<1.23.1|>=1.24,<1.24.1|>=2,<2.1", "tinymce/tinymce": "<7.2", @@ -5254,16 +5276,16 @@ "tobiasbg/tablepress": "<=2.0.0.0-RC1", "topthink/framework": "<6.0.17|>=6.1,<=8.0.4", "topthink/think": "<=6.1.1", - "topthink/thinkphp": "<=3.2.3", + "topthink/thinkphp": "<=3.2.3|>=6.1.3,<=8.0.4", "torrentpier/torrentpier": "<=2.4.3", "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2", - "tribalsystems/zenario": "<9.5.60602", + "tribalsystems/zenario": "<=9.7.61188", "truckersmp/phpwhois": "<=4.3.1", "ttskch/pagination-service-provider": "<1", "twbs/bootstrap": "<=3.4.1|>=4,<=4.6.2", - "twig/twig": "<1.44.8|>=2,<2.16.1|>=3,<3.11.1|>=3.12,<3.14", + "twig/twig": "<3.11.2|>=3.12,<3.14.1", "typo3/cms": "<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2", - "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", + "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<10.4.46|>=11,<11.5.40|>=12,<12.4.21|>=13,<13.3.1", "typo3/cms-core": "<=8.7.56|>=9,<=9.5.47|>=10,<=10.4.44|>=11,<=11.5.36|>=12,<=12.4.14|>=13,<=13.1", "typo3/cms-extbase": "<6.2.24|>=7,<7.6.8|==8.1.1", "typo3/cms-fluid": "<4.3.4|>=4.4,<4.4.1", @@ -5280,6 +5302,7 @@ "ua-parser/uap-php": "<3.8", "uasoft-indonesia/badaso": "<=2.9.7", "unisharp/laravel-filemanager": "<2.6.4", + "unopim/unopim": "<0.1.5", "userfrosting/userfrosting": ">=0.3.1,<4.6.3", "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2", "uvdesk/community-skeleton": "<=1.1.1", @@ -5313,6 +5336,7 @@ "winter/wn-dusk-plugin": "<2.1", "winter/wn-system-module": "<1.2.4", "wintercms/winter": "<=1.2.3", + "wireui/wireui": "<1.19.3|>=2,<2.1.3", "woocommerce/woocommerce": "<6.6|>=8.8,<8.8.5|>=8.9,<8.9.3", "wp-cli/wp-cli": ">=0.12,<2.5", "wp-graphql/wp-graphql": "<=1.14.5", @@ -5324,7 +5348,7 @@ "xataface/xataface": "<3", "xpressengine/xpressengine": "<3.0.15", "yab/quarx": "<2.4.5", - "yeswiki/yeswiki": "<4.1", + "yeswiki/yeswiki": "<=4.4.4", "yetiforce/yetiforce-crm": "<=6.4", "yidashi/yii2cmf": "<=2", "yii2mod/yii2-cms": "<1.9.2", @@ -5415,7 +5439,7 @@ "type": "tidelift" } ], - "time": "2024-09-16T19:04:26+00:00" + "time": "2024-12-06T23:05:03+00:00" }, { "name": "slevomat/coding-standard", @@ -5484,16 +5508,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.2", + "version": "3.11.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" + "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", + "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", "shasum": "" }, "require": { @@ -5560,7 +5584,7 @@ "type": "open_collective" } ], - "time": "2024-07-21T23:26:44+00:00" + "time": "2024-11-16T12:02:36+00:00" } ], "aliases": [], @@ -5579,6 +5603,6 @@ "ext-gmp": "*", "ext-mbstring": "*" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/phpstan.neon b/phpstan.neon index bfd62e11f..88a1ac106 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -2,6 +2,7 @@ parameters: level: 4 paths: - app + - tests excludePaths: - app/components/phpqrcode.php tmpDir: temp/phpstan diff --git a/tests/.htaccess b/tests/.htaccess deleted file mode 100644 index aded78619..000000000 --- a/tests/.htaccess +++ /dev/null @@ -1,8 +0,0 @@ -order deny,allow -deny from all -allow from 192.168.31.0/24 -allow from 94.112.206.90 -allow from 46.135.126.2 -allow from 37.188.183.195 -allow from 90.182.181.138 -allow from 80.188.249.250 \ No newline at end of file diff --git a/tests/TestAuthenticator.php b/tests/TestAuthenticator.php deleted file mode 100644 index f239d3a40..000000000 --- a/tests/TestAuthenticator.php +++ /dev/null @@ -1,51 +0,0 @@ -setId(38); - $this->setStatus(["TESTROLE", "TESTROLE2"]); - $this->setArr([ - "tym" => "testteam", - "sessionKey" => "dsfbglsdfbg13546", - "hash" => "123hash", - "login" => $username - ]); - return new Nette\Security\Identity($this->id, $this->status, $this->arr); - } - - public function setId($id) - { - $this->id = $id; - } - - public function setStatus($status) - { - $this->status = $status; - } - - public function setArr($arr) - { - $this->arr = $arr; - } -} diff --git a/app/module/autotest/app/attendance/AttendanceStatusTest.php b/tests/app/attendance/AttendanceStatusTest.php similarity index 97% rename from app/module/autotest/app/attendance/AttendanceStatusTest.php rename to tests/app/attendance/AttendanceStatusTest.php index 212f19c6f..01ab9d9d5 100644 --- a/app/module/autotest/app/attendance/AttendanceStatusTest.php +++ b/tests/app/attendance/AttendanceStatusTest.php @@ -2,12 +2,13 @@ // phpcs:disable PSR1.Files.SideEffects -namespace Tymy\Module\Autotest\Event; +namespace Tymy\Test\Event; +use Nette\NotImplementedException; use Tymy\Bootstrap; use Tymy\Module\Attendance\Model\Attendance; -use Tymy\Module\Autotest\ApiTest; -use Tymy\Module\Autotest\Entity\Assert; +use Tymy\Test\ApiTest; +use Tymy\Test\Entity\Assert; use function count; @@ -178,7 +179,7 @@ private function getStatusSetId(): int public function createRecord(): array { - //use creator from recorManager - can create status or statusSet + throw new NotImplementedException(); } public function mockRecord(): void diff --git a/app/module/autotest/app/attendance/AttendanceTest.php b/tests/app/attendance/AttendanceTest.php similarity index 97% rename from app/module/autotest/app/attendance/AttendanceTest.php rename to tests/app/attendance/AttendanceTest.php index ce828bc1e..75bdc0092 100644 --- a/app/module/autotest/app/attendance/AttendanceTest.php +++ b/tests/app/attendance/AttendanceTest.php @@ -2,12 +2,13 @@ // phpcs:disable PSR1.Files.SideEffects -namespace Tymy\Module\Autotest\Event; +namespace Tymy\Test\Event; +use Nette\NotImplementedException; use Tymy\Bootstrap; use Tymy\Module\Attendance\Model\Attendance; -use Tymy\Module\Autotest\ApiTest; -use Tymy\Module\Autotest\Entity\Assert; +use Tymy\Test\ApiTest; +use Tymy\Test\Entity\Assert; require getenv("ROOT_DIR") . '/app/Bootstrap.php'; $container = Bootstrap::boot(); @@ -155,7 +156,7 @@ public function testUnknownEvent(): void public function createRecord(): array { - //attendance are never created solely, always just posted to some event + throw new NotImplementedException(); } public function mockRecord(): array diff --git a/app/module/autotest/app/authentication/IsTest.php b/tests/app/authentication/IsTest.php similarity index 86% rename from app/module/autotest/app/authentication/IsTest.php rename to tests/app/authentication/IsTest.php index 60dc1cc4b..7d0421f59 100644 --- a/app/module/autotest/app/authentication/IsTest.php +++ b/tests/app/authentication/IsTest.php @@ -2,10 +2,11 @@ // phpcs:disable PSR1.Files.SideEffects -namespace Tymy\Module\Autotest\Authentication; +namespace Tymy\Test\Authentication; +use Nette\NotImplementedException; use Tymy\Bootstrap; -use Tymy\Module\Autotest\ApiTest; +use Tymy\Test\ApiTest; require getenv("ROOT_DIR") . '/app/Bootstrap.php'; $container = Bootstrap::boot(); @@ -35,7 +36,7 @@ protected function mockChanges(): array public function createRecord(): array { - //not used in this test + throw new NotImplementedException(); } protected function getBasePath(): string diff --git a/app/module/autotest/app/debt/DebtTest.php b/tests/app/debt/DebtTest.php similarity index 96% rename from app/module/autotest/app/debt/DebtTest.php rename to tests/app/debt/DebtTest.php index de4d965fe..33b9daf1e 100644 --- a/app/module/autotest/app/debt/DebtTest.php +++ b/tests/app/debt/DebtTest.php @@ -2,12 +2,12 @@ // phpcs:disable PSR1.Files.SideEffects -namespace Tymy\Module\Autotest\Debt; +namespace Tymy\Test\Debt; use Nette\Utils\DateTime; use Tymy\Bootstrap; -use Tymy\Module\Autotest\ApiTest; -use Tymy\Module\Autotest\Entity\Assert; +use Tymy\Test\ApiTest; +use Tymy\Test\Entity\Assert; use Tymy\Module\Debt\Model\Debt; require getenv("ROOT_DIR") . '/app/Bootstrap.php'; @@ -32,7 +32,7 @@ public function testGet(): void public function testCRUDSingular(): void { $this->authorizeAdmin(); - $recordId = $this->createRecord(); + $recordId = $this->createRecord()["id"]; $this->request($this->getBasePath() . "/" . $recordId)->expect(200, "array"); @@ -127,7 +127,7 @@ public function testBlankCaption(): void $data["caption"] = ""; $this->request($this->getBasePath(), "POST", $data)->expect(400); - $recordId = $this->createRecord(); + $recordId = $this->createRecord()["id"]; $this->request($this->getBasePath() . "/" . $recordId, "PUT", ["caption" => ""])->expect(400); } @@ -146,7 +146,7 @@ public function testDebtNegative(): void $data["amount"] = -13; $this->request($this->getBasePath(), "POST", $data)->expect(400); - $recordId = $this->createRecord(); + $recordId = $this->createRecord()["id"]; $this->request($this->getBasePath() . "/" . $recordId, "PUT", ["amount" => "-14"])->expect(400); } @@ -173,7 +173,7 @@ public function testTeamOwesMe(): void public function testCRUDPlural(): void { $this->authorizeAdmin(); - $recordId = $this->createRecord(); + $recordId = $this->createRecord()["id"]; $this->request($this->getBasePath() . "s/" . $recordId)->expect(200, "array"); diff --git a/tests/app/discussion/DiscussionDetailUiTest.php b/tests/app/discussion/DiscussionDetailUiTest.php new file mode 100644 index 000000000..dc5eae647 --- /dev/null +++ b/tests/app/discussion/DiscussionDetailUiTest.php @@ -0,0 +1,129 @@ +authorizeUser(); + $request = new Request("{$this->getModule()}:{$this->getPresenter()}", 'GET', ['action' => $action] + $params); + $response = $this->presenter->run($request); + + Assert::type(TextResponse::class, $response); + assert($response instanceof TextResponse); + + //replace unescaped ampersands in html to prevent tests from failing + $html = preg_replace('/&(?!(?:apos|quot|[gl]t|amp);|#)/', "&", (string) $response->getSource()); + + return DomQuery::fromHtml($html); + } + + public function testActionDiscussionReadableWritable() + { + $this->authorizeAdmin(); + $discussion = $this->recordManager->createDiscussion(); + $discussionWebName = Strings::webalize($discussion["id"] . "-" . $discussion["caption"]); + $dom = $this->getDomForAction('default', ['discussion' => $discussionWebName]); + + //has navbar + parent::assertNavbar($dom); + + //has breadcrumbs + $this->assertBreadcrumb($dom, 0, "Hlavní stránka", true); + $this->assertBreadcrumb($dom, 1, "Diskuze", true); + $this->assertBreadcrumb($dom, 2, $discussion["caption"], false); + + $discussionDom = parent::assertDomHas($dom, 'div.container-fluid.my-2'); + Assert::equal(count($discussionDom->find('div.row.justify-content-md-center')), 2); //search container and wysiwyg container + + $wysiwygDom = parent::assertDomHas($discussionDom, 'div.row.justify-content-md-center', 0); + $searchBarDom = parent::assertDomHas($discussionDom, 'div.row.justify-content-md-center', 1); + + //user can write, assert there is addPost textarea wysiwyg shown + parent::assertDomHas($wysiwygDom, 'div.col-md-10 textarea#addPost'); + + $searchFormDom = parent::assertDomHas($searchBarDom, 'div.col-md-10 div.addPost form.form-inline'); + parent::assertDomHas($searchFormDom, 'div.col-9 div.input-group input.form-control[name=search]'); + parent::assertDomHas($searchFormDom, 'div.col-9 div.input-group select.form-control.custom-select[name=suser]'); + parent::assertDomHas($searchFormDom, 'div.col-9 div.input-group button.form-control.btn.btn-outline-success.mr-sm-2.rounded-right'); + + parent::assertDomHas($searchFormDom, 'div.col-3 button#editPost.btn.btn-warning'); + + $discussionPostsDom = parent::assertDomHas($discussionDom, 'div.container-fluid.discussion#snippet--discussion'); + Assert::count(0, $discussionPostsDom->find('div.row')); + + $this->authorizeAdmin(); + $this->recordManager->deleteDiscussion($discussion["id"]); + } + + public function testActionDiscussionReadableOnly() + { + $this->authorizeAdmin(); + $discussion = $this->recordManager->createDiscussion(null, ["writeRightName" => "ADMINONLY"]); + $discussionWebName = Strings::webalize($discussion["id"] . "-" . $discussion["caption"]); + + $this->authorizeUser(); //this user can read only in this discussion + $dom = $this->getDomForAction('default', ['discussion' => $discussionWebName]); + + //has navbar + parent::assertNavbar($dom); + + //has breadcrumbs + + parent::assertDomHas($dom, 'div.container div.row div.col ol.breadcrumb'); + Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 2); + Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 3); //last item aint link + + $discussionDom = parent::assertDomHas($dom, 'div.container-fluid.my-2'); + Assert::falsey(count($dom->find('div.container.my-2 div.row.justify-content-md-center div.col-md-10 textarea#addPost'))); //user cannot write, assert there is not addPost textarea wysiwyg shown + Assert::equal(count($discussionDom->find('div.row.justify-content-md-center')), 1); //only search container + $searchBarDom = parent::assertDomHas($discussionDom, 'div.row.justify-content-md-center', 0); + $searchFormDom = parent::assertDomHas($searchBarDom, 'div.col-md-10 div.addPost form.form-inline'); + parent::assertDomHas($searchFormDom, 'div.col-9 div.input-group input.form-control[name=search]'); + parent::assertDomHas($searchFormDom, 'div.col-9 div.input-group select.form-control.custom-select[name=suser]'); + parent::assertDomHas($searchFormDom, 'div.col-9 div.input-group button.form-control.btn.btn-outline-success.mr-sm-2.rounded-right'); + + Assert::falsey(count($searchFormDom->find('div.col-3 button#editPost.btn.btn-warning'))); //no editPost button is shown in search bar + + $discussionPostsDom = parent::assertDomHas($discussionDom, 'div.container-fluid.discussion#snippet--discussion'); + Assert::count(0, $discussionPostsDom->find('div.row')); + + $this->authorizeAdmin(); + $this->recordManager->deleteDiscussion($discussion["id"]); + } + + protected function getPresenter(): string + { + return "Discussion"; + } + + public function getModule(): string + { + return "Discussion"; + } +} + +(new DiscussionDetailUiTest($container))->run(); diff --git a/app/module/autotest/app/discussion/DiscussionTest.php b/tests/app/discussion/DiscussionTest.php similarity index 97% rename from app/module/autotest/app/discussion/DiscussionTest.php rename to tests/app/discussion/DiscussionTest.php index 7fd4c14c9..8e0ec8c2c 100644 --- a/app/module/autotest/app/discussion/DiscussionTest.php +++ b/tests/app/discussion/DiscussionTest.php @@ -2,12 +2,12 @@ // phpcs:disable PSR1.Files.SideEffects -namespace Tymy\Module\Autotest\Discussion; +namespace Tymy\Test\Discussion; use Nette\Utils\DateTime; use Tymy\Bootstrap; -use Tymy\Module\Autotest\ApiTest; -use Tymy\Module\Autotest\Entity\Assert; +use Tymy\Test\ApiTest; +use Tymy\Test\Entity\Assert; use Tymy\Module\Core\Model\BaseModel; use Tymy\Module\Discussion\Model\Discussion; @@ -88,6 +88,9 @@ public function testCRUDNotPermittedDiscussion(): void $this->request($this->getBasePath() . "/$dId/bb?jump2date=" . $nextYear->format(BaseModel::DATE_ENG_FORMAT))->expect(200, "array"); $this->request($this->getBasePath() . "/$dId/bb?search=Autotest&suser=2")->expect(200, "array"); + + $this->authorizeAdmin(); + $this->recordManager->deleteDiscussion($dId); } public function testPostDiscussion(): void @@ -132,6 +135,9 @@ public function testPostDiscussion(): void $this->authorizeAdmin(); $this->request($this->getBasePath() . "/$dId/post/$pid", "DELETE")->expect(200); + + $this->authorizeAdmin(); + $this->recordManager->deleteDiscussion($dId); } public function testBbCodes(): void @@ -209,6 +215,9 @@ public function testSticky(): void //check that user can update, but cannot stick $this->request($this->getBasePath() . "/$dId/post/$pid2", "PUT", ["sticky" => true])->expect(403); + + $this->authorizeAdmin(); + $this->deleteRecord($dId); } public function testCRUD(): void diff --git a/tests/app/discussion/DiscussionsUiTest.php b/tests/app/discussion/DiscussionsUiTest.php new file mode 100644 index 000000000..0697ae26e --- /dev/null +++ b/tests/app/discussion/DiscussionsUiTest.php @@ -0,0 +1,50 @@ +authorizeAdmin(); + $dId = $this->recordManager->createDiscussion()["id"]; + + $dom = parent::getDomForAction(); + + //has navbar + parent::assertNavbar($dom); + parent::assertDomHas($dom, 'div.container'); + $this->assertBreadcrumb($dom, 0, "Hlavní stránka", true); + $this->assertBreadcrumb($dom, 1, "Diskuze", false); + + $discussionsDom = parent::assertDomHas($dom, 'div.container-fluid.discussions'); + $discussionsListDom = parent::assertDomHas($discussionsDom, 'div.card.sh-box.discussion-box'); + Assert::true(count($discussionsListDom->find('div.card-body div.row')) >= 1); + + $this->authorizeAdmin(); + $this->recordManager->deleteDiscussion($dId); + } + + protected function getPresenter(): string + { + return "Default"; + } + + public function getModule(): string + { + return "Discussion"; + } +} + +(new DiscussionsUiTest($container))->run(); diff --git a/tests/app/event/EventDetailUiTest.php b/tests/app/event/EventDetailUiTest.php new file mode 100644 index 000000000..4b56f51e0 --- /dev/null +++ b/tests/app/event/EventDetailUiTest.php @@ -0,0 +1,74 @@ +authorizeAdmin(); + $event = $this->recordManager->createEvent(); + + $this->authorizeUser(); + $dom = parent::getDomForAction('default', ["resource" => $event["id"]]); + + + + //has navbar + parent::assertNavbar($dom); + + //has breadcrumbs + $this->assertBreadcrumb($dom, 0, "Hlavní stránka", true); + $this->assertBreadcrumb($dom, 1, "Docházka", true); + $this->assertBreadcrumb($dom, 2, $event["caption"], false); + + $eventDom = parent::assertDomHas($dom, 'div.container-fluid.event'); + $eventBoxDom = parent::assertDomHas($eventDom, 'div.card.sh-box', expectedCount: 2); + $attendanceBoxDom = parent::assertDomHas($eventDom, 'div.card.sh-box#snippet--attendanceTabs'); + + //eventBox: header + $eventBoxHeader = parent::assertDomHas($eventBoxDom, 'div.card-header'); + parent::assertDomHas($eventBoxHeader, 'h4.card-title'); + parent::assertDomHas($eventBoxHeader, 'a.btn.btn-outline-dark.ajax#snippet--historyBtn'); + + //eventBox: body + $eventBoxBody = parent::assertDomHas($eventBoxDom, 'div.card-body'); + parent::assertDomHas($eventBoxBody, 'h6.card-subtitle.text-muted'); + parent::assertDomHas($eventBoxBody, 'div.row div.col-lg-4 table.table.mb-0 tr th', expectedCount: 3); + parent::assertDomHas($eventBoxBody, 'div.row div.col-lg-4 table.table.mb-0 tr td', expectedCount: 3); + parent::assertDomHas($eventBoxBody, 'div.row div.col-lg-8.d-flex.flex-column.align-items-center div#snippet--attendanceWarning'); + parent::assertDomHas($eventBoxBody, 'div.row div.col-lg-8.d-flex.flex-column.align-items-center input[name=preStatusDesc]'); + parent::assertDomHas($eventBoxBody, 'div.row div.col-lg-8.d-flex.flex-column.align-items-center div.custom-container.btn-group.input-group.pt-2'); //attendance button group + parent::assertDomHas($eventBoxBody, 'div.row div.col-lg-8.d-flex.flex-column.align-items-center div.custom-container.btn-group.input-group.pt-2 button.custom-btn-sm', expectedCount: 3); + + //attendanceBox + parent::assertDomHas($attendanceBoxDom, 'div.card-header ul.nav li.nav-item', expectedCount: 1); + parent::assertDomHas($attendanceBoxDom, 'div.card-body.tab-content div.tab-pane', expectedCount: 1); + + $this->authorizeAdmin(); + $this->recordManager->deleteEvent($event["id"]); + } + + protected function getPresenter(): string + { + return "Detail"; + } + + public function getModule(): string + { + return "Event"; + } +} + +$test = new EventDetailUiTest($container); +$test->run(); diff --git a/app/module/autotest/app/event/EventTest.php b/tests/app/event/EventTest.php similarity index 94% rename from app/module/autotest/app/event/EventTest.php rename to tests/app/event/EventTest.php index a3b2e2f20..c634128fb 100644 --- a/app/module/autotest/app/event/EventTest.php +++ b/tests/app/event/EventTest.php @@ -2,11 +2,11 @@ // phpcs:disable PSR1.Files.SideEffects -namespace Tymy\Module\Autotest\Event; +namespace Tymy\Test\Event; use Tymy\Bootstrap; -use Tymy\Module\Autotest\ApiTest; -use Tymy\Module\Autotest\Entity\Assert; +use Tymy\Test\ApiTest; +use Tymy\Test\Entity\Assert; use Tymy\Module\Event\Model\Event; require getenv("ROOT_DIR") . '/app/Bootstrap.php'; @@ -39,7 +39,7 @@ public function testCreateMultiple(): void public function testCRUDSingular(): void { - $recordId = $this->createRecord(); + $recordId = $this->createRecord()["id"]; $this->request($this->getBasePath() . "/" . $recordId)->expect(200, "array"); $this->request($this->getBasePath() . "/" . $recordId . "/history")->expect(200, "array"); diff --git a/tests/app/event/EventsUiTest.php b/tests/app/event/EventsUiTest.php new file mode 100644 index 000000000..0e65054b1 --- /dev/null +++ b/tests/app/event/EventsUiTest.php @@ -0,0 +1,53 @@ +authorizeAdmin(); + $eventId = $this->recordManager->createEvent()["id"]; + + $dom = parent::getDomForAction(); +//has navbar + Assert::true($dom->has('div#snippet-navbar-nav')); + $this->assertBreadcrumb($dom, 0, "Hlavní stránka", true); + $this->assertBreadcrumb($dom, 1, "Docházka", false); + + Assert::true($dom->has('div.container-fluid.events')); + Assert::true(count($dom->find('div.container-fluid.events div.row')) >= 1); + Assert::true($dom->has('div.container-fluid.events div.row div.col-md-7.my-3 div.card.sh-box#calendar')); + Assert::true($dom->has('div.container-fluid.events div.row div.col-md-5.my-3.agenda-wrapper#snippet--events-agenda')); + Assert::equal(count($dom->find('div.container-fluid.events div.row div.col-md-5.my-3.agenda-wrapper#snippet--events-agenda div.card.sh-box.agenda[data-month]')), 13); + + $this->authorizeAdmin(); + $this->recordManager->deleteEvent($eventId); + } + + protected function getPresenter(): string + { + return "Default"; + } + + public function getModule(): string + { + return "Event"; + } +} + +$test = new EventsUiTest($container); +$test->run(); diff --git a/app/module/autotest/app/multiaccount/MultiaccountTest.php b/tests/app/multiaccount/MultiaccountTest.php similarity index 96% rename from app/module/autotest/app/multiaccount/MultiaccountTest.php rename to tests/app/multiaccount/MultiaccountTest.php index f980dd21b..c2d66267d 100644 --- a/app/module/autotest/app/multiaccount/MultiaccountTest.php +++ b/tests/app/multiaccount/MultiaccountTest.php @@ -2,11 +2,11 @@ // phpcs:disable PSR1.Files.SideEffects -namespace Tymy\Module\Autotest\Multiaccount; +namespace Tymy\Test\Multiaccount; use Tymy\Bootstrap; -use Tymy\Module\Autotest\ApiTest; -use Tymy\Module\Autotest\Entity\Assert; +use Tymy\Test\ApiTest; +use Tymy\Test\Entity\Assert; use Tymy\Module\Multiaccount\Model\TransferKey; require getenv("ROOT_DIR") . '/app/Bootstrap.php'; diff --git a/app/module/autotest/app/permission/PermissionTest.php b/tests/app/permission/PermissionTest.php similarity index 93% rename from app/module/autotest/app/permission/PermissionTest.php rename to tests/app/permission/PermissionTest.php index 5ba577d85..04fd92791 100644 --- a/app/module/autotest/app/permission/PermissionTest.php +++ b/tests/app/permission/PermissionTest.php @@ -2,11 +2,11 @@ // phpcs:disable PSR1.Files.SideEffects -namespace Tymy\Module\Autotest\Permission; +namespace Tymy\Test\Permission; use Tymy\Bootstrap; -use Tymy\Module\Autotest\ApiTest; -use Tymy\Module\Autotest\Entity\Assert; +use Tymy\Test\ApiTest; +use Tymy\Test\Entity\Assert; use Tymy\Module\Permission\Model\Permission; require getenv("ROOT_DIR") . '/app/Bootstrap.php'; @@ -36,7 +36,7 @@ public function testGetPlural(): void public function testCRUDSingular(): void { - $recordId = $this->createRecord(); + $recordId = $this->createRecord()["id"]; $this->request($this->getBasePath() . "/" . $recordId)->expect(200, "array"); diff --git a/tests/app/poll/PollDetailUiTest.php b/tests/app/poll/PollDetailUiTest.php new file mode 100644 index 000000000..b9d8e59ab --- /dev/null +++ b/tests/app/poll/PollDetailUiTest.php @@ -0,0 +1,50 @@ +authorizeAdmin(); + $poll = $this->recordManager->createPoll(); + + $this->authorizeUser(); + $dom = parent::getDomForAction('default', ["resource" => $poll["id"]]); + + + + //has navbar + parent::assertNavbar($dom); + $this->assertBreadcrumb($dom, 0, "Hlavní stránka", true); + $this->assertBreadcrumb($dom, 1, "Ankety", true); + $this->assertBreadcrumb($dom, 2, $poll["caption"], false); + + $objectDom = parent::assertDomHas($dom, 'div.container-fluid.poll'); + parent::assertDomHas($objectDom, 'div.card.sh-box', expectedCount: 2); + + $this->authorizeAdmin(); + $this->recordManager->deletePoll($poll["id"]); + } + + protected function getPresenter(): string + { + return "Default"; + } + + public function getModule(): string + { + return "Poll"; + } +} + +$test = new PollDetailUiTest($container); +$test->run(); diff --git a/app/module/autotest/app/poll/PollTest.php b/tests/app/poll/PollTest.php similarity index 96% rename from app/module/autotest/app/poll/PollTest.php rename to tests/app/poll/PollTest.php index 62ca6cc37..d51852fc3 100644 --- a/app/module/autotest/app/poll/PollTest.php +++ b/tests/app/poll/PollTest.php @@ -2,11 +2,11 @@ // phpcs:disable PSR1.Files.SideEffects -namespace Tymy\Module\Autotest\Permission; +namespace Tymy\Test\Permission; use Tymy\Bootstrap; -use Tymy\Module\Autotest\ApiTest; -use Tymy\Module\Autotest\Entity\Assert; +use Tymy\Test\ApiTest; +use Tymy\Test\Entity\Assert; use Tymy\Module\Poll\Model\Poll; require getenv("ROOT_DIR") . '/app/Bootstrap.php'; @@ -38,7 +38,7 @@ public function testCRUDSingular(): void { $this->authorizeAdmin(); - $recordId = $this->createRecord(); + $recordId = $this->createRecord()["id"]; $this->request($this->getBasePath() . "/" . $recordId)->expect(200, "array"); @@ -72,7 +72,7 @@ public function testCRUDSingular(): void public function testCrudForbidden(): void { $this->authorizeAdmin(); - $pollId = $this->createRecord(); + $pollId = $this->createRecord()["id"]; $this->createOptionsFor($pollId, 1); $optionsData = $this->request($this->getBasePath() . "/$pollId/options")->expect(200, "array")->getData();//poll doesnt exist $option = $optionsData[0]; diff --git a/tests/app/poll/PollsUiTest.php b/tests/app/poll/PollsUiTest.php new file mode 100644 index 000000000..7352b4ed7 --- /dev/null +++ b/tests/app/poll/PollsUiTest.php @@ -0,0 +1,50 @@ +authorizeAdmin(); + $eventId = $this->recordManager->createPoll()["id"]; + + $dom = parent::getDomForAction(); +//has navbar + Assert::true($dom->has('div#snippet-navbar-nav')); + $this->assertBreadcrumb($dom, 0, "Hlavní stránka", true); + $this->assertBreadcrumb($dom, 1, "Ankety", false); + + Assert::true($dom->has('div.container-fluid.polls')); + Assert::true(count($dom->find('div.container-fluid.polls div.row')) >= 1); + + $this->authorizeAdmin(); + $this->recordManager->deletePoll($eventId); + } + + protected function getPresenter(): string + { + return "Default"; + } + + public function getModule(): string + { + return "Poll"; + } +} + +$test = new PollsUiTest($container); +$test->run(); diff --git a/tests/app/user/TeamUiTest.php b/tests/app/user/TeamUiTest.php new file mode 100644 index 000000000..fb113596a --- /dev/null +++ b/tests/app/user/TeamUiTest.php @@ -0,0 +1,72 @@ + ["players", "Hráči", 2], + "members" => ["members", "Členové", 1], + "inits" => ["inits", "Registrovaní", 1], + "sicks" => ["sicks", "Marodi", 1], + ]; + } + + /** + * @dataProvider getAllStatuses + */ + public function testPlayers(string $action, string $caption, int $expectedCount) + { + Environment::lock('users', ROOT_DIR . "/temp"); + $this->authorizeUser(); + $dom = parent::getDomForAction($action); + + Assert::true($dom->has('div#snippet-navbar-nav')); + $this->assertBreadcrumb($dom, 0, "Hlavní stránka", true); + $this->assertBreadcrumb($dom, 1, $caption, false); + + Assert::true($dom->has('div.container-fluid.users')); + parent::assertDomHas($dom, 'div.container-fluid.users div.row#snippet--userList div.col-md-3.my-2 div.card.sh-box', expectedCount: $expectedCount); + } + + public function testAll() + { + Environment::lock('users', ROOT_DIR . "/temp"); + $this->authorizeUser(); + $dom = parent::getDomForAction(); + + Assert::true($dom->has('div#snippet-navbar-nav')); + $this->assertBreadcrumb($dom, 0, "Hlavní stránka", true); + $this->assertBreadcrumb($dom, 1, "Všichni", false); + + Assert::true($dom->has('div.container-fluid.users')); + parent::assertDomHas($dom, 'div.container-fluid.users div.row#snippet--userList div.col-md-3.my-2 div.card.sh-box', expectedCount: 5); + } + + protected function getPresenter(): string + { + return "Default"; + } + + public function getModule(): string + { + return "Team"; + } +} + +$test = new TeamUiTest($container); +$test->run(); diff --git a/app/module/autotest/app/user/UserTest.php b/tests/app/user/UserTest.php similarity index 99% rename from app/module/autotest/app/user/UserTest.php rename to tests/app/user/UserTest.php index 09f57793d..89779be04 100644 --- a/app/module/autotest/app/user/UserTest.php +++ b/tests/app/user/UserTest.php @@ -2,15 +2,18 @@ // phpcs:disable PSR1.Files.SideEffects -namespace Tymy\Module\Autotest\User; +namespace Tymy\Test\User; use Nette\Security\AuthenticationException; +use Tester\Environment; use Tymy\Bootstrap; -use Tymy\Module\Autotest\ApiTest; -use Tymy\Module\Autotest\Entity\Assert; +use Tymy\Test\ApiTest; +use Tymy\Test\Entity\Assert; use Tymy\Module\User\Model\User; use Vojir\Responses\CsvResponse\ComposedCsvResponse; +use const ROOT_DIR; + require getenv("ROOT_DIR") . '/app/Bootstrap.php'; $container = Bootstrap::boot(); @@ -105,7 +108,8 @@ public function testStatus(): void public function testCRUD(): void { - $recordId = $this->createRecord(); + Environment::lock('users', ROOT_DIR . "/temp"); + $recordId = $this->createRecord()["id"]; $this->request($this->getBasePath() . "/" . $recordId)->expect(200, "array"); @@ -262,11 +266,12 @@ public function testRegisterFailure(): void public function testUpdateFailures(): void { + Environment::lock('users', ROOT_DIR . "/temp"); $this->authorizeAdmin(); $adminData = $this->request($this->getBasePath() . "/1", "PUT", ["roles" => ["USR"]])->expect(200)->getData(); Assert::contains("SUPER", $adminData["roles"]); - $userId = $this->createRecord(); + $userId = $this->createRecord()["id"]; $this->authorizeUser(); $this->request($this->getBasePath() . "/$userId", "PUT", $this->mockChanges())->expect(403); @@ -279,10 +284,14 @@ public function testUpdateFailures(): void $this->request($this->getBasePath() . "/$myId", "PUT", ["login" => "new_login"])->expect(403); $this->request($this->getBasePath() . "/$myId", "PUT", ["callName" => "master_of_puppets"])->expect(403); $this->request($this->getBasePath() . "/$myId", "PUT", ["email" => $this->config["user_admin_mail"]])->expect(403); + + $this->authorizeAdmin(); + $this->deleteRecord($userId); } public function testAvatar(): void { + Environment::lock('users', ROOT_DIR . "/temp"); $this->authorizeUser(); $myId = $this->config["user_test_id"]; $this->request( @@ -312,7 +321,7 @@ public function testAvatar(): void )->expect(400); $this->authorizeAdmin(); - $userId = $this->createRecord(); + $userId = $this->createRecord()["id"]; $this->authorizeUser(); $this->request( @@ -326,6 +335,9 @@ public function testAvatar(): void "POST", "data:image/png;base64,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" )->expect(200); + + $this->authorizeAdmin(); + $this->deleteRecord($userId); } public function testLive(): void diff --git a/app/module/autotest/autotest.records.map.neon b/tests/autotest.records.map.neon similarity index 100% rename from app/module/autotest/autotest.records.map.neon rename to tests/autotest.records.map.neon diff --git a/tests/bootstrap.php b/tests/bootstrap.php deleted file mode 100644 index 1adb6a3de..000000000 --- a/tests/bootstrap.php +++ /dev/null @@ -1,22 +0,0 @@ -team . "." . $testedTeam->root; -$GLOBALS["testedTeam"] = (array)$testedTeam; -$GLOBALS["dateRegex"] = '/^(?:[1-9]\d{3}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1\d|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[1-9]\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)-02-29)T(?:[01]\d|2[0-3]):[0-5]\d:[0-5]\d(?:Z|[+-][01]\d:[0-5]\d)$/m'; -Tester\Environment::setup(); -$configurator = new Nette\Configurator(); -$configurator->setDebugMode(false); -$configurator->setTempDirectory(__DIR__ . '/../temp'); -$configurator->createRobotLoader() - ->addDirectory(__DIR__ . '/../app') - ->addDirectory(__DIR__) - ->register(); -$configurator->addConfig(__DIR__ . '/../app/config/config.neon'); -$configurator->addConfig(__DIR__ . '/../app/config/config.local.neon'); -return $configurator->createContainer(); diff --git a/tests/components/NavbarTest.phpt b/tests/components/NavbarTest.phpt deleted file mode 100644 index 763a9948b..000000000 --- a/tests/components/NavbarTest.phpt +++ /dev/null @@ -1,145 +0,0 @@ -container = $container; - $this->user = $this->container->getByType('Nette\Security\User'); - $this->discussionList = $this->container->getByType('Tapi\DiscussionListResource'); - $this->pollList = $this->container->getByType('Tapi\PollListResource'); - $this->noteList = $this->container->getByType('Tapi\NoteListResource'); - $this->eventList = $this->container->getByType('Tapi\EventListResource'); - $this->userList = $this->container->getByType('Tapi\UserListResource'); - $this->tapiService = $this->container->getByType('Tapi\TapiService'); - $this->testAuthenticator = new TestAuthenticator(); - } - - protected function userTapiAuthenticate($username, $password){ - $this->user->login($username, $password); - } - - protected function userTestAuthenticate($username, $password){ - $this->user->login($username, $password); - } - - function mockPresenter($presenter){ - $presenterFactory = $this->container->getByType('Nette\Application\IPresenterFactory'); - $this->presenter = $presenterFactory->createPresenter($presenter); - $this->presenter->autoCanonicalize = FALSE; - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - } - - function getHomepageHtml($presenter){ - $request = new Nette\Application\Request($presenter, 'GET', array('action' => 'default')); - $response = $this->presenter->run($request); - return $response->getSource(); - } - - - function getPresenters(){ - return [["Homepage"],["Discussion"],["Event"],["Team"],["Poll"]]; - } - - /** - * Test supposed to be run for all presenters - * - * @dataProvider getPresenters - */ - function testNavbarComponents($presenterMock){ - $this->mockPresenter($presenterMock); - $html = (string) $this->getHomepageHtml($presenterMock); - - $dObj = $this->discussionList->getData(); - $pObj = $this->pollList->getData(); - $nObj = $this->noteList->getData(); - $uObj = $this->userList->getData(); - $uCounts = $this->userList->getCounts(); - $eObj = $this->eventList - ->setFrom(date("Ymd")) - ->setTo(date("Ymd", strtotime(" + 1 month"))) - ->setOrder("startTime") - ->getData(); - $dom = DomQuery::fromHtml($html); - Assert::true($dom->has('div#snippet-navbar-nav')); - Assert::true($dom->has('nav.navbar.navbar-expand-lg.navbar-dark.bg-dark.fixed-top')); - Assert::true($dom->has('button.navbar-toggler')); - Assert::true($dom->has('span.navbar-toggler-icon')); - Assert::true($dom->has("a.navbar-brand[href]")); - - Assert::true($dom->has("ul.navbar-nav.mr-auto")); - Assert::equal(count($dom->find("ul.navbar-nav")), 2); //2 navbar menus (left and right) - - Assert::equal(count($dom->find("ul.navbar-nav.mr-auto li.nav-item")), 6); //5 menu items in the first menu - Assert::equal(count($dom->find("ul.navbar-nav.mr-auto li.nav-item.dropdown")), 6); //5 of them with dropdown - - Assert::equal(count($dom->find("ul.navbar-nav.mr-auto li.nav-item.dropdown[name='discussions'] div a")), count((array)$dObj)); //check if the discussions are all displayed - Assert::equal(count($dom->find("ul.navbar-nav.mr-auto li.nav-item.dropdown[name='events'] div a")), count((array)$eObj) + 1, "Displayed " . count($dom->find("ul.navbar-nav.mr-auto li.nav-item.dropdown")[1]->div->a) . "events instead of expected " . count((array)$eObj) + 1); //check display all events + 1 - $caption = "Inits " . $uCounts["INIT"]; - - $teamMenuDropdownCount = ($uCounts["INIT"] > 0 && $this->user->isAllowed('users','canSeeRegisteredUsers')) ? 7 : 6; - Assert::equal(count($dom->find("ul.navbar-nav.mr-auto li.nav-item.dropdown[name='team'] div a")), $teamMenuDropdownCount, $caption); - Assert::equal(count($dom->find("ul.navbar-nav.mr-auto li.nav-item.dropdown[name='polls'] div a")), count((array)$pObj)); //check if the polls are all displayed - Assert::equal(count($dom->find("ul.navbar-nav.mr-auto li.nav-item.dropdown[name='notes'] div a")), count((array)$nObj)); //check if the polls are all displayed - $settingsDropdownCount = count($this->presenter->getAccessibleSettings()); - Assert::equal(count($dom->find("ul.navbar-nav.mr-auto li.nav-item.dropdown[name='settings'] div a")), $settingsDropdownCount); //7 settings items are in menu - - Assert::true(count($dom->find("ul.navbar-nav li.nav-item.dropdown")[6]->div->a)>1); //check if the right menu is displayed - } - -} - -$test = new NavbarTest($container); -$test->run(); diff --git a/app/module/autotest/config/config.neon b/tests/config/config.neon similarity index 59% rename from app/module/autotest/config/config.neon rename to tests/config/config.neon index 666694f49..0c04cd6fe 100644 --- a/app/module/autotest/config/config.neon +++ b/tests/config/config.neon @@ -4,6 +4,5 @@ # services: - TestsManager: Tymy\Module\Autotest\Manager\TestsManager - TestsRouter: Tymy\Module\Autotest\Router\Router + TestsManager: Tymy\Test\Manager\TestsManager \ No newline at end of file diff --git a/app/module/autotest/data.sql b/tests/data.sql similarity index 100% rename from app/module/autotest/data.sql rename to tests/data.sql diff --git a/app/module/autotest/entity/ApiTest.php b/tests/entity/ApiTest.php similarity index 73% rename from app/module/autotest/entity/ApiTest.php rename to tests/entity/ApiTest.php index 490247924..5686cd645 100644 --- a/app/module/autotest/entity/ApiTest.php +++ b/tests/entity/ApiTest.php @@ -1,11 +1,10 @@ recordManager->deleteRecord($this->getBasePath(), $recordId); } + protected function change(int $recordId, ?array $changes = null) + { + $changes = $changes ?: $this->mockChanges(); + + $changedData = $this->request($this->getBasePath() . "/" . $recordId, "PUT", $changes)->expect(200, "array")->getData(); + + $this->assertObjectEquality($changes, $changedData); + } + //*************** COMMON TESTS, SAME FOR ALL MODULES public function testUnauthorized() diff --git a/app/module/autotest/entity/Assert.php b/tests/entity/Assert.php similarity index 89% rename from app/module/autotest/entity/Assert.php rename to tests/entity/Assert.php index 57b3e8f20..a320c2059 100644 --- a/app/module/autotest/entity/Assert.php +++ b/tests/entity/Assert.php @@ -1,8 +1,8 @@ user = $this->container->getByType(User::class); @@ -137,15 +137,6 @@ protected function tearDown(): void $this->logs = []; } - protected function change(int $recordId, ?array $changes = null) - { - $changes = $changes ?: $this->mockChanges(); - - $changedData = $this->request($this->getBasePath() . "/" . $recordId, "PUT", $changes)->expect(200, "array")->getData(); - - $this->assertObjectEquality($changes, $changedData); - } - /** @return SimpleResponse */ public function request($url, $method = "GET", $data = [], $responseClass = null) { diff --git a/app/module/autotest/entity/RequestLog.php b/tests/entity/RequestLog.php similarity index 98% rename from app/module/autotest/entity/RequestLog.php rename to tests/entity/RequestLog.php index b8b52279d..90f174097 100644 --- a/app/module/autotest/entity/RequestLog.php +++ b/tests/entity/RequestLog.php @@ -1,6 +1,6 @@ presenterName = "{$this->getModule()}:{$this->getPresenter()}"; + $this->presenter = $this->presenterFactory->createPresenter($this->presenterName); + assert($this->presenter instanceof Presenter); + $this->presenter->autoCanonicalize = false; + + parent::setUp(); + } + + /** + * Load DOM response on presenter/action query + * + * @param string $action + * @param array $params Additional request parameters + * @return DomQuery + */ + protected function getDomForAction(string $action = "default", array $params = []) + { + $this->authorizeUser(); + $request = new Request("{$this->getModule()}:{$this->getPresenter()}", 'GET', ['action' => $action] + $params); + $response = $this->presenter->run($request); + + Assert::type(TextResponse::class, $response); + assert($response instanceof TextResponse); + + $html = (string) $response->getSource(); + return DomQuery::fromHtml($html); + } + + /** + * Asserts that given selector exists in Dom and return $returnIndex's found instance as DomQuery object + * + * @param DomQuery $dom + * @param string $selector + * @param int|null $returnIndex Index which found element to return + * @param int|null $expectedCount If set, asserts how many items are expected to return + * @return DomQuery + */ + protected function assertDomHas(DomQuery $dom, string $selector, ?int $returnIndex = 0, ?int $expectedCount = null): DomQuery + { + Assert::true($dom->has($selector), "Selector `$selector` not found in HTML output"); + $items = $dom->find($selector); + + if ($expectedCount) { + Assert::count($expectedCount, $items, "Selector `$selector` count not as expected"); + } + + return $items[$returnIndex]; + } + + /** + * Assert breadcrumb number, caption and hyperlink + * + * @param DomQuery $dom + * @param int $index + * @param string $caption + * @param bool $isLink + * @return void + */ + protected function assertBreadcrumb(DomQuery $dom, int $index, string $caption, bool $isLink = false): void + { + Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); + $breadcrumb = self::assertDomHas($dom, 'ol.breadcrumb li.breadcrumb-item', $index); + + if ($isLink) { + Assert::equal($caption, $breadcrumb->a->__toString(), "Breadcrumb #$index caption is invalid"); + Assert::true(isset($breadcrumb->a), "Breadcrumb #$index:$caption is not hyperlink!"); + } else { + Assert::equal($caption, $breadcrumb->__toString(), "Breadcrumb #$index caption is invalid"); + Assert::false(isset($breadcrumb->a), "Breadcrumb #$index:$caption shouldn't be hyperlink!"); + } + } + + public function assertNavbar(DomQuery $dom) + { + $navbarDom = $this->assertDomHas($dom, 'div#snippet-navbar-nav nav.navbar.navbar-expand-lg.fixed-top'); + $this->assertDomHas($navbarDom, 'a.navbar-brand'); + $this->assertDomHas($navbarDom, 'div#navbarContent'); + $leftNavDom = $this->assertDomHas($navbarDom, 'div#navbarContent ul.navbar-nav.mr-auto'); + $rightNavDom = $this->assertDomHas($navbarDom, 'div#navbarContent ul.navbar-nav', 1, 2); + + $this->assertDomHas($rightNavDom, "li.nav-item.dropdown"); + + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown", 0, 8); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown[name=discussions] div.dropdown-menu .dropdown-item"); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown", 1, 8); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown[name=events] div.dropdown-menu .dropdown-item"); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown", 2, 8); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown[name=team] div.dropdown-menu .dropdown-item", 0, 6); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown", 3, 8); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown[name=polls] div.dropdown-menu .dropdown-item"); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown", 4, 8); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown[name=debts] div.dropdown-menu a.dropdown-item"); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown", 5, 8); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown[name=files] div.dropdown-menu a.dropdown-item"); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown", 6, 8); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown[name=reports] div.dropdown-menu a.dropdown-item", 0, 1); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown", 7, 8); + $this->assertDomHas($leftNavDom, "li.nav-item.dropdown[name=settings] div.dropdown-menu a.dropdown-item", 0, 3); + } +} diff --git a/tests/index.php b/tests/index.php deleted file mode 100644 index 447599216..000000000 --- a/tests/index.php +++ /dev/null @@ -1,14 +0,0 @@ -createRecord(Debt::MODULE, $data ?: $this->mockDebt(), $changes); } - /** @return array Created record */ + /** + * Create discussion + * Default config: everyone can read/write, only admin can delete + * + * @return array Created discussion + */ public function createDiscussion(?array $data = null, ?array $changes = null): array { return $this->createRecord(Discussion::MODULE, $data ?: $this->mockDiscussion(), $changes); @@ -289,6 +294,21 @@ public function deleteUser($id): void $this->deleteRecord(User::MODULE, $id); } + public function deleteDiscussion($id): void + { + $this->deleteRecord(Discussion::MODULE, $id); + } + + public function deleteEvent($id): void + { + $this->deleteRecord(Event::MODULE, $id); + } + + public function deletePoll($id): void + { + $this->deleteRecord(Poll::MODULE, $id); + } + public function deleteRecord($basePath, $id): void { $url = "$basePath/$id"; diff --git a/app/module/autotest/manager/TestsManager.php b/tests/manager/TestsManager.php similarity index 98% rename from app/module/autotest/manager/TestsManager.php rename to tests/manager/TestsManager.php index 73ecfd290..3aff26d1f 100644 --- a/app/module/autotest/manager/TestsManager.php +++ b/tests/manager/TestsManager.php @@ -1,6 +1,6 @@ container = $container; - } - - function testHopsThroughPresenters(){ - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user_admin"], $GLOBALS["testedTeam"]["pass_admin"]); - $hopList = [ - ["presenter" => "Homepage", "action" => "default", "params" => []], - ["presenter" => "Discussion", "action" => "default", "params" => []], - ["presenter" => "Discussion", "action" => "discussion", "params" => ["discussion" => 2, "page" => 1, "search" => ""]], - ["presenter" => "Discussion", "action" => "discussion", "params" => ["discussion" => 2, "page" => 2, "search" => ""]], - ["presenter" => "Event", "action" => "default", "params" => []], - ["presenter" => "Event", "action" => "event", "params" => ["udalost" => "119-trenink"]], - ["presenter" => "Team", "action" => "default", "params" => []], - ["presenter" => "Team", "action" => "players", "params" => []], - ["presenter" => "Team", "action" => "members", "params" => []], - ["presenter" => "Team", "action" => "players", "params" => []], - ["presenter" => "Team", "action" => "sicks", "params" => []], - ["presenter" => "Team", "action" => "inits", "params" => []], - ["presenter" => "Team", "action" => "player", "params" => ["player" => "11-matejskej-kminek"]], - ["presenter" => "Poll", "action" => "default", "params" => []], - ["presenter" => "Poll", "action" => "poll", "params" => ["anketa" => "2-nejaka-anketa"]], - ["presenter" => "Poll", "action" => "poll", "params" => ["anketa" => "1-klasika"]], - ["presenter" => "Notes", "action" => "default", "params" => []], - ["presenter" => "Notes", "action" => "note", "params" => ["poznamka" => "4-o-poznamkach"]], - ["presenter" => "Settings", "action" => "default", "params" => []], - ["presenter" => "Settings", "action" => "event", "params" => ["event" => $GLOBALS["testedTeam"]["testEventId"]]], - ["presenter" => "Settings", "action" => "event_new", "params" => []], - ["presenter" => "Settings", "action" => "poll", "params" => ["poll" => $GLOBALS["testedTeam"]["testPollId"]]], - ["presenter" => "Settings", "action" => "poll_new", "params" => []], - ["presenter" => "Settings", "action" => "discussion", "params" => ["discussion" => $GLOBALS["testedTeam"]["testDiscussionId"]]], - ["presenter" => "Settings", "action" => "discussion_new", "params" => []], - - ]; - - shuffle($hopList); // shuffle array each test - - foreach ($hopList as $hop) { - $this->presenter = $this->presenterFactory->createPresenter($hop["presenter"]); - $this->presenter->autoCanonicalize = FALSE; - $request = new Nette\Application\Request($hop["presenter"], 'GET', array_merge(['action' => $hop["action"]], $hop["params"])); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string) $response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container')); - Assert::true($dom->has('ol.breadcrumb')); - } - } -} - -$test = new AllPresentersTest($container); -$test->run(); diff --git a/tests/presenters/DiscussionPresenterTest.phpt b/tests/presenters/DiscussionPresenterTest.phpt deleted file mode 100644 index 0a4b870b8..000000000 --- a/tests/presenters/DiscussionPresenterTest.phpt +++ /dev/null @@ -1,93 +0,0 @@ -container = $container; - } - - function testActionDefault(){ - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'default')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container')); - Assert::true($dom->has('ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 1); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 2); //last item aint link - - Assert::true($dom->has('div.container.discussions')); - Assert::true(count($dom->find('div.container.discussions div.row')) >= 1); - } - - - function getDiscussionNames() { - return $GLOBALS["testedTeam"]["testDiscussionName"]; - } - - /** - * - * @dataProvider getDiscussionNames - */ - function testActionDiscussion($discussionName, $canWrite){ - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'discussion', 'discussion' => $discussionName)); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $re = '/&(?!(?:apos|quot|[gl]t|amp);|#)/'; - - $dom = NULL; - $html = (string)$response->getSource(); - //replace unescaped ampersands in html to prevent tests from failing - $html = preg_replace($re, "&", $html); - - $dom = DomQuery::fromHtml($html); - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - - //has breadcrumbs - - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 2); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 3); //last item aint link - - Assert::equal(count($dom->find('div.container.my-2 div.row.justify-content-md-center')), $canWrite ? 2 : 1); - if($canWrite){ - Assert::true($dom->has('div.container.my-2 div.row.justify-content-md-center div.col-md-10 textarea#addPost')); - Assert::true($dom->has('div.container.my-2 div.row.justify-content-md-center div.col-md-10 div.addPost form.form-inline input.form-control.mr-sm-2')); - Assert::true($dom->has('div.container.my-2 div.row.justify-content-md-center div.col-md-10 div.addPost form.form-inline span.mr-auto input.form-control.btn.btn-outline-success.mr-sm-2')); - Assert::true($dom->has('div.container.my-2 div.row.justify-content-md-center div.col-md-10 div.addPost form.form-inline button.btn.btn-primary')); - } - - Assert::true($dom->has('div.container.discussion#snippet--discussion')); - Assert::true(count($dom->find('div.container.discussion#snippet--discussion div.row'))<=20); - } -} - -$test = new DiscussionPresenterTest($container); -$test->run(); diff --git a/tests/presenters/EventPresenterTest.phpt b/tests/presenters/EventPresenterTest.phpt deleted file mode 100644 index 957f0241b..000000000 --- a/tests/presenters/EventPresenterTest.phpt +++ /dev/null @@ -1,113 +0,0 @@ -container = $container; - } - - function testActionDefault(){ - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'default')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 1); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 2); //last item aint link - - Assert::true($dom->has('div.container.events')); - Assert::true(count($dom->find('div.container.events div.row')) >= 1); - Assert::true($dom->has('div.container.events div.row div.col-md-7.my-3 div.card.sh-box#calendar')); - - Assert::true($dom->has('div.container.events div.row div.col-md-5.my-3.agenda-wrapper#snippet--events-agenda')); - Assert::equal(count($dom->find('div.container.events div.row div.col-md-5.my-3.agenda-wrapper#snippet--events-agenda div.card.sh-box.agenda[data-month]')), 13); - } - - function eventDetailInputs() { - return [ - [ - [ - "adminMode" => TRUE, - "username" => $GLOBALS["testedTeam"]["user_admin"], - "password" => $GLOBALS["testedTeam"]["pass_admin"], - "eventId" => $GLOBALS["testedTeam"]["testEventId"] - ] - ], - [ - [ - "adminMode" => FALSE, - "username" => $GLOBALS["testedTeam"]["user"], - "password" => $GLOBALS["testedTeam"]["pass"], - "eventId" => $GLOBALS["testedTeam"]["testEventId"] - ] - ], - ]; - } - - /** @dataProvider eventDetailInputs */ - function testActionEventAdmin($inputs){ - $this->userTapiAuthenticate($inputs["username"], $inputs["password"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'event', "udalost" => $inputs["eventId"])); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 2); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 3); //last item aint link - - //test body - Assert::true($dom->has('div.container.event div.row div.col div.card.sh-box.my-3 div.card-header div.row div.col h4.card-title')); - $pencilBtn = 'div.container.event div.row div.col div.card.sh-box.my-3 div.card-header div.row div.col.col-md-auto a.btn.btn-sm.btn-light.btn-light-bordered i.fa.fa-edit'; - if($inputs["adminMode"]){ - Assert::true($dom->has($pencilBtn)); - } else { - Assert::false($dom->has($pencilBtn)); - } - - Assert::true($dom->has('div.container.event div.row div.col div.card.sh-box.my-3 div.card-body h6.card-subtitle.mb-2.text-muted span a')); - Assert::true($dom->has('div.container.event div.row div.col div.card.sh-box.my-3 div.card-body p.card-text')); - Assert::equal(count($dom->find('div.container.event div.row div.col div.card.sh-box.my-3 div.card-body div.row div.col-lg-4 table.table.mb-0 tr th')), 3); - Assert::equal(count($dom->find('div.container.event div.row div.col div.card.sh-box.my-3 div.card-body div.row div.col-lg-4 table.table.mb-0 tr td')), 3); - - Assert::true( $dom->has('div.container.event div.row div.col div.card.sh-box.my-3 div.card-body div.row div.col-lg-8.d-flex.flex-column-reverse.align-items-center input.form-control.form-control-sm.custom-btn-sm')); - Assert::count(3, $dom->find('div.container.event div.row div.col div.card.sh-box.my-3 div.card-body div.row div.col-lg-8.d-flex.flex-column-reverse.align-items-center button.btn.custom-btn-sm')); - Assert::true( $dom->has('div.container.event div.row div.col div.card.sh-box.my-3 div.card-body div.row div.col-lg-8.d-flex.flex-column-reverse.align-items-center div#snippet--attendanceWarning')); - - Assert::true($dom->has('div.container.event div.row div.col div.card.sh-box.my-3#snippet--attendanceTabs div.card-header ul.nav.nav-tabs.flex-column.flex-sm-row.card-header-tabs li.nav-item')); - Assert::true($dom->has('div.container.event div.row div.col div.card.sh-box.my-3#snippet--attendanceTabs div.card-body div.tab-content div.tab-pane.fade.player-list div.row.my-2')); - } -} - -$test = new EventPresenterTest($container); -$test->run(); diff --git a/tests/presenters/HomepagePresenterTest.phpt b/tests/presenters/HomepagePresenterTest.phpt deleted file mode 100644 index 12a2ab9d1..000000000 --- a/tests/presenters/HomepagePresenterTest.phpt +++ /dev/null @@ -1,66 +0,0 @@ -container = $container; - } - - function testActionDefault(){ - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'default')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 1); - - Assert::true($dom->has('div.container.homepage')); - Assert::true(count($dom->find('div.container.homepage div.row')) >= 2); // at least two rows, two makes the main layout, more rows are inside for discussions - Assert::true($dom->has('div.container.homepage div.row div.col-md-5.my-3 div.card.sh-box#calendar')); - Assert::true($dom->has('div.container.homepage div.row div.col-md-5.my-3 a.btn.btn-sm.btn-light.btn-light-bordered.my-1.d-block')); - - Assert::true($dom->has('div.container.homepage div.row div.col-md-7.my-3 div.card.sh-box div.card-header div.row div.col h4.card-title')); - Assert::true($dom->has('div.container.homepage div.row div.col-md-7.my-3 div.card.sh-box div.card-header div.row div.col.col-md-auto button.btn.btn-sm.btn-light.btn-light-bordered i.fa.fa-sync')); - Assert::true($dom->has('div.container.homepage div.row div.col-md-7.my-3 div.card.sh-box div.card-body')); - - } - - function testAccessibleSettings(){ - $accessibleSettings = $this->presenter->getAccessibleSettings(); - Assert::type("array", $accessibleSettings); - foreach ($accessibleSettings as $setting) { - Assert::type("SettingMenu", $setting); - Assert::truthy($setting->code); - Assert::truthy($setting->name); - Assert::truthy($setting->href); - Assert::truthy($setting->icon); - } - - } -} - -$test = new HomepagePresenterTest($container); -$test->run(); diff --git a/tests/presenters/IPresenterTest.php b/tests/presenters/IPresenterTest.php deleted file mode 100644 index 938c79341..000000000 --- a/tests/presenters/IPresenterTest.php +++ /dev/null @@ -1,81 +0,0 @@ -user = $this->container->getByType('Nette\Security\User'); - $this->tapiService = $this->container->getByType('Tapi\TapiService'); - - $this->testAuthenticator = new \App\Model\TestAuthenticator(); - - $this->presenterFactory = $this->container->getByType('Nette\Application\IPresenterFactory'); - if ($this->getPresenterName() != "undefined") { - $this->presenter = $this->presenterFactory->createPresenter($this->getPresenterName()); - $this->presenter->autoCanonicalize = false; - } - - - parent::setUp(); - } - - protected function tearDown() - { - parent::tearDown(); - } - - protected function getPresenterName() - { - $class = get_called_class(); - return $class::PRESENTERNAME; - } - - protected function userTapiAuthenticate($username, $password) - { - $this->user->login($username, $password); - } - - protected function userTestAuthenticate($username, $password) - { - $this->user->setAuthenticator($this->testAuthenticator); - $this->user->login($username, $password); - } - - public function testSignInFailsRedirects() - { - if (in_array($this->getPresenterName(), ["Sign","undefined"])) { - return; - } - $this->user->logout(); - $request = new Request($this->getPresenterName(), 'GET', array('action' => 'default')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\RedirectResponse', $response); - Assert::equal("/sign/in", parse_url($response->getUrl(), PHP_URL_PATH)); - Assert::equal(302, $response->getCode()); - } -} diff --git a/tests/presenters/NotesPresenterTest.phpt b/tests/presenters/NotesPresenterTest.phpt deleted file mode 100644 index b70e73eec..000000000 --- a/tests/presenters/NotesPresenterTest.phpt +++ /dev/null @@ -1,79 +0,0 @@ -container = $container; - } - - function testActionDefault(){ - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'default')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 1); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 2); //last item aint link - - Assert::true($dom->has('div.container.notes')); - Assert::true($dom->has('div.container.notes div.row.justify-content-md-center div.col-8.my-3 div.card.sh-box div.card-body')); - - } - - function testActionNote(){ - $noteId = $GLOBALS["testedTeam"]["testNoteId"]; - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'note', 'poznamka' => $noteId)); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $re = '/&(?!(?:apos|quot|[gl]t|amp);|#)/'; - - $dom = NULL; - $html = (string)$response->getSource(); - //replace unescaped ampersands in html to prevent tests from failing - $html = preg_replace($re, "&", $html); - - $dom = DomQuery::fromHtml($html); - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - - //has breadcrumbs - - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 2); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 3); //last item aint link - - Assert::true($dom->has('div.container.note div.row div.col.my-3 div.card.sh-box div.card-header h4.card-title')); - Assert::true($dom->has('div.container.note div.row div.col.my-3 div.card.sh-box div.card-header h6.card-subtitle.mb-2.text-muted')); - - Assert::true($dom->has('div.container.note div.row div.col.my-3 div.card.sh-box div.card-body div.card-text')); - } -} - -$test = new NotesPresenterTest($container); -$test->run(); diff --git a/tests/presenters/PollPresenterTest.phpt b/tests/presenters/PollPresenterTest.phpt deleted file mode 100644 index 32dc7d027..000000000 --- a/tests/presenters/PollPresenterTest.phpt +++ /dev/null @@ -1,97 +0,0 @@ -container = $container; - $this->pollList = $this->container->getByType("Tapi\PollListResource"); - } - - function testActionDefault(){ - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'default')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 1); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 2); //last item aint link - - } - - - function allWebNames(){ - $polls = $this->pollList->getData(); - $inputArray = []; - foreach ($polls as $p) { - $inputArray[] = [$p]; - } - return $inputArray; - } - - /** - * @dataProvider allWebNames - */ - function testPoll($obj){ - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'poll', "anketa" => $obj->webName)); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 2); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 3); // last breadcrumb aint link - - //check shown items - Assert::equal(count($dom->find('div.container.poll div.row div.col.my-3 div.card.sh-box div.card-body h4.card-title')), 1); - Assert::equal(count($dom->find('div.container.poll div.row div.col.my-3 div.card.sh-box div.card-body h6.card-subtitle')), 1); - - //check vote options - if($obj->canVote){ - Assert::true(count($dom->find('div.container.poll div.row div.col.my-3 div.card.sh-box div.card-body div.container div.row div.col-3.py-3.option')) > 0); - } else { - Assert::true(count($dom->find('div.container.poll div.row div.col.my-3 div.card.sh-box div.card-body p.font-italic')) > 0); - } - - if($obj->canSeeResults){ - Assert::true($dom->has('div.container.poll div.row#snippet--poll-results div.col.my-3 div.card.sh-box.text-white.bg-dark div.card-header')); - Assert::true(count($dom->find('div.container.poll div.row#snippet--poll-results div.col.my-3 div.card.sh-box.text-white.bg-dark div.card-body.p-0 table.table.table-dark.table-striped.table-hover.mb-0 tr[data-vote]')) > 0); - } - } -} - -$test = new PollPresenterTest($container); -$test->run(); diff --git a/tests/presenters/PwdLostPresenterTest.phpt b/tests/presenters/PwdLostPresenterTest.phpt deleted file mode 100644 index 8338ef85c..000000000 --- a/tests/presenters/PwdLostPresenterTest.phpt +++ /dev/null @@ -1,77 +0,0 @@ -container = $container; - } - - function testPwdLostComponents(){ - $request = new Nette\Application\Request('Sign', 'GET', array('action' => 'pwdlost')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - Assert::type('Nette\Bridges\ApplicationLatte\Template', $response->getSource()); - - $html = (string) $response->getSource(); - - $dom = DomQuery::fromHtml($html); - - Assert::true($dom->has('input[name="email"]')); - Assert::true($dom->has('input[name="send"]')); - - Assert::true($dom->has('a[href="/sign/in"]')); - Assert::true($dom->has('a[href="/sign/pwdreset"]')); - } - - function testPwdResetComponents(){ - $request = new Nette\Application\Request('Sign', 'GET', array('action' => 'pwdreset')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - Assert::type('Nette\Bridges\ApplicationLatte\Template', $response->getSource()); - - $html = (string) $response->getSource(); - - $dom = DomQuery::fromHtml($html); - - Assert::true($dom->has('input[name="code"]')); - Assert::true($dom->has('input[name="send"]')); - - Assert::true($dom->has('a[href="/sign/in"]')); - } - - function testPwdNewComponents(){ - $request = new Nette\Application\Request('Sign', 'GET', array('action' => 'pwdnew', 'pwd' => 'newpass123')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - Assert::type('Nette\Bridges\ApplicationLatte\Template', $response->getSource()); - - $html = (string) $response->getSource(); - - $dom = DomQuery::fromHtml($html); - - Assert::true($dom->has('input#pwd')); - Assert::true($dom->has('a[href="/sign/in"]')); - } - -} - -$test = new PwdLostPresenterTest($container); -$test->run(); diff --git a/tests/presenters/SettingsPresenterTest.phpt b/tests/presenters/SettingsPresenterTest.phpt deleted file mode 100644 index f350c0aa7..000000000 --- a/tests/presenters/SettingsPresenterTest.phpt +++ /dev/null @@ -1,252 +0,0 @@ -container = $container; - } - - function testActionDefault(){ - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'default')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 1); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 2); //last item aint link - - $settingsDropdownCount = count($this->presenter->getAccessibleSettings()); - Assert::true($dom->has('div.container.settings')); - Assert::equal(count($dom->find('div.container.settings div.row.my-4.justify-content-center div.col-md-4 div.card.sh-box.my-4.text-center a[href]')), $settingsDropdownCount); - } - - function getListActions(){ - return [ - ["discussions"], - ["events"], - ["polls"] - ]; - } - - /** @dataProvider getListActions */ - function testActionList($action) { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => $action)); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 2); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 3); //last item aint link - - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-header h4')); - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table.table-xs.table-hover.table-responsive')); - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table.table-xs.table-hover.table-responsive')); - - Assert::true(count($dom->find('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table.table-xs.table-hover.table-responsive tr[data-binder-id]'))>0); - } - - function getFormActions(){ - return [ - [["action" => "discussions", "discussion" => "testovaci-diskuze"]], - [["action" => "discussions", "discussion" => "tymova-diskuze"]], - ]; - } - - /** @dataProvider getFormActions */ - function testActionForm($requestParams) { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', $requestParams); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\RedirectResponse', $response); - } - - /** @dataProvider getFormActions */ - function testActionFormAdmin($requestParams) { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user_admin"], $GLOBALS["testedTeam"]["pass_admin"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', $requestParams); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 3); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 4); //last item aint link - - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-header h4')); - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table')); - if($this->user->isAllowed('discussion','setup')){ - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-footer.text-right button.btn.btn-danger.mx-2.binder-delete-btn i.fa.fa-times'), "Chyba v " . $requestParams["discussion"]); - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-footer.text-right button.btn.btn-lg.btn-primary.binder-save-btn i.fa.fa-save')); - } else { - Assert::true(!$dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-footer.text-right button.btn.btn-danger.mx-2.binder-delete-btn i.fa.fa-times'), "Chyba v " . $requestParams["discussion"]); - Assert::true(!$dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-footer.text-right button.btn.btn-lg.btn-primary.binder-save-btn i.fa.fa-save')); - } - } - - function testActionApp() { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => "app")); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $re = '/&(?!(?:apos|quot|[gl]t|amp);|#)/'; - - $dom = NULL; - $html = (string)$response->getSource(); - //replace unescaped ampersands in html to prevent tests from failing - $html = preg_replace($re, "&", $html); - - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 2); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 3); //last item aint link - - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-2 div.card-header h4')); - Assert::equal(count($dom->find('div.container.settings div.row div.col div.card.sh-box.my-2 div.card-body table.table tr')), 5); - - } - - function testActionDiscussionNew() { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', ["action" => "discussion_new"]); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\RedirectResponse', $response); - } - - function testActionDiscussionNewAdmin() { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user_admin"], $GLOBALS["testedTeam"]["pass_admin"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', ["action" => "discussion_new"]); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 3); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 4); //last item aint link - - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3[data-binder-id] div.card-header h4')); - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3[data-binder-id] div.card-body table.table')); - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3[data-binder-id] div.card-body table.table')); - Assert::equal(count($dom->find('div.container.settings div.row div.col div.card.sh-box.my-3[data-binder-id] div.card-body table.table tr')), 8); - - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3[data-binder-id] div.card-footer.text-right button.btn.btn-lg.binder-save-btn')); - } - - function testActionEventNew() { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', ["action" => "event_new"]); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\RedirectResponse', $response); - } - - function testActionEventNewAdmin() { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user_admin"], $GLOBALS["testedTeam"]["pass_admin"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', ["action" => "event_new"]); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 3); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 4); //last item aint link - - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-header h4')); - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table.table-xs.table-hover.table-responsive')); - Assert::equal(count($dom->find('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table.table-xs.table-hover.table-responsive tr th')), 10); - Assert::equal(count($dom->find('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table.table-xs.table-hover.table-responsive tr[data-binder-id] td')), 10); - - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table.table-xs.table-hover.table-responsive tr[data-binder-id] td.btn-group button.btn.btn-sm.btn-outline-danger')); //delete new event row button - Assert::equal(count($dom->find('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body div.text-center button.btn.btn-sm.btn-outline-success i.fa.fa-plus')), 3); //three icons to duplicate event row - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-footer.text-right button.btn.btn-lg.binder-save-all-btn')); //save all button - } - - function testActionPollNew() { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', ["action" => "poll_new"]); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\RedirectResponse', $response); - } - - function testActionPollNewAdmin() { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user_admin"], $GLOBALS["testedTeam"]["pass_admin"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', ["action" => "poll_new"]); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string)$response->getSource(); - $dom = DomQuery::fromHtml($html); - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 3); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 4); //last item aint link - - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-header h4')); - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table.table-xs.table-hover.table-responsive')); - Assert::equal(count($dom->find('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table.table-xs.table-hover.table-responsive tr th')), 15); - Assert::equal(count($dom->find('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table.table-xs.table-hover.table-responsive tr[data-binder-id] td')), 15); - - Assert::true($dom->has('div.container.settings div.row div.col div.card.sh-box.my-3 div.card-body table.table.table-xs.table-hover.table-responsive tr[data-binder-id] td.btn-group button.btn.btn-sm.btn-primary.binder-save-btn')); - } - -} - -$test = new SettingsPresenterTest($container); -$test->run(); diff --git a/tests/presenters/SignInTest.phpt b/tests/presenters/SignInTest.phpt deleted file mode 100644 index 08970c50a..000000000 --- a/tests/presenters/SignInTest.phpt +++ /dev/null @@ -1,90 +0,0 @@ -container = $container; - } - - function testSignInComponents(){ - $request = new Nette\Application\Request('Sign', 'GET', array('action' => 'in')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - Assert::type('Nette\Bridges\ApplicationLatte\Template', $response->getSource()); - - $html = (string) $response->getSource(); - - $dom = DomQuery::fromHtml($html); - - Assert::true($dom->has('h4.pb-3')); - Assert::true($dom->has('input[name="name"]')); - Assert::true($dom->has('input[name="password"]')); - Assert::true($dom->has('input[name="send"]')); - - - Assert::true($dom->has('a[href="/sign/up"]')); - Assert::true($dom->has('a[href="/sign/pwdlost"]')); - } - - /** - * @throws \Tapi\Exception\APIAuthenticationException Login failed. Wrong username or password. - */ - function testSignInFails(){ - $this->userTapiAuthenticate("Beatles","Ladyda"); - } - - function testSignInSuccess(){ - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $identity = $this->user->getIdentity(); - Assert::type("Nette\Security\Identity", $identity); - Assert::true(isset($identity->id)); - Assert::true(isset($identity->roles)); - Assert::true(is_array($identity->roles)); - Assert::true(isset($identity->data["sessionKey"])); - Assert::equal(strlen($identity->data["sessionKey"]), 28); - Assert::true(isset($identity->data)); - Assert::true(is_array($identity->data)); - Assert::true(isset($identity->data["id"])); - Assert::true(isset($identity->data["login"])); - Assert::true(isset($identity->data["canLogin"])); - Assert::true(isset($identity->data["lastLogin"])); - Assert::true(isset($identity->data["status"])); - Assert::true(isset($identity->data["roles"])); - Assert::true(is_array($identity->data["roles"])); - Assert::true(isset($identity->data["firstName"])); - Assert::true(isset($identity->data["lastName"])); - Assert::true(isset($identity->data["callName"])); - Assert::true(isset($identity->data["language"])); - Assert::true(isset($identity->data["jerseyNumber"])); - Assert::true(isset($identity->data["street"])); - Assert::true(isset($identity->data["city"])); - Assert::true(isset($identity->data["zipCode"])); - Assert::true(isset($identity->data["phone"])); - Assert::true(isset($identity->data["phone2"])); - Assert::true(isset($identity->data["nameDayMonth"])); - Assert::true(isset($identity->data["nameDayDay"])); - Assert::true(isset($identity->data["pictureUrl"])); - Assert::true(isset($identity->data["fullName"])); - Assert::true(isset($identity->data["displayName"])); - } - -} - -$test = new SignInTest($container); -$test->run(); diff --git a/tests/presenters/SignOutTest.phpt b/tests/presenters/SignOutTest.phpt deleted file mode 100644 index 72d93df82..000000000 --- a/tests/presenters/SignOutTest.phpt +++ /dev/null @@ -1,51 +0,0 @@ -container = $container; - } - - function testSignOutComponents(){ - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Request('Sign', 'GET', array('action' => 'out')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\RedirectResponse', $response); - Assert::equal("/sign/in", parse_url($response->getUrl(), PHP_URL_PATH)); - Assert::equal(302, $response->getCode()); - - Assert::true(!$this->user->isLoggedIn()); - } - - /** - * @throws \Tapi\Exception\APIAuthenticationException Login failed. Wrong username or password. - */ - function testSignOutFails(){ - $this->userTestAuthenticate("Beatles","Ladyda"); - Assert::true($this->user->isLoggedIn()); - $request = new Request('Sign', 'GET', array('action' => 'out')); - $response = $this->presenter->run($request); - - Assert::true(!$this->user->isLoggedIn()); - } - -} - -$test = new SignOutTest($container); -$test->run(); diff --git a/tests/presenters/TeamPresenterTest.phpt b/tests/presenters/TeamPresenterTest.phpt deleted file mode 100644 index d8488f282..000000000 --- a/tests/presenters/TeamPresenterTest.phpt +++ /dev/null @@ -1,138 +0,0 @@ -container = $container; - $this->userList = $this->container->getByType("Tapi\UserListResource"); - } - - protected function setUp() { - $parentResult = parent::setUp(); - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $this->userList->getData(); - $this->counts = $this->userList->getCounts(); - return $parentResult; - } - - function testActionDefault() { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'default')); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string) $response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 1); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 2); //last item aint link - } - - function getActions(){ - return [ - ["players", $this->counts["PLAYER"]], - ["members", $this->counts["MEMBER"]], - ["sicks", $this->counts["SICK"]] - ]; - } - - /** @dataProvider getActions */ - function testAction($actionName, $itemsCount) { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => $actionName)); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string) $response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 2); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 3); //last item aint link - - //has settings bar - Assert::true($dom->has('div.container.users div.row.mt-2 div.col.text-right div.settings-bar a.btn.btn-outline-light i.fa.fa-envelope'), "Has email all button"); - - //count displayed cards - Assert::equal(count($dom->find('div.container.users div.row div.col-md-3.my-2 div.card.sh-box.set-box')), $itemsCount); - } - - function allWebNames() { - $users = $this->userList->getData(); - $inputArray = []; - $i = 0; - foreach ($users as $u) { - $inputArray[] = [$u]; - if($i == 5) break; //limit is 5 players, thats enough for testing - $i++; - } - return $inputArray; - } - - /** - * @dataProvider allWebNames - */ - function testPlayer($player) { - $this->userTapiAuthenticate($GLOBALS["testedTeam"]["user"], $GLOBALS["testedTeam"]["pass"]); - $request = new Nette\Application\Request(self::PRESENTERNAME, 'GET', array('action' => 'player', "player" => $player->webName)); - $response = $this->presenter->run($request); - - Assert::type('Nette\Application\Responses\TextResponse', $response); - - $html = (string) $response->getSource(); - $dom = DomQuery::fromHtml($html); - - //has navbar - Assert::true($dom->has('div#snippet-navbar-nav')); - //has breadcrumbs - Assert::true($dom->has('div.container div.row div.col ol.breadcrumb')); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item a[href]')), 2); - Assert::equal(count($dom->find('ol.breadcrumb li.breadcrumb-item')), 3); //last item aint link - - Assert::equal(count($dom->find('div.container.user div.row div.col.my-3 div.card.sh-box div.card-header ul.nav.nav-tabs.card-header-tabs li.nav-item')), 5); - Assert::equal(count($dom->find('div.container.user div.row div.col.my-3 div.card.sh-box div.card-body div.tab-content div.tab-pane.fade')), 5); - Assert::equal(count($dom->find('div.container.user div.row div.col.my-3 div.card.sh-box div.card-body div.tab-content div.tab-pane.fade.active.show')), 1); - - //TODO : check all the elements on player page, but when the page is finished - - if($this->user->isAllowed('users','canDelete')){ - Assert::true($dom->has('div.container.user div.row div.col.my-3 div.card.sh-box div.card-footer.text-right button.btn.btn-lg.btn-danger.mx-2 i.fa.fa-times')); - } - if($this->user->isAllowed('users','canUpdate')){ - Assert::true($dom->has('div.container.user div.row div.col.my-3 div.card.sh-box div.card-footer.text-right button.btn.btn-lg.btn-primary i.fa.fa-save')); - } - } - -} - -$test = new TeamPresenterTest($container); -$test->run(); diff --git a/app/module/autotest/readme.md b/tests/readme.md similarity index 100% rename from app/module/autotest/readme.md rename to tests/readme.md diff --git a/tests/setup.php b/tests/setup.php index e8c25ff18..86ac2d273 100644 --- a/tests/setup.php +++ b/tests/setup.php @@ -1,28 +1,20 @@ "autotest", - "user" => "autotest", - "user_admin" => "autotest_admin", - "userMail" => "backtassaar@gmail.com", // for pwdLost purposes - "root" => "tymy.cz", - "pass" => "123456.", // pass of user WITHOUT admin privileges - "pass_admin" => "ba8d07ca", // pass of user_admin WITH admin privileges - "invasive" => true, - "testUserId" => 2, - "testEventId" => 147, - "testEventUserId" => 22, - "testPollId" => 2, - "testPollOptionId" => 2, - "testNoteId" => 4, - "testAnonymousPollId" => 1, - "testDiscussionId" => 2, // testovaci diskuze - "searchHash" => "d658281299b4b756f8f6385407eaa442", - "searchedItemUserId" => 11, - "testDiscussionName" => [["oznameni",false],["api",true],["bugy",true],["tymova-diskuze",true],["testovaci-diskuze",true]], //discussion name and if user canWrite - "searchDiscussionId" => 2, - "skips" => [], - "avatarB64" => "data:image/png;base64,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", -]; +use Nette\Utils\FileSystem; +use Tester\Runner\Runner; -file_put_contents(__DIR__ . "/test.json", json_encode($testedTeam)); +/* + * Setup file for nette runner + * You can use variable $runner here, which is created instance of Test Runner + */ + +if (isset($runner) && $runner instanceof Runner) { + require_once __DIR__ . "/../vendor/autoload.php"; + + $rootDir = FileSystem::normalizePath(__DIR__ . "/.."); + putenv("ROOT_DIR=$rootDir"); + putenv("TEAM_DIR=$rootDir"); + putenv("team=autotest"); + + $runner->setEnvironmentVariable("AUTOTEST", true); +} diff --git a/tests/setup_TEMPLATE.php b/tests/setup_TEMPLATE.php deleted file mode 100644 index af54f03da..000000000 --- a/tests/setup_TEMPLATE.php +++ /dev/null @@ -1,31 +0,0 @@ - "dev", - "user" => "autotest", - "user_admin" => "autotest_admin", - "userMail" => "test@example.com", //email of user which is in tymy database - used for pwd reset purposes - "root" => "tymy.cz", //probable not to be changed - "pass" => "********", - "pass_admin" => "********", - "invasive" => false, //if test is invasive, it performs also user registration, discussion item add etc. Probably test just once in time, no need to spam discussion and spam admins with new user info - "testUserId" => 2, - "testEventId" => 74, - "testEventUserId" => 112, - "testPollId" => 2, - "testAnonymousPollId" => 12, - "testDiscussionId" => 2, // testovaci diskuze - "searchHash" => "d658281299b4b756f8f6385407eaa442", //string to be searched for in discussion, should be somewhere in discussion - "searchedItemUserId" => 11, - "testDiscussionName" => [["oznameni"],["api"],["bugy"],["tymova-diskuze"],["testovaci-diskuze"]], - "searchDiscussionId" => 2, - "skips" => [], - "avatarB64" => "data:image/png;base64,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", -]; - -file_put_contents(__DIR__ . "/test.json", json_encode($testedTeam)); diff --git a/tests/test_DEV.sh b/tests/test_DEV.sh deleted file mode 100644 index 04df450ad..000000000 --- a/tests/test_DEV.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -RUN_PATH="$( cd "$(dirname "$0")" ; pwd -P )" -chmod -R 0777 $RUN_PATH/* -chmod -R 0777 $RUN_PATH/../temp/* -chmod -R 0777 $RUN_PATH/../log/* -TESTCMD="$RUN_PATH/../vendor/nette/tester/src/tester.php -p php -c $RUN_PATH/php.ini -j 4 --setup $RUN_PATH/setup_DEV.php $RUN_PATH" -echo $TESTCMD -php $TESTCMD \ No newline at end of file diff --git a/tests/test_DEV_COMPONENTS.sh b/tests/test_DEV_COMPONENTS.sh deleted file mode 100644 index 7a1b5fae2..000000000 --- a/tests/test_DEV_COMPONENTS.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -RUN_PATH="$( cd "$(dirname "$0")" ; pwd -P )" -chmod -R 0777 $RUN_PATH/* -chmod -R 0777 $RUN_PATH/../temp/* -chmod -R 0777 $RUN_PATH/../log/* -TESTCMD="$RUN_PATH/../vendor/nette/tester/src/tester.php -p php -c $RUN_PATH/php.ini -j 4 --setup $RUN_PATH/setup_DEV.php $RUN_PATH/components" -echo $TESTCMD -php $TESTCMD \ No newline at end of file diff --git a/tests/test_DEV_PRESENTERS.sh b/tests/test_DEV_PRESENTERS.sh deleted file mode 100644 index 7a8912b10..000000000 --- a/tests/test_DEV_PRESENTERS.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -RUN_PATH="$( cd "$(dirname "$0")" ; pwd -P )" -chmod -R 0777 $RUN_PATH/* -chmod -R 0777 $RUN_PATH/../temp/* -chmod -R 0777 $RUN_PATH/../log/* -TESTCMD="$RUN_PATH/../vendor/nette/tester/src/tester.php -p php -c $RUN_PATH/php.ini -j 4 --setup $RUN_PATH/setup_DEV.php $RUN_PATH/presenters/" -echo $TESTCMD -php $TESTCMD \ No newline at end of file diff --git a/tests/test_DEV_TAPI.sh b/tests/test_DEV_TAPI.sh deleted file mode 100644 index 80f8c2b40..000000000 --- a/tests/test_DEV_TAPI.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -RUN_PATH="$( cd "$(dirname "$0")" ; pwd -P )" -chmod -R 0777 $RUN_PATH/* -chmod -R 0777 $RUN_PATH/../temp/* -chmod -R 0777 $RUN_PATH/../log/* -TESTCMD="$RUN_PATH/../vendor/nette/tester/src/tester.php -p php -c $RUN_PATH/php.ini -j 4 --setup $RUN_PATH/setup_DEV.php $RUN_PATH/tapi/" -echo $TESTCMD -php $TESTCMD \ No newline at end of file diff --git a/tests/test_MONKEYS.sh b/tests/test_MONKEYS.sh deleted file mode 100644 index 0213aad1a..000000000 --- a/tests/test_MONKEYS.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -RUN_PATH="$( cd "$(dirname "$0")" ; pwd -P )" -chmod -R 0777 $RUN_PATH/* -chmod -R 0777 $RUN_PATH/../temp/* -chmod -R 0777 $RUN_PATH/../log/* -TESTCMD="$RUN_PATH/../vendor/nette/tester/src/tester.php -p php -c $RUN_PATH/php.ini -j 4 --setup $RUN_PATH/setup_MONKEYS.php $RUN_PATH" -echo $TESTCMD -php $TESTCMD \ No newline at end of file