Skip to content
Snippets Groups Projects
Verified Commit e0216370 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3368713 by mondrake, longwave, Spokje, smustgrave, quietone, larowlan:...

Issue #3368713 by mondrake, longwave, Spokje, smustgrave, quietone, larowlan: Change @dataprovider to static in CommentLinkBuilderTest
parent abf79d71
No related branches found
No related tags found
29 merge requests!12227Issue #3181946 by jonmcl, mglaman,!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!5423Draft: Resolve #3329907 "Test2",!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3478Issue #3337882: Deleted menus are not removed from content type config,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #149615 canceled
......@@ -8,7 +8,6 @@
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Url;
use Drupal\node\NodeInterface;
use Drupal\Tests\Traits\Core\GeneratePermutationsTrait;
use Drupal\Tests\UnitTestCase;
......@@ -96,8 +95,8 @@ protected function setUp(): void {
/**
* Tests the buildCommentedEntityLinks method.
*
* @param \Drupal\node\NodeInterface|\PHPUnit\Framework\MockObject\MockObject $node
* Mock node.
* @param array $node_args
* Arguments for the mock node.
* @param array $context
* Context for the links.
* @param bool $has_access_comments
......@@ -116,7 +115,8 @@ protected function setUp(): void {
*
* @covers ::buildCommentedEntityLinks
*/
public function testCommentLinkBuilder(NodeInterface $node, $context, $has_access_comments, $history_exists, $has_post_comments, $is_anonymous, $expected) {
public function testCommentLinkBuilder(array $node_args, $context, $has_access_comments, $history_exists, $has_post_comments, $is_anonymous, $expected) {
$node = $this->getMockNode(...$node_args);
$this->moduleHandler->expects($this->any())
->method('moduleExists')
->with('history')
......@@ -161,11 +161,11 @@ public function testCommentLinkBuilder(NodeInterface $node, $context, $has_acces
/**
* Data provider for ::testCommentLinkBuilder.
*/
public function getLinkCombinations() {
public static function getLinkCombinations() {
$cases = [];
// No links should be created if the entity doesn't have the field.
$cases[] = [
$this->getMockNode(FALSE, CommentItemInterface::OPEN, CommentItemInterface::FORM_BELOW, 1),
[FALSE, CommentItemInterface::OPEN, CommentItemInterface::FORM_BELOW, 1],
['view_mode' => 'teaser'],
TRUE,
TRUE,
......@@ -176,7 +176,7 @@ public function getLinkCombinations() {
foreach (['search_result', 'search_index', 'print'] as $view_mode) {
// Nothing should be output in these view modes.
$cases[] = [
$this->getMockNode(TRUE, CommentItemInterface::OPEN, CommentItemInterface::FORM_BELOW, 1),
[TRUE, CommentItemInterface::OPEN, CommentItemInterface::FORM_BELOW, 1],
['view_mode' => $view_mode],
TRUE,
TRUE,
......@@ -202,10 +202,10 @@ public function getLinkCombinations() {
'teaser', 'rss', 'full',
],
];
$permutations = $this->generatePermutations($combinations);
$permutations = static::generatePermutations($combinations);
foreach ($permutations as $combination) {
$case = [
$this->getMockNode(TRUE, $combination['comments'], $combination['form_location'], $combination['comment_count']),
[TRUE, $combination['comments'], $combination['form_location'], $combination['comment_count']],
['view_mode' => $combination['view_mode']],
$combination['has_access_comments'],
$combination['history_exists'],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment