Merge pull request #151 from Chi-teck/fix-test

Update tests
Chi-teck · May 20, 2024 · 504d605 · 504d605
2 parents 54435aa + 1f016bf
commit 504d605
Show file tree

Hide file tree

Showing 109 changed files with 300 additions and 309 deletions.
diff --git a/composer.json b/composer.json
@@ -27,10 +27,10 @@
         "ext-json": "*",
         "psr/event-dispatcher": "^1.0",
         "psr/log": "^3.0",
-        "symfony/console": "^7.0",
-        "symfony/dependency-injection": "^7.0",
-        "symfony/filesystem": "^7.0",
-        "symfony/string": "^7.0",
+        "symfony/console": "^7.1",
+        "symfony/dependency-injection": "^7.1",
+        "symfony/filesystem": "^7.1",
+        "symfony/string": "^7.1",
         "twig/twig": "^3.4"
     },
     "require-dev": {
@@ -41,12 +41,14 @@
         "phpspec/prophecy-phpunit": "^2.2",
         "phpunit/phpunit": "^10.5",
         "squizlabs/php_codesniffer": "^3.9",
-        "symfony/var-dumper": "^7.0",
-        "symfony/yaml": "^7.0",
+        "symfony/var-dumper": "^7.1",
+        "symfony/yaml": "^7.1",
         "vimeo/psalm": "^5.24.0"
     },
     "conflict": {
         "squizlabs/php_codesniffer": "<3.6",
         "nikic/php-parser": "<4.17"
-    }
+    },
+    "minimum-stability": "RC",
+    "prefer-stable": true
 }
diff --git a/scripts/sut-tests.sh b/scripts/sut-tests.sh
@@ -138,7 +138,7 @@ if [[ $test_filter = all || $test_filter = form ]]; then
 
   dcg_phpcs --exclude=DrupalPractice.Yaml.RoutingAccess .
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -200,7 +200,7 @@ if [[ $test_filter = all || $test_filter = module_component ]]; then
 
   dcg_phpcs .
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -242,7 +242,7 @@ if [[ $test_filter = all || $test_filter = plugin ]]; then
   dcg_module_install $module_machine_name
   echo 'Build CKEditor plugin...'
   npm install && npm run build
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -274,7 +274,7 @@ if [[ $test_filter = all || $test_filter = service ]]; then
 
   dcg_phpcs $module_dir
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   # Do not uninstall this module as the uninstall validator prevents it.
 fi
 
@@ -299,7 +299,7 @@ if [[ $test_filter = all || $test_filter = yml ]]; then
 
   dcg_phpcs $module_dir
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -321,7 +321,7 @@ if [[ $test_filter = all || $test_filter = test ]]; then
 
   dcg_phpcs --exclude=Generic.CodeAnalysis.UselessOverridingMethod $module_dir
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -347,7 +347,7 @@ if [[ $test_filter = all || $test_filter = theme_component ]]; then
 
   dcg_phpcs --exclude=Generic.CodeAnalysis.UselessOverridingMethod $module_dir
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -366,7 +366,7 @@ if [[ $test_filter = all || $test_filter = plugin_manager ]]; then
 
   dcg_phpcs .
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -383,7 +383,7 @@ if [[ $test_filter = all || $test_filter = configuration_entity ]]; then
 
   dcg_phpcs .
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -402,7 +402,7 @@ if [[ $test_filter = all || $test_filter = content_entity ]]; then
 
   dcg_phpcs .
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 
   dcg_label 'Content entity (with fields)'
@@ -418,7 +418,7 @@ if [[ $test_filter = all || $test_filter = content_entity ]]; then
 
   dcg_phpcs .
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 
   dcg_label 'Content entity (without bundles, fields and canonical page)'
@@ -434,7 +434,7 @@ if [[ $test_filter = all || $test_filter = content_entity ]]; then
 
   dcg_phpcs .
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -450,7 +450,7 @@ if [[ $test_filter = all || $test_filter = bundle_class ]]; then
   $dcg entity:bundle-class -a acme -a Acme -a User -a UserBundle -a Yes -a UserBase
   dcg_phpcs $module_dir
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -464,11 +464,11 @@ if [[ $test_filter = all || $test_filter = module ]]; then
   cd $module_dir
 
   $dcg module -d $drupal_dir/modules -a Peach -a peach -a 'Simple module generated by DCG.' \
-    -a DCG -a 'drupal:views, drupal:node, drupal:action' -a Yes -a Yes -a Yes
+    -a DCG -a 'drupal:views, drupal:node' -a Yes -a Yes -a Yes
 
   dcg_phpcs $module_dir
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -491,7 +491,7 @@ if [[ $test_filter = all || $test_filter = theme ]]; then
   dcg_phpcs $theme_dir
   dcg_phpcs $module_dir
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
 
@@ -509,6 +509,6 @@ if [[ $test_filter = all || $test_filter = drush ]]; then
 
   dcg_phpcs $module_dir
   dcg_module_install $module_machine_name
-  dcg_phpunit tests
+  dcg_phpunit $drupal_dir/modules/$module_machine_name/tests
   dcg_module_uninstall $module_machine_name
 fi
diff --git a/src/Twig/TwigSortTokenParser.php b/src/Twig/TwigSortTokenParser.php
@@ -19,6 +19,7 @@ final class TwigSortTokenParser extends AbstractTokenParser {
    * {@inheritdoc}
    */
   public function parse(Token $token): Node {
+    \trigger_deprecation('chi-teck/drupal-code-generator', '3.6.0', 'The sort twig tag is deprecated and will be removed in 5.x, use the sort_namespaces twig filter.');
     $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
     $body = $this->parser->subparse(
       static fn (Token $token): bool => $token->test('endsort'),

diff --git a/templates/Test/_browser/browser.twig b/templates/Test/_browser/browser.twig
@@ -5,12 +5,12 @@ declare(strict_types=1);
 namespace Drupal\Tests\{{ machine_name }}\Functional;
 
 use Drupal\Tests\BrowserTestBase;
+use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Test description.
- *
- * @group {{ machine_name }}
  */
+#[Group('{{ machine_name }}')]
 final class {{ class }} extends BrowserTestBase {
 
   /**

diff --git a/templates/Test/_kernel/kernel.twig b/templates/Test/_kernel/kernel.twig
@@ -5,12 +5,12 @@ declare(strict_types=1);
 namespace Drupal\Tests\{{ machine_name }}\Kernel;
 
 use Drupal\KernelTests\KernelTestBase;
+use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Test description.
- *
- * @group {{ machine_name }}
  */
+#[Group('{{ machine_name }}')]
 final class {{ class }} extends KernelTestBase {
 
   /**

diff --git a/templates/Test/_unit/unit.twig b/templates/Test/_unit/unit.twig
@@ -5,12 +5,12 @@ declare(strict_types=1);
 namespace Drupal\Tests\{{ machine_name }}\Unit;
 
 use Drupal\Tests\UnitTestCase;
+use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Test description.
- *
- * @group {{ machine_name }}
  */
+#[Group('{{ machine_name }}')]
 final class {{ class }} extends UnitTestCase {
 
   /**

diff --git a/templates/Test/_webdriver/webdriver.twig b/templates/Test/_webdriver/webdriver.twig
@@ -5,12 +5,12 @@ declare(strict_types=1);
 namespace Drupal\Tests\{{ machine_name }}\FunctionalJavascript;
 
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Tests the JavaScript functionality of the {{ name }} module.
- *
- * @group {{ machine_name }}
  */
+#[Group('{{ machine_name }}')]
 final class {{ class }} extends WebDriverTestBase {
 
   /**

diff --git a/tests/functional/Generator/PhpStormMetaTest.php b/tests/functional/Generator/PhpStormMetaTest.php
@@ -189,6 +189,7 @@ private function assertPlugins(): void {
     self::assertStringContainsString('plugin.manager.block__plugin_ids', $generated_content);
     self::assertStringContainsString('plugin.manager.ckeditor5.plugin__plugin_ids', $generated_content);
     self::assertStringContainsString('plugin.manager.condition__plugin_ids', $generated_content);
+    self::assertStringContainsString('plugin.manager.config_action__plugin_ids', $generated_content);
     self::assertStringContainsString('plugin.manager.display_variant__plugin_ids', $generated_content);
     self::assertStringContainsString('plugin.manager.editor__plugin_ids', $generated_content);
     self::assertStringContainsString('plugin.manager.element_info__plugin_ids', $generated_content);
@@ -198,6 +199,7 @@ private function assertPlugins(): void {
     self::assertStringContainsString('plugin.manager.field.widget__plugin_ids', $generated_content);
     self::assertStringContainsString('plugin.manager.filter__plugin_ids', $generated_content);
     self::assertStringContainsString('plugin.manager.help_section__plugin_ids', $generated_content);
+    self::assertStringContainsString('plugin.manager.help_topic__plugin_ids', $generated_content);
     self::assertStringContainsString('plugin.manager.image.effect__plugin_ids', $generated_content);
     self::assertStringContainsString('plugin.manager.link_relation_type__plugin_ids', $generated_content);
     self::assertStringContainsString('plugin.manager.mail__plugin_ids', $generated_content);
@@ -227,7 +229,7 @@ private function assertPlugins(): void {
     self::assertStringContainsString('typed_data_manager__plugin_ids', $generated_content);
     self::assertStringContainsString('validation.constraint__plugin_ids', $generated_content);
 
-    self::assertSame(49, \substr_count($generated_content, 'registerArgumentsSet'));
+    self::assertSame(51, \substr_count($generated_content, 'registerArgumentsSet'));
   }
 
   /**
@@ -336,7 +338,6 @@ private function assertSettings(): void {
         'file_scan_ignore_directories',
         'entity_update_batch_size',
         'entity_update_backup',
-        'state_cache',
         'migrate_node_migrate_type_classic',
         'config_sync_directory',
     PHP;

diff --git a/tests/functional/Generator/TemplateTest.php b/tests/functional/Generator/TemplateTest.php
@@ -6,6 +6,7 @@
 
 use DrupalCodeGenerator\Command\Template;
 use DrupalCodeGenerator\Test\Functional\GeneratorTestBase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * Tests template generator.
@@ -57,9 +58,8 @@ public function testGenerator(): void {
 
   /**
    * Test callback.
-   *
-   * @dataProvider templateNameValidatorProvider()
    */
+  #[DataProvider('templateNameValidatorProvider')]
   public function testTemplateNameValidator(mixed $value, bool $exception): void {
     if ($exception) {
       self::expectExceptionObject(new \UnexpectedValueException('The value is not correct template name'));
@@ -72,7 +72,7 @@ public function testTemplateNameValidator(mixed $value, bool $exception): void {
   /**
    * Data provider callback for testTemplateNameValidator().
    */
-  public function templateNameValidatorProvider(): array {
+  public static function templateNameValidatorProvider(): array {
     return [
       ['aaa', FALSE],
       ['aaa.bbb', FALSE],

diff --git a/tests/functional/Generator/Test/_browser/tests/src/Functional/ExampleTest.php b/tests/functional/Generator/Test/_browser/tests/src/Functional/ExampleTest.php
@@ -5,12 +5,12 @@
 namespace Drupal\Tests\foo\Functional;
 
 use Drupal\Tests\BrowserTestBase;
+use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Test description.
- *
- * @group foo
  */
+#[Group('foo')]
 final class ExampleTest extends BrowserTestBase {
 
   /**

diff --git a/tests/functional/Generator/Test/_kernel/tests/src/Kernel/ExampleTest.php b/tests/functional/Generator/Test/_kernel/tests/src/Kernel/ExampleTest.php
@@ -5,12 +5,12 @@
 namespace Drupal\Tests\foo\Kernel;
 
 use Drupal\KernelTests\KernelTestBase;
+use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Test description.
- *
- * @group foo
  */
+#[Group('foo')]
 final class ExampleTest extends KernelTestBase {
 
   /**

diff --git a/tests/functional/Generator/Test/_unit/tests/src/Unit/ExampleTest.php b/tests/functional/Generator/Test/_unit/tests/src/Unit/ExampleTest.php
@@ -5,12 +5,12 @@
 namespace Drupal\Tests\foo\Unit;
 
 use Drupal\Tests\UnitTestCase;
+use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Test description.
- *
- * @group foo
  */
+#[Group('foo')]
 final class ExampleTest extends UnitTestCase {
 
   /**

diff --git a/tests/functional/Generator/Test/_web_driver/tests/src/FunctionalJavascript/ExampleTest.php b/tests/functional/Generator/Test/_web_driver/tests/src/FunctionalJavascript/ExampleTest.php
@@ -5,12 +5,12 @@
 namespace Drupal\Tests\foo\FunctionalJavascript;
 
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Tests the JavaScript functionality of the Foo module.
- *
- * @group foo
  */
+#[Group('foo')]
 final class ExampleTest extends WebDriverTestBase {
 
   /**

diff --git a/tests/functional/Helper/Drupal/HookInfoTest.php b/tests/functional/Helper/Drupal/HookInfoTest.php
@@ -38,7 +38,7 @@ public function testHookInfoTemplates(): void {
     // A hook from entity.api.php file.
     self::assertHookTemplate('entity_field_values_init', $hook_templates);
     // A hook from file.api file.
-    self::assertHookTemplate('file_validate', $hook_templates);
+    self::assertHookTemplate('file_download', $hook_templates);
     // A hook from system.api file.
     self::assertHookTemplate('system_themes_page_alter', $hook_templates);
     // A hook from user.api.php file.