diff --git a/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php b/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php index 350a86adf2..78764fb32d 100644 --- a/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php +++ b/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php @@ -4,6 +4,7 @@ use Drupal\Core\Entity\Entity\EntityFormMode; use Drupal\Core\Entity\Entity\EntityViewMode; +use Drupal\Core\Url; use Drupal\Tests\BrowserTestBase; /** @@ -73,10 +74,10 @@ public function testEntityViewModeUI() { // Test that the link templates added by field_ui_entity_type_build() are // generating valid routes. $view_mode = EntityViewMode::load('entity_test.' . $edit['id']); - $this->assertSame('/admin/structure/display-modes/view', $view_mode->toUrl('collection')->toString()); - $this->assertSame('/admin/structure/display-modes/view/add/entity_test', $view_mode->toUrl('add-form')->toString()); - $this->assertSame('/admin/structure/display-modes/view/manage/entity_test.' . $edit['id'], $view_mode->toUrl('edit-form')->toString()); - $this->assertSame('/admin/structure/display-modes/view/manage/entity_test.' . $edit['id'] . '/delete', $view_mode->toUrl('delete-form')->toString()); + $this->assertEquals(Url::fromRoute('entity.entity_view_mode.collection')->toString(), $view_mode->toUrl('collection')->toString()); + $this->assertEquals(Url::fromRoute('entity.entity_view_mode.add_form', ['entity_type_id' => $view_mode->getTargetType()])->toString(), $view_mode->toUrl('add-form')->toString()); + $this->assertEquals(Url::fromRoute('entity.entity_view_mode.edit_form', ['entity_view_mode' => $view_mode->id()])->toString(), $view_mode->toUrl('edit-form')->toString()); + $this->assertEquals(Url::fromRoute('entity.entity_view_mode.delete_form', ['entity_view_mode' => $view_mode->id()])->toString(), $view_mode->toUrl('delete-form')->toString()); // Test deleting the view mode. $this->clickLink(t('Delete')); @@ -126,11 +127,11 @@ public function testEntityFormModeUI() { // Test that the link templates added by field_ui_entity_type_build() are // generating valid routes. - $view_mode = EntityFormMode::load('entity_test.' . $edit['id']); - $this->assertSame('/admin/structure/display-modes/form', $view_mode->toUrl('collection')->toString()); - $this->assertSame('/admin/structure/display-modes/form/add/entity_test', $view_mode->toUrl('add-form')->toString()); - $this->assertSame('/admin/structure/display-modes/form/manage/entity_test.' . $edit['id'], $view_mode->toUrl('edit-form')->toString()); - $this->assertSame('/admin/structure/display-modes/form/manage/entity_test.' . $edit['id'] . '/delete', $view_mode->toUrl('delete-form')->toString()); + $form_mode = EntityFormMode::load('entity_test.' . $edit['id']); + $this->assertEquals(Url::fromRoute('entity.entity_form_mode.collection')->toString(), $form_mode->toUrl('collection')->toString()); + $this->assertEquals(Url::fromRoute('entity.entity_form_mode.add_form', ['entity_type_id' => $form_mode->getTargetType()])->toString(), $form_mode->toUrl('add-form')->toString()); + $this->assertEquals(Url::fromRoute('entity.entity_form_mode.edit_form', ['entity_form_mode' => $form_mode->id()])->toString(), $form_mode->toUrl('edit-form')->toString()); + $this->assertEquals(Url::fromRoute('entity.entity_form_mode.delete_form', ['entity_form_mode' => $form_mode->id()])->toString(), $form_mode->toUrl('delete-form')->toString()); // Test deleting the form mode. $this->clickLink(t('Delete'));