From 2a03ecd7dc030012a51b886ab30fbff59343c8d9 Mon Sep 17 00:00:00 2001 From: Mingsong Hu Date: Wed, 9 Jun 2021 13:53:59 +1000 Subject: [PATCH 01/45] Check for Drupal error or warning message --- tests/cy/cypress/support/misc.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/cy/cypress/support/misc.js b/tests/cy/cypress/support/misc.js index 120f4bd9f..a6e422bfa 100644 --- a/tests/cy/cypress/support/misc.js +++ b/tests/cy/cypress/support/misc.js @@ -17,4 +17,6 @@ Cypress.Commands.add('checkSiteErrors', () => { cy.get('.xdebug-error').should('not.exist') // Standard PHP error output. cy.contains('b', /Error|Warning|Notice|Deprecated/).should('not.exist') + // Drupal message + cy.get('h2#message-error-title,h2#message-warning-title').should('not.exist') }); \ No newline at end of file From 8bdc8612657f2d80122bd5f796308a3a0f055239 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jan 2022 23:27:50 +0000 Subject: [PATCH 02/45] Update drupal/migrate_tools requirement from 5.0 to 5.1.0 Updates the requirements on drupal/migrate_tools to permit the latest version. --- updated-dependencies: - dependency-name: drupal/migrate_tools dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8a541d457..4a8b8e24f 100644 --- a/composer.json +++ b/composer.json @@ -83,7 +83,7 @@ "drupal/migrate_file": "2.0.0", "drupal/migrate_plus": "5.1", "drupal/migrate_source_csv": "3.4", - "drupal/migrate_tools": "5.0", + "drupal/migrate_tools": "5.1.0", "drupal/minisite": "1.3", "drupal/modifiers": "1.4", "drupal/module_permissions": "3.0", From 3c32b6bb754f05760b99805b14977de73614d887 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jan 2022 01:13:30 +0000 Subject: [PATCH 03/45] Update drupal/shield requirement from 1.4 to 1.5.0 Updates the requirements on drupal/shield to permit the latest version. --- updated-dependencies: - dependency-name: drupal/shield dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9e9c331eb..daee09643 100644 --- a/composer.json +++ b/composer.json @@ -102,7 +102,7 @@ "drupal/search_api_attachments": "1.0.0-beta18", "drupal/search_api_solr": "4.2.1", "drupal/seckit": "2.0.0", - "drupal/shield": "1.4", + "drupal/shield": "1.5.0", "drupal/simple_oauth": "5.2.0", "drupal/simple_sitemap": "3.10.0", "drupal/swiftmailer": "2.2.0", From 557b18300578bf331eb3e0d8c625ddd85abac6e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 16 Jan 2022 19:12:58 +0000 Subject: [PATCH 04/45] Update drupal/layout_builder_restrictions requirement Updates the requirements on drupal/layout_builder_restrictions to permit the latest version. --- updated-dependencies: - dependency-name: drupal/layout_builder_restrictions dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9e9c331eb..3a90916dc 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,7 @@ "drupal/honeypot": "2.0.2", "drupal/inline_entity_form": "1.0.0-rc9", "drupal/key": "1.15.0", - "drupal/layout_builder_restrictions": "2.11.0", + "drupal/layout_builder_restrictions": "2.12.0", "drupal/layout_builder_modal": "1.1", "drupal/linked_field": "1.3.0", "drupal/linkit": "6.0.0-beta3", From 441c9415b2562b7226197b756a2844810e6f13d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 00:09:08 +0000 Subject: [PATCH 05/45] Update drupal/search_api_attachments requirement Updates the requirements on drupal/search_api_attachments to permit the latest version. --- updated-dependencies: - dependency-name: drupal/search_api_attachments dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index daee09643..b130bbd2c 100644 --- a/composer.json +++ b/composer.json @@ -99,7 +99,7 @@ "drupal/robotstxt": "1.4", "drupal/scheduled_transitions": "2.1.0", "drupal/search_api": "1.21.0", - "drupal/search_api_attachments": "1.0.0-beta18", + "drupal/search_api_attachments": "9.0.0", "drupal/search_api_solr": "4.2.1", "drupal/seckit": "2.0.0", "drupal/shield": "1.5.0", From 7246711f4fea02e0722e3456299445d97f708340 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 03:23:33 +0000 Subject: [PATCH 06/45] Update drupal/migrate_plus requirement from 5.1 to 5.2.0 Updates the requirements on drupal/migrate_plus to permit the latest version. --- updated-dependencies: - dependency-name: drupal/migrate_plus dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1db32b124..55836aeb3 100644 --- a/composer.json +++ b/composer.json @@ -81,7 +81,7 @@ "drupal/menu_trail_by_path": "1.3", "drupal/metatag": "1.16.0", "drupal/migrate_file": "2.0.0", - "drupal/migrate_plus": "5.1", + "drupal/migrate_plus": "5.2.0", "drupal/migrate_source_csv": "3.4", "drupal/migrate_tools": "5.1.0", "drupal/minisite": "1.3", From c85aa00b31d7866f887a21ac4b5c342f5b4cc038 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 15:49:50 +1100 Subject: [PATCH 07/45] Update drupal/password_policy requirement from 3.0 to 3.1.0 (#351) Updates the requirements on drupal/password_policy to permit the latest version. --- updated-dependencies: - dependency-name: drupal/password_policy dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index eeba25e96..027db7b52 100644 --- a/composer.json +++ b/composer.json @@ -90,7 +90,7 @@ "drupal/panelizer": "4.4", "drupal/panels": "4.6.0", "drupal/paragraphs": "1.12", - "drupal/password_policy": "3.0", + "drupal/password_policy": "3.1.0", "drupal/pathauto": "1.8.0", "drupal/real_aes": "2.3", "drupal/recaptcha": "3.0", From c34fd124ccce6b8c06eb6b2c7fb18033329b6d76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 19:13:18 +0000 Subject: [PATCH 08/45] Update drush/drush requirement from ~10 to ~11 Updates the requirements on [drush/drush](https://github.com/drush-ops/drush) to permit the latest version. - [Release notes](https://github.com/drush-ops/drush/releases) - [Commits](https://github.com/drush-ops/drush/compare/10.0.0...11.0.2) --- updated-dependencies: - dependency-name: drush/drush dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e38aa81f9..09478026f 100644 --- a/composer.json +++ b/composer.json @@ -118,7 +118,7 @@ "webflo/drupal-finder": "^1.2" }, "require-dev": { - "drush/drush": "~10" + "drush/drush": "~11" }, "extra": { "drupal-scaffold": { From b6ea9cd3ceffb36234f534642317e2880c7eb950 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 01:16:55 +0000 Subject: [PATCH 09/45] Update drupal/core-recommended requirement from 9.2.10 to 9.3.3 Updates the requirements on [drupal/core-recommended](https://github.com/drupal/core-recommended) to permit the latest version. - [Release notes](https://github.com/drupal/core-recommended/releases) - [Commits](https://github.com/drupal/core-recommended/compare/9.2.10...9.3.3) --- updated-dependencies: - dependency-name: drupal/core-recommended dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 29f0f8ca0..964399d09 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "drupal/contact_storage": "1.1.0", "drupal/context": "4.1.0", "drupal/core-composer-scaffold": "^9", - "drupal/core-recommended": "9.2.11", + "drupal/core-recommended": "9.3.3", "drupal/crop": "2.1", "drupal/ctools": "3.7.0", "drupal/devel": "4.1.3", From 22413fe4c6cf1ad77f3960125b38148d63b22874 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 01:24:31 +0000 Subject: [PATCH 10/45] Update drupal/real_aes requirement from 2.3 to 2.4.0 Updates the requirements on drupal/real_aes to permit the latest version. --- updated-dependencies: - dependency-name: drupal/real_aes dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 29f0f8ca0..3a7154c5b 100644 --- a/composer.json +++ b/composer.json @@ -91,7 +91,7 @@ "drupal/paragraphs": "1.12", "drupal/password_policy": "3.1.0", "drupal/pathauto": "1.8.0", - "drupal/real_aes": "2.3", + "drupal/real_aes": "2.4.0", "drupal/recaptcha": "3.0", "drupal/redirect": "1.7.0", "drupal/rest_menu_items": "3.0.2", From be88c45f4c6179bdc6112e90f9a3c084f91ecddf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 01:29:39 +0000 Subject: [PATCH 11/45] Update drupal/search_api_solr requirement from 4.2.1 to 4.2.6 Updates the requirements on drupal/search_api_solr to permit the latest version. --- updated-dependencies: - dependency-name: drupal/search_api_solr dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 29f0f8ca0..706bec3ef 100644 --- a/composer.json +++ b/composer.json @@ -99,7 +99,7 @@ "drupal/scheduled_transitions": "2.1.0", "drupal/search_api": "1.21.0", "drupal/search_api_attachments": "9.0.0", - "drupal/search_api_solr": "4.2.1", + "drupal/search_api_solr": "4.2.6", "drupal/seckit": "2.0.0", "drupal/shield": "1.5.0", "drupal/simple_oauth": "5.2.0", From 5120644d82f8125b22255f0f97ea276058cdb579 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 04:10:30 +0000 Subject: [PATCH 12/45] Update drupal/search_api requirement from 1.21.0 to 1.23.0 Updates the requirements on drupal/search_api to permit the latest version. --- updated-dependencies: - dependency-name: drupal/search_api dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index aed09f713..49d6af3e1 100644 --- a/composer.json +++ b/composer.json @@ -97,7 +97,7 @@ "drupal/rest_menu_items": "3.0.2", "drupal/robotstxt": "1.4", "drupal/scheduled_transitions": "2.1.0", - "drupal/search_api": "1.21.0", + "drupal/search_api": "1.23.0", "drupal/search_api_attachments": "9.0.0", "drupal/search_api_solr": "4.2.6", "drupal/seckit": "2.0.0", From a0b8eeafb6f663797ad1c7efb7707124de396315 Mon Sep 17 00:00:00 2001 From: Raminder Singh Date: Mon, 31 Jan 2022 16:41:56 +1100 Subject: [PATCH 13/45] Allow plugins --- composer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/composer.json b/composer.json index aed09f713..7df2bfd15 100644 --- a/composer.json +++ b/composer.json @@ -189,6 +189,12 @@ } }, "config": { + "allow-plugins": { + "composer/installers": true, + "cweagans/composer-patches": true, + "drupal/core-composer-scaffold": true, + "oomphinc/composer-installers-extender": true + }, "bin-dir": "bin/", "sort-packages": true, "optimize-autoloader": true From abe582e103db6e838f80a38b93dfb8839c1fe105 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 19:12:12 +0000 Subject: [PATCH 14/45] Update drupal/address requirement from 1.9 to 1.10.0 Updates the requirements on drupal/address to permit the latest version. --- updated-dependencies: - dependency-name: drupal/address dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7df2bfd15..0e4edbfa1 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "bower-asset/chosen": "1.8.7", "composer/installers": "^2.0", "cweagans/composer-patches": "^1.7", - "drupal/address": "1.9", + "drupal/address": "1.10.0", "drupal/admin_toolbar": "3.0.3", "drupal/adminimal_admin_toolbar": "1.11.0", "drupal/adminimal_theme": "1.6.0", From 11ffb2b2ab025db95d316d7cd12de4737f4dc9d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 01:19:26 +0000 Subject: [PATCH 15/45] Update drupal/scheduled_transitions requirement from 2.1.0 to 2.2.0 Updates the requirements on drupal/scheduled_transitions to permit the latest version. --- updated-dependencies: - dependency-name: drupal/scheduled_transitions dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9e8b50194..69a54b365 100644 --- a/composer.json +++ b/composer.json @@ -96,7 +96,7 @@ "drupal/redirect": "1.7.0", "drupal/rest_menu_items": "3.0.2", "drupal/robotstxt": "1.4", - "drupal/scheduled_transitions": "2.1.0", + "drupal/scheduled_transitions": "2.2.0", "drupal/search_api": "1.23.0", "drupal/search_api_attachments": "9.0.0", "drupal/search_api_solr": "4.2.6", From 55b878374d5889c7c17ffcf2796c7e171873505d Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 2 Feb 2022 14:45:17 +1100 Subject: [PATCH 16/45] [GOVCMSD9-609] Update tugboat with php version 8.1 --- .tugboat/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index 6f7fc3a6e..cea7bf1b7 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -4,7 +4,7 @@ services: image: tugboatqa/mysql:5 app: - image: tugboatqa/php:7.4-apache + image: tugboatqa/php:8.1-apache # Set this as the default service. This does a few things # 1. Clones the git repository into the service container # 2. Exposes port 80 to the Tugboat HTTP proxy @@ -36,6 +36,7 @@ services: # Install/update packages managed by composer, including drush. - composer selfupdate && composer clear + - composer require php:"^7.4 | ^8" - COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist # Link the document root to the expected path. From 6fda7e33c27253aec3c2a5003b4d15685b064b80 Mon Sep 17 00:00:00 2001 From: Raminder Singh Date: Wed, 2 Feb 2022 16:06:09 +1100 Subject: [PATCH 17/45] Update config.yml --- .tugboat/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index cea7bf1b7..77d5b6db2 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -36,7 +36,7 @@ services: # Install/update packages managed by composer, including drush. - composer selfupdate && composer clear - - composer require php:"^7.4 | ^8" + - composer require php:"^7.4 || ^8" - COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist # Link the document root to the expected path. From d45d3ee27b3d1af8fd9ad224cd23ebd3c7cda7ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 19:17:53 +0000 Subject: [PATCH 18/45] Update drupal/search_api_solr requirement from 4.2.6 to 4.2.7 Updates the requirements on drupal/search_api_solr to permit the latest version. --- updated-dependencies: - dependency-name: drupal/search_api_solr dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 69a54b365..47107f463 100644 --- a/composer.json +++ b/composer.json @@ -99,7 +99,7 @@ "drupal/scheduled_transitions": "2.2.0", "drupal/search_api": "1.23.0", "drupal/search_api_attachments": "9.0.0", - "drupal/search_api_solr": "4.2.6", + "drupal/search_api_solr": "4.2.7", "drupal/seckit": "2.0.0", "drupal/shield": "1.5.0", "drupal/simple_oauth": "5.2.0", From 11c64d9f74fcb088c94fb1a48111522af7db55d0 Mon Sep 17 00:00:00 2001 From: Raminder Singh Date: Thu, 3 Feb 2022 10:46:42 +1100 Subject: [PATCH 19/45] Revert "[GOVCMSD9-624] Update drush/drush requirement from ~10 to ~11" --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c3b45e2f1..69a54b365 100644 --- a/composer.json +++ b/composer.json @@ -118,7 +118,7 @@ "webflo/drupal-finder": "^1.2" }, "require-dev": { - "drush/drush": "~11" + "drush/drush": "~10" }, "extra": { "drupal-scaffold": { From 936537bbf338d9b14c522e81f9d1f01edabb28c4 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Fri, 4 Feb 2022 10:20:17 +1100 Subject: [PATCH 20/45] Revert "Merge pull request #367 from govCMS/dependabot/composer/2.x-develop/drupal/core-recommended-9.3.3" This reverts commit a878987cc1cf598c55c5464e8c61b12c28983fff, reversing changes made to ca6cf1f60a1d677442cb9d07f4d848d774d8ab02. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cab02eca0..92c618854 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "drupal/contact_storage": "1.1.0", "drupal/context": "4.1.0", "drupal/core-composer-scaffold": "^9", - "drupal/core-recommended": "9.3.3", + "drupal/core-recommended": "9.2.11", "drupal/crop": "2.1", "drupal/ctools": "3.7.0", "drupal/devel": "4.1.3", From 4c96e53bdd0d0b78fc189d957c3dfa58a97c50e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 23:47:45 +0000 Subject: [PATCH 21/45] Update drupal/admin_toolbar requirement from 3.0.3 to 3.1.0 Updates the requirements on drupal/admin_toolbar to permit the latest version. --- updated-dependencies: - dependency-name: drupal/admin_toolbar dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e785a5b8d..fcc4cd3e1 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "composer/installers": "^2.0", "cweagans/composer-patches": "^1.7", "drupal/address": "1.10.0", - "drupal/admin_toolbar": "3.0.3", + "drupal/admin_toolbar": "3.1.0", "drupal/adminimal_admin_toolbar": "1.11.0", "drupal/adminimal_theme": "1.6.0", "drupal/bigmenu": "2.0.0-rc2", From 9cc7324e1cdcbf69c6d25fe88468eb6078363bfd Mon Sep 17 00:00:00 2001 From: Tara Wijayagunawarana Date: Tue, 8 Feb 2022 11:21:44 +1100 Subject: [PATCH 22/45] [GOVCMSD9-612] Set the Quick Edit module not enabled by default in the GovCMS profile --- govcms.info.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/govcms.info.yml b/govcms.info.yml index 089d0c52b..3acb9c769 100644 --- a/govcms.info.yml +++ b/govcms.info.yml @@ -27,7 +27,6 @@ install: - options - page_cache - path - - quickedit - rdf - settings_tray - shortcut From 2f8a3ad8f665d50c2bb10bd9aba8ab62491508b2 Mon Sep 17 00:00:00 2001 From: Raminder Singh Date: Tue, 8 Feb 2022 11:46:39 +1100 Subject: [PATCH 23/45] [GOVCMSD9-618]ckeditor libraries fakeobjects and link added --- composer.json | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fbfdd96ba..049802476 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,36 @@ { "type": "composer", "url": "https://asset-packagist.org" + }, + { + "type": "package", + "package": { + "name": "govcmslib/fakeobjects", + "version": "4.17.1", + "type": "drupal-library", + "extra": { + "installer-name": "fakeobjects" + }, + "dist": { + "url": "https://download.ckeditor.com/fakeobjects/releases/fakeobjects_4.17.1.zip", + "type": "zip" + } + } + }, + { + "type": "package", + "package": { + "name": "govcmslib/link", + "version": "4.17.1", + "type": "drupal-library", + "extra": { + "installer-name": "link" + }, + "dist": { + "url": "https://download.ckeditor.com/link/releases/link_4.17.1.zip", + "type": "zip" + } + } } ], "require": { @@ -31,6 +61,7 @@ "drupal/admin_toolbar": "3.1.0", "drupal/adminimal_admin_toolbar": "1.11.0", "drupal/adminimal_theme": "1.6.0", + "drupal/anchor_link": "2.5.0", "drupal/bigmenu": "2.0.0-rc2", "drupal/block_place": "1.0", "drupal/chosen": "3.0.1", @@ -61,6 +92,7 @@ "drupal/entity_reference_revisions": "1.9.0", "drupal/environment_indicator": "4.0.3", "drupal/facets": "1.8.0", + "drupal/fakeobjects": "1.1.0", "drupal/features": "3.12.0", "drupal/field_group": "3.2.0", "drupal/focal_point": "1.5.0", @@ -112,6 +144,8 @@ "drupal/username_enumeration_prevention": "1.2.0", "drupal/video_embed_field": "2.4", "drupal/webform": "6.1.2", + "govcmslib/fakeobjects": "^4.17", + "govcmslib/link": "^4.17", "npm-asset/dropzone": "5.9.3", "oomphinc/composer-installers-extender": "^2.0", "swiftmailer/swiftmailer": "6.3.0", @@ -189,7 +223,7 @@ } }, "config": { - "allow-plugins": { + "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, "drupal/core-composer-scaffold": true, From 7e84a64fdbf087cdb88b8bf9a45bc4a9b0f6e14c Mon Sep 17 00:00:00 2001 From: Pandaski Date: Tue, 8 Feb 2022 12:44:17 +1100 Subject: [PATCH 24/45] Revert "Merge pull request #383 from pandaskii/feature/2.x/GOVCMSD9-609" This reverts commit 8b186e166e286a7b1ac124cc29a127db1cc14189, reversing changes made to c9a4d976b0c0377d1b922a922beed05e034e1776. --- .tugboat/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index 77d5b6db2..6f7fc3a6e 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -4,7 +4,7 @@ services: image: tugboatqa/mysql:5 app: - image: tugboatqa/php:8.1-apache + image: tugboatqa/php:7.4-apache # Set this as the default service. This does a few things # 1. Clones the git repository into the service container # 2. Exposes port 80 to the Tugboat HTTP proxy @@ -36,7 +36,6 @@ services: # Install/update packages managed by composer, including drush. - composer selfupdate && composer clear - - composer require php:"^7.4 || ^8" - COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist # Link the document root to the expected path. From 8705d2b22d3ad80fcfebcfce03960b9017eb8a27 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 2 Feb 2022 09:26:48 +1100 Subject: [PATCH 25/45] [GOVCMSD9-605] Update the default site admin permissions --- config/install/user.role.govcms_site_administrator.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/install/user.role.govcms_site_administrator.yml b/config/install/user.role.govcms_site_administrator.yml index 9ec1772a5..4b3457e6b 100755 --- a/config/install/user.role.govcms_site_administrator.yml +++ b/config/install/user.role.govcms_site_administrator.yml @@ -51,6 +51,9 @@ permissions: - 'administer user form display' - 'administer users' - 'administer views' + - 'assign govcms_content_approver role' + - 'assign govcms_content_author role' + - 'assign govcms_site_administrator role' - 'bypass honeypot protection' - 'bypass node access' - 'configure any layout' From 4146b83bd09e64c8c45f47dd6dfcf7f4b0dd2ff1 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 2 Feb 2022 14:30:10 +1100 Subject: [PATCH 26/45] Update security.settings.php for testing --- .tugboat/security.settings.php | 141 +++++++++++++++++---------------- 1 file changed, 72 insertions(+), 69 deletions(-) diff --git a/.tugboat/security.settings.php b/.tugboat/security.settings.php index 007ac81c4..abd0af2f0 100644 --- a/.tugboat/security.settings.php +++ b/.tugboat/security.settings.php @@ -6,75 +6,76 @@ * Modules allow list for GovCMS module_permissions. */ $config['module_permissions.settings']['managed_modules'] = [ - "bigmenu", - "captcha", - "ctools_block", - "ctools_views", - "chosen", - "chosen_field", - "chosen_lib", - "components", - "contact_storage", - "context", - "context_ui", - "crop", - "search_api_db", - "search_api_db_defaults", - "datetime", - "datetime_range", - "dropzonejs", - "dropzonejs_eb_widget", - "dynamic_entity_reference", - "embed", - "entity_browser", - "entity_browser_entity_form", - "entity_class_formatter", - "entity_embed", - "entity_reference", - "entity_reference_display", - "entity_reference_revisions", - "environment_indicator", - "environment_indicator_ui", - "facets", - "facets_range_widget", - "field_group", - "file", - "focal_point", - "govcms_dlm", - "basic_auth", - "image", - "image_captcha", - "inline_entity_form", - "jquery_ui", - "link", - "linked_field", - "linkit", - "mailsystem", - "media_entity_file_replace", - "menu_block", - "menu_trail_by_path", - "metatag", - "minisite", - "options", - "paragraphs", - "pathauto", - "shield", - "recaptcha", - "redirect", - "redirect_404", - "redirect_domain", - "robotstxt", - "scheduled_transitions", - "search_api", - "search_api_attachments", - "search_api_solr", - "token", - "webform", - "webform_access", - "webform_attachment", - "webform_image_select", - "webform_node", - "webform_ui", + 'bigmenu', + 'captcha', + 'ctools_block', + 'ctools_views', + 'chosen', + 'chosen_field', + 'chosen_lib', + 'components', + 'contact_storage', + 'context', + 'context_ui', + 'crop', + 'search_api_db', + 'search_api_db_defaults', + 'datetime', + 'datetime_range', + 'dropzonejs', + 'dropzonejs_eb_widget', + 'dynamic_entity_reference', + 'embed', + 'entity_browser', + 'entity_browser_entity_form', + 'entity_class_formatter', + 'entity_embed', + 'entity_reference', + 'entity_reference_display', + 'entity_reference_revisions', + 'environment_indicator', + 'environment_indicator_ui', + 'facets', + 'facets_range_widget', + 'field_group', + 'file', + 'focal_point', + 'govcms_dlm', + 'basic_auth', + 'image', + 'image_captcha', + 'inline_entity_form', + 'jquery_ui', + 'link', + 'linked_field', + 'linkit', + 'mailsystem', + 'media_entity_file_replace', + 'menu_block', + 'menu_trail_by_path', + 'metatag', + 'minisite', + 'options', + 'paragraphs', + 'pathauto', + 'shield', + 'recaptcha', + 'redirect', + 'redirect_404', + 'redirect_domain', + 'robotstxt', + 'role_delegation', + 'scheduled_transitions', + 'search_api', + 'search_api_attachments', + 'search_api_solr', + 'token', + 'webform', + 'webform_access', + 'webform_attachment', + 'webform_image_select', + 'webform_node', + 'webform_ui', ]; /** @@ -91,4 +92,6 @@ $config['module_permissions.settings']['permission_blacklist'] = [ 'administer modules', 'administer permissions', + 'administer search_api', + 'assign all roles', ]; From bf272316b27beab3c58e1275f1706e86b49780f6 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Tue, 8 Feb 2022 12:14:09 +1100 Subject: [PATCH 27/45] [GOVCMSD9-605] Add Role Delegation module 8.x-1.1 to GovCMS D9 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index fbfdd96ba..84beb4c20 100644 --- a/composer.json +++ b/composer.json @@ -96,6 +96,7 @@ "drupal/redirect": "1.7.0", "drupal/rest_menu_items": "3.0.2", "drupal/robotstxt": "1.4", + "drupal/role_delegation": "1.1.0", "drupal/scheduled_transitions": "2.2.0", "drupal/search_api": "1.23.0", "drupal/search_api_attachments": "9.0.0", From 9c343e9e39db20aa454566607607df603683e23f Mon Sep 17 00:00:00 2001 From: Raminder Singh Date: Tue, 8 Feb 2022 13:30:57 +1100 Subject: [PATCH 28/45] PHP 7.4 --- .tugboat/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index 77d5b6db2..1c5bd454f 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -4,7 +4,7 @@ services: image: tugboatqa/mysql:5 app: - image: tugboatqa/php:8.1-apache + image: tugboatqa/php:7.4-apache # Set this as the default service. This does a few things # 1. Clones the git repository into the service container # 2. Exposes port 80 to the Tugboat HTTP proxy From 776e74db9d38e8397b00d228dd553a5c81245f27 Mon Sep 17 00:00:00 2001 From: Raminder Singh Date: Tue, 8 Feb 2022 14:32:10 +1100 Subject: [PATCH 29/45] [GOVCMSD9-618] module permissions --- .tugboat/security.settings.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.tugboat/security.settings.php b/.tugboat/security.settings.php index 007ac81c4..959d6b9e0 100644 --- a/.tugboat/security.settings.php +++ b/.tugboat/security.settings.php @@ -6,6 +6,7 @@ * Modules allow list for GovCMS module_permissions. */ $config['module_permissions.settings']['managed_modules'] = [ + "anchor_link", "bigmenu", "captcha", "ctools_block", @@ -37,6 +38,7 @@ "environment_indicator_ui", "facets", "facets_range_widget", + "fakeobjects", "field_group", "file", "focal_point", From 6112c9fe67711eee78be2b85c386182c1519ef36 Mon Sep 17 00:00:00 2001 From: Joseph Z Date: Tue, 8 Feb 2022 14:33:44 +1100 Subject: [PATCH 30/45] Delete config.yml --- .tugboat/config.yml | 83 --------------------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 .tugboat/config.yml diff --git a/.tugboat/config.yml b/.tugboat/config.yml deleted file mode 100644 index 1c5bd454f..000000000 --- a/.tugboat/config.yml +++ /dev/null @@ -1,83 +0,0 @@ -services: - - mysql: - image: tugboatqa/mysql:5 - - app: - image: tugboatqa/php:7.4-apache - # Set this as the default service. This does a few things - # 1. Clones the git repository into the service container - # 2. Exposes port 80 to the Tugboat HTTP proxy - # 3. Routes requests to the preview URL to this service - default: true - depends: mysql - visualdiffs: - :default: - - / - - /test - - /blog/example - - /events - - # A set of commands to run while building this service - commands: - # Commands that set up the basic preview infrastructure. - init: - # Tooling. - - apt-get update - - apt-get install -y libbz2-dev libzip-dev - - docker-php-ext-install opcache bz2 zip - - a2enmod headers rewrite - - # Clean up. This keeps image storage tighter on Tugboat. - - apt-get autoclean && apt-get clean - - # Install drush-launcher. - - wget -O /usr/local/bin/drush https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar && chmod +x /usr/local/bin/drush - - # Install/update packages managed by composer, including drush. - - composer selfupdate && composer clear - - composer require php:"^7.4 || ^8" - - COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist - - # Link the document root to the expected path. - - ln -snf "${TUGBOAT_ROOT}/web" "${DOCROOT}" - - # Create the Drupal private and public files directories. - - mkdir -p "${TUGBOAT_ROOT}/files-private" "${DOCROOT}/sites/default/files" - - # Copy test configurations to install folder. - - cp -af "${TUGBOAT_ROOT}/config/test/." "${TUGBOAT_ROOT}/config/install/" - - # Link the config and private files paths. - - ln -snf "${TUGBOAT_ROOT}/config" "${DOCROOT}/../config" - - ln -snf "${TUGBOAT_ROOT}/files-private" "${DOCROOT}/../files-private" - - # Commands when refreshing an existing preview. - update: - # Install/update packages managed by composer, including drush. - - COMPOSER_MEMORY_LIMIT=-1 composer update - - # Use the tugboat-specific Drupal settings. - - cp "${TUGBOAT_ROOT}/.tugboat/settings.php" "${DOCROOT}/sites/default/" - - cp "${TUGBOAT_ROOT}/.tugboat/security.settings.php" "${DOCROOT}/sites/default/" - - # Set file permissions such that Drupal will not complain - - chgrp -R www-data "${DOCROOT}/sites/default/files" - - find "${DOCROOT}/sites/default/files" -type d -exec chmod 2775 {} \; - - find "${DOCROOT}/sites/default/files" -type f -exec chmod 0664 {} \; - - chgrp -R www-data "/var/lib/tugboat/files-private" - - chmod 2775 /var/lib/tugboat/files-private - - chmod 0664 ${DOCROOT}/sites/default/services.yml - - # Install the site. - - drush -r "${DOCROOT}" site:install govcms install_configure_form.update_status_module='array(FALSE,FALSE)' -y - - # Commands when building a new branch/PR update. - build: - - COMPOSER_MEMORY_LIMIT=-1 composer update - - drush cache:rebuild - # Partial importing is still having some issues with Drush 10 and Drupal 9. - #- drush config-import --partial --source="${TUGBOAT_ROOT}/config/test" -y - - drush en module_permissions -y - - drush updatedb -y - - drush cache:rebuild From 3362c954f2cc702c6356b8a2acd6ecf0fa573a92 Mon Sep 17 00:00:00 2001 From: Tara Wijayagunawarana Date: Tue, 8 Feb 2022 11:21:44 +1100 Subject: [PATCH 31/45] [GOVCMSD9-612] Set the Quick Edit module not enabled by default in the GovCMS profile --- govcms.info.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/govcms.info.yml b/govcms.info.yml index 089d0c52b..3acb9c769 100644 --- a/govcms.info.yml +++ b/govcms.info.yml @@ -27,7 +27,6 @@ install: - options - page_cache - path - - quickedit - rdf - settings_tray - shortcut From 1d9b9df1fb8a9a6681606749f4e954caad1cb64c Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 2 Feb 2022 09:26:48 +1100 Subject: [PATCH 32/45] [GOVCMSD9-605] Update the default site admin permissions --- config/install/user.role.govcms_site_administrator.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/install/user.role.govcms_site_administrator.yml b/config/install/user.role.govcms_site_administrator.yml index 9ec1772a5..4b3457e6b 100755 --- a/config/install/user.role.govcms_site_administrator.yml +++ b/config/install/user.role.govcms_site_administrator.yml @@ -51,6 +51,9 @@ permissions: - 'administer user form display' - 'administer users' - 'administer views' + - 'assign govcms_content_approver role' + - 'assign govcms_content_author role' + - 'assign govcms_site_administrator role' - 'bypass honeypot protection' - 'bypass node access' - 'configure any layout' From 2f6d912fb644e557ee6481848a4f2160508d9c6f Mon Sep 17 00:00:00 2001 From: Pandaski Date: Tue, 8 Feb 2022 12:14:09 +1100 Subject: [PATCH 33/45] [GOVCMSD9-605] Add Role Delegation module 8.x-1.1 to GovCMS D9 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 049802476..9ec8f9dff 100644 --- a/composer.json +++ b/composer.json @@ -128,6 +128,7 @@ "drupal/redirect": "1.7.0", "drupal/rest_menu_items": "3.0.2", "drupal/robotstxt": "1.4", + "drupal/role_delegation": "1.1.0", "drupal/scheduled_transitions": "2.2.0", "drupal/search_api": "1.23.0", "drupal/search_api_attachments": "9.0.0", From 1bde1b2ec2334bdea6eb3aff1277cfd63cdbd35f Mon Sep 17 00:00:00 2001 From: Pandaski Date: Tue, 8 Feb 2022 14:43:47 +1100 Subject: [PATCH 34/45] [GOVCMSD9-618]ckeditor libraries fakeobjects and link added --- .tugboat/security.settings.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.tugboat/security.settings.php b/.tugboat/security.settings.php index abd0af2f0..f88e0a2c5 100644 --- a/.tugboat/security.settings.php +++ b/.tugboat/security.settings.php @@ -6,6 +6,7 @@ * Modules allow list for GovCMS module_permissions. */ $config['module_permissions.settings']['managed_modules'] = [ + "anchor_link", 'bigmenu', 'captcha', 'ctools_block', @@ -37,6 +38,7 @@ 'environment_indicator_ui', 'facets', 'facets_range_widget', + "fakeobjects", 'field_group', 'file', 'focal_point', From 7cde0cb6833acc0c8d7f532657ca89eed9ae7b2d Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 9 Feb 2022 12:16:21 +1100 Subject: [PATCH 35/45] Revert "Merge branch 'rsau-feature/2.x/GOVCMSD9-618-npm' into 2.x-develop" This reverts commit 3ccb9e03db903ce9a92c51d2c88052dd42916523, reversing changes made to 39a39092bae72618acee55bed6c0b447a75f4b3d. --- composer.json | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/composer.json b/composer.json index 9ec8f9dff..84beb4c20 100644 --- a/composer.json +++ b/composer.json @@ -20,36 +20,6 @@ { "type": "composer", "url": "https://asset-packagist.org" - }, - { - "type": "package", - "package": { - "name": "govcmslib/fakeobjects", - "version": "4.17.1", - "type": "drupal-library", - "extra": { - "installer-name": "fakeobjects" - }, - "dist": { - "url": "https://download.ckeditor.com/fakeobjects/releases/fakeobjects_4.17.1.zip", - "type": "zip" - } - } - }, - { - "type": "package", - "package": { - "name": "govcmslib/link", - "version": "4.17.1", - "type": "drupal-library", - "extra": { - "installer-name": "link" - }, - "dist": { - "url": "https://download.ckeditor.com/link/releases/link_4.17.1.zip", - "type": "zip" - } - } } ], "require": { @@ -61,7 +31,6 @@ "drupal/admin_toolbar": "3.1.0", "drupal/adminimal_admin_toolbar": "1.11.0", "drupal/adminimal_theme": "1.6.0", - "drupal/anchor_link": "2.5.0", "drupal/bigmenu": "2.0.0-rc2", "drupal/block_place": "1.0", "drupal/chosen": "3.0.1", @@ -92,7 +61,6 @@ "drupal/entity_reference_revisions": "1.9.0", "drupal/environment_indicator": "4.0.3", "drupal/facets": "1.8.0", - "drupal/fakeobjects": "1.1.0", "drupal/features": "3.12.0", "drupal/field_group": "3.2.0", "drupal/focal_point": "1.5.0", @@ -145,8 +113,6 @@ "drupal/username_enumeration_prevention": "1.2.0", "drupal/video_embed_field": "2.4", "drupal/webform": "6.1.2", - "govcmslib/fakeobjects": "^4.17", - "govcmslib/link": "^4.17", "npm-asset/dropzone": "5.9.3", "oomphinc/composer-installers-extender": "^2.0", "swiftmailer/swiftmailer": "6.3.0", @@ -224,7 +190,7 @@ } }, "config": { - "allow-plugins": { + "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, "drupal/core-composer-scaffold": true, From 0bfec5e24ee9e4e1306f3ebebedaf71f37bab4c2 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 9 Feb 2022 12:18:42 +1100 Subject: [PATCH 36/45] Format the code --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 84beb4c20..ba6c505d5 100644 --- a/composer.json +++ b/composer.json @@ -190,7 +190,7 @@ } }, "config": { - "allow-plugins": { + "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, "drupal/core-composer-scaffold": true, From 83dd2c790d8a5ab0b74a9a910009404a3e4ad776 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 9 Feb 2022 14:38:47 +1100 Subject: [PATCH 37/45] Revert anchor_link and fakeobjects from module_permissions --- .tugboat/security.settings.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/.tugboat/security.settings.php b/.tugboat/security.settings.php index f88e0a2c5..abd0af2f0 100644 --- a/.tugboat/security.settings.php +++ b/.tugboat/security.settings.php @@ -6,7 +6,6 @@ * Modules allow list for GovCMS module_permissions. */ $config['module_permissions.settings']['managed_modules'] = [ - "anchor_link", 'bigmenu', 'captcha', 'ctools_block', @@ -38,7 +37,6 @@ 'environment_indicator_ui', 'facets', 'facets_range_widget', - "fakeobjects", 'field_group', 'file', 'focal_point', From 21e4e9608ce1ad45ac266c61abb523853953eba5 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 9 Feb 2022 14:37:33 +1100 Subject: [PATCH 38/45] [GOVCMSD9-534] add field_ui into module_permissions allowlist (cherry picked from commit cf38587e8a6d46770c51de971925085609e6f147) --- .tugboat/security.settings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/.tugboat/security.settings.php b/.tugboat/security.settings.php index abd0af2f0..766e2dfd0 100644 --- a/.tugboat/security.settings.php +++ b/.tugboat/security.settings.php @@ -38,6 +38,7 @@ 'facets', 'facets_range_widget', 'field_group', + 'field_ui', 'file', 'focal_point', 'govcms_dlm', From 4dcd5edc211261be97a86cb59713a3c35a905ebd Mon Sep 17 00:00:00 2001 From: Raminder Singh Date: Wed, 9 Feb 2022 15:13:46 +1100 Subject: [PATCH 39/45] Skip validation - linked to drupal.org patch --- composer.json | 4 +++- patches/tfa-validation.patch | 0 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 patches/tfa-validation.patch diff --git a/composer.json b/composer.json index ba6c505d5..5b3e4868f 100644 --- a/composer.json +++ b/composer.json @@ -171,7 +171,9 @@ "patches": { "drupal/tfa": { "Create Email one-time-code Validation Plugin & related Setup Plugin - https://www.drupal.org/project/tfa/issues/2930541": "https://www.drupal.org/files/issues/2020-10-19/tfa-2930541-22_0.patch", - "Users' recovery codes exposed to admin users - https://www.drupal.org/project/tfa/issues/3075304": "https://www.drupal.org/files/issues/2021-01-14/tfa-3075304-15.patch" + "Users' recovery codes exposed to admin users - https://www.drupal.org/project/tfa/issues/3075304": "https://www.drupal.org/files/issues/2021-01-14/tfa-3075304-15.patch", + "Set upper limit for number of skipped validation": "https://www.drupal.org/files/issues/2022-02-09/3263289-set-upper-limit.patch" + }, "drupal/twig_tweak": { "sanitize input": "https://www.drupal.org/files/issues/2021-02-03/twig_tweak-token-xss.patch" diff --git a/patches/tfa-validation.patch b/patches/tfa-validation.patch new file mode 100644 index 000000000..e69de29bb From 3ae2a8057630e10b4227e252bd985826dc7896e4 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 9 Feb 2022 16:49:42 +1100 Subject: [PATCH 40/45] [GOVCMSD9-598] Remove the stub modules from the distribution --- govcms.install | 34 +++++++++++++++++++ .../govcms8_default_content.info.yml | 6 ---- .../govcms_blog_article.info.yml | 6 ---- .../govcms_content_types.info.yml | 5 --- .../govcms_event/govcms_event.info.yml | 15 -------- .../govcms_foi/govcms_foi.info.yml | 8 ----- .../govcms_news_and_media.info.yml | 8 ----- .../govcms_standard_page.info.yml | 6 ---- .../govcms_search/govcms_search.info.yml | 6 ---- .../govcms_workflows.info.yml | 7 ---- 10 files changed, 34 insertions(+), 67 deletions(-) delete mode 100644 modules/deprecated/govcms8_default_content/govcms8_default_content.info.yml delete mode 100644 modules/deprecated/govcms_content_types/govcms_blog_article/govcms_blog_article.info.yml delete mode 100644 modules/deprecated/govcms_content_types/govcms_content_types.info.yml delete mode 100644 modules/deprecated/govcms_content_types/govcms_event/govcms_event.info.yml delete mode 100644 modules/deprecated/govcms_content_types/govcms_foi/govcms_foi.info.yml delete mode 100644 modules/deprecated/govcms_content_types/govcms_news_and_media/govcms_news_and_media.info.yml delete mode 100644 modules/deprecated/govcms_content_types/govcms_standard_page/govcms_standard_page.info.yml delete mode 100644 modules/deprecated/govcms_search/govcms_search.info.yml delete mode 100644 modules/deprecated/govcms_workflows/govcms_workflows.info.yml diff --git a/govcms.install b/govcms.install index 166b6530d..825003e6f 100644 --- a/govcms.install +++ b/govcms.install @@ -128,3 +128,37 @@ function govcms_install() { ]) ->save(TRUE); } + +/** + * Issue GOVCMSD9-598: Remove the stub modules from the distribution. + */ +function govcms_update_9001() { + $stub_modules = [ + 'govcms8_default_content', + 'govcms_content_types', + 'govcms_blog_article', + 'govcms_event', + 'govcms_foi', + 'govcms_news_and_media', + 'govcms_standard_page', + 'govcms_search', + 'govcms_workflows', + ]; + + $extension_config = \Drupal::configFactory()->getEditable('core.extension'); + $module = $extension_config->get('module'); + + foreach($stub_modules as $stub_module) { + if (isset($module[$stub_module])) { + unset($module[$stub_module]); + } + } + + $extension_config->set('module', $module); + $extension_config->save(); + + // Remove stub modules from system.schema. + foreach($stub_modules as $stub_module) { + \Drupal::keyValue('system.schema')->delete($stub_module); + } +} diff --git a/modules/deprecated/govcms8_default_content/govcms8_default_content.info.yml b/modules/deprecated/govcms8_default_content/govcms8_default_content.info.yml deleted file mode 100644 index 31d104ad0..000000000 --- a/modules/deprecated/govcms8_default_content/govcms8_default_content.info.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: GovCMS 8 Default Content -type: module -description: "Provides example content and structure to build a sample OOTB site, complete with a Styleguide and a 'kitchen sink' page." -package: GovCMS8 [deprecated] -core: 8.x -core_version_requirement: ^8 || ^9 diff --git a/modules/deprecated/govcms_content_types/govcms_blog_article/govcms_blog_article.info.yml b/modules/deprecated/govcms_content_types/govcms_blog_article/govcms_blog_article.info.yml deleted file mode 100644 index 8f6678eee..000000000 --- a/modules/deprecated/govcms_content_types/govcms_blog_article/govcms_blog_article.info.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: 'Blog article' -description: 'Provides Blog article content type and related configuration. [deprecated]' -type: module -package: GovCMS8 [deprecated] -core: 8.x -core_version_requirement: ^8 || ^9 \ No newline at end of file diff --git a/modules/deprecated/govcms_content_types/govcms_content_types.info.yml b/modules/deprecated/govcms_content_types/govcms_content_types.info.yml deleted file mode 100644 index b0a7010d8..000000000 --- a/modules/deprecated/govcms_content_types/govcms_content_types.info.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: 'GovCMS Content Types' -type: module -description: 'Provides default content types and related configuration. [deprecated]' -package: GovCMS8 [deprecated] -core_version_requirement: ^8 || ^9 \ No newline at end of file diff --git a/modules/deprecated/govcms_content_types/govcms_event/govcms_event.info.yml b/modules/deprecated/govcms_content_types/govcms_event/govcms_event.info.yml deleted file mode 100644 index f686ed530..000000000 --- a/modules/deprecated/govcms_content_types/govcms_event/govcms_event.info.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Event -description: 'Provides Event content type and related configuration. [deprecated]' -type: module -dependencies: - - block - - datetime_range - - facets - - govcms_search - - link - - search_api - - search_api_db - - system -package: GovCMS8 [deprecated] -core: 8.x -core_version_requirement: ^8 || ^9 diff --git a/modules/deprecated/govcms_content_types/govcms_foi/govcms_foi.info.yml b/modules/deprecated/govcms_content_types/govcms_foi/govcms_foi.info.yml deleted file mode 100644 index 7b91e2696..000000000 --- a/modules/deprecated/govcms_content_types/govcms_foi/govcms_foi.info.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: FOI -description: 'Provides FOI content type and related configuration. [deprecated]' -type: module -dependencies: - - datetime -package: GovCMS8 [deprecated] -core: 8.x -core_version_requirement: ^8 || ^9 \ No newline at end of file diff --git a/modules/deprecated/govcms_content_types/govcms_news_and_media/govcms_news_and_media.info.yml b/modules/deprecated/govcms_content_types/govcms_news_and_media/govcms_news_and_media.info.yml deleted file mode 100644 index c0177ad25..000000000 --- a/modules/deprecated/govcms_content_types/govcms_news_and_media/govcms_news_and_media.info.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: 'News and Media' -description: 'Provides News and Media content type and related configuration. [deprecated]' -type: module -dependencies: - - options -package: GovCMS8 [deprecated] -core: 8.x -core_version_requirement: ^8 || ^9 \ No newline at end of file diff --git a/modules/deprecated/govcms_content_types/govcms_standard_page/govcms_standard_page.info.yml b/modules/deprecated/govcms_content_types/govcms_standard_page/govcms_standard_page.info.yml deleted file mode 100644 index 386b53550..000000000 --- a/modules/deprecated/govcms_content_types/govcms_standard_page/govcms_standard_page.info.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: 'Standard page' -description: 'Provides Standard page content type and related configuration. [deprecated]' -type: module -package: GovCMS8 [deprecated] -core: 8.x -core_version_requirement: ^8 || ^9 \ No newline at end of file diff --git a/modules/deprecated/govcms_search/govcms_search.info.yml b/modules/deprecated/govcms_search/govcms_search.info.yml deleted file mode 100644 index 9405ed81a..000000000 --- a/modules/deprecated/govcms_search/govcms_search.info.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: GovCMS Search -type: module -description: Provide default search functions. -package: GovCMS8 [deprecated] -core: 8.x -core_version_requirement: ^8 || ^9 diff --git a/modules/deprecated/govcms_workflows/govcms_workflows.info.yml b/modules/deprecated/govcms_workflows/govcms_workflows.info.yml deleted file mode 100644 index defa817e5..000000000 --- a/modules/deprecated/govcms_workflows/govcms_workflows.info.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: 'GovCMS Workflows' -description: 'Provides default workflow configuration.' -type: module -core: 8.x -core_version_requirement: ^8 || ^9 -version: 8.x-1.0-alpha1 -package: GovCMS8 [deprecated] From 16907897be36513746ca0baa51baa8dcf8931409 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 9 Feb 2022 17:51:03 +1100 Subject: [PATCH 41/45] [GOVCMSD9-598] Remove the stub modules from the distribution --- .../govcms8_default_content.info.yml | 6 ++++++ .../govcms_blog_article.info.yml | 6 ++++++ .../govcms_content_types.info.yml | 5 +++++ .../govcms_event/govcms_event.info.yml | 15 +++++++++++++++ .../govcms_foi/govcms_foi.info.yml | 8 ++++++++ .../govcms_news_and_media.info.yml | 8 ++++++++ .../govcms_standard_page.info.yml | 6 ++++++ .../govcms_search/govcms_search.info.yml | 6 ++++++ .../govcms_workflows/govcms_workflows.info.yml | 7 +++++++ 9 files changed, 67 insertions(+) create mode 100644 modules/deprecated/govcms8_default_content/govcms8_default_content.info.yml create mode 100644 modules/deprecated/govcms_content_types/govcms_blog_article/govcms_blog_article.info.yml create mode 100644 modules/deprecated/govcms_content_types/govcms_content_types.info.yml create mode 100644 modules/deprecated/govcms_content_types/govcms_event/govcms_event.info.yml create mode 100644 modules/deprecated/govcms_content_types/govcms_foi/govcms_foi.info.yml create mode 100644 modules/deprecated/govcms_content_types/govcms_news_and_media/govcms_news_and_media.info.yml create mode 100644 modules/deprecated/govcms_content_types/govcms_standard_page/govcms_standard_page.info.yml create mode 100644 modules/deprecated/govcms_search/govcms_search.info.yml create mode 100644 modules/deprecated/govcms_workflows/govcms_workflows.info.yml diff --git a/modules/deprecated/govcms8_default_content/govcms8_default_content.info.yml b/modules/deprecated/govcms8_default_content/govcms8_default_content.info.yml new file mode 100644 index 000000000..31d104ad0 --- /dev/null +++ b/modules/deprecated/govcms8_default_content/govcms8_default_content.info.yml @@ -0,0 +1,6 @@ +name: GovCMS 8 Default Content +type: module +description: "Provides example content and structure to build a sample OOTB site, complete with a Styleguide and a 'kitchen sink' page." +package: GovCMS8 [deprecated] +core: 8.x +core_version_requirement: ^8 || ^9 diff --git a/modules/deprecated/govcms_content_types/govcms_blog_article/govcms_blog_article.info.yml b/modules/deprecated/govcms_content_types/govcms_blog_article/govcms_blog_article.info.yml new file mode 100644 index 000000000..8f6678eee --- /dev/null +++ b/modules/deprecated/govcms_content_types/govcms_blog_article/govcms_blog_article.info.yml @@ -0,0 +1,6 @@ +name: 'Blog article' +description: 'Provides Blog article content type and related configuration. [deprecated]' +type: module +package: GovCMS8 [deprecated] +core: 8.x +core_version_requirement: ^8 || ^9 \ No newline at end of file diff --git a/modules/deprecated/govcms_content_types/govcms_content_types.info.yml b/modules/deprecated/govcms_content_types/govcms_content_types.info.yml new file mode 100644 index 000000000..b0a7010d8 --- /dev/null +++ b/modules/deprecated/govcms_content_types/govcms_content_types.info.yml @@ -0,0 +1,5 @@ +name: 'GovCMS Content Types' +type: module +description: 'Provides default content types and related configuration. [deprecated]' +package: GovCMS8 [deprecated] +core_version_requirement: ^8 || ^9 \ No newline at end of file diff --git a/modules/deprecated/govcms_content_types/govcms_event/govcms_event.info.yml b/modules/deprecated/govcms_content_types/govcms_event/govcms_event.info.yml new file mode 100644 index 000000000..f686ed530 --- /dev/null +++ b/modules/deprecated/govcms_content_types/govcms_event/govcms_event.info.yml @@ -0,0 +1,15 @@ +name: Event +description: 'Provides Event content type and related configuration. [deprecated]' +type: module +dependencies: + - block + - datetime_range + - facets + - govcms_search + - link + - search_api + - search_api_db + - system +package: GovCMS8 [deprecated] +core: 8.x +core_version_requirement: ^8 || ^9 diff --git a/modules/deprecated/govcms_content_types/govcms_foi/govcms_foi.info.yml b/modules/deprecated/govcms_content_types/govcms_foi/govcms_foi.info.yml new file mode 100644 index 000000000..7b91e2696 --- /dev/null +++ b/modules/deprecated/govcms_content_types/govcms_foi/govcms_foi.info.yml @@ -0,0 +1,8 @@ +name: FOI +description: 'Provides FOI content type and related configuration. [deprecated]' +type: module +dependencies: + - datetime +package: GovCMS8 [deprecated] +core: 8.x +core_version_requirement: ^8 || ^9 \ No newline at end of file diff --git a/modules/deprecated/govcms_content_types/govcms_news_and_media/govcms_news_and_media.info.yml b/modules/deprecated/govcms_content_types/govcms_news_and_media/govcms_news_and_media.info.yml new file mode 100644 index 000000000..c0177ad25 --- /dev/null +++ b/modules/deprecated/govcms_content_types/govcms_news_and_media/govcms_news_and_media.info.yml @@ -0,0 +1,8 @@ +name: 'News and Media' +description: 'Provides News and Media content type and related configuration. [deprecated]' +type: module +dependencies: + - options +package: GovCMS8 [deprecated] +core: 8.x +core_version_requirement: ^8 || ^9 \ No newline at end of file diff --git a/modules/deprecated/govcms_content_types/govcms_standard_page/govcms_standard_page.info.yml b/modules/deprecated/govcms_content_types/govcms_standard_page/govcms_standard_page.info.yml new file mode 100644 index 000000000..386b53550 --- /dev/null +++ b/modules/deprecated/govcms_content_types/govcms_standard_page/govcms_standard_page.info.yml @@ -0,0 +1,6 @@ +name: 'Standard page' +description: 'Provides Standard page content type and related configuration. [deprecated]' +type: module +package: GovCMS8 [deprecated] +core: 8.x +core_version_requirement: ^8 || ^9 \ No newline at end of file diff --git a/modules/deprecated/govcms_search/govcms_search.info.yml b/modules/deprecated/govcms_search/govcms_search.info.yml new file mode 100644 index 000000000..9405ed81a --- /dev/null +++ b/modules/deprecated/govcms_search/govcms_search.info.yml @@ -0,0 +1,6 @@ +name: GovCMS Search +type: module +description: Provide default search functions. +package: GovCMS8 [deprecated] +core: 8.x +core_version_requirement: ^8 || ^9 diff --git a/modules/deprecated/govcms_workflows/govcms_workflows.info.yml b/modules/deprecated/govcms_workflows/govcms_workflows.info.yml new file mode 100644 index 000000000..defa817e5 --- /dev/null +++ b/modules/deprecated/govcms_workflows/govcms_workflows.info.yml @@ -0,0 +1,7 @@ +name: 'GovCMS Workflows' +description: 'Provides default workflow configuration.' +type: module +core: 8.x +core_version_requirement: ^8 || ^9 +version: 8.x-1.0-alpha1 +package: GovCMS8 [deprecated] From a9c4e8b3a89b67036aac8430f6b7a7ad425c7167 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 2 Feb 2022 14:39:44 +1100 Subject: [PATCH 42/45] [GOVCMSD9-603] Update Cypress packages and basic testing --- tests/cy/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/cy/package.json b/tests/cy/package.json index aa60ae698..c62136483 100644 --- a/tests/cy/package.json +++ b/tests/cy/package.json @@ -15,17 +15,17 @@ } }, "dependencies": { - "cypress": "^7.3.0", + "cypress": "^9.4.1", "cypress-file-upload": "^5.0.7", "cypress-xpath": "^1.6.2" }, "devDependencies": { "@cypress/eslint-plugin-json": "^3.2.3", - "eslint": "^7.26.0", + "eslint": "^8.8.0", "eslint-plugin-chai-friendly": "^0.7.1", "eslint-plugin-cypress": "^2.11.3", - "husky": "^6.0.0", - "lint-staged": "^11.0.0" + "husky": "^7.0.4", + "lint-staged": "^12.3.3" }, "license": "GPL-2.0", "repository": "https://github.com/govCMS/govcms-testing-cypress", From 704afb552033cb9ed6e895c0825ab7bf4cb82c09 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 2 Feb 2022 20:51:01 +1100 Subject: [PATCH 43/45] [GOVCMSD9-603] Update Cypress basic testing --- tests/cy/cypress.json | 2 +- .../integration/1-baseline/modules.spec.js | 17 ++++ .../{content => 2-content}/blog.spec.js | 0 .../{content => 2-content}/events.spec.js | 0 .../{content => 2-content}/foi.spec.js | 0 .../{content => 2-content}/home.spec.js | 0 .../{content => 2-content}/news.spec.js | 0 tests/cy/cypress/support/authenticate.js | 58 ++----------- tests/cy/cypress/support/commands.js | 82 ++++++++++++++----- tests/cy/package.json | 2 +- 10 files changed, 87 insertions(+), 74 deletions(-) create mode 100644 tests/cy/cypress/integration/1-baseline/modules.spec.js rename tests/cy/cypress/integration/{content => 2-content}/blog.spec.js (100%) rename tests/cy/cypress/integration/{content => 2-content}/events.spec.js (100%) rename tests/cy/cypress/integration/{content => 2-content}/foi.spec.js (100%) rename tests/cy/cypress/integration/{content => 2-content}/home.spec.js (100%) rename tests/cy/cypress/integration/{content => 2-content}/news.spec.js (100%) diff --git a/tests/cy/cypress.json b/tests/cy/cypress.json index 5629fb45b..3a1222ff7 100644 --- a/tests/cy/cypress.json +++ b/tests/cy/cypress.json @@ -4,8 +4,8 @@ "www.google-analytics.com" ], "chromeWebSecurity": false, - "localEnv": "ahoy", "env": { + "localEnv": "lagoon", "user": { "administrator": { "username": "administrator", diff --git a/tests/cy/cypress/integration/1-baseline/modules.spec.js b/tests/cy/cypress/integration/1-baseline/modules.spec.js new file mode 100644 index 000000000..b85885cb7 --- /dev/null +++ b/tests/cy/cypress/integration/1-baseline/modules.spec.js @@ -0,0 +1,17 @@ +import packages from '../../../../../composer.json' + +let modules = Object.entries(packages['require']).filter((str) => { + return str[0].indexOf('drupal/') !== -1 + && str[1].indexOf('^') === -1 + && str[0].indexOf('drupal/core-recommended') === -1 + && str[0].indexOf('theme') === -1 + && str[0].indexOf('update_notifications_disable') === -1 +}) + +describe('Cross check module versions', () => { + modules.forEach((module, i) => { + it(`${module}`, () => { + cy.composerCommand('show ' + module[0] + ' | grep versions').its('stdout').should('contain', module[1]) + }) + }) +}) diff --git a/tests/cy/cypress/integration/content/blog.spec.js b/tests/cy/cypress/integration/2-content/blog.spec.js similarity index 100% rename from tests/cy/cypress/integration/content/blog.spec.js rename to tests/cy/cypress/integration/2-content/blog.spec.js diff --git a/tests/cy/cypress/integration/content/events.spec.js b/tests/cy/cypress/integration/2-content/events.spec.js similarity index 100% rename from tests/cy/cypress/integration/content/events.spec.js rename to tests/cy/cypress/integration/2-content/events.spec.js diff --git a/tests/cy/cypress/integration/content/foi.spec.js b/tests/cy/cypress/integration/2-content/foi.spec.js similarity index 100% rename from tests/cy/cypress/integration/content/foi.spec.js rename to tests/cy/cypress/integration/2-content/foi.spec.js diff --git a/tests/cy/cypress/integration/content/home.spec.js b/tests/cy/cypress/integration/2-content/home.spec.js similarity index 100% rename from tests/cy/cypress/integration/content/home.spec.js rename to tests/cy/cypress/integration/2-content/home.spec.js diff --git a/tests/cy/cypress/integration/content/news.spec.js b/tests/cy/cypress/integration/2-content/news.spec.js similarity index 100% rename from tests/cy/cypress/integration/content/news.spec.js rename to tests/cy/cypress/integration/2-content/news.spec.js diff --git a/tests/cy/cypress/support/authenticate.js b/tests/cy/cypress/support/authenticate.js index 115409a51..1efcea281 100644 --- a/tests/cy/cypress/support/authenticate.js +++ b/tests/cy/cypress/support/authenticate.js @@ -5,62 +5,14 @@ Cypress.Commands.add("drupalLogin", (user, password) => { user = user || Cypress.env('user').super.username password = password || Cypress.env('user').super.password - return cy.request({ - method: 'POST', - url: '/user/login', - form: true, - body: { - name: user, - pass: password, - form_id: 'user_login_form' - } - }); + cy.visit(`/user/login`) + + cy.get("#edit-name").type(user) + cy.get("#edit-pass").type(password) + cy.get("#edit-submit").click() }); // Drupal logout. Cypress.Commands.add('drupalLogout', () => { return cy.request('/user/logout'); -}); - -// Drupal drush command. -Cypress.Commands.add("drupalDrushCommand", (command) => { - var cmd = Cypress.env('drupalDrushCmdLine'); - - if (cmd == null) { - if(Cypress.env('localEnv') === "lando"){ - cmd = 'lando drush %command' - }else{ - cmd = 'drush %command' - } - } - - if (typeof command === 'string') { - command = [command]; - } - - const execCmd = cmd.replace('%command', command.join(' ')); - - return cy.exec(execCmd); -}); - - -// Composer command. -Cypress.Commands.add("composerCommand", (command) => { - var cmd = Cypress.env('composerCmdLine'); - - if (cmd == null) { - if (Cypress.env('localEnv') === "lando") { - cmd = 'lando composer %command' - } else { - cmd = 'cd ../..; composer %command' - } - } - - if (typeof command === 'string') { - command = [command]; - } - - const execCmd = cmd.replace('%command', command.join(' ')); - - return cy.exec(execCmd) }); \ No newline at end of file diff --git a/tests/cy/cypress/support/commands.js b/tests/cy/cypress/support/commands.js index 2882e1705..828783324 100644 --- a/tests/cy/cypress/support/commands.js +++ b/tests/cy/cypress/support/commands.js @@ -15,6 +15,50 @@ Cypress.Commands.add("aliasAll", () => }) ) +// Drupal drush command. +Cypress.Commands.add("drupalDrushCommand", (command) => { + var cmd = Cypress.env('drupalDrushCmdLine'); + + if (cmd == null) { + if (Cypress.env('localEnv') === "lando") { + cmd = 'lando drush %command' + } else { + cmd = 'drush %command' + } + } + + if (typeof command === 'string') { + command = [command]; + } + + const execCmd = cmd.replace('%command', command.join(' ')); + + return cy.exec(execCmd); +}); + + +// Composer command. +Cypress.Commands.add("composerCommand", (command) => { + var cmd = Cypress.env('composerCmdLine'); + + if (cmd == null) { + console.log(Cypress.env()) + if (Cypress.env('localEnv') === "lando") { + cmd = 'cd ../..; lando composer %command' + } else { + cmd = 'cd ../..; composer %command' + } + } + + if (typeof command === 'string') { + command = [command]; + } + + const execCmd = cmd.replace('%command', command.join(' ')); + + return cy.exec(execCmd) +}); + Cypress.Commands.add("createUser", (siteRole) => { cy.fixture(`users/${siteRole}.json`).then((user) => { const username = user.firstname + user.lastname @@ -67,42 +111,42 @@ Cypress.Commands.add("type_ckeditor", (element, content) => { // govcms-content-author would be Content Author // role is the user that should login to Drupal Cypress.Commands.add('uiCreateUser', (userrole, role) => { - let user_role_machine_name = 'govcms-'+userrole.toLowerCase().replace(' ','-') - let password = user_role_machine_name+'#123' + let user_role_machine_name = 'govcms-' + userrole.toLowerCase().replace(' ', '-') + let password = user_role_machine_name + '#123' cy.userLogin(role).then(() => { cy.get('#toolbar-link-entity-user-collection') - .click({force: true}) + .click({ force: true }) cy.get('.local-actions__item > .button') - .click({force: true}) + .click({ force: true }) cy.get('#edit-mail') - .type('cypress-tester-'+user_role_machine_name+'@test.com', {force: true}) + .type('cypress-tester-' + user_role_machine_name + '@test.com', { force: true }) cy.get('#edit-name') - .type('@cypresstest-'+user_role_machine_name, {force: true}) - cy.get('#edit-pass-pass1', {force: true}) - .type(password, {force: true}) - cy.get('#edit-pass-pass2', {force: true}) - .type(password, {force: true}) + .type('@cypresstest-' + user_role_machine_name, { force: true }) + cy.get('#edit-pass-pass1', { force: true }) + .type(password, { force: true }) + cy.get('#edit-pass-pass2', { force: true }) + .type(password, { force: true }) cy.get('#edit-submit') - .click({force: true}) + .click({ force: true }) cy.get('.messages-list__item') .contains('Created a new user account') cy.get('#toolbar-link-entity-user-collection') - .click({force: true}) + .click({ force: true }) cy.get('#edit-user-bulk-form-0') - .click({force: true}) + .click({ force: true }) cy.get('#edit-action') - .select('Add the '+userrole+' role to the selected user(s)') + .select('Add the ' + userrole + ' role to the selected user(s)') cy.get('#edit-submit') - .click({force: true}) + .click({ force: true }) cy.get('#edit-user-bulk-form-0') - .click({force: true}) + .click({ force: true }) cy.get('#edit-action') .select('Cancel the selected user account(s)') cy.get('#edit-submit') - .click({force: true}) + .click({ force: true }) cy.get('#edit-user-cancel-method-user-cancel-delete') - .click({force: true}) + .click({ force: true }) cy.get('#edit-submit') - .click({force: true}) + .click({ force: true }) }) }) diff --git a/tests/cy/package.json b/tests/cy/package.json index c62136483..6eda935cb 100644 --- a/tests/cy/package.json +++ b/tests/cy/package.json @@ -28,7 +28,7 @@ "lint-staged": "^12.3.3" }, "license": "GPL-2.0", - "repository": "https://github.com/govCMS/govcms-testing-cypress", + "repository": "https://github.com/govCMS/GovCMS", "author": "Joseph Zhao ", "lint-staged": { "*.coffee": [ From 72a6f561b96e99c785a4b9c1833c3cfea0684399 Mon Sep 17 00:00:00 2001 From: Pandaski Date: Wed, 2 Feb 2022 21:09:59 +1100 Subject: [PATCH 44/45] [GOVCMSD9-603] Clean up the test files --- .../cy/cypress/fixtures/currentComposer.json | 206 ------------------ tests/cy/cypress/fixtures/example.json | 5 - tests/cy/cypress/fixtures/locations.json | 3 - .../integration/1-baseline/modules.spec.js | 8 +- .../2-modules}/.gitkeep | 0 .../{2-content => 3-ui}/blog.spec.js | 0 .../{2-content => 3-ui}/events.spec.js | 0 .../{2-content => 3-ui}/foi.spec.js | 0 .../{2-content => 3-ui}/home.spec.js | 0 .../{2-content => 3-ui}/news.spec.js | 0 10 files changed, 2 insertions(+), 220 deletions(-) delete mode 100644 tests/cy/cypress/fixtures/currentComposer.json delete mode 100644 tests/cy/cypress/fixtures/example.json delete mode 100644 tests/cy/cypress/fixtures/locations.json rename tests/cy/cypress/{fixtures => integration/2-modules}/.gitkeep (100%) rename tests/cy/cypress/integration/{2-content => 3-ui}/blog.spec.js (100%) rename tests/cy/cypress/integration/{2-content => 3-ui}/events.spec.js (100%) rename tests/cy/cypress/integration/{2-content => 3-ui}/foi.spec.js (100%) rename tests/cy/cypress/integration/{2-content => 3-ui}/home.spec.js (100%) rename tests/cy/cypress/integration/{2-content => 3-ui}/news.spec.js (100%) diff --git a/tests/cy/cypress/fixtures/currentComposer.json b/tests/cy/cypress/fixtures/currentComposer.json deleted file mode 100644 index 2294808ca..000000000 --- a/tests/cy/cypress/fixtures/currentComposer.json +++ /dev/null @@ -1,206 +0,0 @@ -{ - "name": "govcms/govcms", - "description": "GovCMS Drupal Distribution", - "keywords": [ - "GovCMS" - ], - "type": "drupal-profile", - "license": "GPL-2.0-or-later", - "homepage": "https://www.govcms.gov.au", - "support": { - "issues:": "https://github.com/GovCMS/GovCMS/issues", - "wik": "https://github.com/GovCMS/GovCMS/wiki", - "source": "https://github.com/GovCMS/GovCMS/releases" - }, - "repositories": [ - { - "type": "composer", - "url": "https://packages.drupal.org/8" - }, - { - "type": "composer", - "url": "https://asset-packagist.org" - } - ], - "require": { - "php": "^7.4", - "bower-asset/chosen": "1.8.7", - "bower-asset/dropzone": "5.7.2", - "composer/installers": "^1.9", - "cweagans/composer-patches": "^1.7", - "drupal/admin_toolbar": "2.4.0", - "drupal/adminimal_admin_toolbar": "1.11.0", - "drupal/adminimal_theme": "1.6.0", - "drupal/bigmenu": "2.0.0-rc1", - "drupal/block_place": "1.0", - "drupal/chosen": "3.0.1", - "drupal/components": "2.0-beta3", - "drupal/config_filter": "2.2.0", - "drupal/config_ignore": "2.3.0", - "drupal/config_perms": "2.0", - "drupal/config_split": "1.5.0", - "drupal/config_update": "1.7", - "drupal/consumers": "1.11", - "drupal/contact_storage": "1.1.0", - "drupal/context": "4.0.0-beta5", - "drupal/core-composer-scaffold": "^9", - "drupal/core-recommended": "9.1.4", - "drupal/crop": "2.1", - "drupal/ctools": "3.4.0", - "drupal/devel": "4.0.1", - "drupal/diff": "1.0.0", - "drupal/dropzonejs": "2.3.0", - "drupal/ds": "3.9.0", - "drupal/dynamic_entity_reference": "1.11.0", - "drupal/encrypt": "3.0", - "drupal/entity_browser": "2.5", - "drupal/entity_class_formatter": "1.3", - "drupal/entity_embed": "1.1", - "drupal/entity_reference_display": "1.4.0", - "drupal/entity_reference_revisions": "1.8", - "drupal/environment_indicator": "4.0.1", - "drupal/facets": "1.5", - "drupal/features": "3.11", - "drupal/field_group": "3.1", - "drupal/focal_point": "1.5.0", - "drupal/ga_login": "1.0.0-alpha5", - "drupal/google_analytics": "3.1", - "drupal/govcms_dlm": "1.4.0", - "drupal/honeypot": "2.0.1", - "drupal/inline_entity_form": "1.0.0-rc8", - "drupal/key": "1.14", - "drupal/linked_field": "1.3.0", - "drupal/linkit": "6.0.0-beta1", - "drupal/login_security": "2.0.0", - "drupal/media_entity_file_replace": "1.0-beta3", - "drupal/menu_block": "1.6", - "drupal/menu_trail_by_path": "1.3", - "drupal/metatag": "1.14.0", - "drupal/migrate_file": "2.0.0", - "drupal/migrate_plus": "5.1", - "drupal/migrate_source_csv": "3.4", - "drupal/migrate_tools": "4.5", - "drupal/minisite": "1.3", - "drupal/modifiers": "1.4", - "drupal/panelizer": "4.4", - "drupal/panels": "4.6.0", - "drupal/paragraphs": "1.12", - "drupal/password_policy": "3.0-beta1", - "drupal/pathauto": "1.8.0", - "drupal/real_aes": "2.3", - "drupal/recaptcha": "3.0", - "drupal/redirect": "1.6", - "drupal/rest_menu_items": "3.0.2", - "drupal/robotstxt": "1.4", - "drupal/scheduled_transitions": "2.0.0", - "drupal/search_api": "1.18.0", - "drupal/search_api_attachments": "1.0-beta16", - "drupal/search_api_solr": "4.1.7", - "drupal/seckit": "2.0.0", - "drupal/shield": "1.4", - "drupal/simple_oauth": "5.0.2", - "drupal/simple_sitemap": "3.7", - "drupal/swiftmailer": "2.0-beta1", - "drupal/tfa": "1.0.0-alpha7", - "drupal/token": "1.7", - "drupal/twig_tweak": "2.9", - "drupal/update_notifications_disable": "1.1", - "drupal/username_enumeration_prevention": "1.1", - "drupal/video_embed_field": "2.4", - "drupal/webform": "6.0.2", - "oomphinc/composer-installers-extender": "dev-master", - "swiftmailer/swiftmailer": "6.2.3", - "webflo/drupal-finder": "^1.2" - }, - "require-dev": { - "drush/drush": "~10" - }, - "extra": { - "drupal-scaffold": { - "locations": { - "web-root": "web/" - }, - "initial": { - "sites/default/default.services.yml": "sites/default/services.yml", - "sites/default/default.settings.php": "sites/default/settings.php" - }, - "excludes": [ - "sites/development.services.yml" - ] - }, - "installer-types": [ - "bower-asset", - "npm-asset" - ], - "installer-paths": { - "web/core": [ - "type:drupal-core" - ], - "web/libraries/{$name}": [ - "type:drupal-library", - "type:bower-asset", - "type:npm-asset" - ], - "web/modules/contrib/{$name}": [ - "type:drupal-module" - ], - "web/profiles/contrib/{$name}": [ - "type:drupal-profile" - ], - "web/themes/contrib/{$name}": [ - "type:drupal-theme" - ], - "drush/Commands/contrib/{$name}": [ - "type:drupal-drush" - ], - "web/modules/custom/{$name}": [ - "type:drupal-custom-module" - ], - "web/themes/custom/{$name}": [ - "type:drupal-custom-theme" - ] - }, - "enable-patching": true, - "patches": { - "drupal/tfa": { - "Create Email one-time-code Validation Plugin & related Setup Plugin - https://www.drupal.org/project/tfa/issues/2930541": "https://www.drupal.org/files/issues/2020-10-19/tfa-2930541-22_0.patch", - "Users' recovery codes exposed to admin users - https://www.drupal.org/project/tfa/issues/3075304": "https://www.drupal.org/files/issues/2021-01-14/tfa-3075304-15.patch" - }, - "drupal/username_enumeration_prevention": { - "Deprecated function User::getUsername": "https://www.drupal.org/files/issues/2020-09-01/fix-deprecated-getusername-3167106-2.patch" - }, - "drupal/twig_tweak": { - "sanitize input": "https://www.drupal.org/files/issues/2021-02-03/twig_tweak-token-xss.patch" - } - } - }, - "autoload": { - "psr-4": { - "GovCMS\\composer\\": "src/composer" - } - }, - "config": { - "bin-dir": "bin/", - "sort-packages": true, - "optimize-autoloader": true - }, - "scripts": { - "pre-install-cmd": [ - "GovCMS\\composer\\ScriptHandler::checkComposerVersion" - ], - "pre-update-cmd": [ - "GovCMS\\composer\\ScriptHandler::checkComposerVersion" - ], - "post-install-cmd": [ - "GovCMS\\composer\\ScriptHandler::createRequiredFiles", - "rsync -av --delete --exclude 'web' --exclude '.git' --exclude '.tugboat' --exclude 'vendor' ./ web/profiles/govcms" - ], - "post-update-cmd": [ - "GovCMS\\composer\\ScriptHandler::createRequiredFiles", - "rsync -av --delete --exclude 'web' --exclude '.git' --exclude '.tugboat' --exclude 'vendor' ./ web/profiles/govcms" - ], - "nuke": "rm -r -f composer.lock bin app web vendor" - }, - "minimum-stability": "dev", - "prefer-stable": true -} diff --git a/tests/cy/cypress/fixtures/example.json b/tests/cy/cypress/fixtures/example.json deleted file mode 100644 index da18d9352..000000000 --- a/tests/cy/cypress/fixtures/example.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "Using fixtures to represent data", - "email": "hello@cypress.io", - "body": "Fixtures are a great way to mock data for responses to routes" -} \ No newline at end of file diff --git a/tests/cy/cypress/fixtures/locations.json b/tests/cy/cypress/fixtures/locations.json deleted file mode 100644 index ff78a75f3..000000000 --- a/tests/cy/cypress/fixtures/locations.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "github": "https://raw.githubusercontent.com/govCMS/GovCMS/2.x/composer.json" -} \ No newline at end of file diff --git a/tests/cy/cypress/integration/1-baseline/modules.spec.js b/tests/cy/cypress/integration/1-baseline/modules.spec.js index b85885cb7..e0c11cf95 100644 --- a/tests/cy/cypress/integration/1-baseline/modules.spec.js +++ b/tests/cy/cypress/integration/1-baseline/modules.spec.js @@ -1,14 +1,10 @@ import packages from '../../../../../composer.json' let modules = Object.entries(packages['require']).filter((str) => { - return str[0].indexOf('drupal/') !== -1 - && str[1].indexOf('^') === -1 - && str[0].indexOf('drupal/core-recommended') === -1 - && str[0].indexOf('theme') === -1 - && str[0].indexOf('update_notifications_disable') === -1 + return str[1].indexOf('^') === -1 }) -describe('Cross check module versions', () => { +describe('Cross check module and library versions', () => { modules.forEach((module, i) => { it(`${module}`, () => { cy.composerCommand('show ' + module[0] + ' | grep versions').its('stdout').should('contain', module[1]) diff --git a/tests/cy/cypress/fixtures/.gitkeep b/tests/cy/cypress/integration/2-modules/.gitkeep similarity index 100% rename from tests/cy/cypress/fixtures/.gitkeep rename to tests/cy/cypress/integration/2-modules/.gitkeep diff --git a/tests/cy/cypress/integration/2-content/blog.spec.js b/tests/cy/cypress/integration/3-ui/blog.spec.js similarity index 100% rename from tests/cy/cypress/integration/2-content/blog.spec.js rename to tests/cy/cypress/integration/3-ui/blog.spec.js diff --git a/tests/cy/cypress/integration/2-content/events.spec.js b/tests/cy/cypress/integration/3-ui/events.spec.js similarity index 100% rename from tests/cy/cypress/integration/2-content/events.spec.js rename to tests/cy/cypress/integration/3-ui/events.spec.js diff --git a/tests/cy/cypress/integration/2-content/foi.spec.js b/tests/cy/cypress/integration/3-ui/foi.spec.js similarity index 100% rename from tests/cy/cypress/integration/2-content/foi.spec.js rename to tests/cy/cypress/integration/3-ui/foi.spec.js diff --git a/tests/cy/cypress/integration/2-content/home.spec.js b/tests/cy/cypress/integration/3-ui/home.spec.js similarity index 100% rename from tests/cy/cypress/integration/2-content/home.spec.js rename to tests/cy/cypress/integration/3-ui/home.spec.js diff --git a/tests/cy/cypress/integration/2-content/news.spec.js b/tests/cy/cypress/integration/3-ui/news.spec.js similarity index 100% rename from tests/cy/cypress/integration/2-content/news.spec.js rename to tests/cy/cypress/integration/3-ui/news.spec.js From d9adc815cd49dc01c459860d8c40d5554cd91300 Mon Sep 17 00:00:00 2001 From: Tara Wijayagunawarana Date: Fri, 11 Feb 2022 10:25:50 +1100 Subject: [PATCH 45/45] Preparing GovCMS 2.10.0 relase --- govcms.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/govcms.info.yml b/govcms.info.yml index 3acb9c769..cf524275c 100644 --- a/govcms.info.yml +++ b/govcms.info.yml @@ -3,7 +3,7 @@ type: profile description: 'A GovCMS Drupal Distribution for government and the public sector in Australia.' project: govcms core_version_requirement: ^9 -version: '2.8.0' +version: '2.10.0' distribution: name: GovCMS