diff --git a/core/modules/comment/config/optional/views.view.comment.yml b/core/modules/comment/config/optional/views.view.comment.yml index db85e63716..478986f653 100644 --- a/core/modules/comment/config/optional/views.view.comment.yml +++ b/core/modules/comment/config/optional/views.view.comment.yml @@ -722,7 +722,7 @@ display: description: '' use_operator: false operator: combine_op - identifier: combine + identifier: author_name required: false remember: false multiple: false @@ -995,7 +995,7 @@ display: description: '' use_operator: false operator: combine_op - identifier: combine + identifier: author_name required: false remember: false multiple: false diff --git a/core/modules/comment/src/Tests/Views/CommentAdminTest.php b/core/modules/comment/src/Tests/Views/CommentAdminTest.php index 12324ae2d8..c834bca98c 100644 --- a/core/modules/comment/src/Tests/Views/CommentAdminTest.php +++ b/core/modules/comment/src/Tests/Views/CommentAdminTest.php @@ -52,7 +52,7 @@ public function testApprovalAdminInterface() { // Assert the expose filters on the admin page. $this->assertField('subject'); - $this->assertField('combine'); + $this->assertField('author_name'); $this->assertField('langcode'); $this->drupalLogout(); @@ -106,7 +106,7 @@ public function testApprovalAdminInterface() { // Assert the expose filters on the admin page. $this->assertField('subject'); - $this->assertField('combine'); + $this->assertField('author_name'); $this->assertField('langcode'); $edit = [ diff --git a/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php b/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php index 856fbcfe9a..bfbbd4e270 100644 --- a/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php +++ b/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php @@ -115,7 +115,7 @@ protected function setUp($import_test_views = TRUE) { */ public function testFilters() { $this->doTestFilters('page_1'); - // Unpublish the comment to test the Unapproved comments tab. + // Unpublish the comments to test the Unapproved comments tab. foreach ($this->comments as $comment) { $comment->setUnpublished(); $comment->save(); @@ -144,7 +144,7 @@ protected function doTestFilters($display_id) { // Assert the expose filters on the admin page. $this->assertField('subject'); - $this->assertField('combine'); + $this->assertField('author_name'); $this->assertField('langcode'); $elements = $this->cssSelect('input[type="checkbox"]'); @@ -171,7 +171,7 @@ protected function doTestFilters($display_id) { $executable->destroy(); // Test the combine filter using author name. - $executable->setExposedInput(['combine' => 'barry']); + $executable->setExposedInput(['author_name' => 'barry']); $build = $executable->preview($display_id); $this->setRawContent($renderer->renderRoot($build)); $this->verbose($this->getRawContent()); @@ -180,8 +180,8 @@ protected function doTestFilters($display_id) { $this->assertEquals(1, count($elements), 'Only anonymous comment is visible.'); $executable->destroy(); - // Test the combine filter using username. - $executable->setExposedInput(['combine' => $this->adminUser->label()]); + // Test the combine filter using username. + $executable->setExposedInput(['author_name' => $this->adminUser->label()]); $build = $executable->preview($display_id); $this->setRawContent($renderer->renderRoot($build)); $this->verbose($this->getRawContent());