From a71244598b5df7708d989648cc7a498e08cb15c9 Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Thu, 19 Dec 2024 08:26:52 -0800 Subject: [PATCH 1/2] Drupal 11.4 update --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 5cf241973..9bf162435 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ "drupal/config_split": "^2.0", "drupal/confirm_leave": "^1.0@beta", "drupal/content_lock": "^2.2", - "drupal/core": "~10.3.0", + "drupal/core": "~10.4.0", "drupal/cshs": "^4.0", "drupal/default_content": "^2.0@alpha", "drupal/diff": "^1.3", @@ -183,9 +183,6 @@ } }, "patches": { - "drupal/google_analytics": { - "https://www.drupal.org/project/google_analytics/issues/3373921": "https://www.drupal.org/files/issues/2023-08-07/google-analytics-issues-3373921-cannot-install-from-existing-config-11.patch" - }, "drupal/hook_event_dispatcher": { "https://www.drupal.org/project/hook_event_dispatcher/issues/3354751": "https://www.drupal.org/files/issues/2024-03-14/hook_event_dispatcher-4.x-3354751-7.patch" }, From 9c3087b88718f1c12ca8b7ba27de8aa0b9ddc830 Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Thu, 19 Dec 2024 09:17:41 -0800 Subject: [PATCH 2/2] Updated tests --- tests/codeception/acceptance/SystemCest.php | 2 +- .../codeception/functional/Content/BasicPageParagraphsCest.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/codeception/acceptance/SystemCest.php b/tests/codeception/acceptance/SystemCest.php index 3e94b6bb6..9eeb682a7 100644 --- a/tests/codeception/acceptance/SystemCest.php +++ b/tests/codeception/acceptance/SystemCest.php @@ -14,7 +14,7 @@ public function testSiteStatus(AcceptanceTester $I) { $I->runDrush('xmlsitemap:rebuild'); $I->logInWithRole('administrator'); $I->amOnPage('/admin/reports/status'); - $I->canSee('10.3', '.system-status-general-info'); + $I->canSee('10.4', '.system-status-general-info'); if ($I->grabMultiple('.system-status-counter--error')) { $I->canSee('1 Error', '.system-status-counter--error'); $I->canSee('Access to update.php ', '.system-status-report__status-icon--error'); diff --git a/tests/codeception/functional/Content/BasicPageParagraphsCest.php b/tests/codeception/functional/Content/BasicPageParagraphsCest.php index e56c6f628..e66c7862c 100644 --- a/tests/codeception/functional/Content/BasicPageParagraphsCest.php +++ b/tests/codeception/functional/Content/BasicPageParagraphsCest.php @@ -4,6 +4,8 @@ /** * Test for the basic page content type. + * + * @group basic-page */ class BasicPageParagraphsCest {