diff --git a/core/modules/config/tests/src/FunctionalJavascript/ConfigEntityTest.php b/core/modules/config/tests/src/FunctionalJavascript/ConfigEntityTest.php index b58c6a8..e05528a 100644 --- a/core/modules/config/tests/src/FunctionalJavascript/ConfigEntityTest.php +++ b/core/modules/config/tests/src/FunctionalJavascript/ConfigEntityTest.php @@ -51,7 +51,7 @@ public function testCRUDUI() { $assert_session->statusCodeEquals(200); $assert_session->responseContains($message_insert); $assert_session->responseNotContains($message_update); - $this->assertNotNull($page->find('css', 'a[href="/admin/structure/config_test/manage/' . $id . '"]')); + $assert_session->linkByHrefExists("admin/structure/config_test/manage/$id"); // Update the configuration entity. $this->drupalGet("admin/structure/config_test/manage/$id"); @@ -61,8 +61,8 @@ public function testCRUDUI() { $assert_session->statusCodeEquals(200); $assert_session->responseNotContains($message_insert); $assert_session->responseContains($message_update); - $this->assertNotNull($page->find('css', 'a[href="/admin/structure/config_test/manage/' . $id . '"]')); - $this->assertNotNull($page->find('css', 'a[href="/admin/structure/config_test/manage/' . $id . '/delete"]')); + $assert_session->linkByHrefExists("admin/structure/config_test/manage/$id"); + $assert_session->linkByHrefExists("admin/structure/config_test/manage/$id/delete"); // Delete the configuration entity. $this->drupalGet("admin/structure/config_test/manage/$id"); @@ -75,7 +75,7 @@ public function testCRUDUI() { $assert_session->responseNotContains($message_update); $assert_session->responseContains($message_delete); $assert_session->responseNotContains($label1); - $this->assertNull($page->find('css', 'a[href="/admin/structure/config_test/manage/' . $id . '"]')); + $assert_session->linkByHrefNotExists("admin/structure/config_test/manage/$id"); // Re-create a configuration entity. $this->drupalGet('admin/structure/config_test/add'); @@ -86,7 +86,7 @@ public function testCRUDUI() { $assert_session->addressEquals('admin/structure/config_test'); $assert_session->statusCodeEquals(200); $assert_session->responseContains($label1); - $this->assertNotNull($page->find('css', 'a[href="/admin/structure/config_test/manage/' . $id . '"]')); + $assert_session->linkByHrefExists("admin/structure/config_test/manage/$id"); // Rename the configuration entity's ID/machine name. $new_id = strtolower($this->randomMachineName()); @@ -100,10 +100,8 @@ public function testCRUDUI() { $assert_session->responseNotContains($label1); $assert_session->responseNotContains($label2); $assert_session->responseContains($label3); - $this->assertNull($page->find('css', 'a[href="/admin/structure/config_test/manage/' . $id . '"]')); - - $id = $new_id; - $this->assertNotNull($page->find('css', 'a[href="/admin/structure/config_test/manage/' . $id . '"]')); + $assert_session->linkByHrefNotExists("admin/structure/config_test/manage/$id"); + $assert_session->linkByHrefExists("admin/structure/config_test/manage/$new_id"); // Create a configuration entity with '0' machine name. $this->drupalGet('admin/structure/config_test/add'); @@ -114,8 +112,7 @@ public function testCRUDUI() { $assert_session->statusCodeEquals(200); $message_insert = new FormattableMarkup('%label configuration has been created.', ['%label' => '0']); $assert_session->responseContains($message_insert); - - $this->assertNotNull($page->find('css', 'a[href="/admin/structure/config_test/manage/0"]')); + $assert_session->linkByHrefExists("admin/structure/config_test/manage/0"); $delete_link = $page->find('css', 'a[href="/admin/structure/config_test/manage/0/delete"]'); // Expand the options.