Merge pull request #388 from localgovdrupal/2.x

Prepare to release 2.1.9
localgovdrupal · Oct 4, 2021 · eaed1c0 · eaed1c0
2 parents df7c8f5 + e27e187
commit eaed1c0
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 31 deletions.
diff --git 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.2.0",
-        "localgovdrupal/localgov_base": "~1.0.0",
-        "localgovdrupal/localgov_core": "~2.1.0",
-        "localgovdrupal/localgov_demo": "~2.1.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.2.0",
+        "localgovdrupal/localgov_base": "^1.0.0",
+        "localgovdrupal/localgov_core": "^2.1.0",
+        "localgovdrupal/localgov_demo": "^2.1.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"
@@ -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"
+            }
+        }
     }
 }
diff --git 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');