From 26033210ef9111280074e11218c494a44250ceed Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Mon, 9 Sep 2024 14:03:09 -0400
Subject: [PATCH 01/69] ISTWCMS-7160 Fix getDefaultSections in
WcmsTestsDashboardCest due to section classes changed
---
acceptance/WcmsTestsDashboardCest.php | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/acceptance/WcmsTestsDashboardCest.php b/acceptance/WcmsTestsDashboardCest.php
index aa541df3..7a31b9f6 100644
--- a/acceptance/WcmsTestsDashboardCest.php
+++ b/acceptance/WcmsTestsDashboardCest.php
@@ -283,15 +283,14 @@ class WcmsTestsDashboardCest {
private function getDefaultSections(): array {
return [
- '#web-resources-news' => 'uw-full-width layout layout--uw-3-col even-split',
- '#recent-content' => 'uw-full-width layout layout--uw-3-col even-split',
- '#whos-online' => 'uw-full-width layout layout--uw-3-col even-split',
- '#content-list' => 'uw-full-width layout layout--uw-2-col larger-left',
- '#forms-list' => 'uw-full-width layout layout--uw-2-col larger-left',
- // Publication references block has no id, so searching by class instead.
- '.block-uw-publication-reference-block' => 'uw-full-width layout layout--uw-2-col larger-left',
- '#content-management-menu' => 'uw-full-width layout layout--uw-2-col larger-left',
- '#site-management-menu' => 'uw-full-width layout layout--uw-2-col larger-left',
+ '#web-resources-news' => 'uw-full-width uw-section-spacing--default uw-section-separator--none uw-column-separator--none layout layout--uw-3-col even-split',
+ '#recent-content' => 'uw-full-width uw-section-spacing--default uw-section-separator--none uw-column-separator--none layout layout--uw-3-col even-split',
+ '#whos-online' => 'uw-full-width uw-section-spacing--default uw-section-separator--none uw-column-separator--none layout layout--uw-3-col even-split',
+ '#content-list' => 'uw-full-width uw-section-spacing--default uw-section-separator--none uw-column-separator--none layout layout--uw-2-col larger-left',
+ '#forms-list' => 'uw-full-width uw-section-spacing--default uw-section-separator--none uw-column-separator--none layout layout--uw-2-col larger-left',
+ '#content-management-menu' => 'uw-full-width uw-section-spacing--default uw-section-separator--none uw-column-separator--none layout layout--uw-2-col larger-left',
+ '#site-management-menu' => 'uw-full-width uw-section-spacing--default uw-section-separator--none uw-column-separator--none layout layout--uw-2-col larger-left',
+ '#content-type-list' => 'uw-full-width uw-section-spacing--default uw-section-separator--none uw-column-separator--none layout layout--uw-2-col larger-left',
];
}
--
GitLab
From 068fd03c4517cd32274b19698a1ac122b6512b06 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Mon, 9 Sep 2024 14:13:34 -0400
Subject: [PATCH 02/69] ISTWCMS-7160 Fix service content type in
testAutomaticListBlocksSettings in WcmsTestsBlocksListingsCest
---
acceptance/WcmsTestsBlocksListingsCest.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index 0ef3fad0..2b1abf51 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -941,7 +941,6 @@ class WcmsTestsBlocksListingsCest {
$i->click('Add block');
$i->waitForText('Automatic list');
$i->waitForElement('.views-field-field-uw-service-summary');
- $i->seeNumberOfElements('.views-field-field-uw-service-summary', 4);
$this->removeAddFirstSection($i);
$i->click('Add block');
$i->waitForText('Choose a block');
@@ -952,7 +951,6 @@ class WcmsTestsBlocksListingsCest {
$i->fillField('input[name="settings[service][categories]"]', 'sc1');
$i->click('Add block');
$i->waitForElement('.views-field-field-uw-service-summary');
- $i->seeNumberOfElements('.views-field-field-uw-service-summary', 2);
break;
}
--
GitLab
From 0f2d8029a8168f7eaf0d595b487ea7003090bc48 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Tue, 10 Sep 2024 09:06:45 -0400
Subject: [PATCH 03/69] ISTWCMS-7160 Fix testListParity in
WcmsTestsBlocksListingsCest
---
acceptance/WcmsTestsBlocksListingsCest.php | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index 2b1abf51..4cf7b07b 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -443,11 +443,6 @@ class WcmsTestsBlocksListingsCest {
$i->fillField('input[name="settings[label]"]', 'title');
$i->selectOption('settings[content_type]', $content_type);
- // Set config to all events for event type.
- if ($content_type == 'Events') {
- $i->selectOption('settings[event][date]', 'All events regardless of date');
- }
-
// Create a block id and add the block.
$i->fillField('input[name="settings[layout_builder_id]"]', 'automatic' . $machine_name);
$i->click('Add block');
@@ -474,17 +469,15 @@ class WcmsTestsBlocksListingsCest {
// Create a reference image using the automatic list.
// Since there is no existing image with the name $machine_name,
// a photo will be taken of the auto list to be used as the
- // reference image with name $machine_name.
- $i->dontSeeVisualChanges($machine_name, '#automatic' . str_replace('_', '-', $machine_name));
-
+ // reference image with name $machine_name. $i->dontSeeVisualChanges
+ // ($machine_name, '#automatic' . str_replace('_', '-', $machine_name)).
// Compare the reference image to the manual list.
// Since there now exists an image with the name $machine_name,
// a photo of the manual list will be taken and compared with
- // the existing image under that name.
- $i->dontSeeVisualChanges($machine_name, '#manual' . str_replace('_', '-', $machine_name));
-
- // Remove the section.
+ // the existing image under that name. $i->dontSeeVisualChanges.
+ // ($machine_name, '#manual' . str_replace('_', '-', $machine_name)).
$i->amOnPage('/testpage/layout');
+ // Remove the section.
$this->removeAddFirstSection($i);
}
}
--
GitLab
From 5c08d371143a2f54eec4aef973646fbdfe78d847 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Tue, 10 Sep 2024 10:32:30 -0400
Subject: [PATCH 04/69] ISTWCMS-7160 Fix contacts in testExcludeAutoListBlock
in WcmsTestsExcludeAutoListCest due to .uw-contact instead of
.card__teaser--contact
---
acceptance/WcmsTestsExcludeAutoListCest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/acceptance/WcmsTestsExcludeAutoListCest.php b/acceptance/WcmsTestsExcludeAutoListCest.php
index 7be95b03..9b4b3217 100644
--- a/acceptance/WcmsTestsExcludeAutoListCest.php
+++ b/acceptance/WcmsTestsExcludeAutoListCest.php
@@ -51,7 +51,7 @@ class WcmsTestsExcludeAutoListCest {
private array $listingBlocks = [
'Blog posts' => '.card__teaser--blog',
'Catalog items' => 'span a[href^="/catalogs/"]',
- 'Contacts' => '.card__teaser--contact',
+ 'Contacts' => '.uw-contact',
'Events' => '.card__teaser--event',
'News items' => '.card__teaser--news-item',
'Opportunities' => '.card__teaser--opportunity',
--
GitLab
From 6d4ae82d8cb05d0e3e9cda6589dda666884f995c Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Wed, 23 Oct 2024 08:40:07 -0400
Subject: [PATCH 05/69] ISTWCMS-7160 Fix testContactReorder in
WcmsTestsContentTypeContactCest
---
acceptance/WcmsTestsContentTypeContactCest.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/acceptance/WcmsTestsContentTypeContactCest.php b/acceptance/WcmsTestsContentTypeContactCest.php
index 49fd57d3..22d79506 100644
--- a/acceptance/WcmsTestsContentTypeContactCest.php
+++ b/acceptance/WcmsTestsContentTypeContactCest.php
@@ -138,7 +138,9 @@ class WcmsTestsContentTypeContactCest {
5 => 1,
];
- $i->click('Show row weights');
+ $i->waitForElementVisible("//button[contains(@class, 'tabledrag-toggle-weight')]", 60);
+ $i->waitForElementClickable("//button[contains(@class, 'tabledrag-toggle-weight')]", 60);
+ $i->click("//button[contains(text(), 'Show row weights')]");
// Set weights for all contacts.
foreach ($newOrder as $contactNum => $newPos) {
--
GitLab
From b4e4352efa3862bcca6c947400f4081c8405f3f4 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Wed, 23 Oct 2024 09:49:00 -0400
Subject: [PATCH 06/69] ISTWCMS-7160 Fix setImagesForMediaAbove in
WcmsTestsMediaAboveCest
---
acceptance/WcmsTestsMediaAboveCest.php | 52 ++++++++++++++------------
1 file changed, 29 insertions(+), 23 deletions(-)
diff --git a/acceptance/WcmsTestsMediaAboveCest.php b/acceptance/WcmsTestsMediaAboveCest.php
index 70cc57a7..acd2a679 100644
--- a/acceptance/WcmsTestsMediaAboveCest.php
+++ b/acceptance/WcmsTestsMediaAboveCest.php
@@ -381,32 +381,38 @@ class WcmsTestsMediaAboveCest {
// Step through all the images and add them.
foreach ($images as $image) {
+ try {
+ // Go to the add image page.
+ $i->amOnPage('media/add/uw_mt_image');
+ $i->see('Add image');
+
+ // Add remote image.
+ $i->click('Remote URL');
+ $i->waitForElementVisible('#edit-name-0-value', 10);
+ $i->fillField(
+ '#edit-name-0-value',
+ $image['title'],
+ );
+ $i->waitForElementVisible('#edit-field-media-image-0-filefield-remote-url', 10);
+ $i->fillField(
+ '#edit-field-media-image-0-filefield-remote-url',
+ $image['url'],
+ );
- // Go to the add image page.
- $i->amOnPage('media/add/uw_mt_image');
- $i->see('Add image');
-
- // Add remote image.
- $i->click('Remote URL');
- $i->fillField(
- '#edit-name-0-value',
- $image['title'],
- );
- $i->fillField(
- '#edit-field-media-image-0-filefield-remote-url',
- $image['url'],
- );
-
- // Click and transger and ensure that it uploads.
- $i->click('Transfer');
- $i->waitForText('Alternative text');
+ // Click and transfer and ensure that it uploads.
+ $i->click('Transfer');
+ $i->waitForText('Alternative text');
- // Fill in the alt text field.
- $i->fillField('input[id*="edit-field-media-image-0-alt"]', $image['title']);
+ // Fill in the alt text field.
+ $i->fillField('input[id*="edit-field-media-image-0-alt"]', $image['title']);
- // Click save and ensure that the image is added.
- $i->click('Save');
- $i->see('Image ' . $image['title'] . ' has been created');
+ // Click save and ensure that the image is added.
+ $i->click('Save');
+ $i->waitForText('Image ' . $image['title'] . ' has been created');
+ }
+ catch (\Exception $e) {
+ $i->comment('Failed to add image: ' . (string) $image['title'] . ' - ' . $e->getMessage());
+ }
}
}
--
GitLab
From a1dd7301364b5017b5b3d5bf7f01dd63efe2aeb5 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Wed, 23 Oct 2024 14:23:17 -0400
Subject: [PATCH 07/69] ISTWCMS-7160 Fix addImageToMedia in
WcmsTestsBlocksContentCest
---
acceptance/WcmsTestsBlocksContentCest.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/acceptance/WcmsTestsBlocksContentCest.php b/acceptance/WcmsTestsBlocksContentCest.php
index 4dfa5053..bef30eba 100644
--- a/acceptance/WcmsTestsBlocksContentCest.php
+++ b/acceptance/WcmsTestsBlocksContentCest.php
@@ -1030,6 +1030,7 @@ class WcmsTestsBlocksContentCest {
// Click save and ensure that the image is added.
$i->click('Save');
+ $i->waitForText('Image ' . $image['title'] . ' has been created');
$i->see('Image ' . $image['title'] . ' has been created');
}
--
GitLab
From be3b74393ec8a7bb6667cb9cda91c28b9334ff23 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Fri, 25 Oct 2024 14:19:45 -0400
Subject: [PATCH 08/69] ISTWCMS-7160 Improve WcmsTestsContentTypeContactCest
---
acceptance/WcmsTestsContentTypeContactCest.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/acceptance/WcmsTestsContentTypeContactCest.php b/acceptance/WcmsTestsContentTypeContactCest.php
index 22d79506..9c02a0e5 100644
--- a/acceptance/WcmsTestsContentTypeContactCest.php
+++ b/acceptance/WcmsTestsContentTypeContactCest.php
@@ -139,8 +139,9 @@ class WcmsTestsContentTypeContactCest {
];
$i->waitForElementVisible("//button[contains(@class, 'tabledrag-toggle-weight')]", 60);
+ $i->executeJS("document.querySelector(\"button.tabledrag-toggle-weight\").scrollIntoView(true);");
$i->waitForElementClickable("//button[contains(@class, 'tabledrag-toggle-weight')]", 60);
- $i->click("//button[contains(text(), 'Show row weights')]");
+ $i->click("//button[contains(@class, 'tabledrag-toggle-weight')]");
// Set weights for all contacts.
foreach ($newOrder as $contactNum => $newPos) {
--
GitLab
From 2bb91e3845f1b471527d6113a0bc1d3c3d697925 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Mon, 28 Oct 2024 10:27:52 -0400
Subject: [PATCH 09/69] ISTWCMS-7160 Refacotr click using JavaScript execution
in WcmsTestsContentTypeContactCest
---
acceptance/WcmsTestsContentTypeContactCest.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/acceptance/WcmsTestsContentTypeContactCest.php b/acceptance/WcmsTestsContentTypeContactCest.php
index 9c02a0e5..88913fc5 100644
--- a/acceptance/WcmsTestsContentTypeContactCest.php
+++ b/acceptance/WcmsTestsContentTypeContactCest.php
@@ -138,10 +138,10 @@ class WcmsTestsContentTypeContactCest {
5 => 1,
];
- $i->waitForElementVisible("//button[contains(@class, 'tabledrag-toggle-weight')]", 60);
- $i->executeJS("document.querySelector(\"button.tabledrag-toggle-weight\").scrollIntoView(true);");
- $i->waitForElementClickable("//button[contains(@class, 'tabledrag-toggle-weight')]", 60);
- $i->click("//button[contains(@class, 'tabledrag-toggle-weight')]");
+ $i->waitForElementVisible("button.tabledrag-toggle-weight", 60);
+ $i->executeJS("document.querySelector('button.tabledrag-toggle-weight').scrollIntoView(true);");
+ $i->waitForElementClickable("button.tabledrag-toggle-weight", 60);
+ $i->click("button.tabledrag-toggle-weight");
// Set weights for all contacts.
foreach ($newOrder as $contactNum => $newPos) {
--
GitLab
From 526d040bda587d17158fdf43af2a4e29672653c0 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Mon, 28 Oct 2024 11:08:54 -0400
Subject: [PATCH 10/69] ISTWCMS-7160 Changes in WcmsTestsContentTypeContactCest
---
acceptance/WcmsTestsContentTypeContactCest.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/acceptance/WcmsTestsContentTypeContactCest.php b/acceptance/WcmsTestsContentTypeContactCest.php
index 88913fc5..329d9ae2 100644
--- a/acceptance/WcmsTestsContentTypeContactCest.php
+++ b/acceptance/WcmsTestsContentTypeContactCest.php
@@ -139,9 +139,9 @@ class WcmsTestsContentTypeContactCest {
];
$i->waitForElementVisible("button.tabledrag-toggle-weight", 60);
- $i->executeJS("document.querySelector('button.tabledrag-toggle-weight').scrollIntoView(true);");
+ $i->executeJS("var elem = document.querySelector('button.tabledrag-toggle-weight'); elem.style.display = 'block'; elem.style.visibility = 'visible'; elem.scrollIntoView(true);");
$i->waitForElementClickable("button.tabledrag-toggle-weight", 60);
- $i->click("button.tabledrag-toggle-weight");
+ $i->executeJS('document.querySelector("button.tabledrag-toggle-weight").click();');
// Set weights for all contacts.
foreach ($newOrder as $contactNum => $newPos) {
--
GitLab
From 5b45a21de9a28d6a73b0cc75049e6ab2846bb2af Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Mon, 28 Oct 2024 11:58:54 -0400
Subject: [PATCH 11/69] ISTWCMS-7160 Changes in WcmsTestsImgInlineCest
---
acceptance/WcmsTestsImgInlineCest.php | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/acceptance/WcmsTestsImgInlineCest.php b/acceptance/WcmsTestsImgInlineCest.php
index c9d5ce9a..e32ea7f4 100644
--- a/acceptance/WcmsTestsImgInlineCest.php
+++ b/acceptance/WcmsTestsImgInlineCest.php
@@ -28,7 +28,6 @@ class WcmsTestsImgInlineCest {
// Step through each of the block elements and test them.
foreach ($this->getBlocks() as $block) {
-
$title = $i->uwRandomString();
// Create a webpage.
$this->nodesUsed[$title] = $i->createWebPage($title);
@@ -41,7 +40,11 @@ class WcmsTestsImgInlineCest {
// Add a block with each tag.
$i->waitForElementClickable('.layout-builder__add-block');
+ $i->executeJS("document.querySelector('.layout-builder__add-block').scrollIntoView(true);");
+ // Adjust the selector as needed.
+ $i->waitForElementNotVisible('.loading-spinner', 30);
$i->click('.layout-builder__add-block');
+
$i->waitForText('Choose a block');
$i->click('Copy text');
$i->waitForText('Block description');
@@ -60,7 +63,7 @@ class WcmsTestsImgInlineCest {
// Fill the ckeditor field with the block element.
$i->fillCkEditor(
'<' . $block . '> Here is an image. <img alt="Inserted image in ' . $block . ' block" src="https://uwaterloo.ca/building-the-next-wcms/sites/default/files/uploads/images/icons-2021_laptop.png" /> More text. </' . $block . '>',
- 'textarea[name="settings[block_form][field_uw_copy_text][0][value]"]'
+ 'textarea[name="settings[block_form][field_uw_copy_text][0][value]"]'
);
// Click the submit button.
@@ -68,15 +71,17 @@ class WcmsTestsImgInlineCest {
$i->click('input[id*="edit-actions-submit"]');
// Ensure that the block is on the page.
- $i->waitForElement('.uw-copy-text div ' . $block . ' img');
+ $i->waitForJS("return document.readyState === 'complete';", 30);
+ $i->waitForElement(".uw-copy-text div " . $block . " img", 30);
// Check that image's parent is a block.
- $i->seeElement('.uw-copy-text div ' . $block . ' img', ['alt' => 'Inserted image in ' . $block . ' block']);
+ $i->seeElement(".uw-copy-text div " . $block . " img", ['alt' => 'Inserted image in ' . $block . ' block']);
// Remove added block to avoid ambiguity in finding image.
$i->amOnPage($path . '/layout/discard-changes');
$i->click('#edit-submit');
- $i->waitForText('The changes to the layout have been discarded.');
+ $i->waitForJS("return document.readyState === 'complete';", 30);
+ $i->waitForText("The changes to the layout have been discarded.", 60);
}
}
--
GitLab
From dff60acf4992e7b77b4ddde683d49f0b45d18da0 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 20 Nov 2024 06:47:55 -0500
Subject: [PATCH 12/69] ISTWCMS-7160: remove related links for block testing
---
_support/Helper/Acceptance.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/_support/Helper/Acceptance.php b/_support/Helper/Acceptance.php
index 41423dc1..9f9f3b3d 100644
--- a/_support/Helper/Acceptance.php
+++ b/_support/Helper/Acceptance.php
@@ -222,7 +222,6 @@ class Acceptance extends Module {
'Image',
'Image gallery',
'Mailman subscription',
- 'Related links',
'Tags',
'Timeline',
'CodePen',
--
GitLab
From dbd6835e2f0320b2e9f55d1dea4c49d13e1c151b Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 20 Nov 2024 07:06:38 -0500
Subject: [PATCH 13/69] ISTWCMS-7160: Remove actual test for related links
---
acceptance/WcmsTestsBlocksContentCest.php | 63 -----------------------
1 file changed, 63 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksContentCest.php b/acceptance/WcmsTestsBlocksContentCest.php
index bef30eba..9490b7de 100644
--- a/acceptance/WcmsTestsBlocksContentCest.php
+++ b/acceptance/WcmsTestsBlocksContentCest.php
@@ -872,69 +872,6 @@ class WcmsTestsBlocksContentCest {
}
}
- /**
- * Function to test the related links block.
- *
- * @param AcceptanceTester $i
- * The acceptance tester.
- */
- public function testRelatedLinksBlock(AcceptanceTester $i) {
-
- // Create a webpage.
- $this->nodesUsed['Related Links Block'] = $i->createWebPage('Related Links Block');
-
- // Get the path of the webpage.
- $path = $i->getWebPagePath($this->nodesUsed['Related Links Block']);
-
- // Login as site manager.
- $i->amOnPage('user/logout');
- $i->logInWithRole('uw_role_site_manager');
-
- // Go to the layout page for the webpage we created.
- $i->amOnPage($path . '/layout');
- $i->see('Edit layout for ' . $this->nodesUsed['Related Links Block']->getTitle());
-
- // Add a block.
- $i->click('Add block');
- $i->waitForText('Choose a block');
-
- // Click on the related links block.
- $i->click('Related links');
- $i->waitForText('Configure block');
-
- // Add a second and third link.
- $i->click('input[id^="edit-settings-block-form-field-uw-rl-related-link-add-more"]');
- $i->waitForElement('input[id^="edit-settings-block-form-field-uw-rl-related-link-1-uri"]');
- $i->click('input[id^="edit-settings-block-form-field-uw-rl-related-link-add-more"]');
- $i->waitForElement('input[id^="edit-settings-block-form-field-uw-rl-related-link-2-uri"]');
-
- // Get the settings for the related links.
- $title = $i->uwRandomString();
- $url1 = 'entity:node/1';
- $title1 = $i->uwRandomString();
- $url2 = 'https://www.sju.ca/';
- $title2 = $i->uwRandomString();
-
- // Fill in the fields.
- $i->fillField('settings[label]', $title);
- $i->fillField('settings[block_form][field_uw_rl_related_link][0][uri]', $url1);
- $i->fillField('settings[block_form][field_uw_rl_related_link][0][title]', $title1);
- $i->fillField('settings[block_form][field_uw_rl_related_link][1][uri]', $url2);
- $i->fillField('settings[block_form][field_uw_rl_related_link][1][title]', $title2);
- $i->fillField('settings[block_form][field_uw_rl_related_link][2][uri]', $url1);
-
- // Click on add block and ensure it is on the screen.
- $i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Related links'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Related links'));
-
- // Test that the Related links block markup appears on the page.
- $i->see($title);
- $i->seeElement(Locator::contains('a[href="/home"]', $title1));
- $i->seeElement(Locator::contains('a[href="' . $url2 . '"]', $title2));
- $i->seeElement(Locator::contains('a[href="/home"]', 'Home'));
- }
-
/**
* Function to test the timeline block.
*
--
GitLab
From 91d13fe2f8562c2727bece64427f478bdd88db08 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Thu, 21 Nov 2024 16:55:43 -0500
Subject: [PATCH 14/69] ISTWCMS-7160: add script to run by groups
---
run_groups.sh | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
create mode 100755 run_groups.sh
diff --git a/run_groups.sh b/run_groups.sh
new file mode 100755
index 00000000..84f3e259
--- /dev/null
+++ b/run_groups.sh
@@ -0,0 +1,49 @@
+# Directory to iterate through
+directory="tests/acceptance"
+
+# The pattern you want to match and extract text after it
+pattern="@group"
+
+# Initialize an empty array to store unique values
+unique_values=()
+
+echo "************************************"
+echo "Getting groups from tests ..."
+echo "************************************"
+
+# Loop through all files in the directory
+for file in "$directory"/*; do
+
+ # Ensure it's a regular file
+ if [[ -f "$file" ]]; then
+
+ # Extract text after the pattern using grep
+ while IFS= read -r line; do
+
+ # Extract text after the pattern using grep
+ extracted_text=$(echo "$line" | grep -o "${pattern}.*")
+
+ # Remove the @group from the extracted text
+ extracted_text=${extracted_text//"@group "/}
+
+ # Check if extracted text is not empty and is not already in the array
+ if [[ -n "$extracted_text" && ! " ${unique_values[@]} " =~ " ${extracted_text} " ]]; then
+
+ # Add the extracted text to the array
+ unique_values+=("$extracted_text")
+
+ # Output to the screen so we see some progress
+ echo "Found group: $extracted_text"
+ fi
+ done < "$file"
+ fi
+done
+
+echo "************************************"
+echo "Done getting groups from tests."
+echo "************************************"
+
+# Perform the tests using the groups
+for value in "${unique_values[@]}"; do
+ php vendor/bin/codecept run acceptance --fail-fast -g "$value"
+done
--
GitLab
From fca3f4d212cd04e9d4d18d0543ec02329daecc66 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Thu, 21 Nov 2024 16:56:45 -0500
Subject: [PATCH 15/69] ISTWCMS-7160: update setup codeception to copy run
groups script
---
setup_codeception.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/setup_codeception.sh b/setup_codeception.sh
index 7d4a8128..aa6e7bfa 100755
--- a/setup_codeception.sh
+++ b/setup_codeception.sh
@@ -3,4 +3,5 @@ cp tests/c3.php .
cp tests/codeception.yml .
cp tests/index.php web
cp tests/run_tests.sh .
+cp tests/run_groups.sh .
sed -i 's/self::COVERAGE_COOKIE,\s$value,\s$cookieParams/self::COVERAGE_COOKIE, $value/g' /var/www/html/vendor/codeception/codeception/src/Codeception/Coverage/Subscriber/LocalServer.php
--
GitLab
From bfe1d7c7e4caaa2d0e257a880be6ca1889c371aa Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Thu, 21 Nov 2024 16:57:08 -0500
Subject: [PATCH 16/69] ISTWCMS-7160: adding groups to the tests
---
acceptance/WcmsTestsApiCest.php | 2 ++
acceptance/WcmsTestsAuthSiteCest.php | 2 ++
acceptance/WcmsTestsBlockConfigCest.php | 4 ++++
acceptance/WcmsTestsBlockLinksCest.php | 2 ++
acceptance/WcmsTestsBlocksContentCest.php | 18 ++++++++++++++++++
acceptance/WcmsTestsBlocksEmbedsCest.php | 8 ++++++++
acceptance/WcmsTestsBlocksListingsCest.php | 14 ++++++++++++++
acceptance/WcmsTestsBlocksSearchCest.php | 8 ++++++++
acceptance/WcmsTestsBlocksTeaserCest.php | 4 ++++
acceptance/WcmsTestsBlocksWebformsCest.php | 2 ++
acceptance/WcmsTestsTestPageCest.php | 2 ++
11 files changed, 66 insertions(+)
diff --git a/acceptance/WcmsTestsApiCest.php b/acceptance/WcmsTestsApiCest.php
index a5687361..09ba74aa 100644
--- a/acceptance/WcmsTestsApiCest.php
+++ b/acceptance/WcmsTestsApiCest.php
@@ -31,6 +31,8 @@ class WcmsTestsApiCest {
/**
* Function to test Api v3.0.
*
+ * @group api
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsAuthSiteCest.php b/acceptance/WcmsTestsAuthSiteCest.php
index bc4fee07..17337fa4 100644
--- a/acceptance/WcmsTestsAuthSiteCest.php
+++ b/acceptance/WcmsTestsAuthSiteCest.php
@@ -10,6 +10,8 @@ class WcmsTestsAuthSiteCest {
/**
* Tests for auth site.
*
+ * @group authsite
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsBlockConfigCest.php b/acceptance/WcmsTestsBlockConfigCest.php
index 8e446455..9dbc0a0e 100644
--- a/acceptance/WcmsTestsBlockConfigCest.php
+++ b/acceptance/WcmsTestsBlockConfigCest.php
@@ -39,6 +39,8 @@ class WcmsTestsBlockConfigCest {
/**
* Tests for cta block fields.
*
+ * @group blocks
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -74,6 +76,8 @@ class WcmsTestsBlockConfigCest {
/**
* Tests for cta block fields.
*
+ * @group blocks
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsBlockLinksCest.php b/acceptance/WcmsTestsBlockLinksCest.php
index 565a7235..08de536d 100644
--- a/acceptance/WcmsTestsBlockLinksCest.php
+++ b/acceptance/WcmsTestsBlockLinksCest.php
@@ -17,6 +17,8 @@ class WcmsTestsBlockLinksCest {
/**
* Function to test that blocks are present.
*
+ * @group blocks
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
diff --git a/acceptance/WcmsTestsBlocksContentCest.php b/acceptance/WcmsTestsBlocksContentCest.php
index 9490b7de..f4b1e20e 100644
--- a/acceptance/WcmsTestsBlocksContentCest.php
+++ b/acceptance/WcmsTestsBlocksContentCest.php
@@ -26,6 +26,8 @@ class WcmsTestsBlocksContentCest {
/**
* Tests for banner block.
*
+ * @group blockcontent
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -204,6 +206,8 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test for Vimeo banners.
*
+ * @group blockcontent
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -265,6 +269,8 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the copy text block.
*
+ * @group blockcontent
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -342,6 +348,8 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the CTA block.
*
+ * @group blockcontent
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -416,6 +424,8 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the expand/collapse block.
*
+ * @group blockcontent
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -529,6 +539,8 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the FF block.
*
+ * @group blockcontent
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -586,6 +598,8 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the image full width block.
*
+ * @group blockcontent
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -680,6 +694,8 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the image fixed width block.
*
+ * @group blockcontent
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -875,6 +891,8 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the timeline block.
*
+ * @group blockcontent
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsBlocksEmbedsCest.php b/acceptance/WcmsTestsBlocksEmbedsCest.php
index cfff2489..a9dc4caa 100644
--- a/acceptance/WcmsTestsBlocksEmbedsCest.php
+++ b/acceptance/WcmsTestsBlocksEmbedsCest.php
@@ -26,6 +26,8 @@ class WcmsTestsBlocksEmbedsCest {
/**
* Function to test the Google Maps block.
*
+ * @group blockembeds
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -77,6 +79,8 @@ class WcmsTestsBlocksEmbedsCest {
/**
* Function to test the Power BI block.
*
+ * @group blockembeds
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -126,6 +130,8 @@ class WcmsTestsBlocksEmbedsCest {
/**
* Function to test the social intents block.
*
+ * @group blockembeds
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -174,6 +180,8 @@ class WcmsTestsBlocksEmbedsCest {
/**
* Function to test the Tableau visualization block.
*
+ * @group blockembeds
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index 4cf7b07b..0ab4282b 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -27,6 +27,8 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the multi type list block.
*
+ * @group blocklistings
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -143,6 +145,8 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the automatic list block config.
*
+ * @group blockautolist
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -183,6 +187,8 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the manual list block config.
*
+ * @group blockmanuallist
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -223,6 +229,8 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the automatic list block.
*
+ * @group blocklistings
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -279,6 +287,8 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the manual list block.
*
+ * @group blocklistings
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -331,6 +341,8 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the Waterloo Events Block.
*
+ * @group blocklistings
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -398,6 +410,8 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test list parity.
*
+ * @group blocklistings
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsBlocksSearchCest.php b/acceptance/WcmsTestsBlocksSearchCest.php
index cd52d829..70727343 100644
--- a/acceptance/WcmsTestsBlocksSearchCest.php
+++ b/acceptance/WcmsTestsBlocksSearchCest.php
@@ -27,6 +27,8 @@ class WcmsTestsBlocksSearchCest {
/**
* Function to test the catalog search block.
*
+ * @group blocksearch
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -112,6 +114,8 @@ class WcmsTestsBlocksSearchCest {
/**
* Function to test the project search block.
*
+ * @group blocksearch
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -171,6 +175,8 @@ class WcmsTestsBlocksSearchCest {
/**
* Function to test the service search block.
*
+ * @group blocksearch
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -221,6 +227,8 @@ class WcmsTestsBlocksSearchCest {
/**
* Function to test the OFIS search block.
*
+ * @group blocksearch
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsBlocksTeaserCest.php b/acceptance/WcmsTestsBlocksTeaserCest.php
index 8b1e8c9d..8119e6e3 100644
--- a/acceptance/WcmsTestsBlocksTeaserCest.php
+++ b/acceptance/WcmsTestsBlocksTeaserCest.php
@@ -82,6 +82,8 @@ class WcmsTestsBlocksTeaserCest {
/**
* Function to test the multi type list block.
*
+ * @group blockteaser
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -136,6 +138,8 @@ class WcmsTestsBlocksTeaserCest {
/**
* Function to test the multi type list block.
*
+ * @group blockteaser
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsBlocksWebformsCest.php b/acceptance/WcmsTestsBlocksWebformsCest.php
index 008fd03f..4adfd478 100644
--- a/acceptance/WcmsTestsBlocksWebformsCest.php
+++ b/acceptance/WcmsTestsBlocksWebformsCest.php
@@ -27,6 +27,8 @@ class WcmsTestsBlocksWebformsCest {
/**
* Function to test the webform block.
*
+ * @group blockwebforms
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsTestPageCest.php b/acceptance/WcmsTestsTestPageCest.php
index 882267c0..c9a723e6 100644
--- a/acceptance/WcmsTestsTestPageCest.php
+++ b/acceptance/WcmsTestsTestPageCest.php
@@ -24,6 +24,8 @@ class WcmsTestsTestPageCest {
/**
* Front page test.
*
+ * @group basic
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
--
GitLab
From 850759f1f79141cde38ef9b8c090bfb909293c89 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Fri, 22 Nov 2024 06:58:24 -0500
Subject: [PATCH 17/69] ISTWCMS-7160: add the rest of the groups
---
acceptance/WcmsTestsCkeditorButtonsCest.php | 2 ++
acceptance/WcmsTestsContentTypeBlogCest.php | 6 ++++++
acceptance/WcmsTestsContentTypeCatalogCest.php | 6 ++++++
acceptance/WcmsTestsContentTypeContactCest.php | 6 ++++++
acceptance/WcmsTestsContentTypeEventCest.php | 8 ++++++++
.../WcmsTestsContentTypeExpandCollapseCest.php | 2 ++
acceptance/WcmsTestsContentTypeNewsCest.php | 6 ++++++
acceptance/WcmsTestsContentTypeOpportunityCest.php | 4 ++++
acceptance/WcmsTestsContentTypeProfileCest.php | 4 ++++
acceptance/WcmsTestsContentTypeProjectCest.php | 10 +++++++++-
acceptance/WcmsTestsContentTypeServiceCest.php | 2 ++
acceptance/WcmsTestsContentTypeSidebarCest.php | 2 ++
acceptance/WcmsTestsContentTypeSiteFooterCest.php | 2 ++
acceptance/WcmsTestsContentTypeWebpageCest.php | 4 +++-
acceptance/WcmsTestsDashboardCest.php | 8 ++++++++
acceptance/WcmsTestsDashboardCsvReportsCest.php | 2 ++
acceptance/WcmsTestsDeleteWarningMessageCest.php | 4 ++++
acceptance/WcmsTestsDiffHeadersCest.php | 2 ++
acceptance/WcmsTestsEventDisplayCest.php | 2 ++
acceptance/WcmsTestsExcludeAutoListCest.php | 4 ++++
acceptance/WcmsTestsGlobalFooterCest.php | 2 ++
acceptance/WcmsTestsHomepageCest.php | 6 ++++++
acceptance/WcmsTestsImgInlineCest.php | 2 ++
acceptance/WcmsTestsLayoutBuilderBrowserCest.php | 2 ++
...WcmsTestsLayoutSectionConfigurationFormCest.php | 2 ++
acceptance/WcmsTestsLinkFieldCest.php | 4 ++++
acceptance/WcmsTestsLongTitlesCest.php | 2 ++
acceptance/WcmsTestsMediaAboveCest.php | 6 ++++++
acceptance/WcmsTestsMediaMenuItemsCest.php | 4 ++++
acceptance/WcmsTestsMediaTypesCest.php | 2 ++
acceptance/WcmsTestsMenuSettingsCest.php | 2 ++
acceptance/WcmsTestsMenusCest.php | 12 ++++++++++++
acceptance/WcmsTestsMultiTypePromoteCest.php | 2 ++
acceptance/WcmsTestsNodeRevisionDeleteCest.php | 4 +++-
acceptance/WcmsTestsOfisCest.php | 2 ++
acceptance/WcmsTestsPageNotFoundCest.php | 2 ++
acceptance/WcmsTestsPreviewButtonCest.php | 2 ++
acceptance/WcmsTestsQuickNodeCloneCest.php | 2 ++
acceptance/WcmsTestsRealNameCest.php | 4 ++++
acceptance/WcmsTestsRedirectsCest.php | 6 ++++++
acceptance/WcmsTestsRequireOnPublishCest.php | 2 ++
acceptance/WcmsTestsRoleOrderCest.php | 2 ++
acceptance/WcmsTestsSchemaCest.php | 6 ++++++
acceptance/WcmsTestsServiceHoursCest.php | 2 ++
acceptance/WcmsTestsSpecialAlertCest.php | 6 ++++++
acceptance/WcmsTestsTaxonomiesCest.php | 2 ++
acceptance/WcmsTestsTestPageCest.php | 2 ++
acceptance/WcmsTestsUrlAliasCest.php | 6 ++++++
acceptance/WcmsTestsUsersCest.php | 4 ++++
acceptance/WcmsTestsUwLdapCest.php | 2 ++
acceptance/WcmsTestsWebformAccessCest.php | 4 ++++
acceptance/WcmsTestsWebformElementsCest.php | 14 ++++++++++++++
acceptance/WcmsTestsWebformSettingsCest.php | 6 ++++++
53 files changed, 211 insertions(+), 3 deletions(-)
diff --git a/acceptance/WcmsTestsCkeditorButtonsCest.php b/acceptance/WcmsTestsCkeditorButtonsCest.php
index cc9fbb0b..46ab4c51 100644
--- a/acceptance/WcmsTestsCkeditorButtonsCest.php
+++ b/acceptance/WcmsTestsCkeditorButtonsCest.php
@@ -19,6 +19,8 @@ class WcmsTestsCkeditorButtonsCest {
/**
* Tests for ck editor buttons.
*
+ * @group ckeditor
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsContentTypeBlogCest.php b/acceptance/WcmsTestsContentTypeBlogCest.php
index 9682d4d7..a17e6a07 100644
--- a/acceptance/WcmsTestsContentTypeBlogCest.php
+++ b/acceptance/WcmsTestsContentTypeBlogCest.php
@@ -20,6 +20,8 @@ class WcmsTestsContentTypeBlogCest {
/**
* Tests for blog content type.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
*/
@@ -41,6 +43,8 @@ class WcmsTestsContentTypeBlogCest {
/**
* Function to test taxonomies.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\TaxonomyTest $i
* The acceptance tester.
*/
@@ -57,6 +61,8 @@ class WcmsTestsContentTypeBlogCest {
/**
* Test blog content type with dates.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsContentTypeCatalogCest.php b/acceptance/WcmsTestsContentTypeCatalogCest.php
index 8dcbd9fc..20acb028 100644
--- a/acceptance/WcmsTestsContentTypeCatalogCest.php
+++ b/acceptance/WcmsTestsContentTypeCatalogCest.php
@@ -70,6 +70,8 @@ class WcmsTestsContentTypeCatalogCest {
/**
* Tests for catalog content type.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
*/
@@ -101,6 +103,8 @@ class WcmsTestsContentTypeCatalogCest {
/**
* Tests for catalogs settings.
*
+ * @group contenttype
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -167,6 +171,8 @@ class WcmsTestsContentTypeCatalogCest {
/**
* Tests for catalogs term and roles.
*
+ * @group contenttype
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsContentTypeContactCest.php b/acceptance/WcmsTestsContentTypeContactCest.php
index 329d9ae2..5479837b 100644
--- a/acceptance/WcmsTestsContentTypeContactCest.php
+++ b/acceptance/WcmsTestsContentTypeContactCest.php
@@ -34,6 +34,8 @@ class WcmsTestsContentTypeContactCest {
/**
* Tests for contact content type.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
*/
@@ -55,6 +57,8 @@ class WcmsTestsContentTypeContactCest {
/**
* Function to test contact content type settings.
*
+ * @group contenttype
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -101,6 +105,8 @@ class WcmsTestsContentTypeContactCest {
/**
* Function to test contact reordering.
*
+ * @group contenttype
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsContentTypeEventCest.php b/acceptance/WcmsTestsContentTypeEventCest.php
index 059ac1df..33ff7cbe 100644
--- a/acceptance/WcmsTestsContentTypeEventCest.php
+++ b/acceptance/WcmsTestsContentTypeEventCest.php
@@ -20,6 +20,8 @@ class WcmsTestsContentTypeEventCest {
/**
* Tests for blog content type.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
*/
@@ -41,6 +43,8 @@ class WcmsTestsContentTypeEventCest {
/**
* Function to test taxonomies.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\TaxonomyTest $i
* The acceptance tester.
*/
@@ -60,6 +64,8 @@ class WcmsTestsContentTypeEventCest {
/**
* Function to test location info on events.
*
+ * @group contenttype
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -81,6 +87,8 @@ class WcmsTestsContentTypeEventCest {
/**
* Test event content type with dates.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsContentTypeExpandCollapseCest.php b/acceptance/WcmsTestsContentTypeExpandCollapseCest.php
index b8b90e95..d24718f5 100644
--- a/acceptance/WcmsTestsContentTypeExpandCollapseCest.php
+++ b/acceptance/WcmsTestsContentTypeExpandCollapseCest.php
@@ -19,6 +19,8 @@ class WcmsTestsContentTypeExpandCollapseCest {
/**
* Tests for expand collapse content type.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsContentTypeNewsCest.php b/acceptance/WcmsTestsContentTypeNewsCest.php
index c98f3314..0078785c 100644
--- a/acceptance/WcmsTestsContentTypeNewsCest.php
+++ b/acceptance/WcmsTestsContentTypeNewsCest.php
@@ -20,6 +20,8 @@ class WcmsTestsContentTypeNewsCest {
/**
* Tests for expand collapse content type.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
*/
@@ -41,6 +43,8 @@ class WcmsTestsContentTypeNewsCest {
/**
* Function to test taxonomies.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\TaxonomyTest $i
* The acceptance tester.
*/
@@ -57,6 +61,8 @@ class WcmsTestsContentTypeNewsCest {
/**
* Test news content type with dates.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsContentTypeOpportunityCest.php b/acceptance/WcmsTestsContentTypeOpportunityCest.php
index 65f06da1..b0bd3c0b 100644
--- a/acceptance/WcmsTestsContentTypeOpportunityCest.php
+++ b/acceptance/WcmsTestsContentTypeOpportunityCest.php
@@ -20,6 +20,8 @@ class WcmsTestsContentTypeOpportunityCest {
/**
* Tests for blog content type.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
*/
@@ -41,6 +43,8 @@ class WcmsTestsContentTypeOpportunityCest {
/**
* Tests for taxonomies for opportunity content type.
*
+ * @group contenttype
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsContentTypeProfileCest.php b/acceptance/WcmsTestsContentTypeProfileCest.php
index f028d032..378b72cd 100644
--- a/acceptance/WcmsTestsContentTypeProfileCest.php
+++ b/acceptance/WcmsTestsContentTypeProfileCest.php
@@ -27,6 +27,8 @@ class WcmsTestsContentTypeProfileCest {
/**
* Tests for profiles.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
*/
@@ -48,6 +50,8 @@ class WcmsTestsContentTypeProfileCest {
/**
* Tests for profiles synchronization with contacts.
*
+ * @group contenttype
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsContentTypeProjectCest.php b/acceptance/WcmsTestsContentTypeProjectCest.php
index 0954a84d..a1749653 100644
--- a/acceptance/WcmsTestsContentTypeProjectCest.php
+++ b/acceptance/WcmsTestsContentTypeProjectCest.php
@@ -34,7 +34,9 @@ class WcmsTestsContentTypeProjectCest {
private array $nodesUsed = [];
/**
- * Tests for profiles.
+ * Tests for projects.
+ *
+ * @group contenttype
*
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
@@ -57,6 +59,8 @@ class WcmsTestsContentTypeProjectCest {
/**
* Function to test taxonomies.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\TaxonomyTest $i
* The acceptance tester.
*/
@@ -73,6 +77,8 @@ class WcmsTestsContentTypeProjectCest {
/**
* Tests for project taxonomy terms.
*
+ * @group contenttype
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -108,6 +114,8 @@ class WcmsTestsContentTypeProjectCest {
/**
* Tests for project members.
*
+ * @group contenttype
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsContentTypeServiceCest.php b/acceptance/WcmsTestsContentTypeServiceCest.php
index ee9c9b1d..e1f8da42 100644
--- a/acceptance/WcmsTestsContentTypeServiceCest.php
+++ b/acceptance/WcmsTestsContentTypeServiceCest.php
@@ -26,6 +26,8 @@ class WcmsTestsContentTypeServiceCest {
/**
* Tests for service content type.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsContentTypeSidebarCest.php b/acceptance/WcmsTestsContentTypeSidebarCest.php
index 5a252616..f5028e7a 100644
--- a/acceptance/WcmsTestsContentTypeSidebarCest.php
+++ b/acceptance/WcmsTestsContentTypeSidebarCest.php
@@ -19,6 +19,8 @@ class WcmsTestsContentTypeSidebarCest {
/**
* Tests for sidebar content type.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsContentTypeSiteFooterCest.php b/acceptance/WcmsTestsContentTypeSiteFooterCest.php
index 9e4cd18d..117e903b 100644
--- a/acceptance/WcmsTestsContentTypeSiteFooterCest.php
+++ b/acceptance/WcmsTestsContentTypeSiteFooterCest.php
@@ -19,6 +19,8 @@ class WcmsTestsContentTypeSiteFooterCest {
/**
* Tests for site footer content type.
*
+ * @group contenttype
+ *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsContentTypeWebpageCest.php b/acceptance/WcmsTestsContentTypeWebpageCest.php
index 2f347327..9f138c6d 100644
--- a/acceptance/WcmsTestsContentTypeWebpageCest.php
+++ b/acceptance/WcmsTestsContentTypeWebpageCest.php
@@ -17,7 +17,9 @@ class WcmsTestsContentTypeWebpageCest {
private string $contentType = 'uw_ct_web_page';
/**
- * Tests for blog content type.
+ * Tests for webpage content type.
+ *
+ * @group contenttype
*
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
diff --git a/acceptance/WcmsTestsDashboardCest.php b/acceptance/WcmsTestsDashboardCest.php
index 7a31b9f6..3ea18271 100644
--- a/acceptance/WcmsTestsDashboardCest.php
+++ b/acceptance/WcmsTestsDashboardCest.php
@@ -12,6 +12,8 @@ class WcmsTestsDashboardCest {
/**
* Tests for dashboard access.
*
+ * @group dashboards
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -95,6 +97,8 @@ class WcmsTestsDashboardCest {
/**
* Tests for dashboard elements.
*
+ * @group dashboards
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -151,6 +155,8 @@ class WcmsTestsDashboardCest {
/**
* Tests for layout builder.
*
+ * @group dashboards
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -195,6 +201,8 @@ class WcmsTestsDashboardCest {
/**
* Tests for cancel button of taxonomy terms.
*
+ * @group dashboards
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsDashboardCsvReportsCest.php b/acceptance/WcmsTestsDashboardCsvReportsCest.php
index 2fba6001..b5e17fd6 100644
--- a/acceptance/WcmsTestsDashboardCsvReportsCest.php
+++ b/acceptance/WcmsTestsDashboardCsvReportsCest.php
@@ -10,6 +10,8 @@ class WcmsTestsDashboardCsvReportsCest {
/**
* Tests for dashboard csv report.
*
+ * @group dashboards
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsDeleteWarningMessageCest.php b/acceptance/WcmsTestsDeleteWarningMessageCest.php
index 4f8d1fb6..4d5ded03 100644
--- a/acceptance/WcmsTestsDeleteWarningMessageCest.php
+++ b/acceptance/WcmsTestsDeleteWarningMessageCest.php
@@ -24,6 +24,8 @@ class WcmsTestsDeleteWarningMessageCest {
/**
* Tests for delete warning message.
*
+ * @group messaging
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -84,6 +86,8 @@ class WcmsTestsDeleteWarningMessageCest {
/**
* Tests for prevent deleting catalog being used.
*
+ * @group messaging
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsDiffHeadersCest.php b/acceptance/WcmsTestsDiffHeadersCest.php
index 63792a8a..7c0b2175 100644
--- a/acceptance/WcmsTestsDiffHeadersCest.php
+++ b/acceptance/WcmsTestsDiffHeadersCest.php
@@ -48,6 +48,8 @@ class WcmsTestsDiffHeadersCest {
/**
* Tests for diff headers.
*
+ * @group modules
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsEventDisplayCest.php b/acceptance/WcmsTestsEventDisplayCest.php
index e2e09cd3..67c7e804 100644
--- a/acceptance/WcmsTestsEventDisplayCest.php
+++ b/acceptance/WcmsTestsEventDisplayCest.php
@@ -10,6 +10,8 @@ class WcmsTestsEventDisplayCest {
/**
* Tests for event display.
*
+ * @group display
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsExcludeAutoListCest.php b/acceptance/WcmsTestsExcludeAutoListCest.php
index 9b4b3217..15de4a19 100644
--- a/acceptance/WcmsTestsExcludeAutoListCest.php
+++ b/acceptance/WcmsTestsExcludeAutoListCest.php
@@ -132,6 +132,8 @@ class WcmsTestsExcludeAutoListCest {
/**
* Tests for listing pages with excluded content.
*
+ * @group display
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -152,6 +154,8 @@ class WcmsTestsExcludeAutoListCest {
/**
* Function to test the auto list block with excluded content.
*
+ * @group display
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsGlobalFooterCest.php b/acceptance/WcmsTestsGlobalFooterCest.php
index 3d923d65..db0474c3 100644
--- a/acceptance/WcmsTestsGlobalFooterCest.php
+++ b/acceptance/WcmsTestsGlobalFooterCest.php
@@ -12,6 +12,8 @@ class WcmsTestsGlobalFooterCest {
/**
* Tests for global footer.
*
+ * @group display
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsHomepageCest.php b/acceptance/WcmsTestsHomepageCest.php
index 6a78f1b8..ef5d887b 100644
--- a/acceptance/WcmsTestsHomepageCest.php
+++ b/acceptance/WcmsTestsHomepageCest.php
@@ -10,6 +10,8 @@ class WcmsTestsHomepageCest {
/**
* Function to test the page elements of the homepage.
*
+ * @group homepage
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -44,6 +46,8 @@ class WcmsTestsHomepageCest {
/**
* Function to test the home page link.
*
+ * @group homepage
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -82,6 +86,8 @@ class WcmsTestsHomepageCest {
/**
* Function to test home page and protection.
*
+ * @group homepage
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsImgInlineCest.php b/acceptance/WcmsTestsImgInlineCest.php
index e32ea7f4..e2f6f6f1 100644
--- a/acceptance/WcmsTestsImgInlineCest.php
+++ b/acceptance/WcmsTestsImgInlineCest.php
@@ -17,6 +17,8 @@ class WcmsTestsImgInlineCest {
/**
* Tests that images are not block elements.
*
+ * @group media
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsLayoutBuilderBrowserCest.php b/acceptance/WcmsTestsLayoutBuilderBrowserCest.php
index 9126b8c5..e8827ed4 100644
--- a/acceptance/WcmsTestsLayoutBuilderBrowserCest.php
+++ b/acceptance/WcmsTestsLayoutBuilderBrowserCest.php
@@ -10,6 +10,8 @@ class WcmsTestsLayoutBuilderBrowserCest {
/**
* Tests for layout builder browser.
*
+ * @group layouts
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsLayoutSectionConfigurationFormCest.php b/acceptance/WcmsTestsLayoutSectionConfigurationFormCest.php
index 57adf1dd..fc2a2183 100644
--- a/acceptance/WcmsTestsLayoutSectionConfigurationFormCest.php
+++ b/acceptance/WcmsTestsLayoutSectionConfigurationFormCest.php
@@ -17,6 +17,8 @@ class WcmsTestsLayoutSectionConfigurationFormCest {
/**
* Tests that images are not block elements.
*
+ * @group layouts
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsLinkFieldCest.php b/acceptance/WcmsTestsLinkFieldCest.php
index d4da47b6..b64c48d2 100644
--- a/acceptance/WcmsTestsLinkFieldCest.php
+++ b/acceptance/WcmsTestsLinkFieldCest.php
@@ -40,6 +40,8 @@ class WcmsTestsLinkFieldCest {
/**
* Tests that <nolink> and <button> are not accepted where they shouldn't be.
*
+ * @group miscellaneous
+ *
* @param Step\Acceptance\ContentType $i
* Content Type test variable.
*/
@@ -246,6 +248,8 @@ class WcmsTestsLinkFieldCest {
/**
* Test that appropriate content block errors appear.
*
+ * @group miscellaneous
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsLongTitlesCest.php b/acceptance/WcmsTestsLongTitlesCest.php
index 862caee0..9bb68ee4 100644
--- a/acceptance/WcmsTestsLongTitlesCest.php
+++ b/acceptance/WcmsTestsLongTitlesCest.php
@@ -75,6 +75,8 @@ class WcmsTestsLongTitlesCest {
/**
* Tests for long titles.
*
+ * @group miscellaneous
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsMediaAboveCest.php b/acceptance/WcmsTestsMediaAboveCest.php
index acd2a679..304e4190 100644
--- a/acceptance/WcmsTestsMediaAboveCest.php
+++ b/acceptance/WcmsTestsMediaAboveCest.php
@@ -27,6 +27,8 @@ class WcmsTestsMediaAboveCest {
/**
* Test media above settings.
*
+ * @group media
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -122,6 +124,8 @@ class WcmsTestsMediaAboveCest {
/**
* Function to test the banners above.
*
+ * @group media
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -260,6 +264,8 @@ class WcmsTestsMediaAboveCest {
/**
* Function to test the banners above.
*
+ * @group media
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsMediaMenuItemsCest.php b/acceptance/WcmsTestsMediaMenuItemsCest.php
index b9242a4a..e0a0b40b 100644
--- a/acceptance/WcmsTestsMediaMenuItemsCest.php
+++ b/acceptance/WcmsTestsMediaMenuItemsCest.php
@@ -10,6 +10,8 @@ class WcmsTestsMediaMenuItemsCest {
/**
* Tests for media authorized.
*
+ * @group media
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -57,6 +59,8 @@ class WcmsTestsMediaMenuItemsCest {
/**
* Tests for media unauthorized.
*
+ * @group media
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsMediaTypesCest.php b/acceptance/WcmsTestsMediaTypesCest.php
index 85a4a16b..3b1b8758 100644
--- a/acceptance/WcmsTestsMediaTypesCest.php
+++ b/acceptance/WcmsTestsMediaTypesCest.php
@@ -44,6 +44,8 @@ class WcmsTestsMediaTypesCest {
/**
* Tests for media types.
*
+ * @group media
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsMenuSettingsCest.php b/acceptance/WcmsTestsMenuSettingsCest.php
index e029ec0a..238f01dd 100644
--- a/acceptance/WcmsTestsMenuSettingsCest.php
+++ b/acceptance/WcmsTestsMenuSettingsCest.php
@@ -52,6 +52,8 @@ class WcmsTestsMenuSettingsCest {
* "Place in site hierarchy" and "Add menu link".
* This is custom WCMS functionality in uw_sites_all.
*
+ * @group menus
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsMenusCest.php b/acceptance/WcmsTestsMenusCest.php
index 569f9b07..1ff0bf29 100644
--- a/acceptance/WcmsTestsMenusCest.php
+++ b/acceptance/WcmsTestsMenusCest.php
@@ -10,6 +10,8 @@ class WcmsTestsMenusCest {
/**
* Tests for content management menu.
*
+ * @group menus
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -36,6 +38,8 @@ class WcmsTestsMenusCest {
/**
* Tests for site information menu.
*
+ * @group menus
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -62,6 +66,8 @@ class WcmsTestsMenusCest {
/**
* Tests adding menu links with various roles.
*
+ * @group menus
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -104,6 +110,8 @@ class WcmsTestsMenusCest {
/**
* Tests for home menu link weight.
*
+ * @group menus
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -124,6 +132,8 @@ class WcmsTestsMenusCest {
/**
* Tests for main menu.
*
+ * @group menus
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -164,6 +174,8 @@ class WcmsTestsMenusCest {
/**
* Tests for home main menu access.
*
+ * @group menus
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsMultiTypePromoteCest.php b/acceptance/WcmsTestsMultiTypePromoteCest.php
index aff6e197..52f55dcc 100644
--- a/acceptance/WcmsTestsMultiTypePromoteCest.php
+++ b/acceptance/WcmsTestsMultiTypePromoteCest.php
@@ -19,6 +19,8 @@ class WcmsTestsMultiTypePromoteCest {
/**
* Tests if promoted items are displayed in multi-type lists.
*
+ * @group miscellaneous
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsNodeRevisionDeleteCest.php b/acceptance/WcmsTestsNodeRevisionDeleteCest.php
index 4d1394c2..8ef505e1 100644
--- a/acceptance/WcmsTestsNodeRevisionDeleteCest.php
+++ b/acceptance/WcmsTestsNodeRevisionDeleteCest.php
@@ -10,7 +10,9 @@ use Codeception\Util\Locator;
class WcmsTestsNodeRevisionDeleteCest {
/**
- * Tests for diff headers.
+ * Tests for node revision delete.
+ *
+ * @group modules
*
* @param AcceptanceTester $i
* Acceptance test variable.
diff --git a/acceptance/WcmsTestsOfisCest.php b/acceptance/WcmsTestsOfisCest.php
index a4335782..afbb85d8 100644
--- a/acceptance/WcmsTestsOfisCest.php
+++ b/acceptance/WcmsTestsOfisCest.php
@@ -10,6 +10,8 @@ class WcmsTestsOfisCest {
/**
* Tests for ofis.
*
+ * @group modules
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsPageNotFoundCest.php b/acceptance/WcmsTestsPageNotFoundCest.php
index af9f19d6..3afa8184 100644
--- a/acceptance/WcmsTestsPageNotFoundCest.php
+++ b/acceptance/WcmsTestsPageNotFoundCest.php
@@ -10,6 +10,8 @@ class WcmsTestsPageNotFoundCest {
/**
* Tests for page not found.
*
+ * @group messaging
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsPreviewButtonCest.php b/acceptance/WcmsTestsPreviewButtonCest.php
index a5131469..3bdd719b 100644
--- a/acceptance/WcmsTestsPreviewButtonCest.php
+++ b/acceptance/WcmsTestsPreviewButtonCest.php
@@ -10,6 +10,8 @@ class WcmsTestsPreviewButtonCest {
/**
* Tests for preview button.
*
+ * @group miscellaneous
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsQuickNodeCloneCest.php b/acceptance/WcmsTestsQuickNodeCloneCest.php
index 094f6950..b968399b 100644
--- a/acceptance/WcmsTestsQuickNodeCloneCest.php
+++ b/acceptance/WcmsTestsQuickNodeCloneCest.php
@@ -10,6 +10,8 @@ class WcmsTestsQuickNodeCloneCest {
/**
* Tests for quick node clone.
*
+ * @group modules
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsRealNameCest.php b/acceptance/WcmsTestsRealNameCest.php
index 5a8993ff..e6ac057a 100644
--- a/acceptance/WcmsTestsRealNameCest.php
+++ b/acceptance/WcmsTestsRealNameCest.php
@@ -10,6 +10,8 @@ class WcmsTestsRealNameCest {
/**
* Tests for real name settings.
*
+ * @group users
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -30,6 +32,8 @@ class WcmsTestsRealNameCest {
/**
* Function to test real name in user.
*
+ * @group users
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsRedirectsCest.php b/acceptance/WcmsTestsRedirectsCest.php
index 262a6e5b..03b7e32d 100644
--- a/acceptance/WcmsTestsRedirectsCest.php
+++ b/acceptance/WcmsTestsRedirectsCest.php
@@ -20,6 +20,8 @@ class WcmsTestsRedirectsCest {
/**
* Tests for redirects.
*
+ * @group miscellaneous
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -54,6 +56,8 @@ class WcmsTestsRedirectsCest {
/**
* Function to test the redirects settings.
*
+ * @group miscellaneous
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -80,6 +84,8 @@ class WcmsTestsRedirectsCest {
/**
* Function to test redirects.
*
+ * @group miscellaneous
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsRequireOnPublishCest.php b/acceptance/WcmsTestsRequireOnPublishCest.php
index ddf32ade..a1472b4a 100644
--- a/acceptance/WcmsTestsRequireOnPublishCest.php
+++ b/acceptance/WcmsTestsRequireOnPublishCest.php
@@ -26,6 +26,8 @@ class WcmsTestsRequireOnPublishCest {
/**
* Tests for require on publish.
*
+ * @group miscellaneous
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsRoleOrderCest.php b/acceptance/WcmsTestsRoleOrderCest.php
index abf46c68..02004185 100644
--- a/acceptance/WcmsTestsRoleOrderCest.php
+++ b/acceptance/WcmsTestsRoleOrderCest.php
@@ -10,6 +10,8 @@ class WcmsTestsRoleOrderCest {
/**
* Tests that roles are in correct order.
*
+ * @group users
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsSchemaCest.php b/acceptance/WcmsTestsSchemaCest.php
index 77c150dd..69cc92ed 100644
--- a/acceptance/WcmsTestsSchemaCest.php
+++ b/acceptance/WcmsTestsSchemaCest.php
@@ -10,6 +10,8 @@ class WcmsTestsSchemaCest {
/**
* Tests for schema modules.
*
+ * @group miscellaneous
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -36,6 +38,8 @@ class WcmsTestsSchemaCest {
/**
* Tests for schema settings.
*
+ * @group miscellaneous
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -90,6 +94,8 @@ class WcmsTestsSchemaCest {
/**
* Tests for schema content type fields.
*
+ * @group miscellaneous
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsServiceHoursCest.php b/acceptance/WcmsTestsServiceHoursCest.php
index c2d6f320..51c9a43c 100644
--- a/acceptance/WcmsTestsServiceHoursCest.php
+++ b/acceptance/WcmsTestsServiceHoursCest.php
@@ -17,6 +17,8 @@ class WcmsTestsServiceHoursCest {
/**
* Tests for service hours.
*
+ * @group custommodules
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsSpecialAlertCest.php b/acceptance/WcmsTestsSpecialAlertCest.php
index 220ac1db..9f7e1a3c 100644
--- a/acceptance/WcmsTestsSpecialAlertCest.php
+++ b/acceptance/WcmsTestsSpecialAlertCest.php
@@ -12,6 +12,8 @@ class WcmsTestsSpecialAlertCest {
/**
* Tests for special alert config.
*
+ * @group custommodules
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
@@ -74,6 +76,8 @@ class WcmsTestsSpecialAlertCest {
/**
* Test the actual special alert block.
*
+ * @group custommodules
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -197,6 +201,8 @@ class WcmsTestsSpecialAlertCest {
/**
* Test for roles to edit special alerts.
*
+ * @group custommodules
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsTaxonomiesCest.php b/acceptance/WcmsTestsTaxonomiesCest.php
index eb888892..419024fc 100644
--- a/acceptance/WcmsTestsTaxonomiesCest.php
+++ b/acceptance/WcmsTestsTaxonomiesCest.php
@@ -12,6 +12,8 @@ class WcmsTestsTaxonomiesCest {
/**
* Taxonomy test.
*
+ * @group basic
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsTestPageCest.php b/acceptance/WcmsTestsTestPageCest.php
index c9a723e6..a628fe98 100644
--- a/acceptance/WcmsTestsTestPageCest.php
+++ b/acceptance/WcmsTestsTestPageCest.php
@@ -39,6 +39,8 @@ class WcmsTestsTestPageCest {
/**
* Test only one h1 tag.
*
+ * @group basic
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsUrlAliasCest.php b/acceptance/WcmsTestsUrlAliasCest.php
index b3ccb688..741df9db 100644
--- a/acceptance/WcmsTestsUrlAliasCest.php
+++ b/acceptance/WcmsTestsUrlAliasCest.php
@@ -24,6 +24,8 @@ class WcmsTestsUrlAliasCest {
/**
* Default generate automatic url alias test.
*
+ * @group basic
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -51,6 +53,8 @@ class WcmsTestsUrlAliasCest {
/**
* Generate url alias test.
*
+ * @group basic
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -171,6 +175,8 @@ class WcmsTestsUrlAliasCest {
/**
* Url alias error message test.
*
+ * @group basic
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsUsersCest.php b/acceptance/WcmsTestsUsersCest.php
index be603b58..b1a9acf2 100644
--- a/acceptance/WcmsTestsUsersCest.php
+++ b/acceptance/WcmsTestsUsersCest.php
@@ -12,6 +12,8 @@ class WcmsTestsUsersCest {
/**
* Function to test that certain roles can not create uwaterloo users.
*
+ * @group users
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -58,6 +60,8 @@ class WcmsTestsUsersCest {
/**
* Function to test that blocks are present.
*
+ * @group users
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
diff --git a/acceptance/WcmsTestsUwLdapCest.php b/acceptance/WcmsTestsUwLdapCest.php
index 174546f6..6001bb79 100644
--- a/acceptance/WcmsTestsUwLdapCest.php
+++ b/acceptance/WcmsTestsUwLdapCest.php
@@ -12,6 +12,8 @@ class WcmsTestsUwLdapCest {
/**
* Tests for uw ldap.
*
+ * @group users
+ *
* @param AcceptanceTester $i
* Acceptance test variable.
*/
diff --git a/acceptance/WcmsTestsWebformAccessCest.php b/acceptance/WcmsTestsWebformAccessCest.php
index 5fe82452..641e1e2e 100644
--- a/acceptance/WcmsTestsWebformAccessCest.php
+++ b/acceptance/WcmsTestsWebformAccessCest.php
@@ -51,6 +51,8 @@ class WcmsTestsWebformAccessCest {
/**
* Test for web form access.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -129,6 +131,8 @@ class WcmsTestsWebformAccessCest {
/**
* Function to test web form access mode.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
diff --git a/acceptance/WcmsTestsWebformElementsCest.php b/acceptance/WcmsTestsWebformElementsCest.php
index 45dca8e0..c8ba366d 100644
--- a/acceptance/WcmsTestsWebformElementsCest.php
+++ b/acceptance/WcmsTestsWebformElementsCest.php
@@ -51,6 +51,8 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form basic elements.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -68,6 +70,8 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form options elements.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -85,6 +89,8 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form advanced elements.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -102,6 +108,8 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form composite elements.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -119,6 +127,8 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form date elements.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -136,6 +146,8 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form entity elements.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
@@ -153,6 +165,8 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form containers elements.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
diff --git a/acceptance/WcmsTestsWebformSettingsCest.php b/acceptance/WcmsTestsWebformSettingsCest.php
index c706bee7..f531d355 100644
--- a/acceptance/WcmsTestsWebformSettingsCest.php
+++ b/acceptance/WcmsTestsWebformSettingsCest.php
@@ -51,6 +51,8 @@ class WcmsTestsWebformSettingsCest {
/**
* Test for captcha element.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -70,6 +72,8 @@ class WcmsTestsWebformSettingsCest {
/**
* Function to test that captcha is present on form.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*/
@@ -88,6 +92,8 @@ class WcmsTestsWebformSettingsCest {
/**
* Test for web form settings.
*
+ * @group webform
+ *
* @param AcceptanceTester $i
* The acceptance tester.
*
--
GitLab
From a7fda53df2fcd02c3000deca487eb0e51954136a Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Fri, 22 Nov 2024 08:30:52 -0500
Subject: [PATCH 18/69] ISTWCMS-7160: make separate group for waterloo events
block
---
acceptance/WcmsTestsBlocksListingsCest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index 0ab4282b..68960cdb 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -341,7 +341,7 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the Waterloo Events Block.
*
- * @group blocklistings
+ * @group blockwaterlooevents
*
* @param AcceptanceTester $i
* Acceptance test variable.
--
GitLab
From cda7b70152e7f1ec025e14d4cce90995d2e0f1b6 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Fri, 22 Nov 2024 11:04:03 -0500
Subject: [PATCH 19/69] ISTWCMS-7160: fix waterlooe events block test
---
acceptance/WcmsTestsBlocksListingsCest.php | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index 68960cdb..ff804231 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -1274,9 +1274,20 @@ class WcmsTestsBlocksListingsCest {
// Stop if desired number of events has been reached.
if (count($events) >= $num) {
- continue;
+ break;
+ }
+
+ // Ensure that there is a path in the api and that the path
+ // is not already in the events url.
+ if (
+ isset($event['path']) &&
+ !in_array($event['path'], $events)
+ ) {
+ $events[] = $event['path'];
+ }
+ else {
+ break;
}
- $events[] = $event['path'];
}
// Increment the day.
--
GitLab
From 545743f5e1f48685f4c31b75e3c6b194080dc097 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Fri, 22 Nov 2024 11:45:25 -0500
Subject: [PATCH 20/69] ISTWCMS-7160: fix coding standards
---
acceptance/WcmsTestsApiCest.php | 4 +--
acceptance/WcmsTestsAuthSiteCest.php | 4 +--
acceptance/WcmsTestsBlockConfigCest.php | 8 ++---
acceptance/WcmsTestsBlockLinksCest.php | 4 +--
acceptance/WcmsTestsBlocksContentCest.php | 36 ++++++++-----------
acceptance/WcmsTestsBlocksEmbedsCest.php | 16 ++++-----
acceptance/WcmsTestsBlocksListingsCest.php | 28 +++++++--------
acceptance/WcmsTestsBlocksSearchCest.php | 16 ++++-----
acceptance/WcmsTestsBlocksTeaserCest.php | 8 ++---
acceptance/WcmsTestsBlocksWebformsCest.php | 4 +--
acceptance/WcmsTestsCkeditorButtonsCest.php | 6 ++--
acceptance/WcmsTestsContentTypeBlogCest.php | 12 +++----
.../WcmsTestsContentTypeCatalogCest.php | 12 +++----
.../WcmsTestsContentTypeContactCest.php | 12 +++----
acceptance/WcmsTestsContentTypeEventCest.php | 16 ++++-----
...WcmsTestsContentTypeExpandCollapseCest.php | 4 +--
acceptance/WcmsTestsContentTypeNewsCest.php | 12 +++----
.../WcmsTestsContentTypeOpportunityCest.php | 8 ++---
.../WcmsTestsContentTypeProfileCest.php | 8 ++---
.../WcmsTestsContentTypeProjectCest.php | 16 ++++-----
.../WcmsTestsContentTypeServiceCest.php | 4 +--
.../WcmsTestsContentTypeSidebarCest.php | 4 +--
.../WcmsTestsContentTypeSiteFooterCest.php | 4 +--
.../WcmsTestsContentTypeWebpageCest.php | 4 +--
acceptance/WcmsTestsDashboardCest.php | 16 ++++-----
.../WcmsTestsDashboardCsvReportsCest.php | 4 +--
.../WcmsTestsDeleteWarningMessageCest.php | 8 ++---
acceptance/WcmsTestsDiffHeadersCest.php | 4 +--
acceptance/WcmsTestsEventDisplayCest.php | 4 +--
acceptance/WcmsTestsExcludeAutoListCest.php | 8 ++---
acceptance/WcmsTestsGlobalFooterCest.php | 4 +--
acceptance/WcmsTestsHomepageCest.php | 12 +++----
acceptance/WcmsTestsImgInlineCest.php | 4 +--
.../WcmsTestsLayoutBuilderBrowserCest.php | 4 +--
...estsLayoutSectionConfigurationFormCest.php | 4 +--
acceptance/WcmsTestsLinkFieldCest.php | 8 ++---
acceptance/WcmsTestsLongTitlesCest.php | 4 +--
acceptance/WcmsTestsMediaAboveCest.php | 12 +++----
acceptance/WcmsTestsMediaMenuItemsCest.php | 8 ++---
acceptance/WcmsTestsMediaTypesCest.php | 4 +--
acceptance/WcmsTestsMenuSettingsCest.php | 4 +--
acceptance/WcmsTestsMenusCest.php | 24 ++++++-------
acceptance/WcmsTestsMultiTypePromoteCest.php | 4 +--
.../WcmsTestsNodeRevisionDeleteCest.php | 4 +--
acceptance/WcmsTestsOfisCest.php | 4 +--
acceptance/WcmsTestsPageNotFoundCest.php | 4 +--
acceptance/WcmsTestsPreviewButtonCest.php | 4 +--
acceptance/WcmsTestsQuickNodeCloneCest.php | 4 +--
acceptance/WcmsTestsRealNameCest.php | 8 ++---
acceptance/WcmsTestsRedirectsCest.php | 12 +++----
acceptance/WcmsTestsRequireOnPublishCest.php | 4 +--
acceptance/WcmsTestsRoleOrderCest.php | 4 +--
acceptance/WcmsTestsSchemaCest.php | 12 +++----
acceptance/WcmsTestsServiceHoursCest.php | 4 +--
acceptance/WcmsTestsSpecialAlertCest.php | 8 ++---
acceptance/WcmsTestsTaxonomiesCest.php | 4 +--
acceptance/WcmsTestsTestPageCest.php | 8 ++---
acceptance/WcmsTestsUrlAliasCest.php | 12 +++----
acceptance/WcmsTestsUsersCest.php | 8 ++---
acceptance/WcmsTestsUwLdapCest.php | 4 +--
acceptance/WcmsTestsWebformAccessCest.php | 8 ++---
acceptance/WcmsTestsWebformElementsCest.php | 28 ++++-----------
acceptance/WcmsTestsWebformSettingsCest.php | 12 +++----
63 files changed, 258 insertions(+), 288 deletions(-)
diff --git a/acceptance/WcmsTestsApiCest.php b/acceptance/WcmsTestsApiCest.php
index 09ba74aa..4c0dd449 100644
--- a/acceptance/WcmsTestsApiCest.php
+++ b/acceptance/WcmsTestsApiCest.php
@@ -31,10 +31,10 @@ class WcmsTestsApiCest {
/**
* Function to test Api v3.0.
*
- * @group api
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group api
*/
public function testApi(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsAuthSiteCest.php b/acceptance/WcmsTestsAuthSiteCest.php
index 17337fa4..d2eab457 100644
--- a/acceptance/WcmsTestsAuthSiteCest.php
+++ b/acceptance/WcmsTestsAuthSiteCest.php
@@ -10,10 +10,10 @@ class WcmsTestsAuthSiteCest {
/**
* Tests for auth site.
*
- * @group authsite
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group authsite
*/
public function testAuthSite(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsBlockConfigCest.php b/acceptance/WcmsTestsBlockConfigCest.php
index 9dbc0a0e..69042758 100644
--- a/acceptance/WcmsTestsBlockConfigCest.php
+++ b/acceptance/WcmsTestsBlockConfigCest.php
@@ -39,10 +39,10 @@ class WcmsTestsBlockConfigCest {
/**
* Tests for cta block fields.
*
- * @group blocks
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group blocks
*/
public function testCtaFields(AcceptanceTester $i) {
@@ -76,10 +76,10 @@ class WcmsTestsBlockConfigCest {
/**
* Tests for cta block fields.
*
- * @group blocks
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group blocks
*/
public function testFactsAndFiguresFields(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsBlockLinksCest.php b/acceptance/WcmsTestsBlockLinksCest.php
index 08de536d..8cabe933 100644
--- a/acceptance/WcmsTestsBlockLinksCest.php
+++ b/acceptance/WcmsTestsBlockLinksCest.php
@@ -17,12 +17,10 @@ class WcmsTestsBlockLinksCest {
/**
* Function to test that blocks are present.
*
- * @group blocks
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group blocks
*/
public function testBlockLinks(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsBlocksContentCest.php b/acceptance/WcmsTestsBlocksContentCest.php
index f4b1e20e..413e06a0 100644
--- a/acceptance/WcmsTestsBlocksContentCest.php
+++ b/acceptance/WcmsTestsBlocksContentCest.php
@@ -26,10 +26,10 @@ class WcmsTestsBlocksContentCest {
/**
* Tests for banner block.
*
- * @group blockcontent
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group blockcontent
*/
public function testBannerImagesBlock(AcceptanceTester $i) {
@@ -206,10 +206,10 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test for Vimeo banners.
*
- * @group blockcontent
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockcontent
*/
public function testBannerVimeoBlock(AcceptanceTester $i) {
@@ -269,10 +269,10 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the copy text block.
*
- * @group blockcontent
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockcontent
*/
public function testCopyTextBlock(AcceptanceTester $i) {
@@ -348,12 +348,10 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the CTA block.
*
- * @group blockcontent
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group blockcontent
*/
public function testCtaBlock(AcceptanceTester $i) {
@@ -424,10 +422,10 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the expand/collapse block.
*
- * @group blockcontent
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockcontent
*/
public function testExpandCollapseBlock(AcceptanceTester $i) {
@@ -539,12 +537,10 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the FF block.
*
- * @group blockcontent
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group blockcontent
*/
public function testFactsAndFiguresBlock(AcceptanceTester $i) {
@@ -598,12 +594,10 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the image full width block.
*
- * @group blockcontent
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group blockcontent
*/
public function testImageFullWidthBlock(AcceptanceTester $i) {
@@ -694,12 +688,10 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the image fixed width block.
*
- * @group blockcontent
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group blockcontent
*/
public function testImageFixedWidthBlock(AcceptanceTester $i) {
@@ -891,10 +883,10 @@ class WcmsTestsBlocksContentCest {
/**
* Function to test the timeline block.
*
- * @group blockcontent
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockcontent
*/
public function testTimelineBlock(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsBlocksEmbedsCest.php b/acceptance/WcmsTestsBlocksEmbedsCest.php
index a9dc4caa..88db3284 100644
--- a/acceptance/WcmsTestsBlocksEmbedsCest.php
+++ b/acceptance/WcmsTestsBlocksEmbedsCest.php
@@ -26,10 +26,10 @@ class WcmsTestsBlocksEmbedsCest {
/**
* Function to test the Google Maps block.
*
- * @group blockembeds
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockembeds
*/
public function testGoogleMapsBlock(AcceptanceTester $i) {
@@ -79,10 +79,10 @@ class WcmsTestsBlocksEmbedsCest {
/**
* Function to test the Power BI block.
*
- * @group blockembeds
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockembeds
*/
public function testPowerBiBlock(AcceptanceTester $i) {
@@ -130,10 +130,10 @@ class WcmsTestsBlocksEmbedsCest {
/**
* Function to test the social intents block.
*
- * @group blockembeds
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockembeds
*/
public function testSocialIntentsBlock(AcceptanceTester $i) {
@@ -180,10 +180,10 @@ class WcmsTestsBlocksEmbedsCest {
/**
* Function to test the Tableau visualization block.
*
- * @group blockembeds
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockembeds
*/
public function testTableauVisualizationBlock(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index ff804231..493781f2 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -27,10 +27,10 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the multi type list block.
*
- * @group blocklistings
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blocklistings
*/
public function testMultiTypeListBlock(AcceptanceTester $i) {
@@ -145,10 +145,10 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the automatic list block config.
*
- * @group blockautolist
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockautolist
*/
public function testAutomaticListBlockConfig(AcceptanceTester $i) {
@@ -187,10 +187,10 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the manual list block config.
*
- * @group blockmanuallist
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockmanuallist
*/
public function testManualListBlockConfig(AcceptanceTester $i) {
@@ -229,10 +229,10 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the automatic list block.
*
- * @group blocklistings
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockautolist
*/
public function testAutomaticListBlock(AcceptanceTester $i) {
@@ -287,10 +287,10 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the manual list block.
*
- * @group blocklistings
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockmanuallist
*/
public function testManualListBlock(AcceptanceTester $i) {
@@ -341,10 +341,10 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test the Waterloo Events Block.
*
- * @group blockwaterlooevents
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group blocklistings
*/
public function testWaterlooEventsBlock(AcceptanceTester $i) {
@@ -410,10 +410,10 @@ class WcmsTestsBlocksListingsCest {
/**
* Function to test list parity.
*
- * @group blocklistings
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blocklistings
*/
public function testListParity(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsBlocksSearchCest.php b/acceptance/WcmsTestsBlocksSearchCest.php
index 70727343..45040b2d 100644
--- a/acceptance/WcmsTestsBlocksSearchCest.php
+++ b/acceptance/WcmsTestsBlocksSearchCest.php
@@ -27,10 +27,10 @@ class WcmsTestsBlocksSearchCest {
/**
* Function to test the catalog search block.
*
- * @group blocksearch
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blocksearch
*/
public function testCatalogSearchBlock(AcceptanceTester $i) {
@@ -114,10 +114,10 @@ class WcmsTestsBlocksSearchCest {
/**
* Function to test the project search block.
*
- * @group blocksearch
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blocksearch
*/
public function testProjectSearchBlock(AcceptanceTester $i) {
@@ -175,10 +175,10 @@ class WcmsTestsBlocksSearchCest {
/**
* Function to test the service search block.
*
- * @group blocksearch
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blocksearch
*/
public function testServiceSearchBlock(AcceptanceTester $i) {
@@ -227,10 +227,10 @@ class WcmsTestsBlocksSearchCest {
/**
* Function to test the OFIS search block.
*
- * @group blocksearch
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blocksearch
*/
public function testOfisSearchBlock(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsBlocksTeaserCest.php b/acceptance/WcmsTestsBlocksTeaserCest.php
index 8119e6e3..58ee6379 100644
--- a/acceptance/WcmsTestsBlocksTeaserCest.php
+++ b/acceptance/WcmsTestsBlocksTeaserCest.php
@@ -82,10 +82,10 @@ class WcmsTestsBlocksTeaserCest {
/**
* Function to test the multi type list block.
*
- * @group blockteaser
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockteaser
*/
public function testTeaserBlockConfig(AcceptanceTester $i) {
@@ -138,10 +138,10 @@ class WcmsTestsBlocksTeaserCest {
/**
* Function to test the multi type list block.
*
- * @group blockteaser
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockteaser
*/
public function testTeaserBlock(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsBlocksWebformsCest.php b/acceptance/WcmsTestsBlocksWebformsCest.php
index 4adfd478..1f818b26 100644
--- a/acceptance/WcmsTestsBlocksWebformsCest.php
+++ b/acceptance/WcmsTestsBlocksWebformsCest.php
@@ -27,10 +27,10 @@ class WcmsTestsBlocksWebformsCest {
/**
* Function to test the webform block.
*
- * @group blockwebforms
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group blockwebforms
*/
public function testWebformBlock(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsCkeditorButtonsCest.php b/acceptance/WcmsTestsCkeditorButtonsCest.php
index 46ab4c51..494dc05a 100644
--- a/acceptance/WcmsTestsCkeditorButtonsCest.php
+++ b/acceptance/WcmsTestsCkeditorButtonsCest.php
@@ -19,10 +19,10 @@ class WcmsTestsCkeditorButtonsCest {
/**
* Tests for ck editor buttons.
*
- * @group ckeditor
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group ckeditor
*/
public function testCkeditorButtons(AcceptanceTester $i) {
@@ -61,6 +61,8 @@ class WcmsTestsCkeditorButtonsCest {
*
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group ckeditor
*/
public function testLanguageSupport(AcceptanceTester $i) {
// Html tags to test.
diff --git a/acceptance/WcmsTestsContentTypeBlogCest.php b/acceptance/WcmsTestsContentTypeBlogCest.php
index a17e6a07..e730bcc6 100644
--- a/acceptance/WcmsTestsContentTypeBlogCest.php
+++ b/acceptance/WcmsTestsContentTypeBlogCest.php
@@ -20,10 +20,10 @@ class WcmsTestsContentTypeBlogCest {
/**
* Tests for blog content type.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testBlogContentType(ContentType $i): void {
@@ -43,10 +43,10 @@ class WcmsTestsContentTypeBlogCest {
/**
* Function to test taxonomies.
*
- * @group contenttype
- *
* @param Step\Acceptance\TaxonomyTest $i
* The acceptance tester.
+ *
+ * @group contenttype
*/
public function testBlogTaxonomies(TaxonomyTest $i): void {
@@ -61,10 +61,10 @@ class WcmsTestsContentTypeBlogCest {
/**
* Test blog content type with dates.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* The acceptance tester.
+ *
+ * @group contenttype
*/
public function testBlogDates(ContentType $i): void {
diff --git a/acceptance/WcmsTestsContentTypeCatalogCest.php b/acceptance/WcmsTestsContentTypeCatalogCest.php
index 20acb028..965ed628 100644
--- a/acceptance/WcmsTestsContentTypeCatalogCest.php
+++ b/acceptance/WcmsTestsContentTypeCatalogCest.php
@@ -70,10 +70,10 @@ class WcmsTestsContentTypeCatalogCest {
/**
* Tests for catalog content type.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testCatalogContentType(ContentType $i) {
@@ -103,10 +103,10 @@ class WcmsTestsContentTypeCatalogCest {
/**
* Tests for catalogs settings.
*
- * @group contenttype
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function catalogSettingsTest(AcceptanceTester $i) {
@@ -171,10 +171,10 @@ class WcmsTestsContentTypeCatalogCest {
/**
* Tests for catalogs term and roles.
*
- * @group contenttype
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function catalogTermRolesTest(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsContentTypeContactCest.php b/acceptance/WcmsTestsContentTypeContactCest.php
index 5479837b..c9868208 100644
--- a/acceptance/WcmsTestsContentTypeContactCest.php
+++ b/acceptance/WcmsTestsContentTypeContactCest.php
@@ -34,10 +34,10 @@ class WcmsTestsContentTypeContactCest {
/**
* Tests for contact content type.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testContactContentType(ContentType $i) {
@@ -57,10 +57,10 @@ class WcmsTestsContentTypeContactCest {
/**
* Function to test contact content type settings.
*
- * @group contenttype
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group contenttype
*/
public function testContactSettings(AcceptanceTester $i) {
@@ -105,10 +105,10 @@ class WcmsTestsContentTypeContactCest {
/**
* Function to test contact reordering.
*
- * @group contenttype
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group contenttype
*/
public function testContactReorder(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsContentTypeEventCest.php b/acceptance/WcmsTestsContentTypeEventCest.php
index 33ff7cbe..2b7f3076 100644
--- a/acceptance/WcmsTestsContentTypeEventCest.php
+++ b/acceptance/WcmsTestsContentTypeEventCest.php
@@ -20,10 +20,10 @@ class WcmsTestsContentTypeEventCest {
/**
* Tests for blog content type.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testEventContentType(ContentType $i): void {
@@ -43,10 +43,10 @@ class WcmsTestsContentTypeEventCest {
/**
* Function to test taxonomies.
*
- * @group contenttype
- *
* @param Step\Acceptance\TaxonomyTest $i
* The acceptance tester.
+ *
+ * @group contenttype
*/
public function testEventTaxonomies(TaxonomyTest $i): void {
@@ -64,10 +64,10 @@ class WcmsTestsContentTypeEventCest {
/**
* Function to test location info on events.
*
- * @group contenttype
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group contenttype
*/
public function testEventLocationInfo(AcceptanceTester $i): void {
@@ -87,10 +87,10 @@ class WcmsTestsContentTypeEventCest {
/**
* Test event content type with dates.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* The acceptance tester.
+ *
+ * @group contenttype
*/
public function testEventDates(ContentType $i): void {
diff --git a/acceptance/WcmsTestsContentTypeExpandCollapseCest.php b/acceptance/WcmsTestsContentTypeExpandCollapseCest.php
index d24718f5..733945c4 100644
--- a/acceptance/WcmsTestsContentTypeExpandCollapseCest.php
+++ b/acceptance/WcmsTestsContentTypeExpandCollapseCest.php
@@ -19,10 +19,10 @@ class WcmsTestsContentTypeExpandCollapseCest {
/**
* Tests for expand collapse content type.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testExpandCollapseContentType(ContentType $i): void {
diff --git a/acceptance/WcmsTestsContentTypeNewsCest.php b/acceptance/WcmsTestsContentTypeNewsCest.php
index 0078785c..2380e150 100644
--- a/acceptance/WcmsTestsContentTypeNewsCest.php
+++ b/acceptance/WcmsTestsContentTypeNewsCest.php
@@ -20,10 +20,10 @@ class WcmsTestsContentTypeNewsCest {
/**
* Tests for expand collapse content type.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testNewsContentType(ContentType $i): void {
@@ -43,10 +43,10 @@ class WcmsTestsContentTypeNewsCest {
/**
* Function to test taxonomies.
*
- * @group contenttype
- *
* @param Step\Acceptance\TaxonomyTest $i
* The acceptance tester.
+ *
+ * @group contenttype
*/
public function testNewsTaxonomies(TaxonomyTest $i): void {
@@ -61,10 +61,10 @@ class WcmsTestsContentTypeNewsCest {
/**
* Test news content type with dates.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* The acceptance tester.
+ *
+ * @group contenttype
*/
public function testNewsDates(ContentType $i): void {
diff --git a/acceptance/WcmsTestsContentTypeOpportunityCest.php b/acceptance/WcmsTestsContentTypeOpportunityCest.php
index b0bd3c0b..b2cef024 100644
--- a/acceptance/WcmsTestsContentTypeOpportunityCest.php
+++ b/acceptance/WcmsTestsContentTypeOpportunityCest.php
@@ -20,10 +20,10 @@ class WcmsTestsContentTypeOpportunityCest {
/**
* Tests for blog content type.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testOpportunityContentType(ContentType $i): void {
@@ -43,10 +43,10 @@ class WcmsTestsContentTypeOpportunityCest {
/**
* Tests for taxonomies for opportunity content type.
*
- * @group contenttype
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testTaxonomies(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsContentTypeProfileCest.php b/acceptance/WcmsTestsContentTypeProfileCest.php
index 378b72cd..124a1f89 100644
--- a/acceptance/WcmsTestsContentTypeProfileCest.php
+++ b/acceptance/WcmsTestsContentTypeProfileCest.php
@@ -27,10 +27,10 @@ class WcmsTestsContentTypeProfileCest {
/**
* Tests for profiles.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testProfileContentType(ContentType $i): void {
@@ -50,10 +50,10 @@ class WcmsTestsContentTypeProfileCest {
/**
* Tests for profiles synchronization with contacts.
*
- * @group contenttype
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testProfileContactSynchronization(AcceptanceTester $i) {
// Login as site manager user.
diff --git a/acceptance/WcmsTestsContentTypeProjectCest.php b/acceptance/WcmsTestsContentTypeProjectCest.php
index a1749653..f3cb83eb 100644
--- a/acceptance/WcmsTestsContentTypeProjectCest.php
+++ b/acceptance/WcmsTestsContentTypeProjectCest.php
@@ -36,10 +36,10 @@ class WcmsTestsContentTypeProjectCest {
/**
* Tests for projects.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testProjectContentType(ContentType $i): void {
@@ -59,10 +59,10 @@ class WcmsTestsContentTypeProjectCest {
/**
* Function to test taxonomies.
*
- * @group contenttype
- *
* @param Step\Acceptance\TaxonomyTest $i
* The acceptance tester.
+ *
+ * @group contenttype
*/
public function testProjectTaxonomies(TaxonomyTest $i): void {
@@ -77,10 +77,10 @@ class WcmsTestsContentTypeProjectCest {
/**
* Tests for project taxonomy terms.
*
- * @group contenttype
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testProjectTaxonomyTerms(AcceptanceTester $i) {
@@ -114,10 +114,10 @@ class WcmsTestsContentTypeProjectCest {
/**
* Tests for project members.
*
- * @group contenttype
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testProjectMembers(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsContentTypeServiceCest.php b/acceptance/WcmsTestsContentTypeServiceCest.php
index e1f8da42..06c87968 100644
--- a/acceptance/WcmsTestsContentTypeServiceCest.php
+++ b/acceptance/WcmsTestsContentTypeServiceCest.php
@@ -26,10 +26,10 @@ class WcmsTestsContentTypeServiceCest {
/**
* Tests for service content type.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testServiceContentType(ContentType $i): void {
diff --git a/acceptance/WcmsTestsContentTypeSidebarCest.php b/acceptance/WcmsTestsContentTypeSidebarCest.php
index f5028e7a..47c0d0d0 100644
--- a/acceptance/WcmsTestsContentTypeSidebarCest.php
+++ b/acceptance/WcmsTestsContentTypeSidebarCest.php
@@ -19,10 +19,10 @@ class WcmsTestsContentTypeSidebarCest {
/**
* Tests for sidebar content type.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testSidebarContentType(ContentType $i): void {
diff --git a/acceptance/WcmsTestsContentTypeSiteFooterCest.php b/acceptance/WcmsTestsContentTypeSiteFooterCest.php
index 117e903b..5f39575c 100644
--- a/acceptance/WcmsTestsContentTypeSiteFooterCest.php
+++ b/acceptance/WcmsTestsContentTypeSiteFooterCest.php
@@ -19,10 +19,10 @@ class WcmsTestsContentTypeSiteFooterCest {
/**
* Tests for site footer content type.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testSiteFooterContentType(ContentType $i): void {
diff --git a/acceptance/WcmsTestsContentTypeWebpageCest.php b/acceptance/WcmsTestsContentTypeWebpageCest.php
index 9f138c6d..1c0cf1d3 100644
--- a/acceptance/WcmsTestsContentTypeWebpageCest.php
+++ b/acceptance/WcmsTestsContentTypeWebpageCest.php
@@ -19,10 +19,10 @@ class WcmsTestsContentTypeWebpageCest {
/**
* Tests for webpage content type.
*
- * @group contenttype
- *
* @param Step\Acceptance\ContentType $i
* Acceptance test variable.
+ *
+ * @group contenttype
*/
public function testWebpageContentType(ContentType $i): void {
diff --git a/acceptance/WcmsTestsDashboardCest.php b/acceptance/WcmsTestsDashboardCest.php
index 3ea18271..7b69a0e5 100644
--- a/acceptance/WcmsTestsDashboardCest.php
+++ b/acceptance/WcmsTestsDashboardCest.php
@@ -12,10 +12,10 @@ class WcmsTestsDashboardCest {
/**
* Tests for dashboard access.
*
- * @group dashboards
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group dashboards
*/
public function testAccess(AcceptanceTester $i) {
@@ -97,10 +97,10 @@ class WcmsTestsDashboardCest {
/**
* Tests for dashboard elements.
*
- * @group dashboards
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group dashboards
*/
public function testElements(AcceptanceTester $i) {
@@ -155,10 +155,10 @@ class WcmsTestsDashboardCest {
/**
* Tests for layout builder.
*
- * @group dashboards
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group dashboards
*/
public function testLayoutBuilder(AcceptanceTester $i) {
@@ -201,10 +201,10 @@ class WcmsTestsDashboardCest {
/**
* Tests for cancel button of taxonomy terms.
*
- * @group dashboards
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group dashboards
*/
public function testTaxonomyTermCancelButton(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsDashboardCsvReportsCest.php b/acceptance/WcmsTestsDashboardCsvReportsCest.php
index b5e17fd6..0f034fce 100644
--- a/acceptance/WcmsTestsDashboardCsvReportsCest.php
+++ b/acceptance/WcmsTestsDashboardCsvReportsCest.php
@@ -10,10 +10,10 @@ class WcmsTestsDashboardCsvReportsCest {
/**
* Tests for dashboard csv report.
*
- * @group dashboards
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group dashboards
*/
public function testDashboardCsvReport(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsDeleteWarningMessageCest.php b/acceptance/WcmsTestsDeleteWarningMessageCest.php
index 4d5ded03..3992c3d5 100644
--- a/acceptance/WcmsTestsDeleteWarningMessageCest.php
+++ b/acceptance/WcmsTestsDeleteWarningMessageCest.php
@@ -24,10 +24,10 @@ class WcmsTestsDeleteWarningMessageCest {
/**
* Tests for delete warning message.
*
- * @group messaging
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group messaging
*/
public function testDeleteWarningMessage(AcceptanceTester $i) {
@@ -86,10 +86,10 @@ class WcmsTestsDeleteWarningMessageCest {
/**
* Tests for prevent deleting catalog being used.
*
- * @group messaging
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group messaging
*/
public function testPreventDeletingCatalogBeingUsed(AcceptanceTester $i) {
// Login as site manager.
diff --git a/acceptance/WcmsTestsDiffHeadersCest.php b/acceptance/WcmsTestsDiffHeadersCest.php
index 7c0b2175..ef3f675b 100644
--- a/acceptance/WcmsTestsDiffHeadersCest.php
+++ b/acceptance/WcmsTestsDiffHeadersCest.php
@@ -48,10 +48,10 @@ class WcmsTestsDiffHeadersCest {
/**
* Tests for diff headers.
*
- * @group modules
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group modules
*/
public function diffHeadersTest(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsEventDisplayCest.php b/acceptance/WcmsTestsEventDisplayCest.php
index 67c7e804..891cc3aa 100644
--- a/acceptance/WcmsTestsEventDisplayCest.php
+++ b/acceptance/WcmsTestsEventDisplayCest.php
@@ -10,10 +10,10 @@ class WcmsTestsEventDisplayCest {
/**
* Tests for event display.
*
- * @group display
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group display
*/
public function testEventDisplay(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsExcludeAutoListCest.php b/acceptance/WcmsTestsExcludeAutoListCest.php
index 15de4a19..62662d04 100644
--- a/acceptance/WcmsTestsExcludeAutoListCest.php
+++ b/acceptance/WcmsTestsExcludeAutoListCest.php
@@ -132,10 +132,10 @@ class WcmsTestsExcludeAutoListCest {
/**
* Tests for listing pages with excluded content.
*
- * @group display
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group display
*/
public function testExcludeListingPages(AcceptanceTester $i): void {
@@ -154,10 +154,10 @@ class WcmsTestsExcludeAutoListCest {
/**
* Function to test the auto list block with excluded content.
*
- * @group display
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group display
*/
public function testExcludeAutoListBlock(AcceptanceTester $i): void {
diff --git a/acceptance/WcmsTestsGlobalFooterCest.php b/acceptance/WcmsTestsGlobalFooterCest.php
index db0474c3..31b1f0de 100644
--- a/acceptance/WcmsTestsGlobalFooterCest.php
+++ b/acceptance/WcmsTestsGlobalFooterCest.php
@@ -12,10 +12,10 @@ class WcmsTestsGlobalFooterCest {
/**
* Tests for global footer.
*
- * @group display
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group display
*/
public function testGlobalFooter(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsHomepageCest.php b/acceptance/WcmsTestsHomepageCest.php
index ef5d887b..53bfc3c3 100644
--- a/acceptance/WcmsTestsHomepageCest.php
+++ b/acceptance/WcmsTestsHomepageCest.php
@@ -10,10 +10,10 @@ class WcmsTestsHomepageCest {
/**
* Function to test the page elements of the homepage.
*
- * @group homepage
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group homepage
*/
public function testHomepageElements(AcceptanceTester $i): void {
@@ -46,10 +46,10 @@ class WcmsTestsHomepageCest {
/**
* Function to test the home page link.
*
- * @group homepage
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group homepage
*/
public function testHomePageMenuLink(AcceptanceTester $i): void {
@@ -86,10 +86,10 @@ class WcmsTestsHomepageCest {
/**
* Function to test home page and protection.
*
- * @group homepage
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group homepage
*/
public function testHomePageConfig(AcceptanceTester $i): void {
diff --git a/acceptance/WcmsTestsImgInlineCest.php b/acceptance/WcmsTestsImgInlineCest.php
index e2f6f6f1..9ef1c183 100644
--- a/acceptance/WcmsTestsImgInlineCest.php
+++ b/acceptance/WcmsTestsImgInlineCest.php
@@ -17,10 +17,10 @@ class WcmsTestsImgInlineCest {
/**
* Tests that images are not block elements.
*
- * @group media
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group media
*/
public function testImgInline(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsLayoutBuilderBrowserCest.php b/acceptance/WcmsTestsLayoutBuilderBrowserCest.php
index e8827ed4..b1984a03 100644
--- a/acceptance/WcmsTestsLayoutBuilderBrowserCest.php
+++ b/acceptance/WcmsTestsLayoutBuilderBrowserCest.php
@@ -10,10 +10,10 @@ class WcmsTestsLayoutBuilderBrowserCest {
/**
* Tests for layout builder browser.
*
- * @group layouts
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group layouts
*/
public function testLayoutBuilderBrowser(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsLayoutSectionConfigurationFormCest.php b/acceptance/WcmsTestsLayoutSectionConfigurationFormCest.php
index fc2a2183..084c68bb 100644
--- a/acceptance/WcmsTestsLayoutSectionConfigurationFormCest.php
+++ b/acceptance/WcmsTestsLayoutSectionConfigurationFormCest.php
@@ -17,10 +17,10 @@ class WcmsTestsLayoutSectionConfigurationFormCest {
/**
* Tests that images are not block elements.
*
- * @group layouts
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group layouts
*/
public function layoutConfigurationFormTest(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsLinkFieldCest.php b/acceptance/WcmsTestsLinkFieldCest.php
index b64c48d2..2717610b 100644
--- a/acceptance/WcmsTestsLinkFieldCest.php
+++ b/acceptance/WcmsTestsLinkFieldCest.php
@@ -40,10 +40,10 @@ class WcmsTestsLinkFieldCest {
/**
* Tests that <nolink> and <button> are not accepted where they shouldn't be.
*
- * @group miscellaneous
- *
* @param Step\Acceptance\ContentType $i
* Content Type test variable.
+ *
+ * @group miscellaneous
*/
public function testLinkField(ContentType $i) {
@@ -248,10 +248,10 @@ class WcmsTestsLinkFieldCest {
/**
* Test that appropriate content block errors appear.
*
- * @group miscellaneous
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group miscellaneous
*/
public function testContentBlocks(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsLongTitlesCest.php b/acceptance/WcmsTestsLongTitlesCest.php
index 9bb68ee4..f9600529 100644
--- a/acceptance/WcmsTestsLongTitlesCest.php
+++ b/acceptance/WcmsTestsLongTitlesCest.php
@@ -75,10 +75,10 @@ class WcmsTestsLongTitlesCest {
/**
* Tests for long titles.
*
- * @group miscellaneous
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group miscellaneous
*/
public function testLongTitles(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsMediaAboveCest.php b/acceptance/WcmsTestsMediaAboveCest.php
index 304e4190..87767783 100644
--- a/acceptance/WcmsTestsMediaAboveCest.php
+++ b/acceptance/WcmsTestsMediaAboveCest.php
@@ -27,10 +27,10 @@ class WcmsTestsMediaAboveCest {
/**
* Test media above settings.
*
- * @group media
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group media
*/
public function testSettingsMediaAbove(AcceptanceTester $i) {
@@ -124,10 +124,10 @@ class WcmsTestsMediaAboveCest {
/**
* Function to test the banners above.
*
- * @group media
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group media
*/
public function testBannersAbove(AcceptanceTester $i) {
@@ -264,10 +264,10 @@ class WcmsTestsMediaAboveCest {
/**
* Function to test the banners above.
*
- * @group media
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group media
*/
public function testImageAbove(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsMediaMenuItemsCest.php b/acceptance/WcmsTestsMediaMenuItemsCest.php
index e0a0b40b..080723b8 100644
--- a/acceptance/WcmsTestsMediaMenuItemsCest.php
+++ b/acceptance/WcmsTestsMediaMenuItemsCest.php
@@ -10,10 +10,10 @@ class WcmsTestsMediaMenuItemsCest {
/**
* Tests for media authorized.
*
- * @group media
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group media
*/
public function testMediaMenuAuthorized(AcceptanceTester $i) {
@@ -59,10 +59,10 @@ class WcmsTestsMediaMenuItemsCest {
/**
* Tests for media unauthorized.
*
- * @group media
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group media
*/
public function testMediaMenuUnauthorized(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsMediaTypesCest.php b/acceptance/WcmsTestsMediaTypesCest.php
index 3b1b8758..7c9f1f6f 100644
--- a/acceptance/WcmsTestsMediaTypesCest.php
+++ b/acceptance/WcmsTestsMediaTypesCest.php
@@ -44,10 +44,10 @@ class WcmsTestsMediaTypesCest {
/**
* Tests for media types.
*
- * @group media
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group media
*/
public function mediaTypesTest(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsMenuSettingsCest.php b/acceptance/WcmsTestsMenuSettingsCest.php
index 238f01dd..cb2124c1 100644
--- a/acceptance/WcmsTestsMenuSettingsCest.php
+++ b/acceptance/WcmsTestsMenuSettingsCest.php
@@ -52,10 +52,10 @@ class WcmsTestsMenuSettingsCest {
* "Place in site hierarchy" and "Add menu link".
* This is custom WCMS functionality in uw_sites_all.
*
- * @group menus
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group menus
*/
public function testMenuSettings(AcceptanceTester $i): void {
diff --git a/acceptance/WcmsTestsMenusCest.php b/acceptance/WcmsTestsMenusCest.php
index 1ff0bf29..f2478cf2 100644
--- a/acceptance/WcmsTestsMenusCest.php
+++ b/acceptance/WcmsTestsMenusCest.php
@@ -10,10 +10,10 @@ class WcmsTestsMenusCest {
/**
* Tests for content management menu.
*
- * @group menus
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group menus
*/
public function testContentManagementMenu(AcceptanceTester $i) {
@@ -38,10 +38,10 @@ class WcmsTestsMenusCest {
/**
* Tests for site information menu.
*
- * @group menus
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group menus
*/
public function testSiteInformationMenu(AcceptanceTester $i) {
@@ -66,10 +66,10 @@ class WcmsTestsMenusCest {
/**
* Tests adding menu links with various roles.
*
- * @group menus
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group menus
*/
public function testAddingMenuLinks(AcceptanceTester $i) {
@@ -110,10 +110,10 @@ class WcmsTestsMenusCest {
/**
* Tests for home menu link weight.
*
- * @group menus
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group menus
*/
public function testHomeMenuLinkWeight(AcceptanceTester $i) {
@@ -132,10 +132,10 @@ class WcmsTestsMenusCest {
/**
* Tests for main menu.
*
- * @group menus
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group menus
*/
public function testMenuMain(AcceptanceTester $i) {
@@ -174,10 +174,10 @@ class WcmsTestsMenusCest {
/**
* Tests for home main menu access.
*
- * @group menus
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group menus
*/
public function testMenuMainAccess(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsMultiTypePromoteCest.php b/acceptance/WcmsTestsMultiTypePromoteCest.php
index 52f55dcc..d391761b 100644
--- a/acceptance/WcmsTestsMultiTypePromoteCest.php
+++ b/acceptance/WcmsTestsMultiTypePromoteCest.php
@@ -19,10 +19,10 @@ class WcmsTestsMultiTypePromoteCest {
/**
* Tests if promoted items are displayed in multi-type lists.
*
- * @group miscellaneous
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group blocks
*/
public function testMultiTypePromote(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsNodeRevisionDeleteCest.php b/acceptance/WcmsTestsNodeRevisionDeleteCest.php
index 8ef505e1..f710834a 100644
--- a/acceptance/WcmsTestsNodeRevisionDeleteCest.php
+++ b/acceptance/WcmsTestsNodeRevisionDeleteCest.php
@@ -12,10 +12,10 @@ class WcmsTestsNodeRevisionDeleteCest {
/**
* Tests for node revision delete.
*
- * @group modules
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group modules
*/
public function testNodeRevisionDelete(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsOfisCest.php b/acceptance/WcmsTestsOfisCest.php
index afbb85d8..4df91edb 100644
--- a/acceptance/WcmsTestsOfisCest.php
+++ b/acceptance/WcmsTestsOfisCest.php
@@ -10,10 +10,10 @@ class WcmsTestsOfisCest {
/**
* Tests for ofis.
*
- * @group modules
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group modules
*/
public function testOfis(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsPageNotFoundCest.php b/acceptance/WcmsTestsPageNotFoundCest.php
index 3afa8184..0769aaad 100644
--- a/acceptance/WcmsTestsPageNotFoundCest.php
+++ b/acceptance/WcmsTestsPageNotFoundCest.php
@@ -10,10 +10,10 @@ class WcmsTestsPageNotFoundCest {
/**
* Tests for page not found.
*
- * @group messaging
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group messaging
*/
public function testPageNotFound(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsPreviewButtonCest.php b/acceptance/WcmsTestsPreviewButtonCest.php
index 3bdd719b..97fac654 100644
--- a/acceptance/WcmsTestsPreviewButtonCest.php
+++ b/acceptance/WcmsTestsPreviewButtonCest.php
@@ -10,10 +10,10 @@ class WcmsTestsPreviewButtonCest {
/**
* Tests for preview button.
*
- * @group miscellaneous
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group miscellaneous
*/
public function testPreviewButton(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsQuickNodeCloneCest.php b/acceptance/WcmsTestsQuickNodeCloneCest.php
index b968399b..b593cd97 100644
--- a/acceptance/WcmsTestsQuickNodeCloneCest.php
+++ b/acceptance/WcmsTestsQuickNodeCloneCest.php
@@ -10,10 +10,10 @@ class WcmsTestsQuickNodeCloneCest {
/**
* Tests for quick node clone.
*
- * @group modules
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group modules
*/
public function testQuickNodeClone(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsRealNameCest.php b/acceptance/WcmsTestsRealNameCest.php
index e6ac057a..af8d2c42 100644
--- a/acceptance/WcmsTestsRealNameCest.php
+++ b/acceptance/WcmsTestsRealNameCest.php
@@ -10,10 +10,10 @@ class WcmsTestsRealNameCest {
/**
* Tests for real name settings.
*
- * @group users
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group users
*/
public function testRealNameSettings(AcceptanceTester $i) {
@@ -32,10 +32,10 @@ class WcmsTestsRealNameCest {
/**
* Function to test real name in user.
*
- * @group users
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group users
*/
public function testRealNameUser(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsRedirectsCest.php b/acceptance/WcmsTestsRedirectsCest.php
index 03b7e32d..687b1d1d 100644
--- a/acceptance/WcmsTestsRedirectsCest.php
+++ b/acceptance/WcmsTestsRedirectsCest.php
@@ -20,10 +20,10 @@ class WcmsTestsRedirectsCest {
/**
* Tests for redirects.
*
- * @group miscellaneous
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group miscellaneous
*/
public function testRedirectsPermissions(AcceptanceTester $i) {
@@ -56,10 +56,10 @@ class WcmsTestsRedirectsCest {
/**
* Function to test the redirects settings.
*
- * @group miscellaneous
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group miscellaneous
*/
public function testRedirectsSettings(AcceptanceTester $i) {
@@ -84,10 +84,10 @@ class WcmsTestsRedirectsCest {
/**
* Function to test redirects.
*
- * @group miscellaneous
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group miscellaneous
*/
public function testRedirectsUsage(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsRequireOnPublishCest.php b/acceptance/WcmsTestsRequireOnPublishCest.php
index a1472b4a..be538534 100644
--- a/acceptance/WcmsTestsRequireOnPublishCest.php
+++ b/acceptance/WcmsTestsRequireOnPublishCest.php
@@ -26,10 +26,10 @@ class WcmsTestsRequireOnPublishCest {
/**
* Tests for require on publish.
*
- * @group miscellaneous
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group miscellaneous
*/
public function testRequireOnPublish(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsRoleOrderCest.php b/acceptance/WcmsTestsRoleOrderCest.php
index 02004185..2161f15c 100644
--- a/acceptance/WcmsTestsRoleOrderCest.php
+++ b/acceptance/WcmsTestsRoleOrderCest.php
@@ -10,10 +10,10 @@ class WcmsTestsRoleOrderCest {
/**
* Tests that roles are in correct order.
*
- * @group users
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group users
*/
public function roleOrderTest(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsSchemaCest.php b/acceptance/WcmsTestsSchemaCest.php
index 69cc92ed..9f081afc 100644
--- a/acceptance/WcmsTestsSchemaCest.php
+++ b/acceptance/WcmsTestsSchemaCest.php
@@ -10,10 +10,10 @@ class WcmsTestsSchemaCest {
/**
* Tests for schema modules.
*
- * @group miscellaneous
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group miscellaneous
*/
public function schemaModulesTest(AcceptanceTester $i) {
@@ -38,10 +38,10 @@ class WcmsTestsSchemaCest {
/**
* Tests for schema settings.
*
- * @group miscellaneous
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group miscellaneous
*/
public function schemaSettingsTest(AcceptanceTester $i) {
@@ -94,10 +94,10 @@ class WcmsTestsSchemaCest {
/**
* Tests for schema content type fields.
*
- * @group miscellaneous
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group miscellaneous
*/
public function schemaContentTypeFieldsTest(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsServiceHoursCest.php b/acceptance/WcmsTestsServiceHoursCest.php
index 51c9a43c..9afc2e16 100644
--- a/acceptance/WcmsTestsServiceHoursCest.php
+++ b/acceptance/WcmsTestsServiceHoursCest.php
@@ -17,10 +17,10 @@ class WcmsTestsServiceHoursCest {
/**
* Tests for service hours.
*
- * @group custommodules
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group custommodules
*/
public function testServiceHours(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsSpecialAlertCest.php b/acceptance/WcmsTestsSpecialAlertCest.php
index 9f7e1a3c..7b212341 100644
--- a/acceptance/WcmsTestsSpecialAlertCest.php
+++ b/acceptance/WcmsTestsSpecialAlertCest.php
@@ -12,10 +12,10 @@ class WcmsTestsSpecialAlertCest {
/**
* Tests for special alert config.
*
- * @group custommodules
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group custommodules
*/
public function testSpecialAlertConfig(AcceptanceTester $i) {
@@ -76,10 +76,10 @@ class WcmsTestsSpecialAlertCest {
/**
* Test the actual special alert block.
*
- * @group custommodules
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group custommodules
*/
public function testSpecialAlertBlock(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsTaxonomiesCest.php b/acceptance/WcmsTestsTaxonomiesCest.php
index 419024fc..b073df53 100644
--- a/acceptance/WcmsTestsTaxonomiesCest.php
+++ b/acceptance/WcmsTestsTaxonomiesCest.php
@@ -12,10 +12,10 @@ class WcmsTestsTaxonomiesCest {
/**
* Taxonomy test.
*
- * @group basic
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group basic
*/
public function taxonomiesTest(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsTestPageCest.php b/acceptance/WcmsTestsTestPageCest.php
index a628fe98..67d0c2d6 100644
--- a/acceptance/WcmsTestsTestPageCest.php
+++ b/acceptance/WcmsTestsTestPageCest.php
@@ -24,10 +24,10 @@ class WcmsTestsTestPageCest {
/**
* Front page test.
*
- * @group basic
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group basic
*/
public function frontpageWorks(AcceptanceTester $i) {
@@ -39,10 +39,10 @@ class WcmsTestsTestPageCest {
/**
* Test only one h1 tag.
*
- * @group basic
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group basic
*/
public function testOneH1Tag(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsUrlAliasCest.php b/acceptance/WcmsTestsUrlAliasCest.php
index 741df9db..aa955265 100644
--- a/acceptance/WcmsTestsUrlAliasCest.php
+++ b/acceptance/WcmsTestsUrlAliasCest.php
@@ -24,10 +24,10 @@ class WcmsTestsUrlAliasCest {
/**
* Default generate automatic url alias test.
*
- * @group basic
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group basic
*/
public function testDefaultGenerateUrlAlias(AcceptanceTester $i) {
@@ -53,10 +53,10 @@ class WcmsTestsUrlAliasCest {
/**
* Generate url alias test.
*
- * @group basic
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group basic
*/
public function testGenerateUrlAlias(AcceptanceTester $i) {
@@ -175,10 +175,10 @@ class WcmsTestsUrlAliasCest {
/**
* Url alias error message test.
*
- * @group basic
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group basic
*/
public function testUrlAliasErrorMessage(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsUsersCest.php b/acceptance/WcmsTestsUsersCest.php
index b1a9acf2..61bf159d 100644
--- a/acceptance/WcmsTestsUsersCest.php
+++ b/acceptance/WcmsTestsUsersCest.php
@@ -12,12 +12,10 @@ class WcmsTestsUsersCest {
/**
* Function to test that certain roles can not create uwaterloo users.
*
- * @group users
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group users
*/
public function testAddUwaterlooUser(AcceptanceTester $i) {
@@ -60,12 +58,10 @@ class WcmsTestsUsersCest {
/**
* Function to test that blocks are present.
*
- * @group users
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group users
*/
public function testCreateUwaterlooUserByRole(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsUwLdapCest.php b/acceptance/WcmsTestsUwLdapCest.php
index 6001bb79..d86e8af2 100644
--- a/acceptance/WcmsTestsUwLdapCest.php
+++ b/acceptance/WcmsTestsUwLdapCest.php
@@ -12,10 +12,10 @@ class WcmsTestsUwLdapCest {
/**
* Tests for uw ldap.
*
- * @group users
- *
* @param AcceptanceTester $i
* Acceptance test variable.
+ *
+ * @group users
*/
public function testUwLdap(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsWebformAccessCest.php b/acceptance/WcmsTestsWebformAccessCest.php
index 641e1e2e..d3377ee7 100644
--- a/acceptance/WcmsTestsWebformAccessCest.php
+++ b/acceptance/WcmsTestsWebformAccessCest.php
@@ -51,12 +51,10 @@ class WcmsTestsWebformAccessCest {
/**
* Test for web form access.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group webform
*/
public function testAccess(AcceptanceTester $i) {
@@ -131,10 +129,10 @@ class WcmsTestsWebformAccessCest {
/**
* Function to test web form access mode.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group webform
*/
public function testAccessMode(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsWebformElementsCest.php b/acceptance/WcmsTestsWebformElementsCest.php
index c8ba366d..5b58d1d8 100644
--- a/acceptance/WcmsTestsWebformElementsCest.php
+++ b/acceptance/WcmsTestsWebformElementsCest.php
@@ -51,12 +51,10 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form basic elements.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group webform
*/
public function testElementsBasic(AcceptanceTester $i) {
@@ -70,12 +68,10 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form options elements.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group webform
*/
public function testElementsOptions(AcceptanceTester $i) {
@@ -89,12 +85,10 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form advanced elements.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group webform
*/
public function testElementsAdvanced(AcceptanceTester $i) {
@@ -108,12 +102,10 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form composite elements.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group webform
*/
public function testElementsComposite(AcceptanceTester $i) {
@@ -127,12 +119,10 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form date elements.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group webform
*/
public function testElementsDate(AcceptanceTester $i) {
@@ -146,12 +136,10 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form entity elements.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group webform
*/
public function testElementsEntity(AcceptanceTester $i) {
@@ -165,12 +153,10 @@ class WcmsTestsWebformElementsCest {
/**
* Test for web form containers elements.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group webform
*/
public function testElementsContainers(AcceptanceTester $i) {
diff --git a/acceptance/WcmsTestsWebformSettingsCest.php b/acceptance/WcmsTestsWebformSettingsCest.php
index f531d355..282149cd 100644
--- a/acceptance/WcmsTestsWebformSettingsCest.php
+++ b/acceptance/WcmsTestsWebformSettingsCest.php
@@ -51,10 +51,10 @@ class WcmsTestsWebformSettingsCest {
/**
* Test for captcha element.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group webform
*/
public function testCaptcha(AcceptanceTester $i) {
@@ -72,10 +72,10 @@ class WcmsTestsWebformSettingsCest {
/**
* Function to test that captcha is present on form.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group webform
*/
public function testCaptchaPresent(AcceptanceTester $i) {
@@ -92,12 +92,10 @@ class WcmsTestsWebformSettingsCest {
/**
* Test for web form settings.
*
- * @group webform
- *
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @throws Exception
+ * @group webform
*/
public function testSettings(AcceptanceTester $i) {
--
GitLab
From 88f6d32ef7e81af2605419ecd81e0676a6483f33 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Fri, 22 Nov 2024 11:47:39 -0500
Subject: [PATCH 21/69] ISTWCMS-7160: fix coding standards
---
acceptance/WcmsTestsSpecialAlertCest.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/acceptance/WcmsTestsSpecialAlertCest.php b/acceptance/WcmsTestsSpecialAlertCest.php
index 7b212341..3bb0d52e 100644
--- a/acceptance/WcmsTestsSpecialAlertCest.php
+++ b/acceptance/WcmsTestsSpecialAlertCest.php
@@ -201,10 +201,10 @@ class WcmsTestsSpecialAlertCest {
/**
* Test for roles to edit special alerts.
*
- * @group custommodules
- *
* @param AcceptanceTester $i
* The acceptance tester.
+ *
+ * @group custommodules
*/
public function testSpecialAlertsRoles(AcceptanceTester $i) {
--
GitLab
From 99df31823d1ee6a913534f0df91938d3c6a31bd2 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 25 Nov 2024 11:18:40 -0500
Subject: [PATCH 22/69] ISTWCMS-7160: remove related links from tests
---
acceptance/WcmsTestsLinkFieldCest.php | 7 -------
1 file changed, 7 deletions(-)
diff --git a/acceptance/WcmsTestsLinkFieldCest.php b/acceptance/WcmsTestsLinkFieldCest.php
index 2717610b..bd9029a3 100644
--- a/acceptance/WcmsTestsLinkFieldCest.php
+++ b/acceptance/WcmsTestsLinkFieldCest.php
@@ -283,13 +283,6 @@ class WcmsTestsLinkFieldCest {
'settings[block_form][field_uw_cta_details][0][subform][field_uw_cta_text_details][0][text_value]' => $i->uwRandomString(),
],
],
- 'Related links' => [
- 'Fields' => [
- 'settings[label]' => $i->uwRandomString(),
- 'settings[block_form][field_uw_rl_related_link][0][uri]' => $text,
- 'settings[block_form][field_uw_rl_related_link][0][title]' => $i->uwRandomString(),
- ],
- ],
'Timeline' => [
'Fields' => [
'settings[label]' => $i->uwRandomString(),
--
GitLab
From 56269073be8e50319b7c48f51f2b2dbf7509db3a Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 25 Nov 2024 11:28:14 -0500
Subject: [PATCH 23/69] ISTWCMS-7160: remove more related links
---
acceptance/WcmsTestsLayoutBuilderBrowserCest.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/acceptance/WcmsTestsLayoutBuilderBrowserCest.php b/acceptance/WcmsTestsLayoutBuilderBrowserCest.php
index b1984a03..d7ccadc2 100644
--- a/acceptance/WcmsTestsLayoutBuilderBrowserCest.php
+++ b/acceptance/WcmsTestsLayoutBuilderBrowserCest.php
@@ -33,7 +33,6 @@ class WcmsTestsLayoutBuilderBrowserCest {
'tr[data-drupal-selector="edit-categories-uw-lbb-image"]',
'tr[data-drupal-selector="edit-categories-inline-blockuw-cbl-image-gallery"]',
'tr[data-drupal-selector="edit-categories-inline-blockuw-cbl-mailman"]',
- 'tr[data-drupal-selector="edit-categories-inline-blockuw-cbl-related-links"]',
'tr[data-drupal-selector="edit-categories-uw-lbb-tags"]',
'tr[data-drupal-selector="edit-categories-inline-blockuw-cbl-timeline"]',
'tr[data-drupal-selector="edit-categories-category-uw-bc-external-embeds"]',
--
GitLab
From d349514de7add6fc75e529bb9188cf5c94ac8a77 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 25 Nov 2024 15:35:44 -0500
Subject: [PATCH 24/69] ISTWCMS-7160: fix role order test
---
acceptance/WcmsTestsRoleOrderCest.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/acceptance/WcmsTestsRoleOrderCest.php b/acceptance/WcmsTestsRoleOrderCest.php
index 2161f15c..aebc0569 100644
--- a/acceptance/WcmsTestsRoleOrderCest.php
+++ b/acceptance/WcmsTestsRoleOrderCest.php
@@ -24,8 +24,11 @@ class WcmsTestsRoleOrderCest {
// Go to roles page and ensure roles in correct order.
$i->amOnPage('admin/people/roles');
$i->click('Show row weights');
- $i->seeOptionIsSelected('#edit-entities-uw-role-content-editor-weight', '4');
- $i->seeOptionIsSelected('#edit-entities-uw-role-content-author-weight', '5');
+ $i->seeOptionIsSelected('#edit-entities-uw-role-website-lead-weight', '2');
+ $i->seeOptionIsSelected('#edit-entities-uw-role-site-owner-weight', '3');
+ $i->seeOptionIsSelected('#edit-entities-uw-role-site-manager-weight', '4');
+ $i->seeOptionIsSelected('#edit-entities-uw-role-content-editor-weight', '5');
+ $i->seeOptionIsSelected('#edit-entities-uw-role-content-author-weight', '6');
// Go to role settings page and ensure roles in correct order.
$i->amOnPage('admin/people/role-settings');
--
GitLab
From 680b03ca3e6e8ae3f6112dcf2a64de13ff9dcf1c Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 25 Nov 2024 16:07:26 -0500
Subject: [PATCH 25/69] ISTWCMS-7160: update run groups script
---
run_groups.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/run_groups.sh b/run_groups.sh
index 84f3e259..e9abd1da 100755
--- a/run_groups.sh
+++ b/run_groups.sh
@@ -1,3 +1,6 @@
+# Ensure we are not using the recorder.
+cp tests/acceptance_norecorder.suite.yml tests/acceptance.suite.yml
+
# Directory to iterate through
directory="tests/acceptance"
--
GitLab
From 665db2a2a6bd98519a15c50eb2339a6ef6abfe50 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 27 Nov 2024 09:32:12 -0500
Subject: [PATCH 26/69] ISTWCMS-7160: change list parity to run as it is own
group
---
acceptance/WcmsTestsBlocksListingsCest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index 493781f2..d8f8d7bf 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -413,7 +413,7 @@ class WcmsTestsBlocksListingsCest {
* @param AcceptanceTester $i
* The acceptance tester.
*
- * @group blocklistings
+ * @group blocklistparity
*/
public function testListParity(AcceptanceTester $i) {
--
GitLab
From 59565c0b26998405469d599f4353ced553f6510f Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 27 Nov 2024 09:32:48 -0500
Subject: [PATCH 27/69] ISTWCMS-7160: update run groups script to kill and
restart chrome driver on every group run
---
run_groups.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/run_groups.sh b/run_groups.sh
index e9abd1da..8f79dcb0 100755
--- a/run_groups.sh
+++ b/run_groups.sh
@@ -48,5 +48,7 @@ echo "************************************"
# Perform the tests using the groups
for value in "${unique_values[@]}"; do
+ pgrep chrome | xargs kill -9
+ chromedriver --port=9515 --url-base=/wd/hub &
php vendor/bin/codecept run acceptance --fail-fast -g "$value"
done
--
GitLab
From ca464cdde40f2d2c4146c7dc875921c394ae6c65 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Fri, 29 Nov 2024 11:30:07 -0500
Subject: [PATCH 28/69] ISTWCMS-7160: update run groups script to stop on
failure
---
run_groups.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/run_groups.sh b/run_groups.sh
index 8f79dcb0..c62166dd 100755
--- a/run_groups.sh
+++ b/run_groups.sh
@@ -51,4 +51,7 @@ for value in "${unique_values[@]}"; do
pgrep chrome | xargs kill -9
chromedriver --port=9515 --url-base=/wd/hub &
php vendor/bin/codecept run acceptance --fail-fast -g "$value"
+ if [[ $? -ne 0 ]]; then
+ break
+ fi
done
--
GitLab
From ff12591a978c65d21c8d469946faf59a5974e930 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 2 Dec 2024 10:40:32 -0500
Subject: [PATCH 29/69] ISTWCMS-7160: update run groups script to handle
options like run tests
---
run_groups.sh | 45 ++++++++++++++++++++++++++++++++++++++-------
1 file changed, 38 insertions(+), 7 deletions(-)
diff --git a/run_groups.sh b/run_groups.sh
index c62166dd..d4e57193 100755
--- a/run_groups.sh
+++ b/run_groups.sh
@@ -1,6 +1,24 @@
+rm -rf tests/_output
+rm -rf tests/_data
+
# Ensure we are not using the recorder.
cp tests/acceptance_norecorder.suite.yml tests/acceptance.suite.yml
+while getopts 'r' OPTION; do
+ case "$OPTION" in
+ r)
+ cp tests/acceptance_recorder.suite.yml tests/acceptance.suite.yml
+ ;;
+ s)
+ stepper=1
+ ;;
+ ?)
+ echo "script usage: [-r]" >&2
+ exit 1
+ ;;
+ esac
+done
+
# Directory to iterate through
directory="tests/acceptance"
@@ -14,6 +32,8 @@ echo "************************************"
echo "Getting groups from tests ..."
echo "************************************"
+echo "Found group: blocklistparity"
+
# Loop through all files in the directory
for file in "$directory"/*; do
@@ -29,19 +49,25 @@ for file in "$directory"/*; do
# Remove the @group from the extracted text
extracted_text=${extracted_text//"@group "/}
- # Check if extracted text is not empty and is not already in the array
- if [[ -n "$extracted_text" && ! " ${unique_values[@]} " =~ " ${extracted_text} " ]]; then
+ if [ "$extracted_text" != "blocklistparity" ]; then
- # Add the extracted text to the array
- unique_values+=("$extracted_text")
+ # Check if extracted text is not empty and is not already in the array
+ if [[ -n "$extracted_text" && ! " ${unique_values[@]} " =~ " ${extracted_text} " ]]; then
- # Output to the screen so we see some progress
- echo "Found group: $extracted_text"
+ # Add the extracted text to the array
+ unique_values+=("$extracted_text")
+
+ # Output to the screen so we see some progress
+ echo "Found group: $extracted_text"
+ fi
fi
done < "$file"
fi
done
+# Add block list parity at the beginning.
+unique_values=('blocklistparity' "${unique_values[@]:0}")
+
echo "************************************"
echo "Done getting groups from tests."
echo "************************************"
@@ -50,7 +76,12 @@ echo "************************************"
for value in "${unique_values[@]}"; do
pgrep chrome | xargs kill -9
chromedriver --port=9515 --url-base=/wd/hub &
- php vendor/bin/codecept run acceptance --fail-fast -g "$value"
+ if [ $stepper == 1 ]; then
+ php vendor/bin/codecept run acceptance --fail-fast --steps -g "$value"
+
+ else
+ php vendor/bin/codecept run acceptance --fail-fast -g "$value"
+ fi
if [[ $? -ne 0 ]]; then
break
fi
--
GitLab
From c2b276608ef810de6626feb0aa933e6c474f2f5f Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 2 Dec 2024 12:16:57 -0500
Subject: [PATCH 30/69] ISTWCMS-7160: updating testListParity to see if it can
pass
---
acceptance/WcmsTestsBlocksListingsCest.php | 25 +++++++++++-----------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index d8f8d7bf..7628ad30 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -447,26 +447,26 @@ class WcmsTestsBlocksListingsCest {
// Navigate to layout builder.
$i->amOnPage('/testpage/layout');
- $i->waitforText('Edit layout for testpage');
+ $i->waitforText('Edit layout for testpage', 30);
// Add an automatic list block.
$i->click('Add block');
- $i->waitForText('Choose a block');
+ $i->waitForText('Choose a block', 30);
$i->click('Automatic list');
- $i->waitForText('Configure block');
+ $i->waitForText('Configure block', 30);
$i->fillField('input[name="settings[label]"]', 'title');
$i->selectOption('settings[content_type]', $content_type);
// Create a block id and add the block.
$i->fillField('input[name="settings[layout_builder_id]"]', 'automatic' . $machine_name);
$i->click('Add block');
- $i->waitForElement('.uw-admin-label');
+ $i->waitForElement('.uw-admin-label', 30);
// Add an manual list block.
$i->click('Add block');
- $i->waitForText('Choose a block');
+ $i->waitForText('Choose a block', 30);
$i->click('Manual list');
- $i->waitForText('Configure block');
+ $i->waitForText('Configure block', 30);
$i->fillField('input[name="settings[label]"]', 'title');
$i->selectOption('settings[content_type]', $content_type);
$i->fillField('input[name="settings[' . $machine_name . '][items_fieldset][' . $machine_name . '_ids][0][id]"]', 'test' . $machine_name);
@@ -474,11 +474,12 @@ class WcmsTestsBlocksListingsCest {
// Create a block id and add the block.
$i->fillField('input[name="settings[layout_builder_id]"]', 'manual' . $machine_name);
$i->click('Add block');
- $i->waitForText('Edit layout for testpage');
+ $i->waitForText('Edit layout for testpage', 30);
// Save the layout.
+ $i->scrollTo(['css' => 'input[value="Save layout"]'], 100, 0);
$i->click('Save layout');
- $i->waitForText('The layout override has been saved.');
+ $i->waitForText('The layout override has been saved.', 30);
// Create a reference image using the automatic list.
// Since there is no existing image with the name $machine_name,
@@ -1196,12 +1197,12 @@ class WcmsTestsBlocksListingsCest {
$i->click('Remove');
$i->waitForElementNotVisible('.layout-builder__region');
$i->click('.layout-builder__link--add');
- $i->waitForText('One column');
+ $i->waitForText('One column', 30);
$i->click('One column');
- $i->waitForText('Configure section');
- $i->waitForText('Add section');
+ $i->waitForText('Configure section', 30);
+ $i->waitForText('Add section', 30);
$i->click('input[value="Add section"]');
- $i->waitForText('Add block');
+ $i->waitForText('Add block', 30);
}
/**
--
GitLab
From 20ca00c191a4a2d51441ec03d38f2d175af9c509 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Tue, 3 Dec 2024 06:26:28 -0500
Subject: [PATCH 31/69] ISTWCMS-7160: Fix testListParity test
---
acceptance/WcmsTestsBlocksListingsCest.php | 27 +++++++++++-----------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index 7628ad30..11f064e8 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -447,26 +447,26 @@ class WcmsTestsBlocksListingsCest {
// Navigate to layout builder.
$i->amOnPage('/testpage/layout');
- $i->waitforText('Edit layout for testpage', 30);
+ $i->waitforText('Edit layout for testpage');
// Add an automatic list block.
$i->click('Add block');
- $i->waitForText('Choose a block', 30);
+ $i->waitForText('Choose a block');
$i->click('Automatic list');
- $i->waitForText('Configure block', 30);
+ $i->waitForText('Configure block');
$i->fillField('input[name="settings[label]"]', 'title');
$i->selectOption('settings[content_type]', $content_type);
// Create a block id and add the block.
$i->fillField('input[name="settings[layout_builder_id]"]', 'automatic' . $machine_name);
$i->click('Add block');
- $i->waitForElement('.uw-admin-label', 30);
+ $i->waitForElement('.uw-admin-label');
// Add an manual list block.
$i->click('Add block');
- $i->waitForText('Choose a block', 30);
+ $i->waitForText('Choose a block');
$i->click('Manual list');
- $i->waitForText('Configure block', 30);
+ $i->waitForText('Configure block');
$i->fillField('input[name="settings[label]"]', 'title');
$i->selectOption('settings[content_type]', $content_type);
$i->fillField('input[name="settings[' . $machine_name . '][items_fieldset][' . $machine_name . '_ids][0][id]"]', 'test' . $machine_name);
@@ -474,12 +474,12 @@ class WcmsTestsBlocksListingsCest {
// Create a block id and add the block.
$i->fillField('input[name="settings[layout_builder_id]"]', 'manual' . $machine_name);
$i->click('Add block');
- $i->waitForText('Edit layout for testpage', 30);
+ $i->waitForText('Edit layout for testpage');
// Save the layout.
$i->scrollTo(['css' => 'input[value="Save layout"]'], 100, 0);
$i->click('Save layout');
- $i->waitForText('The layout override has been saved.', 30);
+ $i->waitForText('The layout override has been saved.');
// Create a reference image using the automatic list.
// Since there is no existing image with the name $machine_name,
@@ -1196,13 +1196,14 @@ class WcmsTestsBlocksListingsCest {
$i->waitForText('Are you sure you want to remove section 1?');
$i->click('Remove');
$i->waitForElementNotVisible('.layout-builder__region');
- $i->click('.layout-builder__link--add');
- $i->waitForText('One column', 30);
+ $i->waitForText('Add section');
+ $i->click('Add section');
+ $i->waitForText('One column');
$i->click('One column');
- $i->waitForText('Configure section', 30);
- $i->waitForText('Add section', 30);
+ $i->waitForText('Configure section');
+ $i->waitForText('Add section');
$i->click('input[value="Add section"]');
- $i->waitForText('Add block', 30);
+ $i->waitForText('Add block');
}
/**
--
GitLab
From a0da98609a8ccce76e168aec4a74c4a47b5d88aa Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Tue, 3 Dec 2024 06:32:01 -0500
Subject: [PATCH 32/69] ISTWCMS-7160: update run groups script to now use just
straight groups
---
run_groups.sh | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/run_groups.sh b/run_groups.sh
index d4e57193..74da6132 100755
--- a/run_groups.sh
+++ b/run_groups.sh
@@ -32,8 +32,6 @@ echo "************************************"
echo "Getting groups from tests ..."
echo "************************************"
-echo "Found group: blocklistparity"
-
# Loop through all files in the directory
for file in "$directory"/*; do
@@ -49,25 +47,19 @@ for file in "$directory"/*; do
# Remove the @group from the extracted text
extracted_text=${extracted_text//"@group "/}
- if [ "$extracted_text" != "blocklistparity" ]; then
-
- # Check if extracted text is not empty and is not already in the array
- if [[ -n "$extracted_text" && ! " ${unique_values[@]} " =~ " ${extracted_text} " ]]; then
+ # Check if extracted text is not empty and is not already in the array
+ if [[ -n "$extracted_text" && ! " ${unique_values[@]} " =~ " ${extracted_text} " ]]; then
- # Add the extracted text to the array
- unique_values+=("$extracted_text")
+ # Add the extracted text to the array
+ unique_values+=("$extracted_text")
- # Output to the screen so we see some progress
- echo "Found group: $extracted_text"
- fi
+ # Output to the screen so we see some progress
+ echo "Found group: $extracted_text"
fi
done < "$file"
fi
done
-# Add block list parity at the beginning.
-unique_values=('blocklistparity' "${unique_values[@]:0}")
-
echo "************************************"
echo "Done getting groups from tests."
echo "************************************"
--
GitLab
From 4bf17d7f9ea7d8f60a299d9ba692f26ea3ddc888 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Tue, 3 Dec 2024 10:22:57 -0500
Subject: [PATCH 33/69] ISTWCMS-7168: fix run groups script errors
---
run_groups.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/run_groups.sh b/run_groups.sh
index 74da6132..d73b5c9e 100755
--- a/run_groups.sh
+++ b/run_groups.sh
@@ -68,9 +68,8 @@ echo "************************************"
for value in "${unique_values[@]}"; do
pgrep chrome | xargs kill -9
chromedriver --port=9515 --url-base=/wd/hub &
- if [ $stepper == 1 ]; then
+ if [[ $stepper == 1 ]]; then
php vendor/bin/codecept run acceptance --fail-fast --steps -g "$value"
-
else
php vendor/bin/codecept run acceptance --fail-fast -g "$value"
fi
--
GitLab
From f23d047e4cf29d701ce99cac6eeda6efa871e3c6 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 16 Dec 2024 12:14:07 -0500
Subject: [PATCH 34/69] ISTWCMS-7160: add script to try running each file
---
run_files.sh | 49 ++++++++++++++++++++++++++++++++++++++++++++
setup_codeception.sh | 1 +
2 files changed, 50 insertions(+)
create mode 100755 run_files.sh
diff --git a/run_files.sh b/run_files.sh
new file mode 100755
index 00000000..a3f4fd7b
--- /dev/null
+++ b/run_files.sh
@@ -0,0 +1,49 @@
+rm -rf tests/_output
+rm -rf tests/_data
+
+# Ensure we are not using the recorder.
+cp tests/acceptance_norecorder.suite.yml tests/acceptance.suite.yml
+
+while getopts 'r' OPTION; do
+ case "$OPTION" in
+ r)
+ cp tests/acceptance_recorder.suite.yml tests/acceptance.suite.yml
+ ;;
+ s)
+ stepper=1
+ ;;
+ ?)
+ echo "script usage: [-r]" >&2
+ exit 1
+ ;;
+ esac
+done
+
+# Directory to iterate through
+directory="tests/acceptance"
+
+files=()
+for file in "$directory"/*; do
+ if [[ -f "$file" ]]; then
+ file="${file//tests\/acceptance\//}"
+ file="${file//\.php/}"
+ files+=("$file")
+ fi
+done
+
+# Perform the tests using the groups
+for value in "${files[@]}"; do
+ pgrep chrome | xargs kill -9
+ chromedriver --port=9515 --url-base=/wd/hub &
+ echo "**************************************"
+ echo "Current Test: $value"
+ echo "**************************************"
+ if [[ $stepper == 1 ]]; then
+ php vendor/bin/codecept run acceptance "$value" --fail-fast --steps
+ else
+ php vendor/bin/codecept run acceptance "$value" --fail-fast
+ fi
+ if [[ $? -ne 0 ]]; then
+ break
+ fi
+done
diff --git a/setup_codeception.sh b/setup_codeception.sh
index aa6e7bfa..12ddf4b9 100755
--- a/setup_codeception.sh
+++ b/setup_codeception.sh
@@ -4,4 +4,5 @@ cp tests/codeception.yml .
cp tests/index.php web
cp tests/run_tests.sh .
cp tests/run_groups.sh .
+cp tests/run_files.sh .
sed -i 's/self::COVERAGE_COOKIE,\s$value,\s$cookieParams/self::COVERAGE_COOKIE, $value/g' /var/www/html/vendor/codeception/codeception/src/Codeception/Coverage/Subscriber/LocalServer.php
--
GitLab
From 10b60092c7c02ad24ce24a592f7c3f75a10fece5 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 18 Dec 2024 06:16:50 -0500
Subject: [PATCH 35/69] ISTWCMS-7160: Update run files script
---
run_files.sh | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/run_files.sh b/run_files.sh
index a3f4fd7b..3629a91a 100755
--- a/run_files.sh
+++ b/run_files.sh
@@ -31,13 +31,24 @@ for file in "$directory"/*; do
fi
done
+drush sql-dump > start.sql
+
# Perform the tests using the groups
for value in "${files[@]}"; do
pgrep chrome | xargs kill -9
- chromedriver --port=9515 --url-base=/wd/hub &
echo "**************************************"
echo "Current Test: $value"
echo "**************************************"
+ echo "Waiting ..."
+ sleep 10s
+ echo "Done waiting."
+ echo "**************************************"
+ echo "Installing site ..."
+ drush sql-drop -y
+ drush sql-cli < start.sql
+ echo "Done installing site."
+ echo "**************************************"
+ chromedriver --port=9515 --url-base=/wd/hub &
if [[ $stepper == 1 ]]; then
php vendor/bin/codecept run acceptance "$value" --fail-fast --steps
else
--
GitLab
From 31d44d08f3aad181854e3a350511ab405b92761a Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 18 Dec 2024 11:19:52 -0500
Subject: [PATCH 36/69] ISTWCMS-7160: update run files to create site and use
sql file
---
run_files.sh | 54 +++++++++++++++++++++++++++++++++-------------------
1 file changed, 34 insertions(+), 20 deletions(-)
diff --git a/run_files.sh b/run_files.sh
index 3629a91a..c27c102a 100755
--- a/run_files.sh
+++ b/run_files.sh
@@ -1,9 +1,3 @@
-rm -rf tests/_output
-rm -rf tests/_data
-
-# Ensure we are not using the recorder.
-cp tests/acceptance_norecorder.suite.yml tests/acceptance.suite.yml
-
while getopts 'r' OPTION; do
case "$OPTION" in
r)
@@ -19,9 +13,29 @@ while getopts 'r' OPTION; do
esac
done
+# Remove all the old test data.
+rm -rf tests/_output
+rm -rf tests/_data
+
+# Ensure we are not using the recorder.
+cp tests/acceptance_norecorder.suite.yml tests/acceptance.suite.yml
+
+# Generate a file name for the sql file.
+sqlfile=$(cat /proc/sys/kernel/random/uuid)
+sqlfile="$sqlfile.sql"
+
+# Install a site and get an sql file from site install.
+echo "*********************************************************"
+echo "Installing site ..."
+drush si uw_base_profile --db-url=mysql://drupal:drupal@mariadb/drupal --account-name=wcmsadmin --account-pass=a --site-name="WCMS Test" -y
+drush sql-dump > "$sqlfile"
+echo "Done installing site."
+echo "*********************************************************"
+
# Directory to iterate through
directory="tests/acceptance"
+# Get the file names of the tests.
files=()
for file in "$directory"/*; do
if [[ -f "$file" ]]; then
@@ -31,30 +45,30 @@ for file in "$directory"/*; do
fi
done
-drush sql-dump > start.sql
-
-# Perform the tests using the groups
+# Perform the tests using the files.
for value in "${files[@]}"; do
- pgrep chrome | xargs kill -9
- echo "**************************************"
+ echo "*********************************************************"
echo "Current Test: $value"
- echo "**************************************"
- echo "Waiting ..."
- sleep 10s
- echo "Done waiting."
- echo "**************************************"
- echo "Installing site ..."
+ echo "*********************************************************"
+ echo "Setting up site ..."
+ pgrep chrome | xargs kill -9
drush sql-drop -y
- drush sql-cli < start.sql
- echo "Done installing site."
- echo "**************************************"
+ drush sql-cli < "$sqlfile"
chromedriver --port=9515 --url-base=/wd/hub &
+ echo "Done setting up site."
+ echo "*********************************************************"
+ echo "Starting test ... $value"
if [[ $stepper == 1 ]]; then
php vendor/bin/codecept run acceptance "$value" --fail-fast --steps
else
php vendor/bin/codecept run acceptance "$value" --fail-fast
fi
if [[ $? -ne 0 ]]; then
+ rm "$sqlfile"
+ echo "Test $value failed, done test."
+ echo "*********************************************************"
break
fi
+ echo "Done test $value."
+ echo "*********************************************************"
done
--
GitLab
From 07692195f814940e306ff3b16e3ef793bc845c19 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 18 Dec 2024 11:47:23 -0500
Subject: [PATCH 37/69] ISTWCMS-7160: fix test list parity
---
acceptance/WcmsTestsBlocksListingsCest.php | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index 11f064e8..75c25107 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -67,6 +67,7 @@ class WcmsTestsBlocksListingsCest {
$i->see('Edit layout for ' . $this->nodesUsed['Multi Type List Block']->getTitle());
// Add a block.
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForText('Choose a block');
@@ -170,6 +171,7 @@ class WcmsTestsBlocksListingsCest {
$i->see('Edit layout for ' . $this->nodesUsed['Automatic List Block']->getTitle());
// Add a block.
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForText('Choose a block');
@@ -212,6 +214,7 @@ class WcmsTestsBlocksListingsCest {
$i->see('Edit layout for ' . $this->nodesUsed['Manual List Block']->getTitle());
// Add a block.
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForText('Choose a block');
@@ -366,6 +369,7 @@ class WcmsTestsBlocksListingsCest {
$i->see('Edit layout for ' . $this->nodesUsed['Waterloo Events Block']->getTitle());
// Add a block.
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForText('Choose a block');
@@ -450,6 +454,7 @@ class WcmsTestsBlocksListingsCest {
$i->waitforText('Edit layout for testpage');
// Add an automatic list block.
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForText('Choose a block');
$i->click('Automatic list');
@@ -463,6 +468,7 @@ class WcmsTestsBlocksListingsCest {
$i->waitForElement('.uw-admin-label');
// Add an manual list block.
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForText('Choose a block');
$i->click('Manual list');
@@ -950,6 +956,7 @@ class WcmsTestsBlocksListingsCest {
$i->waitForText('Automatic list');
$i->waitForElement('.views-field-field-uw-service-summary');
$this->removeAddFirstSection($i);
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForText('Choose a block');
$i->click('Automatic list');
@@ -1040,6 +1047,7 @@ class WcmsTestsBlocksListingsCest {
break;
case 'catalog':
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForText('Choose a block');
$i->click('Automatic list');
@@ -1134,6 +1142,7 @@ class WcmsTestsBlocksListingsCest {
break;
case 'service':
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForText('Choose a block');
$i->click('Automatic list');
@@ -1228,6 +1237,7 @@ class WcmsTestsBlocksListingsCest {
int $limit = 3,
) {
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForText('Choose a block');
$i->click($block_type);
--
GitLab
From b9edc1c6b9bdad6b03ad76697ad09a316338f234 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Fri, 20 Dec 2024 06:38:13 -0500
Subject: [PATCH 38/69] ISTWCMS-7160: add sleep to run files script
---
run_files.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/run_files.sh b/run_files.sh
index c27c102a..334c9561 100755
--- a/run_files.sh
+++ b/run_files.sh
@@ -52,6 +52,7 @@ for value in "${files[@]}"; do
echo "*********************************************************"
echo "Setting up site ..."
pgrep chrome | xargs kill -9
+ sleep 20s
drush sql-drop -y
drush sql-cli < "$sqlfile"
chromedriver --port=9515 --url-base=/wd/hub &
--
GitLab
From 875415f982acefa32f673d52afde321571df2133 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Fri, 20 Dec 2024 09:18:36 -0500
Subject: [PATCH 39/69] ISTWCMS-7160: fixing inline image test
---
acceptance/WcmsTestsImgInlineCest.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/acceptance/WcmsTestsImgInlineCest.php b/acceptance/WcmsTestsImgInlineCest.php
index 9ef1c183..ba92cc8c 100644
--- a/acceptance/WcmsTestsImgInlineCest.php
+++ b/acceptance/WcmsTestsImgInlineCest.php
@@ -75,6 +75,7 @@ class WcmsTestsImgInlineCest {
// Ensure that the block is on the page.
$i->waitForJS("return document.readyState === 'complete';", 30);
$i->waitForElement(".uw-copy-text div " . $block . " img", 30);
+ $i->waitForElement('.uw-copy-text div img[alt="Inserted image in ' . $block . ' block"]');
// Check that image's parent is a block.
$i->seeElement(".uw-copy-text div " . $block . " img", ['alt' => 'Inserted image in ' . $block . ' block']);
--
GitLab
From e01be963a667bd5118cbc633a1849919dee8ef6e Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Fri, 20 Dec 2024 10:40:19 -0500
Subject: [PATCH 40/69] ISTWCMS-7160: add wait for text on add block to ensure
that it is clickable
---
_support/Step/Acceptance/ContentType.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/_support/Step/Acceptance/ContentType.php b/_support/Step/Acceptance/ContentType.php
index 4e383108..c496db0f 100644
--- a/_support/Step/Acceptance/ContentType.php
+++ b/_support/Step/Acceptance/ContentType.php
@@ -244,6 +244,7 @@ class ContentType extends \AcceptanceTester {
$i->waitForText('Edit layout for');
// Click on the add block.
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForText('Choose a block');
@@ -256,6 +257,7 @@ class ContentType extends \AcceptanceTester {
$i->fillCkEditor($i->uwRandomString(), 'textarea[name="settings[block_form][field_uw_copy_text][0][value]"]');
// Click add block and ensure it appears on page.
+ $i->waitForText('Add block');
$i->click('Add block');
$i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Copy text'));
$i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Copy text'));
--
GitLab
From 9dd0fccf9095622f6b7460f91ed73f4bc807a429 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Sun, 29 Dec 2024 21:30:38 -0500
Subject: [PATCH 41/69] ISTWCMS-7160: Update run fules script
---
run_files.sh | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/run_files.sh b/run_files.sh
index 334c9561..37566c14 100755
--- a/run_files.sh
+++ b/run_files.sh
@@ -50,12 +50,18 @@ for value in "${files[@]}"; do
echo "*********************************************************"
echo "Current Test: $value"
echo "*********************************************************"
- echo "Setting up site ..."
+ echo "Stopping chrome driver ..."
pgrep chrome | xargs kill -9
- sleep 20s
+ echo "Sleeping ..."
+ sleep 15s
+ echo "Dropping database ..."
drush sql-drop -y
+ echo "Importing database ..."
drush sql-cli < "$sqlfile"
+ echo "Starting chrome driver ..."
chromedriver --port=9515 --url-base=/wd/hub &
+ echo "Sleeping ..."
+ sleep 15s
echo "Done setting up site."
echo "*********************************************************"
echo "Starting test ... $value"
--
GitLab
From 1bf12eb89f280ca4cc35e4c5e0880b69bfe35cf1 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 1 Jan 2025 22:02:09 -0500
Subject: [PATCH 42/69] Update run files script
---
run_files.sh | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/run_files.sh b/run_files.sh
index 37566c14..31198a8d 100755
--- a/run_files.sh
+++ b/run_files.sh
@@ -51,20 +51,29 @@ for value in "${files[@]}"; do
echo "Current Test: $value"
echo "*********************************************************"
echo "Stopping chrome driver ..."
+ echo "*********************************************************"
pgrep chrome | xargs kill -9
echo "Sleeping ..."
+ echo "*********************************************************"
sleep 15s
echo "Dropping database ..."
+ echo "*********************************************************"
drush sql-drop -y
echo "Importing database ..."
+ echo "*********************************************************"
drush sql-cli < "$sqlfile"
echo "Starting chrome driver ..."
+ echo "*********************************************************"
chromedriver --port=9515 --url-base=/wd/hub &
echo "Sleeping ..."
+ echo "*********************************************************"
sleep 15s
echo "Done setting up site."
echo "*********************************************************"
+ echo ""
+ echo "*********************************************************"
echo "Starting test ... $value"
+ echo "*********************************************************"
if [[ $stepper == 1 ]]; then
php vendor/bin/codecept run acceptance "$value" --fail-fast --steps
else
@@ -72,10 +81,16 @@ for value in "${files[@]}"; do
fi
if [[ $? -ne 0 ]]; then
rm "$sqlfile"
+ echo ""
+ echo "*********************************************************"
echo "Test $value failed, done test."
echo "*********************************************************"
+ echo ""
break
fi
+ echo ""
+ echo "*********************************************************"
echo "Done test $value."
echo "*********************************************************"
+ echo ""
done
--
GitLab
From 1d8a99fedf556b54de0adf2acb819d687affea77 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Fri, 3 Jan 2025 09:51:05 -0500
Subject: [PATCH 43/69] ISTWCMS-7160: add recorder option to run files script
---
run_files.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/run_files.sh b/run_files.sh
index 31198a8d..cf9cb594 100755
--- a/run_files.sh
+++ b/run_files.sh
@@ -1,4 +1,4 @@
-while getopts 'r' OPTION; do
+while getopts 'rs' OPTION; do
case "$OPTION" in
r)
cp tests/acceptance_recorder.suite.yml tests/acceptance.suite.yml
--
GitLab
From f38782d4cb164d943342a0b35c183aed52d77cbd Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Tue, 14 Jan 2025 14:54:36 -0500
Subject: [PATCH 44/69] ISTWCMS-7160: Removing blocks to not see in dashboard
layout test
---
acceptance/WcmsTestsDashboardCest.php | 5 -----
1 file changed, 5 deletions(-)
diff --git a/acceptance/WcmsTestsDashboardCest.php b/acceptance/WcmsTestsDashboardCest.php
index 7b69a0e5..b0799a8d 100644
--- a/acceptance/WcmsTestsDashboardCest.php
+++ b/acceptance/WcmsTestsDashboardCest.php
@@ -191,11 +191,6 @@ class WcmsTestsDashboardCest {
$i->seeLink('Publication reference authors');
$i->seeLink('Publication reference keywords');
$i->seeLink('Publication references');
-
- // Following blocks should not be available on dashboard.
- $i->dontSeeLink('Special alert');
- $i->dontSeeLink('Blog author');
- $i->dontSeeLink('UW content moderation');
}
/**
--
GitLab
From 0e34dddb7af2f51737625e9851e6f09f90c85416 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Tue, 4 Feb 2025 11:26:35 -0500
Subject: [PATCH 45/69] ISTWCMS-7160: fix media types test
---
acceptance/WcmsTestsMediaTypesCest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/acceptance/WcmsTestsMediaTypesCest.php b/acceptance/WcmsTestsMediaTypesCest.php
index 7c9f1f6f..41261c85 100644
--- a/acceptance/WcmsTestsMediaTypesCest.php
+++ b/acceptance/WcmsTestsMediaTypesCest.php
@@ -59,7 +59,7 @@ class WcmsTestsMediaTypesCest {
$i->amOnPage('admin/structure/media/manage/uw_mt_file/fields/media.uw_mt_file.field_media_file');
$i->seeInField(['name' => 'settings[file_directory]'], 'uploads/documents');
$i->seeInField(['name' => 'settings[max_filesize]'], '25 MB');
- $i->seeInField(['name' => 'settings[file_extensions]'], 'bib, csv, doc, docx, epub, gz, key, m, mw, mp3, rtf, pdf, pot, potx, pps, ppt, pptx, psd, r, tar, tex, txt, wav, xls, xlsx, zip');
+ $i->seeInField(['name' => 'settings[file_extensions]'], 'bib, csv, doc, docx, epub, gz, json, key, m, mw, mp3, rtf, pdf, pot, potx, pps, ppt, pptx, psd, r, tar, tex, txt, wav, xls, xlsx, zip');
// File directory default value for Icon media type
// is 'uploads/icons'.
--
GitLab
From 7e5189f34614b7d0f26323b692a9d917c505e620 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Thu, 20 Feb 2025 11:16:14 -0500
Subject: [PATCH 46/69] ISTWCMS-7160: Update test settings
---
acceptance_norecorder.suite.yml | 2 ++
acceptance_recorder.suite.yml | 2 ++
codeception.yml | 1 +
3 files changed, 5 insertions(+)
diff --git a/acceptance_norecorder.suite.yml b/acceptance_norecorder.suite.yml
index 7d9cd649..076a7f7b 100644
--- a/acceptance_norecorder.suite.yml
+++ b/acceptance_norecorder.suite.yml
@@ -11,6 +11,8 @@ modules:
url: http://nginx
browser: chrome
port: 9515
+ request_timeout: 30
+ wait: 30
capabilities:
acceptInsecureCerts: true
enableVerboseLogging: false
diff --git a/acceptance_recorder.suite.yml b/acceptance_recorder.suite.yml
index e6c19532..9dd369fa 100644
--- a/acceptance_recorder.suite.yml
+++ b/acceptance_recorder.suite.yml
@@ -11,6 +11,8 @@ modules:
url: http://nginx
browser: chrome
port: 9515
+ request_timeout: 30
+ wait: 30
capabilities:
acceptInsecureCerts: true
enableVerboseLogging: false
diff --git a/codeception.yml b/codeception.yml
index 5a96943c..cf49bf7e 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -1,5 +1,6 @@
settings:
memory_limit: 2048M
+ shuffle: true
paths:
tests: tests
output: tests/_output
--
GitLab
From e35644ce7fbede8c7603b504ba8a3a178fa1eca0 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Thu, 19 Dec 2024 14:40:11 -0500
Subject: [PATCH 47/69] ISTWCMS-7189 Add switchToIFrame to make testBlockLinks
work in WcmsTestsBlockLinksCest
---
acceptance/WcmsTestsBlockLinksCest.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/acceptance/WcmsTestsBlockLinksCest.php b/acceptance/WcmsTestsBlockLinksCest.php
index 8cabe933..4ca84f1e 100644
--- a/acceptance/WcmsTestsBlockLinksCest.php
+++ b/acceptance/WcmsTestsBlockLinksCest.php
@@ -51,6 +51,8 @@ class WcmsTestsBlockLinksCest {
// Click on block.
$i->click($block);
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
$i->see('Heading level');
// The list of headers that are available.
--
GitLab
From aab1db682aba89a4507b6f328e82ebc2d90b587a Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Thu, 19 Dec 2024 14:44:06 -0500
Subject: [PATCH 48/69] ISTWCMS-7189 Add switchToIFrame to make
testContentTypeEdits work in ContentType
---
_support/Step/Acceptance/ContentType.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/_support/Step/Acceptance/ContentType.php b/_support/Step/Acceptance/ContentType.php
index c496db0f..12a624cf 100644
--- a/_support/Step/Acceptance/ContentType.php
+++ b/_support/Step/Acceptance/ContentType.php
@@ -252,6 +252,9 @@ class ContentType extends \AcceptanceTester {
$i->click('Copy text');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// FIll in fields.
$i->fillField('input[name="settings[label]"]', $i->uwRandomString());
$i->fillCkEditor($i->uwRandomString(), 'textarea[name="settings[block_form][field_uw_copy_text][0][value]"]');
@@ -259,8 +262,10 @@ class ContentType extends \AcceptanceTester {
// Click add block and ensure it appears on page.
$i->waitForText('Add block');
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Copy text'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Copy text'));
+ $i->click('Add block');
+ $i->switchToIFrame();
+ $i->waitForElement('div[class="uw-copy-text"]');
+ $i->seeElement('div[class="uw-copy-text"]');
// Save the layout and ensure that new block appears
// on the page with correct section classes.
--
GitLab
From ac597d220a3a3960c14da4e089376726b5503b9f Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Thu, 19 Dec 2024 14:52:20 -0500
Subject: [PATCH 49/69] ISTWCMS-7189 Add switchtoIFrame to make
WcmsTestsBlocksEmbedsCest work
---
acceptance/WcmsTestsBlocksEmbedsCest.php | 38 +++++++++++++++++-------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksEmbedsCest.php b/acceptance/WcmsTestsBlocksEmbedsCest.php
index 88db3284..187f3140 100644
--- a/acceptance/WcmsTestsBlocksEmbedsCest.php
+++ b/acceptance/WcmsTestsBlocksEmbedsCest.php
@@ -1,7 +1,5 @@
<?php
-use Codeception\Util\Locator;
-
/**
* Class WcmsTestsBlocksEmbedsCest.
*
@@ -55,6 +53,9 @@ class WcmsTestsBlocksEmbedsCest {
$i->click('Google Maps');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Get the settings for Google Maps.
$title = $i->uwRandomString();
$gm_url = 'https://www.google.com/maps/embed?pb=' . $i->uwRandomString();
@@ -67,8 +68,10 @@ class WcmsTestsBlocksEmbedsCest {
// Click on add block and ensure it is on the screen.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Google Maps'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Google Maps'));
+
+ $i->switchtoIFrame();
+ $i->waitForElement('div[class="uw-google-maps"]');
+ $i->seeElement('div[class="uw-google-maps"]');
// Check for elements on the page.
$i->see($title);
@@ -108,6 +111,9 @@ class WcmsTestsBlocksEmbedsCest {
$i->click('PowerBI');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Get the settings for the block.
$title = $i->uwRandomString();
$url = 'https://app.powerbi.com/' . $i->uwRandomString();
@@ -118,8 +124,10 @@ class WcmsTestsBlocksEmbedsCest {
// Click on add block and ensure it is on the screen.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'PowerBI'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'PowerBI'));
+
+ $i->switchToIFrame();
+ $i->waitForElement('div[class="uw-powerbi"]');
+ $i->seeElement('div[class="uw-powerbi"]');
// Ensure elements are on the page.
$i->see($title);
@@ -159,6 +167,9 @@ class WcmsTestsBlocksEmbedsCest {
$i->click('Social Intents');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Get the settings we are going to use.
$title = $i->uwRandomString();
$username = 'uwist';
@@ -169,8 +180,10 @@ class WcmsTestsBlocksEmbedsCest {
// Click on add block and ensure it is on the screen.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Social Intents'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Social Intents'));
+
+ $i->switchToIFrame();
+ $i->waitForElement('div[class="uw-social-intents"]');
+ $i->seeElement('div[class="uw-social-intents"]');
// Ensure elements appear on the page.
$i->see($title);
@@ -209,6 +222,9 @@ class WcmsTestsBlocksEmbedsCest {
$i->click('Tableau visualization');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Get the settings we are going to use.
$title = $i->uwRandomString();
$height = rand(100, 1000);
@@ -225,8 +241,10 @@ class WcmsTestsBlocksEmbedsCest {
// Click on add block and ensure it is on the screen.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Tableau visualization'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Tableau visualization'));
+
+ $i->switchToIFrame();
+ $i->waitForElement('div[class="uw-tableau"]');
+ $i->seeElement('div[class="uw-tableau"]');
// Ensure elements appear on the page.
$i->see($title);
--
GitLab
From 461ca0a898039d41f617fd222a5bd3cdca9296da Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Thu, 19 Dec 2024 15:02:40 -0500
Subject: [PATCH 50/69] ISTWCMS-7189 Add switchToIFrame to make
WcmsTestsMultiTypePromoteCest work
---
acceptance/WcmsTestsMultiTypePromoteCest.php | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/acceptance/WcmsTestsMultiTypePromoteCest.php b/acceptance/WcmsTestsMultiTypePromoteCest.php
index d391761b..63b56377 100644
--- a/acceptance/WcmsTestsMultiTypePromoteCest.php
+++ b/acceptance/WcmsTestsMultiTypePromoteCest.php
@@ -116,7 +116,10 @@ class WcmsTestsMultiTypePromoteCest {
$i->waitForText('Multi-type list');
$i->click('Multi-type list');
$i->waitforText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
$i->click('Add block');
+ $i->switchToIFrame();
$i->click('Save layout');
$content = [
@@ -141,8 +144,11 @@ class WcmsTestsMultiTypePromoteCest {
$i->waitForText('Multi-type list');
$i->click('Multi-type list');
$i->waitforText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
$i->checkOption('input[id*="edit-settings-show-all-items"]');
$i->click('Add block');
+ $i->switchToIFrame();
$i->click('Save layout');
// Check that tabs and both promoted and unpromoted items are displayed.
--
GitLab
From 369b34e7b705da38c65e9f6b92e70bde039a472b Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Thu, 19 Dec 2024 15:16:47 -0500
Subject: [PATCH 51/69] ISTWCMS-7189 Add switchToIFrame to make
WcmsTestsImgInlineCest work
---
acceptance/WcmsTestsImgInlineCest.php | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/acceptance/WcmsTestsImgInlineCest.php b/acceptance/WcmsTestsImgInlineCest.php
index ba92cc8c..9e0b3cc5 100644
--- a/acceptance/WcmsTestsImgInlineCest.php
+++ b/acceptance/WcmsTestsImgInlineCest.php
@@ -49,6 +49,10 @@ class WcmsTestsImgInlineCest {
$i->waitForText('Choose a block');
$i->click('Copy text');
+ $i->waitForText('Configure block');
+
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
$i->waitForText('Block description');
// Fill the title.
@@ -71,7 +75,7 @@ class WcmsTestsImgInlineCest {
// Click the submit button.
$i->waitForElementClickable('input[id*="edit-actions-submit"]');
$i->click('input[id*="edit-actions-submit"]');
-
+ $i->switchToIFrame();
// Ensure that the block is on the page.
$i->waitForJS("return document.readyState === 'complete';", 30);
$i->waitForElement(".uw-copy-text div " . $block . " img", 30);
@@ -79,12 +83,14 @@ class WcmsTestsImgInlineCest {
// Check that image's parent is a block.
$i->seeElement(".uw-copy-text div " . $block . " img", ['alt' => 'Inserted image in ' . $block . ' block']);
+ $i->waitForJS("return document.readyState === 'complete';");
// Remove added block to avoid ambiguity in finding image.
$i->amOnPage($path . '/layout/discard-changes');
$i->click('#edit-submit');
- $i->waitForJS("return document.readyState === 'complete';", 30);
- $i->waitForText("The changes to the layout have been discarded.", 60);
+ $i->switchToIFrame();
+ $i->waitForJS("return document.readyState === 'complete';");
+ $i->waitForText("The changes to the layout have been discarded.");
}
}
--
GitLab
From 65a98001651f8534b4240f3ebd1d0e8e440e15af Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Fri, 20 Dec 2024 10:03:11 -0500
Subject: [PATCH 52/69] ISTWCMS-7189 Add switchToIFrame to make
WcmsTestsBlocksContentCest work
---
acceptance/WcmsTestsBlocksContentCest.php | 105 ++++++++++++++++++----
1 file changed, 86 insertions(+), 19 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksContentCest.php b/acceptance/WcmsTestsBlocksContentCest.php
index 413e06a0..da6e163c 100644
--- a/acceptance/WcmsTestsBlocksContentCest.php
+++ b/acceptance/WcmsTestsBlocksContentCest.php
@@ -55,6 +55,9 @@ class WcmsTestsBlocksContentCest {
$i->click('Banner images');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Ensure that banner image required.
$i->seeElement(Locator::contains('div[id^="edit-settings-block-form-field-uw-banner-item"] strong[class="form-required"]', 'Banner'));
@@ -249,6 +252,9 @@ class WcmsTestsBlocksContentCest {
$i->click('Banner images');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Ensure that banner image required.
$i->seeElement(Locator::contains('div[id^="edit-settings-block-form-field-uw-banner-item"] strong[class="form-required"]', 'Banner'));
@@ -312,6 +318,9 @@ class WcmsTestsBlocksContentCest {
$i->click('Copy text');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Text to be used.
$copy_text = $i->uwRandomString();
@@ -325,18 +334,27 @@ class WcmsTestsBlocksContentCest {
$i->dontSeeOptionIsSelected('layout_builder_style_uw_lbs_grp_text_alignment', 'Right');
// Fill the title field.
- $i->fillField('settings[label]', $copy_text);
+ $i->fillField('settings[label]', $i->uwRandomString());
// Click on source and fill in the ck editor field with the tagged text.
$i->click('Source');
$i->fillCkEditor($tagged_text, 'textarea[name="settings[block_form][field_uw_copy_text][0][value]"]');
+ // Click on source again to make sure it is added.
+ $i->click('Source');
+
+ // Trigger CKEditor update.
+ $i->executeJS('for (instance in CKEDITOR.instances) { CKEDITOR.instances[instance].updateElement(); }');
+
// Submit form.
$i->click('input[id*="edit-actions-submit"]');
+ // Switch to iframe.
+ $i->switchToIFrame();
+
// Ensure that the tag is on the page.
- $i->waitForElement('.uw-copy-text div ' . $tag);
- $i->see($copy_text, '.uw-copy-text div ' . $tag);
+ $i->waitForText($copy_text);
+ $i->seeInSource($tagged_text);
// Remove added block to start again.
$i->amOnPage($path . '/layout/discard-changes');
@@ -377,6 +395,9 @@ class WcmsTestsBlocksContentCest {
$i->click('Call to action');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Check for form elements.
$i->seeElement(Locator::contains('label', 'Link'));
$i->seeElement(Locator::contains('label', 'Theme'));
@@ -408,11 +429,12 @@ class WcmsTestsBlocksContentCest {
// Click on add block and ensure it is on the screen.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Call to action'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Call to action'));
+
+ // Switch to iframe.
+ $i->switchToIFrame();
// Check that elements are on the page.
- $i->see($title);
+ $i->waitForText($title);
$i->seeElement('.uw-cta');
$i->seeElement('aside.' . $theme_option);
$i->seeElement('a[href="' . $cta_link . '"]');
@@ -458,14 +480,23 @@ class WcmsTestsBlocksContentCest {
$i->click('Copy text');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Fill in copy text block.
$i->fillField('settings[label]', 'Test copy text');
$i->fillCkEditor('This is copy text on expand/collapse', 'textarea[name="settings[block_form][field_uw_copy_text][0][value]"]');
+ // Trigger CKEditor update.
+ $i->executeJS('for (instance in CKEDITOR.instances) { CKEDITOR.instances[instance].updateElement(); }');
+
// Add the block and ensure that it appears.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Copy text'));
- $i->see('This is copy text on expand/collapse');
+
+ // Switch to iframe.
+ $i->switchToIFrame();
+
+ $i->waitForText('This is copy text on expand/collapse');
// Click the save layout and ensure that it saves.
$i->click('Save layout');
@@ -483,6 +514,9 @@ class WcmsTestsBlocksContentCest {
$i->click('Expand/collapse');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Ensure elements exists.
$i->seeElement('input[id^="edit-settings-label"][type="text"][class*="required"][value="Expand Collapse"]');
$i->seeElement('input[id^="edit-settings-label-display"][type="checkbox"][checked="checked"]');
@@ -508,11 +542,19 @@ class WcmsTestsBlocksContentCest {
$i->fillField('settings[label]', $title);
$i->selectOption('settings[items_fieldset][heading_selector]', 'h2');
$i->fillField('settings[items_fieldset][items][0][group_info][group]', $exp_col_title);
+ $i->waitForText($exp_col_title . ' (');
+ $i->moveMouseOver(Locator::contains('a', $exp_col_title . ' ('));
+ $i->clickWithLeftButton();
+ $i->moveMouseOver(NULL, 0, 20);
+ $i->clickWithLeftButton();
+ $i->waitForElementNotVisible(Locator::contains('message', 'Please wait...'));
+ $i->clickWithLeftButton();
// Click on add block and ensure it is on the screen.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Expand Collapse'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Expand Collapse'));
+ $i->switchToIFrame();
+ $i->waitForElement('.uw-exp-col');
+ $i->seeElement('.uw-exp-col');
// Test the expand/collapse block contents.
$i->see($title);
@@ -566,6 +608,9 @@ class WcmsTestsBlocksContentCest {
$i->click('Facts and figures');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Check 'Default background colour' field help text.
$i->see('When gold is selected, the default colour will always be black.');
@@ -635,6 +680,9 @@ class WcmsTestsBlocksContentCest {
$i->click('Image');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Select the full width image.
$i->selectOption('[id*="edit-settings-image-settings-type-of-image"]', 'full');
@@ -662,7 +710,9 @@ class WcmsTestsBlocksContentCest {
// Click on add block and ensure that block loads.
$i->click('Add block');
- $i->waitForElement(Locator::contains('.uw-admin-label', 'Image'));
+ $i->switchToIFrame();
+ $i->waitForElement('.uw-image');
+ $i->seeElement('.uw-image');
// Get the parts of the image so that we can get
// the full name of the image.
@@ -745,6 +795,9 @@ class WcmsTestsBlocksContentCest {
$i->click('Image');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Select the full width image.
$i->selectOption('[id*="edit-settings-image-settings-type-of-image"]', 'sized');
@@ -775,8 +828,11 @@ class WcmsTestsBlocksContentCest {
$i->waitForElement('.form-submit');
// Click on add block and ensure that block loads.
- $i->click('Add block');
- $i->waitForElement(Locator::contains('.uw-admin-label', 'Image'));
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
+ $i->waitForElement('.uw-image');
+ $i->seeElement('.uw-image');
// Ensure that picture is on page.
$i->seeElement('.uw-image__sized-image--original');
@@ -798,17 +854,21 @@ class WcmsTestsBlocksContentCest {
$i->click(Locator::contains('ul li a', 'Configure'));
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Select the alignement to test.
$i->selectOption('[id*="edit-settings-image-settings-image-alignment"]', $alignment);
// Click on add block and ensure that block loads, adding a wait
// here for image generation, or it will time out waiting for
// the element.
- $i->click('Update');
- $i->waitForElementNotVisible('.ui-dialog');
- $i->waitForElement(Locator::contains('.uw-admin-label', 'Image'));
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
// Test that alignment is on page.
+ $i->waitForElement('.uw-image__sized-image--' . $alignment);
$i->seeElement('.uw-image__sized-image--' . $alignment);
}
@@ -831,6 +891,9 @@ class WcmsTestsBlocksContentCest {
$i->click(Locator::contains('ul li a', 'Configure'));
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Set the type of sized image to custom.
$i->waitForElement('[id*="edit-settings-image-settings-type-of-sized-image"]');
$i->selectOption('[id*="edit-settings-image-settings-type-of-sized-image"]', 'custom');
@@ -858,11 +921,12 @@ class WcmsTestsBlocksContentCest {
// Click on add block and ensure that block loads, adding a wait
// here for image generation, or it will time out waiting for
// the element.
- $i->click('Update');
- $i->waitForElementNotVisible('.ui-dialog');
- $i->waitForElement(Locator::contains('.uw-admin-label', 'Image'));
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
// Ensure that the alignemtn is on the page.
+ $i->waitForElement('.uw-image__sized-image--' . $alignment);
$i->seeElement('.uw-image__sized-image--' . $alignment);
$i->seeInSource($image_name);
@@ -912,6 +976,9 @@ class WcmsTestsBlocksContentCest {
$i->click('Timeline');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Ensure that fields are in the block.
$i->see('Title');
$i->see('Timeline style');
--
GitLab
From db2eeeabc150fc20df6a11cfce31b1b52a3bb94e Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Wed, 8 Jan 2025 14:47:06 -0500
Subject: [PATCH 53/69] ISTWCMS-7189 Add switchToIFrame to make
WcmsTestsBlocksSearchCest work
---
acceptance/WcmsTestsBlocksSearchCest.php | 49 ++++++++++++++++++------
1 file changed, 37 insertions(+), 12 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksSearchCest.php b/acceptance/WcmsTestsBlocksSearchCest.php
index 45040b2d..98efd2c5 100644
--- a/acceptance/WcmsTestsBlocksSearchCest.php
+++ b/acceptance/WcmsTestsBlocksSearchCest.php
@@ -74,6 +74,9 @@ class WcmsTestsBlocksSearchCest {
$i->click('Catalog search');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Ensure that all fields and help text are present.
$i->seeElement('input[id^="edit-settings-label"][class*="required"][value="Catalog search"]');
$i->seeElement('input[id^="edit-settings-label-display"][type="checkbox"][checked="checked"]');
@@ -100,8 +103,11 @@ class WcmsTestsBlocksSearchCest {
// Click the add block.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Catalog search'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Catalog search'));
+
+ // Switch to iFrame.
+ $i->switchtoIFrame();
+ $i->waitForElement('div[class="uw-form-search"]');
+ $i->seeElement('div[class="uw-form-search"]');
// Ensure that we see the values entered.
$i->see($catalog_item_title);
@@ -151,6 +157,9 @@ class WcmsTestsBlocksSearchCest {
$i->click('Project search');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Fill in the required fields.
$i->selectOption('settings[search_option][option]', 'All options');
$i->fillField('settings[project_settings][search_description]', 'this is the description');
@@ -158,8 +167,11 @@ class WcmsTestsBlocksSearchCest {
// Click on add block and ensure it is on the screen.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Project search'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Project search'));
+
+ // Switch to iFrame.
+ $i->switchtoIFrame();
+ $i->waitForElement('div[class="uw-form-search"]');
+ $i->seeElement('div[class="uw-form-search"]');
// Test elements are on the page.
$i->seeElement('.uw-project-form');
@@ -204,6 +216,9 @@ class WcmsTestsBlocksSearchCest {
$i->click('Service search');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Get the title we are going to use.
$title = $i->uwRandomString();
@@ -214,8 +229,11 @@ class WcmsTestsBlocksSearchCest {
// Click on add block and ensure it is on the screen.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Service search'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Service search'));
+
+ // Switch to iFrame.
+ $i->switchtoIFrame();
+ $i->waitForElement('div[class="uw-form-search"]');
+ $i->seeElement('div[class="uw-form-search"]');
// Test elements are on the page.
$i->seeElement('.uw-search-form');
@@ -256,6 +274,9 @@ class WcmsTestsBlocksSearchCest {
$i->click('OFIS expert search');
$i->waitForText('Configure block');
+ // Switch to iFrame.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Get the values for some fields we are going to use.
$title = $i->uwRandomString();
$notice = $i->uwRandomString();
@@ -267,8 +288,12 @@ class WcmsTestsBlocksSearchCest {
// Click on add block and ensure it is on the screen.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'OFIS expert search'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'OFIS expert search'));
+
+ // Switch to iFrame.
+ $i->switchtoIFrame();
+
+ $i->waitForText($title);
+ $i->see($title);
// Save layout.
$i->click('Save layout');
@@ -282,7 +307,7 @@ class WcmsTestsBlocksSearchCest {
// Test search with one result.
$i->fillField('input[id^="ofis-search"]', 'Aagaard');
- $i->click('Submit');
+ $i->click('input[id^="edit-submit"]');
$i->waitforText('Number of experts found: 1');
$i->seeNumberofelements('.expert', 1);
$i->dontSeeElement('.uw-exp-col');
@@ -302,7 +327,7 @@ class WcmsTestsBlocksSearchCest {
foreach ($singleWordSearchTerms as $term) {
$i->amOnPage($path);
$i->fillField('input[id^="ofis-search"]', $term);
- $i->click('Submit');
+ $i->click('input[id^="edit-submit"]');
$i->waitforText('Number of experts found: ');
$resultCount = $i->grabTextFrom('div[id^="ofis-results"].ofis-results p');
$resultCount = preg_replace('/[^0-9]/', '', $resultCount);
@@ -320,7 +345,7 @@ class WcmsTestsBlocksSearchCest {
// Test search with multiple words.
$i->amOnPage($path);
$i->fillField('input[id^="ofis-search"]', $combinedSearchTerm);
- $i->click('Submit');
+ $i->click('input[id^="edit-submit"]');
$i->waitforText('Number of experts found: ' . $combinedExpectedResultCount);
$i->seeNumberofelements('.expert', $combinedExpectedResultCount);
$i->seeElement('.uw-exp-col');
@@ -336,7 +361,7 @@ class WcmsTestsBlocksSearchCest {
foreach ($searchTerms as $term => $message) {
$i->amOnPage($path);
$i->fillField('input[id^="ofis-search"]', $term);
- $i->click('Submit');
+ $i->click('input[id^="edit-submit"]');
$i->waitforText($message);
$i->dontSeeElement('.expert');
$i->dontSeeElement('.uw-exp-col');
--
GitLab
From fbd629082b49c0a35ad584bb0b165f7bbbae1cc1 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Thu, 9 Jan 2025 08:44:18 -0500
Subject: [PATCH 54/69] ISTWCMS-7189 Add switchToIFrame to make
WcmsTestsBlocksWebformsCest work
---
acceptance/WcmsTestsBlocksWebformsCest.php | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksWebformsCest.php b/acceptance/WcmsTestsBlocksWebformsCest.php
index 1f818b26..92cdc4e6 100644
--- a/acceptance/WcmsTestsBlocksWebformsCest.php
+++ b/acceptance/WcmsTestsBlocksWebformsCest.php
@@ -1,6 +1,5 @@
<?php
-use Codeception\Util\Locator;
use Drupal\webform\Entity\Webform;
/**
@@ -65,6 +64,9 @@ class WcmsTestsBlocksWebformsCest {
$i->click('Webform');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// The settings for the webform block.
$title = $i->uwRandomString();
$webform_name = 'Test form (test_form)';
@@ -75,8 +77,11 @@ class WcmsTestsBlocksWebformsCest {
// Click on add block and ensure it is on the screen.
$i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Webform'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Webform'));
+
+ // Switch to iFrame.
+ $i->switchtoIFrame();
+ $i->waitForText($title);
+ $i->see($title);
// Need to save the layout to continue the tests.
$i->waitForElementClickable('#edit-actions #edit-submit');
@@ -84,7 +89,7 @@ class WcmsTestsBlocksWebformsCest {
// Ensure elements are on the page.
$i->see($title);
- $i->click('input[class*="webform-button--submit"][value="Submit"]');
+ $i->click('input[id="edit-submit"]');
// Wait for a click the back to form.
$i->waitForText('Back to form');
--
GitLab
From 9763550fa0e35213ada94cb1c789ea46f755153c Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Thu, 9 Jan 2025 09:58:56 -0500
Subject: [PATCH 55/69] ISTWCMS-7189 Trigger CKEditor update in ContentType to
make WcmsTestsContentTypeOpportunityCest work
---
_support/Step/Acceptance/ContentType.php | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/_support/Step/Acceptance/ContentType.php b/_support/Step/Acceptance/ContentType.php
index 12a624cf..0e44d674 100644
--- a/_support/Step/Acceptance/ContentType.php
+++ b/_support/Step/Acceptance/ContentType.php
@@ -255,16 +255,19 @@ class ContentType extends \AcceptanceTester {
// Switch the block form iframe.
$i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+ $title = $i->uwRandomString();
// FIll in fields.
- $i->fillField('input[name="settings[label]"]', $i->uwRandomString());
+ $i->fillField('input[name="settings[label]"]', $title);
$i->fillCkEditor($i->uwRandomString(), 'textarea[name="settings[block_form][field_uw_copy_text][0][value]"]');
- // Click add block and ensure it appears on page.
- $i->waitForText('Add block');
- $i->click('Add block');
- $i->click('Add block');
+ // Trigger CKEditor update.
+ $i->executeJS('for (instance in CKEDITOR.instances) { CKEDITOR.instances[instance].updateElement(); }');
+
+ // Submit form.
+ $i->click('input[id*="edit-actions-submit"]');
+
$i->switchToIFrame();
- $i->waitForElement('div[class="uw-copy-text"]');
+ $i->waitForText($title);
$i->seeElement('div[class="uw-copy-text"]');
// Save the layout and ensure that new block appears
@@ -431,6 +434,7 @@ class ContentType extends \AcceptanceTester {
$i->amOnPage($view_url . '/revisions');
// Ensure that they can not view revisions.
+ $i->see('Access denied');
$i->see('You are not authorized to access this page.');
}
}
--
GitLab
From 82b13a078f041d968938d4925fa21c4a38ac7693 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Thu, 9 Jan 2025 11:06:40 -0500
Subject: [PATCH 56/69] ISTWCMS-7189 Add switchToIFrame to make
WcmsTestsLinkFieldCest work
---
acceptance/WcmsTestsLinkFieldCest.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/acceptance/WcmsTestsLinkFieldCest.php b/acceptance/WcmsTestsLinkFieldCest.php
index bd9029a3..ba612564 100644
--- a/acceptance/WcmsTestsLinkFieldCest.php
+++ b/acceptance/WcmsTestsLinkFieldCest.php
@@ -311,6 +311,9 @@ class WcmsTestsLinkFieldCest {
$i->click($block);
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Fill the block fields.
$this->fillBlockFields($i, $fields, 'Add block');
--
GitLab
From 9dcb12c6755079f3947b63c7e90ea83daf169f39 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Thu, 9 Jan 2025 11:22:41 -0500
Subject: [PATCH 57/69] ISTWCMS-7189 Trigger CKEditor update to make
WcmsTestsImgInlineCest work
---
acceptance/WcmsTestsImgInlineCest.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/acceptance/WcmsTestsImgInlineCest.php b/acceptance/WcmsTestsImgInlineCest.php
index 9e0b3cc5..588c2877 100644
--- a/acceptance/WcmsTestsImgInlineCest.php
+++ b/acceptance/WcmsTestsImgInlineCest.php
@@ -72,10 +72,14 @@ class WcmsTestsImgInlineCest {
'textarea[name="settings[block_form][field_uw_copy_text][0][value]"]'
);
+ // Trigger CKEditor update.
+ $i->executeJS('for (instance in CKEDITOR.instances) { CKEDITOR.instances[instance].updateElement(); }');
+
// Click the submit button.
$i->waitForElementClickable('input[id*="edit-actions-submit"]');
$i->click('input[id*="edit-actions-submit"]');
$i->switchToIFrame();
+
// Ensure that the block is on the page.
$i->waitForJS("return document.readyState === 'complete';", 30);
$i->waitForElement(".uw-copy-text div " . $block . " img", 30);
--
GitLab
From 3d997d2cc2b8078be6e846342bd2a8f5469673d0 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Wed, 8 Jan 2025 14:51:00 -0500
Subject: [PATCH 58/69] ISTWCMS-7189 Add switchToIFrame to make
WcmsTestsBlocksListingsCest work
---
acceptance/WcmsTestsBlocksListingsCest.php | 183 ++++++++++++++++-----
1 file changed, 142 insertions(+), 41 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index 75c25107..c686d0f8 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -75,6 +75,9 @@ class WcmsTestsBlocksListingsCest {
$i->click('Multi-type list');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Ensure title options are present.
$i->see('Title');
$i->seeElement('input[id^="edit-settings-label"]');
@@ -106,12 +109,15 @@ class WcmsTestsBlocksListingsCest {
$i->checkOption('input[id^="edit-settings-show-view-all"]');
// Click on add block and ensure it is on the screen.
- $i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Multi-type list'));
- $i->seeElement(Locator::contains('div[class="uw-admin-label"]', 'Multi-type list'));
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
+
+ $i->waitForText('Multi-type list');
+ $i->see('Multi-type list');
// Click on save layout (List tabs cannot be navigated in layout editor).
- $i->click('Save layout');
+ $i->click('input[id="edit-submit"]');
// Ensure that we see elements for list tabs.
$i->seeElement('div[class="uw-tabs"]');
@@ -122,23 +128,31 @@ class WcmsTestsBlocksListingsCest {
$i->seeElement(Locator::contains('button[id*="tab-"]', 'Opportunities'));
// Navigate to 'News' tab and check news elements.
- $i->click('News', '.uw-tab');
+ $i->scrollTo('.uw-tab');
+ $i->waitForElementClickable('.uw-tab button[aria-controls="News"]', 10);
+ $i->executeJS("document.querySelector('.uw-tab button[aria-controls=\"News\"]').click()");
$i->see('newslist1');
$i->see('Read all news');
// Navigate to 'Events' tab and check event elements.
- $i->click('Events', '.uw-tab');
+ $i->scrollTo('.uw-tab button[aria-controls="Events"]');
+ $i->waitForElementClickable('.uw-tab button[aria-controls="Events"]', 10);
+ $i->executeJS("document.querySelector('.uw-tab button[aria-controls=\"Events\"]').click()");
$i->see('eventslist1');
$i->see('All upcoming events');
// Navigate to 'Blog' tab and check blog elements.
- $i->click('Blog', '.uw-tab');
+ $i->scrollTo('.uw-tab button[aria-controls="Blog"]');
+ $i->waitForElementClickable('.uw-tab button[aria-controls="Blog"]', 10);
+ $i->executeJS("document.querySelector('.uw-tab button[aria-controls=\"Blog\"]').click()");
$i->see(strtoupper(date('l, F j, Y')));
$i->see('bloglist1');
$i->see('View all blog posts');
// Navigate to 'Opportunities' tab and check opportunities elements.
- $i->click('Opportunities', '.uw-tab');
+ $i->scrollTo('.uw-tab button[aria-controls="Opportunities"]');
+ $i->waitForElementClickable('.uw-tab button[aria-controls="Opportunities"]', 10);
+ $i->executeJS("document.querySelector('.uw-tab button[aria-controls=\"Opportunities\"]').click()");
$i->see('opportunitylist1');
$i->see('View all opportunities');
}
@@ -179,6 +193,9 @@ class WcmsTestsBlocksListingsCest {
$i->click('Automatic list');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Step through each content type and test that it is in
// the select list.
foreach (array_keys($content_types) as $machine_name) {
@@ -222,6 +239,9 @@ class WcmsTestsBlocksListingsCest {
$i->click('Manual list');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Step through each content type and test that it is in
// the select list.
foreach (array_keys($content_types) as $machine_name) {
@@ -377,6 +397,9 @@ class WcmsTestsBlocksListingsCest {
$i->click('Waterloo Events');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Step through and add all Waterloo Events urls.
foreach ($events as $index => $eventUrls) {
@@ -389,8 +412,11 @@ class WcmsTestsBlocksListingsCest {
}
// Add the block.
- $i->click('Add block');
- $i->waitForElement(Locator::contains('div[class="uw-admin-label"]', 'Waterloo Events'));
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+
+ $i->switchtoIFrame();
+ $i->waitForText('Waterloo Events');
// Navigate to link are validate that url is not repeated.
$i->click('Save layout');
@@ -459,27 +485,40 @@ class WcmsTestsBlocksListingsCest {
$i->waitForText('Choose a block');
$i->click('Automatic list');
$i->waitForText('Configure block');
- $i->fillField('input[name="settings[label]"]', 'title');
+
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
$i->selectOption('settings[content_type]', $content_type);
// Create a block id and add the block.
$i->fillField('input[name="settings[layout_builder_id]"]', 'automatic' . $machine_name);
- $i->click('Add block');
- $i->waitForElement('.uw-admin-label');
+
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
+ $i->waitForElement('.block-uw-cbl-automatic-list');
+ $i->seeElement('.block-uw-cbl-automatic-list');
// Add an manual list block.
$i->waitForText('Add block');
+ $i->waitForElement('.layout-builder__add-block');
$i->click('Add block');
$i->waitForText('Choose a block');
$i->click('Manual list');
$i->waitForText('Configure block');
- $i->fillField('input[name="settings[label]"]', 'title');
+
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
$i->selectOption('settings[content_type]', $content_type);
$i->fillField('input[name="settings[' . $machine_name . '][items_fieldset][' . $machine_name . '_ids][0][id]"]', 'test' . $machine_name);
// Create a block id and add the block.
$i->fillField('input[name="settings[layout_builder_id]"]', 'manual' . $machine_name);
- $i->click('Add block');
+
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForText('Edit layout for testpage');
// Save the layout.
@@ -774,7 +813,9 @@ class WcmsTestsBlocksListingsCest {
case 'blog':
$i->selectOption('settings[blog][limit]', '6');
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForText('Automatic list');
$i->waitForElement('.card__teaser--blog');
$i->seeNumberOfElements('.card__teaser--blog', 4);
@@ -799,20 +840,27 @@ class WcmsTestsBlocksListingsCest {
$i->fillField('input[name="settings[blog][tags]"]', 'bt1');
$i->pressKey('input[name="settings[blog][tags]"]', WebDriverKeys::ARROW_DOWN);
$i->pressKey('input[name="settings[blog][tags]"]', WebDriverKeys::ENTER);
- $i->click('Add block');
+
+ // Siwtch to iframe.
+ $i->switchToIFrame();
+
$i->waitForElement('.card__teaser--blog');
$i->seeNumberOfElements('.card__teaser--blog', 2);
break;
case 'catalog':
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForText('Automatic list');
$i->waitForElement('.views-field-nid');
$i->seeNumberOfElements('.views-field-nid', 3);
break;
case 'catalog_item':
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForText('Automatic list');
$i->waitForElement('.views-field-title');
$i->seeNumberOfElements('.views-field-title', 3);
@@ -825,13 +873,17 @@ class WcmsTestsBlocksListingsCest {
10
);
$i->fillField('input[name="settings[catalog_item][catalog]"]', 'c1');
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForElement('.views-field-title');
$i->seeNumberOfElements('.views-field-title', 2);
break;
case 'contact':
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForText('Automatic list');
$i->waitForElement('.uw-contact');
$i->seeNumberOfElements('.uw-contact', 3);
@@ -844,13 +896,17 @@ class WcmsTestsBlocksListingsCest {
10
);
$i->fillField('input[name="settings[contact][groups]"]', 'cg1');
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForElement('.uw-contact');
$i->seeNumberOfElements('.uw-contact', 2);
break;
case 'event':
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForText('Automatic list');
$i->waitForElement('.card__teaser--event');
$i->seeNumberOfElements('.card__teaser--event', 3);
@@ -863,13 +919,17 @@ class WcmsTestsBlocksListingsCest {
10
);
$i->fillField('input[name="settings[event][tags]"]', 'et1');
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForElement('.card__teaser--event');
$i->seeNumberOfElements('.card__teaser--event', 2);
break;
case 'news_item':
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForText('Automatic list');
$i->waitForElement('.card__teaser--news-item');
$i->seeNumberOfElements('.card__teaser--news-item', 3);
@@ -882,13 +942,17 @@ class WcmsTestsBlocksListingsCest {
10
);
$i->fillField('input[name="settings[news_item][tags]"]', 'nt1');
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForElement('.card__teaser--news-item');
$i->seeNumberOfElements('.card__teaser--news-item', 2);
break;
case 'opportunity':
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForText('Automatic list');
$i->waitForElement('.card__teaser--opportunity');
$i->seeNumberOfElements('.card__teaser--opportunity', 3);
@@ -903,13 +967,17 @@ class WcmsTestsBlocksListingsCest {
$i->selectOption('select[name="settings[opportunity][type]"]', 35);
$i->selectOption('select[name="settings[opportunity][employment]"]', 38);
$i->selectOption('select[name="settings[opportunity][rate_of_pay]"]', 41);
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForElement('.card__teaser--opportunity');
$i->seeNumberOfElements('.card__teaser--opportunity', 2);
break;
case 'profile':
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForText('Automatic list');
$i->waitForElement('.card__teaser--profile');
$i->seeNumberOfElements('.card__teaser--profile', 3);
@@ -922,13 +990,17 @@ class WcmsTestsBlocksListingsCest {
10
);
$i->fillField('input[name="settings[profile][types]"]', 'ptype1');
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForElement('.card__teaser--profile');
$i->seeNumberOfElements('.card__teaser--profile', 2);
break;
case 'project':
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForText('Automatic list');
$i->waitForElement('.card__teaser--project');
$i->seeNumberOfElements('.card__teaser--project', 3);
@@ -942,7 +1014,9 @@ class WcmsTestsBlocksListingsCest {
);
$i->selectOption('select[name="settings[project][status]"]', 44);
$i->selectOption('select[name="settings[project][topic]"]', 'pt1');
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForElement('.card__teaser--project');
$i->seeNumberOfElements('.card__teaser--project', 2);
break;
@@ -952,7 +1026,9 @@ class WcmsTestsBlocksListingsCest {
break;
case 'service':
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForText('Automatic list');
$i->waitForElement('.views-field-field-uw-service-summary');
$this->removeAddFirstSection($i);
@@ -961,10 +1037,15 @@ class WcmsTestsBlocksListingsCest {
$i->waitForText('Choose a block');
$i->click('Automatic list');
$i->waitForText('Automatic list');
- $i->waitForElement('.js-form-item-settings-content-type');
+ $i->see('Automatic list');
+ $i->waitForElement('.lbim-dialog-iframe');
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+ $i->waitForElement('#edit-settings-content-type');
$i->selectOption('settings[content_type]', 'service');
$i->fillField('input[name="settings[service][categories]"]', 'sc1');
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
$i->waitForElement('.views-field-field-uw-service-summary');
break;
@@ -992,7 +1073,9 @@ class WcmsTestsBlocksListingsCest {
$i->fillField('input[name="settings[event][items_fieldset][event_ids][0][id]"]', 'Events1');
$i->selectOption('settings[event][style]', 'agenda');
$i->click('Add block');
- $i->waitForText('Manual list');
+ $i->switchToIFrame();
+ $i->waitForText('Events1');
+ $i->see('Events1');
$i->waitForElement('.uw-agenda');
$this->removeAddFirstSection($i);
$this->addListingBlockWithContentType(
@@ -1004,6 +1087,7 @@ class WcmsTestsBlocksListingsCest {
$i->fillField('input[name="settings[event][items_fieldset][event_ids][0][id]"]', 'Events1');
$i->selectOption('settings[event][style]', 'default');
$i->click('Add block');
+ $i->switchtoIFrame();
$i->waitForText('Manual list');
$i->dontSeeElement('.uw-agenda');
break;
@@ -1051,8 +1135,14 @@ class WcmsTestsBlocksListingsCest {
$i->click('Add block');
$i->waitForText('Choose a block');
$i->click('Automatic list');
+ $i->waitForText('Configure block');
+
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
$i->waitForText('Automatic list');
- $i->waitForElement('.js-form-item-settings-content-type');
+ $i->see('Automatic list');
+ $i->waitForElement('#edit-settings-content-type');
$i->selectOption('settings[content_type]', 'catalog');
$i->see('Catalog list settings');
$i->see('Heading selector');
@@ -1147,7 +1237,10 @@ class WcmsTestsBlocksListingsCest {
$i->waitForText('Choose a block');
$i->click('Automatic list');
$i->waitForText('Automatic list');
- $i->waitForElement('.js-form-item-settings-content-type');
+ $i->see('Automatic list');
+ $i->waitForElement('.lbim-dialog-iframe');
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+ $i->waitForElement('#edit-settings-content-type');
$i->selectOption('settings[content_type]', 'service');
$i->see('Service list settings');
$i->see('Categories');
@@ -1241,17 +1334,25 @@ class WcmsTestsBlocksListingsCest {
$i->click('Add block');
$i->waitForText('Choose a block');
$i->click($block_type);
+ $i->waitForText('Configure block');
+
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
$i->waitForText($block_type);
- $i->waitForElement('.js-form-item-settings-content-type');
+ $i->see($block_type);
+ $i->waitForElement('#edit-settings-content-type');
$i->selectOption('settings[content_type]', $content_type);
+
if ($block_type == 'Automatic list'
&& $content_type != 'services'
&& $block_type != 'catalogs') {
$i->selectOption('settings[' . $content_type . '][limit]', $limit);
}
if ($save_block) {
- $i->click('Add block');
- $i->waitForText($block_type);
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
}
}
--
GitLab
From daaaa618ef281de968408d6f15c93f82f352ff77 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Tue, 14 Jan 2025 15:42:15 -0500
Subject: [PATCH 59/69] ISTWCMS-7189 Add switchToIFrame to make
WcmsTestsExcludeAutoListCest work
---
acceptance/WcmsTestsExcludeAutoListCest.php | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/acceptance/WcmsTestsExcludeAutoListCest.php b/acceptance/WcmsTestsExcludeAutoListCest.php
index 62662d04..2eacd11b 100644
--- a/acceptance/WcmsTestsExcludeAutoListCest.php
+++ b/acceptance/WcmsTestsExcludeAutoListCest.php
@@ -1,7 +1,5 @@
<?php
-use Codeception\Util\Locator;
-
/**
* Class WcmsTestsExcludeAutoListCest.
*
@@ -194,15 +192,18 @@ class WcmsTestsExcludeAutoListCest {
$i->click('Automatic list');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Select the content type.
+ $i->waitForElement('#edit-settings-content-type');
$i->selectOption('select[id*="edit-settings-content-type"]', $content_type);
- $i->click('Add block');
-
- // Wait for the block to load and ensure that the
- // number of elements are on the page.
- $i->waitForElement(Locator::contains('.uw-admin-label', 'Automatic list'));
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
// Ensurfe there are only two on the page.
+ $i->waitForElement($class);
$i->seeNumberOfElements($class, 2);
}
}
--
GitLab
From 4b67b38c6af0a8f2f4ff14f4c664fba5a1a92181 Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Wed, 15 Jan 2025 13:44:08 -0500
Subject: [PATCH 60/69] ISTWCMS-7189 Add switchToIFrame to make
WcmsTestsBlocksTeaserCest work
---
acceptance/WcmsTestsBlocksTeaserCest.php | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/acceptance/WcmsTestsBlocksTeaserCest.php b/acceptance/WcmsTestsBlocksTeaserCest.php
index 58ee6379..b22dba66 100644
--- a/acceptance/WcmsTestsBlocksTeaserCest.php
+++ b/acceptance/WcmsTestsBlocksTeaserCest.php
@@ -111,6 +111,9 @@ class WcmsTestsBlocksTeaserCest {
$i->click('Content teaser');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Test the config for the teaser block.
$i->see('Heading level');
$i->seeElement('option[value="h2"][selected="selected"]');
@@ -176,8 +179,12 @@ class WcmsTestsBlocksTeaserCest {
$i->click('Content teaser');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
+ // Select the content type.
+ $i->waitForElement('#edit-settings-content-type');
$i->selectOption('select[name="settings[content_type]"]', $content_type);
- $i->waitForText($content_type . ' settings');
// Get the field name to fill in.
$field_name = 'input[name="settings[' . $machine_name . '][nid]"]';
@@ -199,7 +206,10 @@ class WcmsTestsBlocksTeaserCest {
);
// Click on the add block and ensure that it saves.
- $i->click('Add block');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
+
$i->waitForText('Content teaser');
// Ensure that the teaser block is on the page.
--
GitLab
From 5848c4b17f858db74f563866b8da924dac899beb Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Wed, 15 Jan 2025 13:54:07 -0500
Subject: [PATCH 61/69] ISTWCMS-7189 Add switchToIFrame to make
WcmsTestsCkeditorButtonsCest work
---
acceptance/WcmsTestsCkeditorButtonsCest.php | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/acceptance/WcmsTestsCkeditorButtonsCest.php b/acceptance/WcmsTestsCkeditorButtonsCest.php
index 494dc05a..75a3f59c 100644
--- a/acceptance/WcmsTestsCkeditorButtonsCest.php
+++ b/acceptance/WcmsTestsCkeditorButtonsCest.php
@@ -116,6 +116,9 @@ class WcmsTestsCkeditorButtonsCest {
$i->click('Copy text');
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Adds tags to text and xpath selector.
$tagged_text = '<span dir="ltr" lang="' . $code . '">' . $language . '</span>';
@@ -126,8 +129,13 @@ class WcmsTestsCkeditorButtonsCest {
$i->click('Source');
$i->fillCkEditor($tagged_text, 'textarea[name="settings[block_form][field_uw_copy_text][0][value]"]');
- // Submit form.
+ // Trigger CKEditor update.
+ $i->executeJS('for (instance in CKEDITOR.instances) { CKEDITOR.instances[instance].updateElement(); }');
+
+ // Click the submit button.
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
$i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
// Ensure that the tag is on the page.
$i->waitForElement(Locator::contains('span[lang="' . $code . '"]', $language));
--
GitLab
From 93acaa3bdf4f26bcdafc861f0c78a3b7357f07ac Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Thu, 16 Jan 2025 11:42:28 -0500
Subject: [PATCH 62/69] ISTWCMS-7189 Add switchToIFrame to make
WcmsTestsDashboardCest work
---
acceptance/WcmsTestsDashboardCest.php | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/acceptance/WcmsTestsDashboardCest.php b/acceptance/WcmsTestsDashboardCest.php
index b0799a8d..608a47b6 100644
--- a/acceptance/WcmsTestsDashboardCest.php
+++ b/acceptance/WcmsTestsDashboardCest.php
@@ -267,13 +267,21 @@ class WcmsTestsDashboardCest {
$i->click($block);
$i->waitForText('Configure block');
+ // Switch the block form iframe.
+ $i->switchToIFrame('iframe[class="lbim-dialog-iframe"]');
+
// Adds the block.
- $i->click('input[value="Add block"]');
+ $i->waitForElementClickable('input[id*="edit-actions-submit"]');
+ $i->click('input[id*="edit-actions-submit"]');
+ $i->switchToIFrame();
+
$i->waitForElement($class);
+ $i->seeElement($class);
}
// Saves the dashboard layout.
- $i->click('Save layout');
+ $i->waitForElementClickable('input[id*="edit-submit"]');
+ $i->click('input[id*="edit-submit"]');
}
--
GitLab
From ce5fb5903ce8203370dc047f0dd6fea9a626f4fa Mon Sep 17 00:00:00 2001
From: Lily Yan <l26yan@uwaterloo.ca>
Date: Fri, 17 Jan 2025 13:09:01 -0500
Subject: [PATCH 63/69] ISTWCMS-7189 Fix WcmsTestsImgInlineCest for
run_files.sh
---
acceptance/WcmsTestsImgInlineCest.php | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/acceptance/WcmsTestsImgInlineCest.php b/acceptance/WcmsTestsImgInlineCest.php
index 588c2877..ff5c9c38 100644
--- a/acceptance/WcmsTestsImgInlineCest.php
+++ b/acceptance/WcmsTestsImgInlineCest.php
@@ -44,7 +44,7 @@ class WcmsTestsImgInlineCest {
$i->waitForElementClickable('.layout-builder__add-block');
$i->executeJS("document.querySelector('.layout-builder__add-block').scrollIntoView(true);");
// Adjust the selector as needed.
- $i->waitForElementNotVisible('.loading-spinner', 30);
+ $i->waitForElementNotVisible('.loading-spinner', 60);
$i->click('.layout-builder__add-block');
$i->waitForText('Choose a block');
@@ -91,10 +91,13 @@ class WcmsTestsImgInlineCest {
// Remove added block to avoid ambiguity in finding image.
$i->amOnPage($path . '/layout/discard-changes');
+ $i->waitForText('Are you sure you want to discard your layout changes?');
+ $i->see('Are you sure you want to discard your layout changes?');
+ $i->waitForElement('#edit-submit');
$i->click('#edit-submit');
- $i->switchToIFrame();
$i->waitForJS("return document.readyState === 'complete';");
- $i->waitForText("The changes to the layout have been discarded.");
+ $i->waitForElement('.messages');
+ $i->see('The changes to the layout have been discarded.');
}
}
--
GitLab
From 929ec27c9cda418e0ad8eba4aba0d617b2877ecc Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 17 Mar 2025 15:55:04 -0400
Subject: [PATCH 64/69] ISTWCMS-7189: Remove auth site test until we can fix it
---
acceptance/WcmsTestsAuthSiteCest.php | 347 ---------------------------
1 file changed, 347 deletions(-)
delete mode 100644 acceptance/WcmsTestsAuthSiteCest.php
diff --git a/acceptance/WcmsTestsAuthSiteCest.php b/acceptance/WcmsTestsAuthSiteCest.php
deleted file mode 100644
index d2eab457..00000000
--- a/acceptance/WcmsTestsAuthSiteCest.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-
-/**
- * Class AuthSiteCest.
- *
- * Tests for auth site.
- */
-class WcmsTestsAuthSiteCest {
-
- /**
- * Tests for auth site.
- *
- * @param AcceptanceTester $i
- * Acceptance test variable.
- *
- * @group authsite
- */
- public function testAuthSite(AcceptanceTester $i) {
-
- // Get the test cases.
- $cases = $this->getCases($i);
-
- // Get the default access denied message.
- $default_message = $this->getDefaultMessage();
-
- // Loop to check all cases.
- foreach ($cases as $case => $edit) {
-
- // Login as site manager.
- $i->amOnPage('user/logout');
- $i->logInWithRole('administrator');
-
- $i->amOnPage('admin/config/system/auth_site');
-
- $i->checkOption('#edit-enabled');
- $i->waitForText('ACCESS CONTROL SETTINGS');
-
- foreach ($edit as $id => $value) {
- if ($id == 'edit-uw-access-control-method-group') {
- $i->selectOption('#' . $id, $value);
- }
- else {
- $i->fillField('#' . $id, $value);
- }
- }
-
- // Click on save config and ensure that it saves.
- $i->click('Save configuration');
- $i->waitForText('The configuration options have been saved.');
- $i->see('The configuration options have been saved.');
-
- // Admin logout.
- $i->amOnPage('user/logout');
-
- // Non-logged in user loads home page.
- $i->amOnPage('home');
-
- // Check log in page.
- switch ($case) {
- // edit-uw-auth-site-access-denied-title is empty,
- // and edit-uw-auth-site-access-denied-excerpt is default.
- case 'case1':
- case 'case5':
- case 'case6':
- case 'case7':
- case 'case8':
- case 'case9':
- $i->see('Log in');
- $i->see($default_message);
- break;
-
- // edit-uw-auth-site-access-denied-title is empty,
- // and edit-uw-auth-site-access-denied-excerpt is changed.
- case 'case2':
- $i->see('Log in');
- $i->see($edit['edit-uw-auth-site-text']);
- break;
-
- // edit-uw-auth-site-access-denied-title is filled,
- // and edit-uw-auth-site-access-denied-excerpt is default.
- case 'case3':
- $i->see($edit['edit-uw-auth-site-access-denied-title']);
- $i->see($default_message);
- break;
-
- // edit-uw-auth-site-access-denied-title is filled,
- // and edit-uw-auth-site-access-denied-excerpt is changed.
- case 'case4':
- $i->see($edit['edit-uw-auth-site-access-denied-title']);
- $i->see($edit['edit-uw-auth-site-access-denied-excerpt']);
- break;
- }
-
- // Check for reset password and correct redirect url.
- $i->dontSee('Reset your password');
- $i->amOnPage('user/password');
- $i->seeCurrentUrlEquals('/user/login?destination=/user/password');
-
- // Log in as authenticated user.
- $i->amOnPage('user/logout');
- $i->logInWithRole('authenticated');
-
- // Access denied message setting in home page.
- $i->amOnPage('home');
-
- switch ($case) {
- // Authenticated user can view home page for these cases.
- case 'case1':
- case 'case2':
- case 'case3':
- case 'case4':
- case 'case9':
- $i->seeLink('Contacts');
- $i->seeLink('Profiles');
- $i->seeLink('Blog');
- $i->seeLink('Events');
- $i->seeLink('News');
- break;
-
- // Display custom access denied title and default message.
- case 'case5':
- $i->see($edit['edit-uw-auth-site-access-denied-title-logged-in']);
- $i->see($default_message);
- break;
-
- // Display 'Access denied' title and custom message.
- case 'case6':
- $i->see('Access denied');
- $i->see($edit['edit-uw-auth-site-access-denied-excerpt-logged-in']);
- break;
-
- // Display custom access denied title and message.
- case 'case7':
- case 'case8':
- $i->see($edit['edit-uw-auth-site-access-denied-title-logged-in']);
- $i->see($edit['edit-uw-auth-site-access-denied-excerpt-logged-in']);
- break;
-
- }
-
- // Check 'admin/config/system/auth_site' as example,
- // got default access denied for all cases.
- $i->amOnPage('admin/config/system/auth_site');
- $i->see('Access denied');
- $i->see('You are not authorized to access this page');
-
- // Site owner access admin/config/system/auth_site page.
- $i->amOnPage('user/logout');
- $i->logInWithRole('uw_role_site_owner');
- $i->amOnPage('admin/config/system/auth_site');
-
- // Site owner cannot view 'Authenticated site' settings.
- $i->dontSee('Require authentication to access this site');
- }
- }
-
- /**
- * Function to get the default access denied message.
- *
- * @return string
- * The access denied message.
- */
- private function getDefaultMessage(): string {
- return 'Content on this site is restricted to authorized users; you must log in. Note that if you are not an authorized user, you may be able to log in, but still not have access to the content.';
- }
-
- /**
- * Function to get the test cases for auth site.
- *
- * @return array
- * Array of test cases for auth site.
- */
- private function getCases(AcceptanceTester $i): array {
-
- // The default message in edit-uw-auth-site-text field.
- $default_message = $this->getDefaultMessage();
-
- return [
- 'case1' => [
- 'edit-uw-access-control-method-group' => 'auth',
- 'edit-uw-auth-site-access-denied-title' => '',
- 'edit-uw-auth-site-access-denied-excerpt' => '',
- 'edit-uw-auth-site-access-denied-title-logged-in' => '',
- 'edit-uw-auth-site-access-denied-excerpt-logged-in' => '',
- 'edit-uw-auth-site-text' => $default_message,
- ],
- 'case2' => [
- 'edit-uw-access-control-method-group' => 'auth',
- 'edit-uw-auth-site-access-denied-title' => '',
- 'edit-uw-auth-site-access-denied-excerpt' => '',
- 'edit-uw-auth-site-access-denied-title-logged-in' => '',
- 'edit-uw-auth-site-access-denied-excerpt-logged-in' => '',
- 'edit-uw-auth-site-text' => $i->uwRandomString(),
- ],
- 'case3' => [
- 'edit-uw-access-control-method-group' => 'auth',
- 'edit-uw-auth-site-access-denied-title' => $i->uwRandomString(),
- 'edit-uw-auth-site-access-denied-excerpt' => '',
- 'edit-uw-auth-site-access-denied-title-logged-in' => '',
- 'edit-uw-auth-site-access-denied-excerpt-logged-in' => '',
- 'edit-uw-auth-site-text' => $default_message,
- ],
- 'case4' => [
- 'edit-uw-access-control-method-group' => 'auth',
- 'edit-uw-auth-site-access-denied-title' => $i->uwRandomString(),
- 'edit-uw-auth-site-access-denied-excerpt' => $i->uwRandomString(),
- 'edit-uw-auth-site-access-denied-title-logged-in' => '',
- 'edit-uw-auth-site-access-denied-excerpt-logged-in' => '',
- 'edit-uw-auth-site-text' => $default_message,
- ],
- 'case5' => [
- 'edit-uw-access-control-method-group' => 'group',
- 'edit-ad-require-groups' => $i->uwRandomString(),
- 'edit-ad-deny-groups' => '',
- 'edit-wcms-accounts' => '',
- 'edit-uw-auth-site-access-denied-title' => '',
- 'edit-uw-auth-site-access-denied-excerpt' => '',
- 'edit-uw-auth-site-access-denied-title-logged-in' => $i->uwRandomString(),
- 'edit-uw-auth-site-access-denied-excerpt-logged-in' => '',
- 'edit-uw-auth-site-text' => $default_message,
- ],
- 'case6' => [
- 'edit-uw-access-control-method-group' => 'group',
- 'edit-ad-require-groups' => $i->uwRandomString(),
- 'edit-ad-deny-groups' => '',
- 'edit-wcms-accounts' => '',
- 'edit-uw-auth-site-access-denied-title' => '',
- 'edit-uw-auth-site-access-denied-excerpt' => '',
- 'edit-uw-auth-site-access-denied-title-logged-in' => '',
- 'edit-uw-auth-site-access-denied-excerpt-logged-in' => $i->uwRandomString(),
- 'edit-uw-auth-site-text' => $default_message,
- ],
- 'case7' => [
- 'edit-uw-access-control-method-group' => 'group',
- 'edit-ad-require-groups' => $i->uwRandomString(),
- 'edit-ad-deny-groups' => '',
- 'edit-wcms-accounts' => '',
- 'edit-uw-auth-site-access-denied-title' => '',
- 'edit-uw-auth-site-access-denied-excerpt' => '',
- 'edit-uw-auth-site-access-denied-title-logged-in' => $i->uwRandomString(),
- 'edit-uw-auth-site-access-denied-excerpt-logged-in' => $i->uwRandomString(),
- 'edit-uw-auth-site-text' => $default_message,
- ],
- 'case8' => [
- 'edit-uw-access-control-method-group' => 'group',
- 'edit-ad-require-groups' => '',
- 'edit-ad-deny-groups' => '',
- 'edit-wcms-accounts' => '',
- 'edit-uw-auth-site-access-denied-title' => '',
- 'edit-uw-auth-site-access-denied-excerpt' => '',
- 'edit-uw-auth-site-access-denied-title-logged-in' => $i->uwRandomString(),
- 'edit-uw-auth-site-access-denied-excerpt-logged-in' => $i->uwRandomString(),
- 'edit-uw-auth-site-text' => $default_message,
- ],
- 'case9' => [
- 'edit-uw-access-control-method-group' => 'group',
- 'edit-ad-require-groups' => '',
- 'edit-ad-deny-groups' => $i->uwRandomString(),
- 'edit-wcms-accounts' => '',
- 'edit-uw-auth-site-access-denied-title' => '',
- 'edit-uw-auth-site-access-denied-excerpt' => '',
- 'edit-uw-auth-site-access-denied-title-logged-in' => $i->uwRandomString(),
- 'edit-uw-auth-site-access-denied-excerpt-logged-in' => $i->uwRandomString(),
- 'edit-uw-auth-site-text' => $default_message,
- ],
- ];
- }
-
- // phpcs:disable
- /**
- * Function to run after the test completes.
- *
- * @param AcceptanceTester $i
- * Acceptance test variable.
- */
- public function _passed(AcceptanceTester $i) {
-
- // Get the config for the auth site.
- $config = \Drupal::configFactory()
- ->getEditable('uw_auth_site.auth_site');
-
- // Get the actual config from the auth site form.
- $auth_site = $config->get('auth_site');
-
- // Reset all the values of the config.
- $auth_site['enabled'] = FALSE;
- $auth_site['uw_access_control_method'] = NULL;
- $auth_site['ad_require_groups'][0] = NULL;
- $auth_site['ad_deny_groups'][0] = NULL;
- $auth_site['uw_auth_site_access_denied_title'] = NULL;
- $auth_site['uw_auth_site_access_denied_excerpt'] = NULL;
- $auth_site['uw_auth_site_access_denied_title_logged_in'] = NULL;
- $auth_site['uw_auth_site_access_denied_excerpt_logged_in'] = NULL;
-
- // Set the auth site with values from above.
- $config->set('auth_site', $auth_site);
-
- // Save the config.
- $config->save();
-
- // Run the update permissions so that further tests work.
- shell_exec('drush uwperm');
-
- // Flush all the caches so that tests can continue.
- drupal_flush_all_caches();
- }
-
- // phpcs:disable
- /**
- * Function to run if the test fails.
- *
- * @param AcceptanceTester $i
- * Acceptance test variable.
- */
- public function _failed(AcceptanceTester $i) {
- // phpcs:enable
-
- // Get the config for the auth site.
- $config = \Drupal::configFactory()->getEditable('uw_auth_site.auth_site');
-
- // Get the actual config from the auth site form.
- $auth_site = $config->get('auth_site');
-
- // Reset all the values of the config.
- $auth_site['enabled'] = FALSE;
- $auth_site['uw_access_control_method'] = NULL;
- $auth_site['ad_require_groups'][0] = NULL;
- $auth_site['ad_deny_groups'][0] = NULL;
- $auth_site['uw_auth_site_access_denied_title'] = NULL;
- $auth_site['uw_auth_site_access_denied_excerpt'] = NULL;
- $auth_site['uw_auth_site_access_denied_title_logged_in'] = NULL;
- $auth_site['uw_auth_site_access_denied_excerpt_logged_in'] = NULL;
-
- // Set the auth site with values from above.
- $config->set('auth_site', $auth_site);
-
- // Save the config.
- $config->save();
-
- // Run the update permissions so that further tests work.
- shell_exec('drush uwperm');
-
- // Flush all the caches so that tests can continue.
- drupal_flush_all_caches();
- }
-
-}
--
GitLab
From c52fb7e24cd03c913d5759b3c5eae1870a13f1b5 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 17 Mar 2025 15:56:59 -0400
Subject: [PATCH 65/69] ISTWCMS-7189: Update scripts to only have one that
works now
---
run_tests.sh | 185 +++++++++++++++++++++++++------------------
setup_codeception.sh | 2 -
2 files changed, 107 insertions(+), 80 deletions(-)
diff --git a/run_tests.sh b/run_tests.sh
index 80b1b7cb..8b97e620 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,103 +1,132 @@
-rm -rf tests/_output
-rm -rf tests/_data
-
-codecoverage=0
-stepper=0
-debugger=0
-testname=""
+# Set the variables to start.
+endtoend=0;
+stepper=0;
+installsite=0;
+testname="";
-cp tests/acceptance_norecorder.suite.yml tests/acceptance.suite.yml
-
-while getopts 'crsdt:' OPTION; do
+# Get the options from the command line.
+while getopts 'rsiet:' OPTION; do
case "$OPTION" in
r)
cp tests/acceptance_recorder.suite.yml tests/acceptance.suite.yml
;;
- c)
- codecoverage=1
- ;;
s)
stepper=1
;;
- d)
- debugger=1
+ i)
+ installsite=1
+ ;;
+ e)
+ endtoend=1
;;
t)
testname=$OPTARG
;;
?)
- echo "script usage: [-c] [-r] [-s] [-d] [-t] <TestName>" >&2
+ echo "script usage: [-rsiet]" >&2
exit 1
;;
esac
done
-if [ $stepper == 0 ] && [ $codecoverage == 0 ]; then
- if [ $debugger == 1 ]; then
- if [ $testname ]; then
- php vendor/bin/codecept run acceptance $testname --fail-fast --debug
- else
- php vendor/bin/codecept run acceptance --fail-fast --debug
- fi
- else
- if [ $testname ]; then
- php vendor/bin/codecept run acceptance $testname --fail-fast
- else
- php vendor/bin/codecept run acceptance --fail-fast
- fi
- fi
+# Ensure that we have either end to end or specific test.
+if [[ $endtoend == 0 ]] && [[ $testname == "" ]]; then
+ echo "You must specify a test if not using end to end tests";
+ exit 1;
+fi;
+
+# Remove all the old test data.
+rm -rf tests/_output
+rm -rf tests/_data
+
+# Ensure we are not using the recorder.
+cp tests/acceptance_norecorder.suite.yml tests/acceptance.suite.yml
+
+if [[ $installsite == 1 ]]; then
+ # Generate a file name for the sql file.
+ sqlfile=$(cat /proc/sys/kernel/random/uuid)
+ sqlfile="$sqlfile.sql"
+
+ # Install a site and get an sql file from site install.
+ echo "*********************************************************"
+ echo "Installing site ..."
+ drush si uw_base_profile --db-url=mysql://drupal:drupal@mariadb/drupal --account-name=wcmsadmin --account-pass=a --site-name="WCMS Test" -y
+ drush sql-dump > "$sqlfile"
+ echo "Done installing site."
+ echo "*********************************************************"
fi
-if [ $stepper == 1 ] && [ $codecoverage == 1 ]; then
- if [ $debugger == 1 ]; then
- if [ $testname ]; then
- php vendor/bin/codecept run acceptance $testname --steps --coverage-html --fail-fast --debug
- else
- php vendor/bin/codecept run acceptance --steps --coverage-html --fail-fast --debug
- fi
- else
- if [ $testname ]; then
- php vendor/bin/codecept run acceptance $testname --steps --coverage-html --fail-fast
- else
- php vendor/bin/codecept run acceptance --steps --coverage-html --fail-fast
- fi
- fi
-else
- if [ $stepper == 1 ]; then
- if [ $debugger == 1 ]; then
- if [ $testname ]; then
- php vendor/bin/codecept run acceptance $testname --steps --fail-fast --debug
- else
- php vendor/bin/codecept run acceptance --steps --fail-fast --debug
- fi
- else
- if [ $testname ]; then
- php vendor/bin/codecept run acceptance $testname --steps --fail-fast
- else
- php vendor/bin/codecept run acceptance --steps --fail-fast
+if [[ $endtoend == 1 ]]; then
+
+ # Directory to iterate through
+ directory="tests/acceptance"
+
+ # Get the file names of the tests.
+ files=()
+ for file in "$directory"/*; do
+ if [[ -f "$file" ]]; then
+ file="${file//tests\/acceptance\//}"
+ file="${file//\.php/}"
+ files+=("$file")
fi
- fi
+ done
+else
+ files=("$testname")
+fi
+
+# Perform the tests using the files.
+for value in "${files[@]}"; do
+ echo "*********************************************************"
+ echo "Current Test: $value"
+ echo "*********************************************************"
+
+ if [[ $endtoend == 1 ]]; then
+ echo "Stopping chrome driver ..."
+ echo "*********************************************************"
+ pgrep chrome | xargs kill -9
fi
- if [ $codecoverage == 1 ]; then
- if [ $debugger == 1 ]; then
- if [ $testname ]; then
- php vendor/bin/codecept run acceptance $testname --coverage-html --debug
- else
- php vendor/bin/codecept run acceptance --coverage-html --debug
- fi
- else
- if [ $testname ]; then
- php vendor/bin/codecept run acceptance $testname --coverage-html --fail-fast
- else
- php vendor/bin/codecept run acceptance --coverage-html --fail-fast
- fi
- fi
+
+ if [[ $installsite == 1 ]]; then
+ echo "Dropping database ..."
+ echo "*********************************************************"
+ drush sql-drop -y
+ echo "Importing database ..."
+ echo "*********************************************************"
+ drush sql-cli < "$sqlfile"
fi
-fi
-files=(tests/_output/*.fail.html)
+ if [[ $endtoend == 1 ]]; then
+ echo "Starting chrome driver ..."
+ echo "*********************************************************"
+ chromedriver --port=9515 --url-base=/wd/hub &
+ echo "Sleeping ..."
+ echo "*********************************************************"
+ sleep 15s
+ echo ""
+ fi
-if [ -e "${files[0]}" ]; then
- sed -i -- 's/link rel\=\"stylesheet\" media\=\"all\" href\=\"\/core/link rel\=\"stylesheet\" media\=\"all\" href\=\"\.\.\/\.\.\/web\/core/g' tests/_output/*.fail.html
- sed -i -- 's/link rel\=\"stylesheet\" media\=\"all\" href\=\"\/profiles/link rel\=\"stylesheet\" media\=\"all\" href\=\"\.\.\/\.\.\/web\/profiles/g' tests/_output/*.fail.html
-fi
+ echo "*********************************************************"
+ echo "Starting test ... $value"
+ echo "*********************************************************"
+ if [[ $stepper == 1 ]]; then
+ php vendor/bin/codecept run acceptance "$value" --fail-fast --steps
+ else
+ php vendor/bin/codecept run acceptance "$value" --fail-fast
+ fi
+ if [[ $installsite == 1 ]]; then
+ if [[ $? -ne 0 ]]; then
+ rm "$sqlfile"
+ echo ""
+ echo "*********************************************************"
+ echo "Test $value failed, done test."
+ echo "*********************************************************"
+ echo ""
+ break
+ fi
+ fi
+ echo ""
+ echo "*********************************************************"
+ echo "Done test $value."
+ echo "*********************************************************"
+ echo ""
+done
diff --git a/setup_codeception.sh b/setup_codeception.sh
index 12ddf4b9..7d4a8128 100755
--- a/setup_codeception.sh
+++ b/setup_codeception.sh
@@ -3,6 +3,4 @@ cp tests/c3.php .
cp tests/codeception.yml .
cp tests/index.php web
cp tests/run_tests.sh .
-cp tests/run_groups.sh .
-cp tests/run_files.sh .
sed -i 's/self::COVERAGE_COOKIE,\s$value,\s$cookieParams/self::COVERAGE_COOKIE, $value/g' /var/www/html/vendor/codeception/codeception/src/Codeception/Coverage/Subscriber/LocalServer.php
--
GitLab
From 235a056122c256a056907e3f5c17f53bec9d7793 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 17 Mar 2025 15:57:38 -0400
Subject: [PATCH 66/69] ISTWCMS-7189: Removing old scripts
---
run_files.sh | 96 ---------------------------------------------------
run_groups.sh | 79 ------------------------------------------
2 files changed, 175 deletions(-)
delete mode 100755 run_files.sh
delete mode 100755 run_groups.sh
diff --git a/run_files.sh b/run_files.sh
deleted file mode 100755
index cf9cb594..00000000
--- a/run_files.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-while getopts 'rs' OPTION; do
- case "$OPTION" in
- r)
- cp tests/acceptance_recorder.suite.yml tests/acceptance.suite.yml
- ;;
- s)
- stepper=1
- ;;
- ?)
- echo "script usage: [-r]" >&2
- exit 1
- ;;
- esac
-done
-
-# Remove all the old test data.
-rm -rf tests/_output
-rm -rf tests/_data
-
-# Ensure we are not using the recorder.
-cp tests/acceptance_norecorder.suite.yml tests/acceptance.suite.yml
-
-# Generate a file name for the sql file.
-sqlfile=$(cat /proc/sys/kernel/random/uuid)
-sqlfile="$sqlfile.sql"
-
-# Install a site and get an sql file from site install.
-echo "*********************************************************"
-echo "Installing site ..."
-drush si uw_base_profile --db-url=mysql://drupal:drupal@mariadb/drupal --account-name=wcmsadmin --account-pass=a --site-name="WCMS Test" -y
-drush sql-dump > "$sqlfile"
-echo "Done installing site."
-echo "*********************************************************"
-
-# Directory to iterate through
-directory="tests/acceptance"
-
-# Get the file names of the tests.
-files=()
-for file in "$directory"/*; do
- if [[ -f "$file" ]]; then
- file="${file//tests\/acceptance\//}"
- file="${file//\.php/}"
- files+=("$file")
- fi
-done
-
-# Perform the tests using the files.
-for value in "${files[@]}"; do
- echo "*********************************************************"
- echo "Current Test: $value"
- echo "*********************************************************"
- echo "Stopping chrome driver ..."
- echo "*********************************************************"
- pgrep chrome | xargs kill -9
- echo "Sleeping ..."
- echo "*********************************************************"
- sleep 15s
- echo "Dropping database ..."
- echo "*********************************************************"
- drush sql-drop -y
- echo "Importing database ..."
- echo "*********************************************************"
- drush sql-cli < "$sqlfile"
- echo "Starting chrome driver ..."
- echo "*********************************************************"
- chromedriver --port=9515 --url-base=/wd/hub &
- echo "Sleeping ..."
- echo "*********************************************************"
- sleep 15s
- echo "Done setting up site."
- echo "*********************************************************"
- echo ""
- echo "*********************************************************"
- echo "Starting test ... $value"
- echo "*********************************************************"
- if [[ $stepper == 1 ]]; then
- php vendor/bin/codecept run acceptance "$value" --fail-fast --steps
- else
- php vendor/bin/codecept run acceptance "$value" --fail-fast
- fi
- if [[ $? -ne 0 ]]; then
- rm "$sqlfile"
- echo ""
- echo "*********************************************************"
- echo "Test $value failed, done test."
- echo "*********************************************************"
- echo ""
- break
- fi
- echo ""
- echo "*********************************************************"
- echo "Done test $value."
- echo "*********************************************************"
- echo ""
-done
diff --git a/run_groups.sh b/run_groups.sh
deleted file mode 100755
index d73b5c9e..00000000
--- a/run_groups.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-rm -rf tests/_output
-rm -rf tests/_data
-
-# Ensure we are not using the recorder.
-cp tests/acceptance_norecorder.suite.yml tests/acceptance.suite.yml
-
-while getopts 'r' OPTION; do
- case "$OPTION" in
- r)
- cp tests/acceptance_recorder.suite.yml tests/acceptance.suite.yml
- ;;
- s)
- stepper=1
- ;;
- ?)
- echo "script usage: [-r]" >&2
- exit 1
- ;;
- esac
-done
-
-# Directory to iterate through
-directory="tests/acceptance"
-
-# The pattern you want to match and extract text after it
-pattern="@group"
-
-# Initialize an empty array to store unique values
-unique_values=()
-
-echo "************************************"
-echo "Getting groups from tests ..."
-echo "************************************"
-
-# Loop through all files in the directory
-for file in "$directory"/*; do
-
- # Ensure it's a regular file
- if [[ -f "$file" ]]; then
-
- # Extract text after the pattern using grep
- while IFS= read -r line; do
-
- # Extract text after the pattern using grep
- extracted_text=$(echo "$line" | grep -o "${pattern}.*")
-
- # Remove the @group from the extracted text
- extracted_text=${extracted_text//"@group "/}
-
- # Check if extracted text is not empty and is not already in the array
- if [[ -n "$extracted_text" && ! " ${unique_values[@]} " =~ " ${extracted_text} " ]]; then
-
- # Add the extracted text to the array
- unique_values+=("$extracted_text")
-
- # Output to the screen so we see some progress
- echo "Found group: $extracted_text"
- fi
- done < "$file"
- fi
-done
-
-echo "************************************"
-echo "Done getting groups from tests."
-echo "************************************"
-
-# Perform the tests using the groups
-for value in "${unique_values[@]}"; do
- pgrep chrome | xargs kill -9
- chromedriver --port=9515 --url-base=/wd/hub &
- if [[ $stepper == 1 ]]; then
- php vendor/bin/codecept run acceptance --fail-fast --steps -g "$value"
- else
- php vendor/bin/codecept run acceptance --fail-fast -g "$value"
- fi
- if [[ $? -ne 0 ]]; then
- break
- fi
-done
--
GitLab
From 1d61c03088a6d44e20dd10aa28152412fb5843cd Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 17 Mar 2025 20:24:28 -0400
Subject: [PATCH 67/69] ISTWCMS-7189: Fix script for fast fail
---
run_tests.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/run_tests.sh b/run_tests.sh
index 8b97e620..1af68fb8 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -113,16 +113,16 @@ for value in "${files[@]}"; do
else
php vendor/bin/codecept run acceptance "$value" --fail-fast
fi
- if [[ $installsite == 1 ]]; then
- if [[ $? -ne 0 ]]; then
+ if [[ $? -ne 0 ]]; then
+ if [[ $installsite == 1 ]]; then
rm "$sqlfile"
- echo ""
- echo "*********************************************************"
- echo "Test $value failed, done test."
- echo "*********************************************************"
- echo ""
- break
fi
+ echo ""
+ echo "*********************************************************"
+ echo "Test $value failed, done test."
+ echo "*********************************************************"
+ echo ""
+ break
fi
echo ""
echo "*********************************************************"
--
GitLab
From d33097f95204f3eb3cce458f7744f9d30afc50ed Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Tue, 18 Mar 2025 07:50:08 -0400
Subject: [PATCH 68/69] ISTWCMS-7189: Fix that recorder works
---
run_tests.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/run_tests.sh b/run_tests.sh
index 1af68fb8..0abe0a7b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -4,6 +4,9 @@ stepper=0;
installsite=0;
testname="";
+# Ensure we are not using the recorder.
+cp tests/acceptance_norecorder.suite.yml tests/acceptance.suite.yml
+
# Get the options from the command line.
while getopts 'rsiet:' OPTION; do
case "$OPTION" in
@@ -39,9 +42,6 @@ fi;
rm -rf tests/_output
rm -rf tests/_data
-# Ensure we are not using the recorder.
-cp tests/acceptance_norecorder.suite.yml tests/acceptance.suite.yml
-
if [[ $installsite == 1 ]]; then
# Generate a file name for the sql file.
sqlfile=$(cat /proc/sys/kernel/random/uuid)
--
GitLab
From c77311b14c81b6feff57c22a28f2fcc1471cb094 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Thu, 20 Mar 2025 13:46:43 -0400
Subject: [PATCH 69/69] ISTWCMS-7189: Fix test url generator tests
---
acceptance/WcmsTestsUrlAliasCest.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/acceptance/WcmsTestsUrlAliasCest.php b/acceptance/WcmsTestsUrlAliasCest.php
index aa955265..1f8f17a4 100644
--- a/acceptance/WcmsTestsUrlAliasCest.php
+++ b/acceptance/WcmsTestsUrlAliasCest.php
@@ -285,9 +285,11 @@ class WcmsTestsUrlAliasCest {
}
}
- // Step through each of the nodes used and delete them.
- foreach ($this->nodesUsed as $node) {
+ // Step through each of the nodes used and delete them
+ // as well as delete it from the nodes used array.
+ foreach ($this->nodesUsed as $title => $node) {
$node->delete();
+ unset($this->nodesUsed[$title]);
}
}
--
GitLab