mirror of
https://github.com/humhub/humhub.git
synced 2025-01-16 21:58:17 +01:00
Implement auto-generated id for checkbox list items (#6006)
* Implement auto-generated id for checkbox list items * Update CHANGELOG.md * Fix activity settings test
This commit is contained in:
Yuriy Bakhtin
GitHub
parent
7bdd75ee62
commit
6e3c91642a
@ -9,5 +9,6 @@ HumHub Changelog (DEVELOP)
|
||||
1.14.0 (February 28, 2023)
|
||||
--------------------------
|
||||
|
||||
- Enh #4803: Added more panel styles (`panel-info` and `panel-primary`)
|
||||
- Enh #5972: Removed old vendor CSS prefixes (e.g. `-moz` or `-webkit`)
|
||||
- Enh #4803: Added more panel styles (`panel-info` and `panel-primary`)
|
||||
- Enh #5972: Removed old vendor CSS prefixes (e.g. `-moz` or `-webkit`)
|
||||
- Enh #6006: Fix activity settings test
|
||||
|
||||
@ -57,7 +57,6 @@
|
||||
"phpoffice/phpspreadsheet": "^1.0",
|
||||
"raoul2000/yii2-jcrop-widget": "*",
|
||||
"symfony/amazon-mailer": "^5.4",
|
||||
"symfony/css-selector": "v5.4.11",
|
||||
"symfony/google-mailer": "^5.4",
|
||||
"symfony/mailchimp-mailer": "^5.4",
|
||||
"symfony/mailer": "^5.4",
|
||||
|
||||
236
composer.lock
generated
236
composer.lock
generated
@ -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": "889d45cd694bf9b4717bea1b8eace42e",
|
||||
"content-hash": "ea7835858ecbffe0eca508e310593ff7",
|
||||
"packages": [
|
||||
{
|
||||
"name": "async-aws/core",
|
||||
@ -135,7 +135,7 @@
|
||||
"version": "v3.4.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/twbs/bootstrap.git",
|
||||
"url": "git@github.com:twbs/bootstrap.git",
|
||||
"reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
|
||||
},
|
||||
"dist": {
|
||||
@ -177,7 +177,7 @@
|
||||
"version": "3.6.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "git@github.com:jquery/jquery-dist.git",
|
||||
"url": "https://github.com/jquery/jquery-dist.git",
|
||||
"reference": "da0f228131a578aea168b799fe4d7fe01764c98b"
|
||||
},
|
||||
"dist": {
|
||||
@ -454,31 +454,74 @@
|
||||
"time": "2020-07-03T15:54:43+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/instantiator",
|
||||
"version": "1.4.1",
|
||||
"name": "doctrine/deprecations",
|
||||
"version": "v1.0.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/instantiator.git",
|
||||
"reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
|
||||
"url": "https://github.com/doctrine/deprecations.git",
|
||||
"reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
|
||||
"reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
|
||||
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
|
||||
"reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^7.1|^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/coding-standard": "^9",
|
||||
"phpunit/phpunit": "^7.5|^8.5|^9.5",
|
||||
"psr/log": "^1|^2|^3"
|
||||
},
|
||||
"suggest": {
|
||||
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
|
||||
"homepage": "https://www.doctrine-project.org/",
|
||||
"support": {
|
||||
"issues": "https://github.com/doctrine/deprecations/issues",
|
||||
"source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
|
||||
},
|
||||
"time": "2022-05-02T15:47:09+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/instantiator",
|
||||
"version": "1.5.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/instantiator.git",
|
||||
"reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
|
||||
"reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^7.1 || ^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/coding-standard": "^9",
|
||||
"doctrine/coding-standard": "^9 || ^11",
|
||||
"ext-pdo": "*",
|
||||
"ext-phar": "*",
|
||||
"phpbench/phpbench": "^0.16 || ^1",
|
||||
"phpstan/phpstan": "^1.4",
|
||||
"phpstan/phpstan-phpunit": "^1",
|
||||
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
|
||||
"vimeo/psalm": "^4.22"
|
||||
"vimeo/psalm": "^4.30 || ^5.4"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
@ -505,7 +548,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/doctrine/instantiator/issues",
|
||||
"source": "https://github.com/doctrine/instantiator/tree/1.4.1"
|
||||
"source": "https://github.com/doctrine/instantiator/tree/1.5.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -521,35 +564,37 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-03-03T08:28:38+00:00"
|
||||
"time": "2022-12-30T00:15:36+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/lexer",
|
||||
"version": "1.2.3",
|
||||
"version": "2.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/lexer.git",
|
||||
"reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
|
||||
"reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
|
||||
"reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
|
||||
"url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
|
||||
"reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/deprecations": "^1.0",
|
||||
"php": "^7.1 || ^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/coding-standard": "^9.0",
|
||||
"doctrine/coding-standard": "^9 || ^10",
|
||||
"phpstan/phpstan": "^1.3",
|
||||
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
|
||||
"vimeo/psalm": "^4.11"
|
||||
"psalm/plugin-phpunit": "^0.18.3",
|
||||
"vimeo/psalm": "^4.11 || ^5.0"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
|
||||
"Doctrine\\Common\\Lexer\\": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
@ -581,7 +626,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/doctrine/lexer/issues",
|
||||
"source": "https://github.com/doctrine/lexer/tree/1.2.3"
|
||||
"source": "https://github.com/doctrine/lexer/tree/2.1.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -597,29 +642,28 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-02-28T11:07:21+00:00"
|
||||
"time": "2022-12-14T08:49:07+00:00"
|
||||
},
|
||||
{
|
||||
"name": "egulias/email-validator",
|
||||
"version": "3.2.2",
|
||||
"version": "3.2.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/egulias/EmailValidator.git",
|
||||
"reference": "1ac0be80b32ea829009257934ecfd5ab20f24ba5"
|
||||
"reference": "b531a2311709443320c786feb4519cfaf94af796"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/1ac0be80b32ea829009257934ecfd5ab20f24ba5",
|
||||
"reference": "1ac0be80b32ea829009257934ecfd5ab20f24ba5",
|
||||
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796",
|
||||
"reference": "b531a2311709443320c786feb4519cfaf94af796",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/lexer": "^1.2",
|
||||
"doctrine/lexer": "^1.2|^2",
|
||||
"php": ">=7.2",
|
||||
"symfony/polyfill-intl-idn": "^1.15"
|
||||
},
|
||||
"require-dev": {
|
||||
"php-coveralls/php-coveralls": "^2.2",
|
||||
"phpunit/phpunit": "^8.5.8|^9.3.3",
|
||||
"vimeo/psalm": "^4"
|
||||
},
|
||||
@ -657,7 +701,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/egulias/EmailValidator/issues",
|
||||
"source": "https://github.com/egulias/EmailValidator/tree/3.2.2"
|
||||
"source": "https://github.com/egulias/EmailValidator/tree/3.2.5"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -665,7 +709,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2022-12-29T21:07:24+00:00"
|
||||
"time": "2023-01-02T17:26:14+00:00"
|
||||
},
|
||||
{
|
||||
"name": "ezyang/htmlpurifier",
|
||||
@ -6055,72 +6099,6 @@
|
||||
],
|
||||
"time": "2022-04-12T16:18:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/css-selector",
|
||||
"version": "v5.4.11",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/css-selector.git",
|
||||
"reference": "c1681789f059ab756001052164726ae88512ae3d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/css-selector/zipball/c1681789f059ab756001052164726ae88512ae3d",
|
||||
"reference": "c1681789f059ab756001052164726ae88512ae3d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.2.5",
|
||||
"symfony/polyfill-php80": "^1.16"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Component\\CssSelector\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "Jean-François Simon",
|
||||
"email": "jeanfrancois.simon@sensiolabs.com"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "Converts CSS selectors to XPath expressions",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/css-selector/tree/v5.4.11"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://symfony.com/sponsor",
|
||||
"type": "custom"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/fabpot",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-06-27T16:58:25+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/deprecation-contracts",
|
||||
"version": "v2.5.2",
|
||||
@ -10903,6 +10881,72 @@
|
||||
],
|
||||
"time": "2022-12-28T14:15:31+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/css-selector",
|
||||
"version": "v5.4.17",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/css-selector.git",
|
||||
"reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/css-selector/zipball/052ef49b660f9ad2a3adb311c555c9bc11ba61f4",
|
||||
"reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.2.5",
|
||||
"symfony/polyfill-php80": "^1.16"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Component\\CssSelector\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "Jean-François Simon",
|
||||
"email": "jeanfrancois.simon@sensiolabs.com"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "Converts CSS selectors to XPath expressions",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/css-selector/tree/v5.4.17"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://symfony.com/sponsor",
|
||||
"type": "custom"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/fabpot",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-12-23T11:40:44+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/dom-crawler",
|
||||
"version": "v4.4.45",
|
||||
|
||||
@ -11,6 +11,7 @@ namespace activity\functional;
|
||||
|
||||
use humhub\modules\comment\activities\NewComment;
|
||||
use humhub\modules\content\activities\ContentCreated;
|
||||
use humhub\modules\like\activities\Liked;
|
||||
use humhub\modules\space\models\Space;
|
||||
use activity\FunctionalTester;
|
||||
use yii\helpers\Url;
|
||||
@ -35,9 +36,9 @@ class ActivitySettingsCest
|
||||
$I->seeInField('#mailsummaryform-interval', '1' );
|
||||
$I->seeCheckboxIsChecked('[name="MailSummaryForm[limitSpacesMode]"]', '1');
|
||||
$I->seeOptionIsSelected('#mailsummaryform-limitspaces', 'Space 1');
|
||||
$I->dontSeeCheckboxIsChecked('[value="humhub\modules\comment\activities\NewComment"]');
|
||||
$I->seeCheckboxIsChecked('[value="humhub\modules\content\activities\ContentCreated"]');
|
||||
$I->dontSeeCheckboxIsChecked('[value="humhub\modules\like\activities\Liked"]');
|
||||
$I->dontSeeCheckboxIsChecked($this->getActivityCheckboxSelector(NewComment::class));
|
||||
$I->seeCheckboxIsChecked($this->getActivityCheckboxSelector(ContentCreated::class));
|
||||
$I->dontSeeCheckboxIsChecked($this->getActivityCheckboxSelector(Liked::class));
|
||||
|
||||
$I->submitForm('.panel-body form', [
|
||||
'MailSummaryForm[interval]' => '2',
|
||||
@ -51,9 +52,9 @@ class ActivitySettingsCest
|
||||
$I->dontSeeCheckboxIsChecked('[name="MailSummaryForm[limitSpacesMode]"]', '0');
|
||||
$I->dontSeeCheckboxIsChecked('[name="MailSummaryForm[limitSpacesMode]"]', '1');
|
||||
$I->dontSeeOptionIsSelected('#mailsummaryform-limitspaces', 'Space 1');
|
||||
$I->seeCheckboxIsChecked('[value="humhub\modules\comment\activities\NewComment"]');
|
||||
$I->dontSeeCheckboxIsChecked('[value="humhub\modules\content\activities\ContentCreated"]');
|
||||
$I->dontSeeCheckboxIsChecked('[value="humhub\modules\like\activities\Liked"]');
|
||||
$I->seeCheckboxIsChecked($this->getActivityCheckboxSelector(NewComment::class));
|
||||
$I->dontSeeCheckboxIsChecked($this->getActivityCheckboxSelector(ContentCreated::class));
|
||||
$I->dontSeeCheckboxIsChecked($this->getActivityCheckboxSelector(Liked::class));
|
||||
|
||||
$I->see('Reset to defaults');
|
||||
$I->sendAjaxPostRequest(Url::toRoute('/activity/user/reset'));
|
||||
@ -62,9 +63,14 @@ class ActivitySettingsCest
|
||||
$I->seeInField('#mailsummaryform-interval', '1' );
|
||||
$I->seeCheckboxIsChecked('[name="MailSummaryForm[limitSpacesMode]"]', '1');
|
||||
$I->seeOptionIsSelected('#mailsummaryform-limitspaces', 'Space 1');
|
||||
$I->dontSeeCheckboxIsChecked('[value="humhub\modules\comment\activities\NewComment"]');
|
||||
$I->seeCheckboxIsChecked('[value="humhub\modules\content\activities\ContentCreated"]');
|
||||
$I->dontSeeCheckboxIsChecked('[value="humhub\modules\like\activities\Liked"]');
|
||||
$I->dontSeeCheckboxIsChecked($this->getActivityCheckboxSelector(NewComment::class));
|
||||
$I->seeCheckboxIsChecked($this->getActivityCheckboxSelector(ContentCreated::class));
|
||||
$I->dontSeeCheckboxIsChecked($this->getActivityCheckboxSelector(Liked::class));
|
||||
}
|
||||
|
||||
private function getActivityCheckboxSelector(string $className): string
|
||||
{
|
||||
return '[value="' . str_replace('\\', '\\\5c ', $className) . '"]';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user