From 653a385837d8b2ea4b999e9bef45ee1946f9fb5b Mon Sep 17 00:00:00 2001
From: Pieter Frenssen <pieter@frenssen.be>
Date: Tue, 14 Jan 2025 20:06:21 +0200
Subject: [PATCH 1/2] Run tests against Drupal 11 and the maximum supported PHP
version.
---
.gitlab-ci.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1023f2..a5143af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,12 +12,11 @@ include:
- '/includes/include.drupalci.workflows.yml'
variables:
- _TARGET_PHP: "8.2"
+ OPT_IN_TEST_PREVIOUS_MAJOR: 1
+ OPT_IN_TEST_MAX_PHP: 1
SYMFONY_DEPRECATIONS_HELPER: weak
- SKIP_STYLELINT: "1"
- SKIP_ESLINT: "1"
- # Keep testing on Drupal 10.
- CORE_STABLE: 10.3.6
+ SKIP_STYLELINT: 1
+ SKIP_ESLINT: 1
documentation:
stage: build
--
GitLab
From bb2a8fbc6d6233807a29d3bf613a1307202c2dec Mon Sep 17 00:00:00 2001
From: Pieter Frenssen <pieter@frenssen.be>
Date: Wed, 15 Jan 2025 13:11:14 +0200
Subject: [PATCH 2/2] Fix tests on Drupal 11.
---
tests/src/Kernel/AccessCheckTest.php | 2 +-
.../BreadcrumbExtensionTest.php | 0
.../EntityQueryExtensionTest.php | 6 +++---
.../ImageExtensionTest.php | 0
.../RoutingExtensionTest.php | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename tests/src/Kernel/{SchemaExtensions => SchemaExtension}/BreadcrumbExtensionTest.php (100%)
rename tests/src/Kernel/{SchemaExtensions => SchemaExtension}/EntityQueryExtensionTest.php (99%)
rename tests/src/Kernel/{SchemaExtensions => SchemaExtension}/ImageExtensionTest.php (100%)
rename tests/src/Kernel/{SchemaExtensions => SchemaExtension}/RoutingExtensionTest.php (100%)
diff --git a/tests/src/Kernel/AccessCheckTest.php b/tests/src/Kernel/AccessCheckTest.php
index 3eb769b..b6fca58 100644
--- a/tests/src/Kernel/AccessCheckTest.php
+++ b/tests/src/Kernel/AccessCheckTest.php
@@ -54,7 +54,7 @@ class AccessCheckTest extends CoreComposableKernelTestBase {
['target_bundles' => ['tag' => 'tag', 'location' => 'location']],
6
);
- $editorUser = $this->createUser(['name' => 'John Editor']);
+ $editorUser = $this->createUser([], 'John Editor');
$user = $this->setUpCurrentUser();
$role = $this->createRole(['access content']);
diff --git a/tests/src/Kernel/SchemaExtensions/BreadcrumbExtensionTest.php b/tests/src/Kernel/SchemaExtension/BreadcrumbExtensionTest.php
similarity index 100%
rename from tests/src/Kernel/SchemaExtensions/BreadcrumbExtensionTest.php
rename to tests/src/Kernel/SchemaExtension/BreadcrumbExtensionTest.php
diff --git a/tests/src/Kernel/SchemaExtensions/EntityQueryExtensionTest.php b/tests/src/Kernel/SchemaExtension/EntityQueryExtensionTest.php
similarity index 99%
rename from tests/src/Kernel/SchemaExtensions/EntityQueryExtensionTest.php
rename to tests/src/Kernel/SchemaExtension/EntityQueryExtensionTest.php
index b782e9c..86aec23 100644
--- a/tests/src/Kernel/SchemaExtensions/EntityQueryExtensionTest.php
+++ b/tests/src/Kernel/SchemaExtension/EntityQueryExtensionTest.php
@@ -532,9 +532,9 @@ GQL;
* Test that access checks are performed.
*/
public function testAccessCheckForUser(): void {
- $this->createUser(['name' => 'User A']);
- $this->createUser(['name' => 'User B']);
- $this->createUser(['name' => 'User C']);
+ $this->createUser([], 'User A');
+ $this->createUser([], 'User B');
+ $this->createUser([], 'User C');
$user = $this->setUpCurrentUser();
$role = $this->createRole(['access content']);
diff --git a/tests/src/Kernel/SchemaExtensions/ImageExtensionTest.php b/tests/src/Kernel/SchemaExtension/ImageExtensionTest.php
similarity index 100%
rename from tests/src/Kernel/SchemaExtensions/ImageExtensionTest.php
rename to tests/src/Kernel/SchemaExtension/ImageExtensionTest.php
diff --git a/tests/src/Kernel/SchemaExtensions/RoutingExtensionTest.php b/tests/src/Kernel/SchemaExtension/RoutingExtensionTest.php
similarity index 100%
rename from tests/src/Kernel/SchemaExtensions/RoutingExtensionTest.php
rename to tests/src/Kernel/SchemaExtension/RoutingExtensionTest.php
--
GitLab