From 5ecea83563c18506dc85951805db0f561595993f Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 22 Sep 2021 10:05:57 +0100 Subject: [PATCH 1/3] Use carets instead of tildes for our version constraints to allow for future updates with non-breaking changes. --- composer.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 90362c5..154b0fa 100644 --- a/composer.json +++ b/composer.json @@ -14,27 +14,27 @@ "drupal/admin_toolbar": "^3.0", "drupal/core": "^9.1", "drupal/devel": "^4.1", - "drupal/gin": "~3.0@alpha", + "drupal/gin": "^3.0@alpha", "drupal/gin_login": "^1.0@RC", "drupal/gin_toolbar": "^1.0@beta", "drupal/simple_sitemap": "^3.7", "drush/drush": ">=10", - "localgovdrupal/localgov_alert_banner": "~1.1.0", - "localgovdrupal/localgov_base": "~1.0.0", - "localgovdrupal/localgov_core": "~2.1.0", - "localgovdrupal/localgov_demo": "~2.0.0", - "localgovdrupal/localgov_directories": "~2.0.0", - "localgovdrupal/localgov_events": "~2.0.0", - "localgovdrupal/localgov_guides": "~2.0.0", - "localgovdrupal/localgov_menu_link_group": "~1.0.0", - "localgovdrupal/localgov_news": "~2.0.0", - "localgovdrupal/localgov_paragraphs": "~2.0.0", - "localgovdrupal/localgov_search": "~1.0.0", - "localgovdrupal/localgov_services": "~2.0.0", - "localgovdrupal/localgov_step_by_step": "~2.0.0", - "localgovdrupal/localgov_subsites": "~2.0.0", - "localgovdrupal/localgov_theme": "~1.0.0", - "localgovdrupal/localgov_workflows": "~1.0.0" + "localgovdrupal/localgov_alert_banner": "^1.1.0", + "localgovdrupal/localgov_base": "^1.0.0", + "localgovdrupal/localgov_core": "^2.1.0", + "localgovdrupal/localgov_demo": "^2.0.0", + "localgovdrupal/localgov_directories": "^2.0.0", + "localgovdrupal/localgov_events": "^2.0.0", + "localgovdrupal/localgov_guides": "^2.0.0", + "localgovdrupal/localgov_menu_link_group": "^1.0.0", + "localgovdrupal/localgov_news": "^2.0.0", + "localgovdrupal/localgov_paragraphs": "^2.0.0", + "localgovdrupal/localgov_search": "^1.0.0", + "localgovdrupal/localgov_services": "^2.0.0", + "localgovdrupal/localgov_step_by_step": "^2.0.0", + "localgovdrupal/localgov_subsites": "^2.0.0", + "localgovdrupal/localgov_theme": "^1.0.0", + "localgovdrupal/localgov_workflows": "^1.0.0" }, "require-dev": { "drupal/core-dev": "^9.1" From 133219c407e566060f1a2c74389c56fa0c363cd0 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Mon, 27 Sep 2021 10:49:45 +0100 Subject: [PATCH 2/3] Patch core for 'Notice: Undefined index: type in Drupal\Core\Render\Element\Date::processDate()' (#373) (localgovdrupal/localgov_workflows#18) Drupal core issue: https://www.drupal.org/project/drupal/issues/3189302 --- composer.json | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 296bb26..1ff39fd 100644 --- a/composer.json +++ b/composer.json @@ -45,19 +45,20 @@ "sort-packages": true }, "extra": { - "enable-patching": true, - "composer-exit-on-patch-failure": true, - "patchLevel": { - "drupal/core": "-p2" - }, - "patches": { - "drupal/core": { - "Fix for narrow forms on node/add screens, which is included in 9.2. See https://www.drupal.org/project/drupal/issues/3184667": "https://www.drupal.org/files/issues/2021-04-16/3184667.26.patch", - "Fix tests running with paratest. See https://www.drupal.org/project/drupal/issues/3192365": "https://www.drupal.org/files/issues/2021-01-12/3192365-3.patch" + "enable-patching": true, + "composer-exit-on-patch-failure": true, + "patchLevel": { + "drupal/core": "-p2" }, - "drupal/gin_login": { - "Fix schema for gin_toolbar, see https://www.drupal.org/project/gin_login/issues/3192526": "https://www.drupal.org/files/issues/2021-01-13/gin_login-config_schema-3192526-8.patch" - } - } + "patches": { + "drupal/core": { + "Fix for narrow forms on node/add screens, which is included in 9.2. See https://www.drupal.org/project/drupal/issues/3184667": "https://www.drupal.org/files/issues/2021-04-16/3184667.26.patch", + "Fix tests running with paratest. See https://www.drupal.org/project/drupal/issues/3192365": "https://www.drupal.org/files/issues/2021-01-12/3192365-3.patch", + "Fix Undefined index 'type' in Drupal\\Core\\Render\\Element\\Date::processDate() #3189302": "https://www.drupal.org/files/issues/2021-04-07/3189302_11.patch" + }, + "drupal/gin_login": { + "Fix schema for gin_toolbar, see https://www.drupal.org/project/gin_login/issues/3192526": "https://www.drupal.org/files/issues/2021-01-13/gin_login-config_schema-3192526-8.patch" + } + } } } From e27e187049a7ff1210d685e3a3999252dc496196 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Mon, 4 Oct 2021 16:54:23 +0100 Subject: [PATCH 3/3] Fix test for missing content text (#387) --- tests/src/Functional/LocalGovUpdateTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/src/Functional/LocalGovUpdateTest.php b/tests/src/Functional/LocalGovUpdateTest.php index 5a40c10..3b52a5a 100644 --- a/tests/src/Functional/LocalGovUpdateTest.php +++ b/tests/src/Functional/LocalGovUpdateTest.php @@ -99,7 +99,7 @@ public function testUpdate() { // Test Step by step overview page: Request support for an adult. $this->drupalGet('/adult-health-and-social-care/step-by-step/request-support-adult-step-step'); $this->assertSession()->elementTextContains('css', 'header h1', 'Request support for an adult: step by step'); - $this->assertSession()->elementTextContains('css', 'main article .alert-info', 'Appointments with adult social care staff are now happening on the telephone.'); + $this->assertSession()->elementTextContains('css', 'main article .alert-info', 'Important update'); $this->assertSession()->elementTextContains('css', 'main article .callout-danger', 'For urgent help'); $this->assertSession()->elementTextContains('css', '.step-list', 'Find out what support we offer'); $this->assertSession()->elementTextContains('css', '.step-list', 'Contact the support team');