From fc2cb8ecf543a327959c667c574c1affc7089a2d Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Fri, 25 Oct 2024 19:49:26 +0530 Subject: [PATCH 1/3] ACMS-4288: Remove SKIP_INTEGRATED_TEST_ON_LATEST_EOL_MAJOR_PHP8 variable as added in GitLab Orca project. --- modules/acquia_cms_headless/.gitlab-ci.yml | 1 - modules/acquia_cms_site_studio/.gitlab-ci.yml | 4 ---- 2 files changed, 5 deletions(-) diff --git a/modules/acquia_cms_headless/.gitlab-ci.yml b/modules/acquia_cms_headless/.gitlab-ci.yml index 59fb5790d..fdf272bff 100644 --- a/modules/acquia_cms_headless/.gitlab-ci.yml +++ b/modules/acquia_cms_headless/.gitlab-ci.yml @@ -21,4 +21,3 @@ variables: COMPOSER_PATCHES_FILE: $CI_PROJECT_DIR/.gitlab-ci/patches/patches.json SKIP_INTEGRATED_TEST_ON_LATEST_EOL_MAJOR: 1 - SKIP_INTEGRATED_TEST_ON_LATEST_EOL_MAJOR_PHP8: 1 diff --git a/modules/acquia_cms_site_studio/.gitlab-ci.yml b/modules/acquia_cms_site_studio/.gitlab-ci.yml index f0a783a67..bc13ff05d 100644 --- a/modules/acquia_cms_site_studio/.gitlab-ci.yml +++ b/modules/acquia_cms_site_studio/.gitlab-ci.yml @@ -22,12 +22,8 @@ variables: # Site Studio 8.0.x doesn't support 9.5.x, hence skipping 9.5.x CI jobs now SKIP_INTEGRATED_TEST_ON_LATEST_EOL_MAJOR: 1 - SKIP_INTEGRATED_TEST_ON_LATEST_EOL_MAJOR_PHP8: 1 # Do not add patch for latest EOL Major i.e 9.5.x as it's working as expected. INTEGRATED_TEST_ON_LATEST_EOL_MAJOR: variables: COMPOSER_PATCHES_FILE: "" -INTEGRATED_TEST_ON_LATEST_EOL_MAJOR_PHP8: - variables: - COMPOSER_PATCHES_FILE: "" From fd331fae6a9df06f3f9fdd663dd4db1aba79877f Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Fri, 25 Oct 2024 19:58:31 +0530 Subject: [PATCH 2/3] ACMS-4288: Skip code covearge for component. --- modules/acquia_cms_component/.gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/acquia_cms_component/.gitlab-ci.yml b/modules/acquia_cms_component/.gitlab-ci.yml index bb677688a..a1eaa71f0 100644 --- a/modules/acquia_cms_component/.gitlab-ci.yml +++ b/modules/acquia_cms_component/.gitlab-ci.yml @@ -18,3 +18,5 @@ variables: # Coverage report ORCA_SUT_DIR: "$CI_PROJECT_DIR/../acquia_cms_component" ORCA_JUNIT_LOG: "$CI_PROJECT_DIR/var/logs/junit.xml" + # Exclude the code coverage, as tests have not been written yet. + SKIP_ISOLATED_TEST_ON_CURRENT_COVERAGE_PHP83: 1 From 34bddb219daf979118c60acf6ca8933fa6a2f34c Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Fri, 25 Oct 2024 20:06:31 +0530 Subject: [PATCH 3/3] ACMS-4288: Fix Headless failing test with D11. --- .../tests/src/Traits/HeadlessNextJsTrait.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/acquia_cms_headless/tests/src/Traits/HeadlessNextJsTrait.php b/modules/acquia_cms_headless/tests/src/Traits/HeadlessNextJsTrait.php index 9b8f1ab6d..50fcddb41 100644 --- a/modules/acquia_cms_headless/tests/src/Traits/HeadlessNextJsTrait.php +++ b/modules/acquia_cms_headless/tests/src/Traits/HeadlessNextJsTrait.php @@ -66,11 +66,15 @@ protected function assertNextJsEntityTypeConfigure(): void { $assert = $this->assertSession(); $page = $this->getSession()->getPage(); $this->drupalGet("admin/config/services/next/entity-types/add"); - $assert->selectExists('id')->selectOption('node.test'); - $assert->waitForElementVisible('css', '.settings-container'); + $assert->selectExists('Entity type')->selectOption('node.test'); $this->assertTrue($assert->optionExists('id', 'node.test')->isSelected()); + $assert->buttonExists('Save')->press(); + $this->drupalGet("admin/config/services/next/entity-types/node.test/edit"); + $assert->waitForText('Settings'); + $assert->waitForText('Configure draft mode for this entity type.'); $assert->selectExists('site_resolver')->selectOption('site_selector'); $assert->assertWaitOnAjaxRequest(); + $assert->buttonExists('Save')->press(); $assert->waitForText('Next.js sites'); $this->assertTrue($assert->optionExists('site_resolver', 'site_selector')->isSelected()); $page->checkField('sites[headless_site_one]');