Merge branch '3.0.x' into prod/3.0.x

composer.json

@@ -61,7 +61,7 @@
         "drupal/jquery_ui_slider": "1.1",
         "drupal/jquery_ui_touch_punch": "1.0.0",
         "drupal/label_help": "dev-8.x-1.x",
-        "drupal/layout_builder_browser": "dev-1.2-uw_wcms2",
+        "drupal/layout_builder_browser": "dev-1.3-uw_wcms1",
         "drupal/layout_builder_ids": "2.0.0-rc6",
         "drupal/layout_builder_lock": "1.1",
         "drupal/layout_builder_modal": "1.1",
@@ -69,7 +69,7 @@
         "drupal/layout_builder_styles": "1.0-beta4",
         "drupal/leaflet": "2.1.14",
         "drupal/libraries": "3.0-beta1",
-        "drupal/linkit": "dev-6.0.0-beta1-uw_wcms2",
+        "drupal/linkit": "dev-6.0.0-beta2-uw_wcms1",
         "drupal/mailsystem": "4.3",
         "drupal/markup": "1.0-beta3",
         "drupal/maxlength": "1.0-rc1",

tests/src/Functional/UwWcmsBasicTest.php

@@ -1498,8 +1498,9 @@ class UwWcmsBasicTest extends BrowserTestBase {
     // No access to edit home page menu entry.
     $this->drupalGet('admin/structure/menu/link/uw_base_profile.front_page/edit');
     $this->assertSession()->statusCodeEquals(403);
-    // Test that the home page cannot be the parent of any item.
-    $this->drupalGet('admin/structure/menu/link/uw_main_menu.blog/edit');
+    // Test that the home page cannot be the parent of any item. Using first
+    // menu item that was created.
+    $this->drupalGet('admin/structure/menu/item/1/edit');
     $this->assertSession()->statusCodeEquals(200);
     $this->assertSession()->elementExists('css', 'select#edit-menu-parent');
     $this->assertSession()->elementNotExists('css', 'select#edit-menu-parent > option[value="main:uw_base_profile.front_page"]');
@@ -1508,7 +1509,12 @@ class UwWcmsBasicTest extends BrowserTestBase {
     $this->drupalGet('admin/structure/menu/manage/main');
     $this->assertSession()->statusCodeEquals(200);
     $this->assertEquals(base_path() . 'catalogs', $this->getSession()->getPage()->findLink('Catalogs')->getAttribute('href'));
-    $this->assertSession()->checkboxNotChecked('edit-links-menu-plugin-iduw-main-menucatalogs-enabled');
+
+    // All menus items created using menu_link_content have uuid as part
+    // of their id. Getting menu id from tr element. And using that menu id
+    // to validate if checkbox is unchecked.
+    $menu_uuid = $this->getSession()->getPage()->findLink('Catalogs')->getParent()->getParent()->getAttribute('data-drupal-selector');
+    $this->assertSession()->checkboxNotChecked($menu_uuid . '-enabled');
   }
 
   /**