From 1a8b586718c5804b97ead819791d94e41702d895 Mon Sep 17 00:00:00 2001 From: Alex Pott <alex.a.pott@googlemail.com> Date: Tue, 26 Jul 2022 09:31:37 +0100 Subject: [PATCH] Issue #3295935 by lauriii: Follow-up to #3268983: Move test case to correct group (cherry picked from commit 07a160117a2c0b038cba4366e1be9410c876c561) --- .../tests/src/Unit/HTMLRestrictionsTest.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/core/modules/ckeditor5/tests/src/Unit/HTMLRestrictionsTest.php b/core/modules/ckeditor5/tests/src/Unit/HTMLRestrictionsTest.php index 4ba7fb590f40..aa904e86f3a6 100644 --- a/core/modules/ckeditor5/tests/src/Unit/HTMLRestrictionsTest.php +++ b/core/modules/ckeditor5/tests/src/Unit/HTMLRestrictionsTest.php @@ -816,20 +816,6 @@ public function providerOperands(): \Generator { 'intersection' => 'a', 'union' => 'b', ]; - yield 'wildcard + matching tag: wildcard resolves into matching tag, but matching tag already supports all attributes' => [ - 'a' => new HTMLRestrictions(['p' => TRUE]), - 'b' => new HTMLRestrictions(['$text-container' => ['class' => ['foo' => TRUE, 'bar' => TRUE]]]), - 'diff' => 'a', - 'intersection' => HTMLRestrictions::emptySet(), - 'union' => new HTMLRestrictions(['p' => TRUE, '$text-container' => ['class' => ['foo' => TRUE, 'bar' => TRUE]]]), - ]; - yield 'wildcard + matching tag: wildcard resolves into matching tag, but matching tag already supports all attributes — vice versa' => [ - 'a' => new HTMLRestrictions(['$text-container' => ['class' => ['foo' => TRUE, 'bar' => TRUE]]]), - 'b' => new HTMLRestrictions(['p' => TRUE]), - 'diff' => 'a', - 'intersection' => HTMLRestrictions::emptySet(), - 'union' => new HTMLRestrictions(['p' => TRUE, '$text-container' => ['class' => ['foo' => TRUE, 'bar' => TRUE]]]), - ]; // Tag restrictions. yield 'tag restrictions are different: <a> vs <b c>' => [ @@ -1093,6 +1079,20 @@ public function providerOperands(): \Generator { 'intersection' => new HTMLRestrictions(['$text-container' => ['class' => TRUE], 'p' => ['class' => TRUE]]), 'union' => 'b', ]; + yield 'wildcard + matching tag: wildcard resolves into matching tag, but matching tag already supports all attributes' => [ + 'a' => new HTMLRestrictions(['p' => TRUE]), + 'b' => new HTMLRestrictions(['$text-container' => ['class' => ['foo' => TRUE, 'bar' => TRUE]]]), + 'diff' => 'a', + 'intersection' => HTMLRestrictions::emptySet(), + 'union' => new HTMLRestrictions(['p' => TRUE, '$text-container' => ['class' => ['foo' => TRUE, 'bar' => TRUE]]]), + ]; + yield 'wildcard + matching tag: wildcard resolves into matching tag, but matching tag already supports all attributes — vice versa' => [ + 'a' => new HTMLRestrictions(['$text-container' => ['class' => ['foo' => TRUE, 'bar' => TRUE]]]), + 'b' => new HTMLRestrictions(['p' => TRUE]), + 'diff' => 'a', + 'intersection' => HTMLRestrictions::emptySet(), + 'union' => new HTMLRestrictions(['p' => TRUE, '$text-container' => ['class' => ['foo' => TRUE, 'bar' => TRUE]]]), + ]; // Wildcard tag + non-matching tag cases. yield 'wildcard + non-matching tag: attribute diff — without possible resolving' => [ -- GitLab