diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml index 8bc6278..a252f97 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml @@ -1,3 +1,4 @@ +uuid: 2f71e413-f5d0-4650-9461-0cd933439b8a langcode: en status: true dependencies: @@ -26,21 +27,67 @@ display: type: basic fields: title: + id: title + table: node_field_data + field: title + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false alter: - absolute: false alter_text: false - ellipsis: false - html: false + text: '' make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: false + ellipsis: false + more_link: false + more_link_text: '' + more_link_path: '' strip_tags: false trim: false - word_boundary: false - empty_zero: false - field: title + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' hide_empty: false - id: title - label: '' - table: node_field_data + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false plugin_id: field entity_type: node entity_field: title @@ -163,6 +210,8 @@ display: status: expose: operator: '0' + operator_limit_selection: false + operator_list: { } field: status group: 1 id: status diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php index b4afccd..e05fcaf 100644 --- a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php @@ -62,8 +62,8 @@ public function testFeedOutput() { $this->config('system.site')->set('name', $site_name)->save(); $this->drupalGet('test-feed-display.xml'); - $this->assertEquals($site_name, $this->getSession()->getDriver()->getText('//title')); - $this->assertEquals($frontpage_url, $this->getSession()->getDriver()->getText('//link')); + $this->assertEquals($site_name, $this->getSession()->getDriver()->getText('//channel/title')); + $this->assertEquals($frontpage_url, $this->getSession()->getDriver()->getText('//channel/link')); $this->assertEquals('Copyright 2019 Dries Buytaert', $this->getSession()->getDriver()->getText('//channel/copyright')); $this->assertEquals($node_title, $this->getSession()->getDriver()->getText('//item/title')); $this->assertEquals($node_link, $this->getSession()->getDriver()->getText('//item/link')); @@ -76,7 +76,7 @@ public function testFeedOutput() { $view->save(); $this->drupalGet('test-feed-display.xml'); - $this->assertEquals('test_display_feed', $this->getSession()->getDriver()->getText('//title')); + $this->assertEquals('test_display_feed', $this->getSession()->getDriver()->getText('//channel/title')); // Add a block display and attach the feed. $view->getExecutable()->newDisplay('block', NULL, 'test'); @@ -120,7 +120,7 @@ public function testFeedFieldOutput() { $node_link = $node->toUrl()->setAbsolute()->toString(); $this->drupalGet('test-feed-display-fields.xml'); - $this->assertEquals($node_title, $this->getSession()->getDriver()->getText('//title/a')); + $this->assertEquals($node_title, $this->getSession()->getDriver()->getText('//item/title')); $this->assertEquals($node_link, $this->getSession()->getDriver()->getText('//item/link')); // Verify HTML is properly escaped in the description field. $this->assertRaw('<p>A paragraph</p>'); diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php index 0b43613..1dd1247 100644 --- a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php @@ -139,10 +139,7 @@ public function testFeedFieldOutput() { // we find, and then assert that the rest of the content of that item is // what we expect for the given langcode. foreach ($items as $item) { - // Sadly, the test view we're using uses links in the title. - // @todo Fix the test view to not do this and update selectors. - // @see https://www.drupal.org/project/drupal/issues/3092571 - $title_element = $item->findAll('xpath', 'title/a'); + $title_element = $item->findAll('xpath', 'title'); $this->assertCount(1, $title_element); $langcode = $title_element[0]->getText(); $this->assertArrayHasKey($langcode, $expected);