Added kernel tests.

sonnykt · sonnykt · commit 29a971d1f7b4 · 2024-12-31T00:20:00.000+11:00
diff --git a/.ahoy.yml b/.ahoy.yml
@@ -61,28 +61,28 @@ commands:
     usage: Run tests.
     cmd: |
       pushd "build" >/dev/null || exit 1
-      php -d pcov.directory=.. vendor/bin/phpunit --coverage-text
+      php -d pcov.directory="../.." vendor/bin/phpunit --coverage-text
       popd >/dev/null || exit 1
 
   test-unit:
     usage: Run unit tests.
     cmd: |
       pushd "build" >/dev/null || exit 1
-      php -d pcov.directory=.. vendor/bin/phpunit --testsuite unit "$@"
+      php -d pcov.directory="../.." vendor/bin/phpunit --testsuite unit "$@"
       popd >/dev/null || exit 1
 
   test-kernel:
     usage: Run kernel tests.
     cmd: |
       pushd "build" >/dev/null || exit 1
-      php -d pcov.directory=.. vendor/bin/phpunit --testsuite kernel "$@"
+      php -d pcov.directory="../.." vendor/bin/phpunit --testsuite kernel "$@"
       popd >/dev/null || exit 1
 
   test-functional:
     usage: Run functional tests.
     cmd: |
       pushd "build" >/dev/null || exit 1
-      php -d pcov.directory=.. vendor/bin/phpunit --testsuite functional "$@"
+      php -d pcov.directory="../.." vendor/bin/phpunit --testsuite functional "$@"
       popd >/dev/null || exit 1
 
   check-code-coverage:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -151,7 +151,7 @@ jobs:
 
       - name: Run tests
         working-directory: build
-        run: php -d pcov.directory=.. vendor/bin/phpunit --coverage-text --colors=never || [ "${CI_TEST_IGNORE_FAILURE:-0}" -eq 1 ] || [ "${CI_TEST_ACCEPT_CANARY_FAILURE:-0}" -eq 1 ]
+        run: php -d pcov.directory="../.." vendor/bin/phpunit --coverage-text --colors=never || [ "${CI_TEST_IGNORE_FAILURE:-0}" -eq 1 ] || [ "${CI_TEST_ACCEPT_CANARY_FAILURE:-0}" -eq 1 ]
         env:
           BROWSERTEST_OUTPUT_DIRECTORY: /tmp
           CI_TEST_IGNORE_FAILURE: ${{ vars.CI_TEST_IGNORE_FAILURE }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -67,7 +67,10 @@ variables:
         apt-get update && apt-get install -qy --no-install-recommends $PHPIZE_DEPS
         pecl install pcov
       fi
-    - echo -e '[pcov]\npcov.directory=.' > /usr/local/etc/php/conf.d/pcov.ini
+    - echo -e "[pcov]\npcov.directory=${CI_PROJECT_DIR}" > /usr/local/etc/php/conf.d/pcov.ini
+    - |
+      echo "Content of /usr/local/etc/php/conf.d/pcov.ini"
+      cat cat /usr/local/etc/php/conf.d/pcov.ini
     - docker-php-ext-enable pcov
     - echo -e "\e[0Ksection_end:`date +%s`:php_ext_install\r\e[0K"
   after_script:
diff --git a/README.md b/README.md
@@ -184,7 +184,7 @@ You can run specific tests by passing a path to the test file or PHPUnit CLI
 option (`--filter`, `--group`, etc.) to the `ahoy test` command:
 
 ```bash
-ahoy test-unit tests/src/Unit/MyUnitTest.php
+ahoy test-unit ../tests/src/Unit/MyUnitTest.php
 ahoy test-unit -- --group=wip
 ```
 
diff --git a/config/install/core.entity_form_display.node.rac.default.yml b/config/install/core.entity_form_display.node.rac.default.yml
@@ -2,7 +2,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.node.rac.body
     - field.field.node.rac.field_rules
     - field.field.node.rac.field_webform
     - node.type.rac
@@ -16,16 +15,6 @@ targetEntityType: node
 bundle: rac
 mode: default
 content:
-  body:
-    type: text_textarea_with_summary
-    weight: 121
-    region: content
-    settings:
-      rows: 9
-      summary_rows: 3
-      placeholder: ''
-      show_summary: false
-    third_party_settings: {  }
   created:
     type: datetime_timestamp
     weight: 10
diff --git a/config/install/core.entity_view_display.node.rac.default.yml b/config/install/core.entity_view_display.node.rac.default.yml
@@ -2,7 +2,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.node.rac.body
     - field.field.node.rac.field_rules
     - field.field.node.rac.field_webform
     - node.type.rac
@@ -16,13 +15,6 @@ targetEntityType: node
 bundle: rac
 mode: default
 content:
-  body:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
   field_rules:
     type: entity_reference_revisions_entity_view
     label: visually_hidden
diff --git a/config/install/field.field.node.rac.body.yml b/config/install/field.field.node.rac.body.yml
diff --git a/config/install/field.storage.node.field_rules.yml b/config/install/field.storage.node.field_rules.yml
@@ -1,4 +1,3 @@
-uuid: 00ad54a1-2ed3-4870-a278-b31cf1c07f8a
 langcode: en
 status: true
 dependencies:
diff --git a/config/install/field.storage.node.field_webform.yml b/config/install/field.storage.node.field_webform.yml
@@ -1,4 +1,3 @@
-uuid: 69a3486a-67ec-4e21-9df9-9d6ccb7e3ba0
 langcode: en
 status: true
 dependencies:
diff --git a/config/install/field.storage.paragraph.field_redirect_to.yml b/config/install/field.storage.paragraph.field_redirect_to.yml
@@ -1,4 +1,3 @@
-uuid: f26533ec-0af5-4c6d-8b7f-c0cbe6508cac
 langcode: en
 status: true
 dependencies:
diff --git a/config/install/field.storage.paragraph.field_value.yml b/config/install/field.storage.paragraph.field_value.yml
@@ -1,4 +1,3 @@
-uuid: a40ba023-bbae-42c3-b89c-fa3433944176
 langcode: en
 status: true
 dependencies:
diff --git a/config/install/field.storage.paragraph.field_variable.yml b/config/install/field.storage.paragraph.field_variable.yml
@@ -1,4 +1,3 @@
-uuid: 57e232dd-b12b-415a-8ac4-c7572859867a
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/core.entity_view_display.node.rac.teaser.yml b/config/optional/core.entity_view_display.node.rac.teaser.yml
@@ -3,7 +3,6 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.teaser
-    - field.field.node.rac.body
     - field.field.node.rac.field_rules
     - field.field.node.rac.field_webform
     - node.type.rac
@@ -15,14 +14,6 @@ targetEntityType: node
 bundle: rac
 mode: teaser
 content:
-  body:
-    type: text_summary_or_trimmed
-    label: hidden
-    settings:
-      trim_length: 600
-    third_party_settings: {  }
-    weight: 101
-    region: content
   links:
     settings: {  }
     third_party_settings: {  }
diff --git a/src/RacContentHelper.php b/src/RacContentHelper.php
@@ -140,7 +140,7 @@ protected function findRacRulesForWebform(string $webform_id): ?array {
       ) {
         continue;
       }
-      /** @var \Drupal\node\NodeInterface[] */
+      /** @var \Drupal\node\NodeInterface[] $redirect_nodes */
       $redirect_nodes = $redirect_to->referencedEntities();
       $redirect_node = reset($redirect_nodes);
       if (!$redirect_node instanceof NodeInterface) {
diff --git a/tests/src/Kernel/BaseKernelTest.php b/tests/src/Kernel/BaseKernelTest.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\Tests\webform_openfisca\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Base class for kernel tests.
+ */
+class BaseKernelTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'file',
+    'field',
+    'menu_ui',
+    'options',
+    'path',
+    'path_alias',
+    'serialization',
+    'system',
+    'text',
+    'node',
+    'user',
+    'entity_reference_revisions',
+    'paragraphs',
+    'token',
+    'webform',
+    'webform_ui',
+    'webform_openfisca',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() : void {
+    parent::setUp();
+    $this->installEntitySchema('file');
+    $this->installSchema('user', ['users_data']);
+    $this->installConfig(['user']);
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('path_alias');
+    $this->installEntitySchema('node');
+    $this->installConfig(['paragraphs']);
+    $this->installEntitySchema('paragraph');
+    $this->installSchema('webform', ['webform']);
+    $this->installConfig(['webform']);
+    $this->installEntitySchema('webform_submission');
+    $this->installConfig(['webform_openfisca']);
+  }
+
+}
diff --git a/tests/src/Kernel/RacContentHelperKernelTest.php b/tests/src/Kernel/RacContentHelperKernelTest.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\Tests\webform_openfisca\Kernel;
+
+/**
+ * Kernel test for the RacContentHelper service.
+ *
+ * @group webform_openfisca
+ * @coversDefaultClass \Drupal\webform_openfisca\RacContentHelper
+ */
+class RacContentHelperKernelTest extends BaseKernelTest {
+
+  /**
+   * Test the RacContentHelper service.
+   *
+   * @coversDefaultClass \Drupal\webform_openfisca\RacContentHelper
+   * @covers \Drupal\webform_openfisca\RacContentHelper::__construct
+   * @covers \Drupal\webform_openfisca\RacContentHelper::findRacRedirectForWebform
+   */
+  public function testRacContentHelper(): void {
+    /** @var \Drupal\webform_openfisca\RacContentHelper $helper */
+    $helper = \Drupal::service('webform_openfisca.rac_helper');
+    $redirect = $helper->findRacRedirectForWebform('test', ['123']);
+    $this->assertNull($redirect);
+    $this->assertEmpty($redirect);
+  }
+
+}
diff --git a/tests/src/Unit/BaseUnitTest.php b/tests/src/Unit/BaseUnitTest.php
@@ -9,6 +9,7 @@
 use Drupal\Core\Logger\LoggerChannelInterface;
 use Drupal\Core\Serialization\Yaml;
 use Drupal\Core\Theme\ThemeManagerInterface;
+use Drupal\Tests\UnitTestCase;
 use Drupal\webform\WebformInterface;
 use Drupal\webform_openfisca\OpenFisca\ClientFactory;
 use Drupal\webform_openfisca\OpenFisca\ClientFactoryInterface;
@@ -22,9 +23,9 @@
 use Psr\Http\Message\StreamInterface;
 
 /**
- * Trait with helper methods for unit testing.
+ * Base class for unit tests.
  */
-trait UnitTestTrait {
+class BaseUnitTest extends UnitTestCase {
 
   /**
    * Mock an OpenFisca Client Factory service.
diff --git a/tests/src/Unit/OpenFiscaClientFactoryUnitTest.php b/tests/src/Unit/OpenFiscaClientFactoryUnitTest.php
@@ -4,7 +4,6 @@
 
 namespace Drupal\Tests\webform_openfisca\Unit;
 
-use Drupal\Tests\UnitTestCase;
 use Drupal\webform_openfisca\OpenFisca\ClientInterface;
 
 /**
@@ -13,9 +12,7 @@
  * @group webform_openfisca
  * @coversDefaultClass \Drupal\webform_openfisca\OpenFisca\ClientFactory
  */
-class OpenFiscaClientFactoryUnitTest extends UnitTestCase {
-
-  use UnitTestTrait;
+class OpenFiscaClientFactoryUnitTest extends BaseUnitTest {
 
   /**
    * Tests the create() method of OpenFisca Client Factory.
diff --git a/tests/src/Unit/OpenFiscaClientUnitTest.php b/tests/src/Unit/OpenFiscaClientUnitTest.php
@@ -5,7 +5,6 @@
 namespace Drupal\Tests\webform_openfisca\Unit;
 
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Tests\UnitTestCase;
 use Drupal\webform_openfisca\OpenFisca\Client;
 use Drupal\webform_openfisca\OpenFisca\Helper;
 
@@ -15,9 +14,7 @@
  * @group webform_openfisca
  * @coversDefaultClass \Drupal\webform_openfisca\OpenFisca\Client
  */
-class OpenFiscaClientUnitTest extends UnitTestCase {
-
-  use UnitTestTrait;
+class OpenFiscaClientUnitTest extends BaseUnitTest {
 
   /**
    * Tests the get() method of OpenFisca Client.
diff --git a/tests/src/Unit/OpenFiscaHelperUnitTest.php b/tests/src/Unit/OpenFiscaHelperUnitTest.php
@@ -7,7 +7,6 @@
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Tests\UnitTestCase;
 use Drupal\webform_openfisca\OpenFisca\Helper;
 
 /**
@@ -16,7 +15,7 @@
  * @group webform_openfisca
  * @coversDefaultClass \Drupal\webform_openfisca\OpenFisca\Helper
  */
-class OpenFiscaHelperUnitTest extends UnitTestCase {
+class OpenFiscaHelperUnitTest extends BaseUnitTest {
 
   /**
    * {@inheritDoc}
diff --git a/tests/src/Unit/OpenFiscaPayloadUnitTest.php b/tests/src/Unit/OpenFiscaPayloadUnitTest.php
@@ -4,7 +4,6 @@
 
 namespace Drupal\Tests\webform_openfisca\Unit;
 
-use Drupal\Tests\UnitTestCase;
 use Drupal\webform_openfisca\OpenFisca\Payload\RequestPayload;
 use Drupal\webform_openfisca\OpenFisca\Payload\ResponsePayload;
 use Psr\Http\Message\ResponseInterface;
@@ -16,9 +15,7 @@
  * @group webform_openfisca
  * @coversDefaultClass \Drupal\webform_openfisca\OpenFisca\Payload
  */
-class OpenFiscaPayloadUnitTest extends UnitTestCase {
-
-  use UnitTestTrait;
+class OpenFiscaPayloadUnitTest extends BaseUnitTest {
 
   /**
    * Tests the OpenFisca RequestPayload.
diff --git a/tests/src/Unit/WebformOpenFiscaSettingsUnitTest.php b/tests/src/Unit/WebformOpenFiscaSettingsUnitTest.php
@@ -15,8 +15,6 @@
  */
 class WebformOpenFiscaSettingsUnitTest extends OpenFiscaHelperUnitTest {
 
-  use UnitTestTrait;
-
   /**
    * Tests the WebformOpenFiscaSettings class.
    */

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-uuid: 00ad54a1-2ed3-4870-a278-b31cf1c07f8a`
`2`	`1`	`langcode: en`
`3`	`2`	`status: true`
`4`	`3`	`dependencies:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-uuid: 69a3486a-67ec-4e21-9df9-9d6ccb7e3ba0`
`2`	`1`	`langcode: en`
`3`	`2`	`status: true`
`4`	`3`	`dependencies:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-uuid: f26533ec-0af5-4c6d-8b7f-c0cbe6508cac`
`2`	`1`	`langcode: en`
`3`	`2`	`status: true`
`4`	`3`	`dependencies:`