updated core
This commit is contained in:
Bachir Soussi Chiadmi
@@ -324,7 +324,7 @@ class CommentStorage extends SqlContentEntityStorage implements CommentStorageIn
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getUnapprovedCount() {
|
||||
return $this->database->select('comment_field_data', 'c')
|
||||
return $this->database->select('comment_field_data', 'c')
|
||||
->condition('status', CommentInterface::NOT_PUBLISHED, '=')
|
||||
->condition('default_langcode', 1)
|
||||
->countQuery()
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Controller;
|
||||
|
||||
use Drupal\Core\Controller\ControllerBase;
|
||||
use Drupal\Core\Form\FormBuilderInterface;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
* Returns responses for comment module administrative routes.
|
||||
*/
|
||||
class AdminController extends ControllerBase {
|
||||
|
||||
/**
|
||||
* The form builder.
|
||||
*
|
||||
* @var \Drupal\Core\Form\FormBuilderInterface
|
||||
*/
|
||||
protected $formBuilder;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function create(ContainerInterface $container) {
|
||||
return new static(
|
||||
$container->get('form_builder')
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an AdminController object.
|
||||
*
|
||||
* @param \Drupal\Core\Form\FormBuilderInterface $form_builder
|
||||
* The form builder.
|
||||
*/
|
||||
public function __construct(FormBuilderInterface $form_builder) {
|
||||
$this->formBuilder = $form_builder;
|
||||
}
|
||||
|
||||
/**
|
||||
* Presents an administrative comment listing.
|
||||
*
|
||||
* @param \Symfony\Component\HttpFoundation\Request $request
|
||||
* The request of the page.
|
||||
* @param string $type
|
||||
* The type of the overview form ('approval' or 'new') default to 'new'.
|
||||
*
|
||||
* @return array
|
||||
* Then comment multiple delete confirmation form or the comments overview
|
||||
* administration form.
|
||||
*/
|
||||
public function adminPage(Request $request, $type = 'new') {
|
||||
if ($request->request->get('operation') == 'delete' && $request->request->get('comments')) {
|
||||
return $this->formBuilder->getForm('\Drupal\comment\Form\ConfirmDeleteMultiple', $request);
|
||||
}
|
||||
else {
|
||||
return $this->formBuilder->getForm('\Drupal\comment\Form\CommentAdminOverview', $type);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -73,6 +73,8 @@ class Comment extends ContentEntityBase implements CommentInterface {
|
||||
|
||||
/**
|
||||
* The thread for which a lock was acquired.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $threadLock = '';
|
||||
|
||||
|
||||
@@ -78,7 +78,7 @@ class CommentDefaultFormatter extends FormatterBase implements ContainerFactoryP
|
||||
protected $entityFormBuilder;
|
||||
|
||||
/**
|
||||
* @param \Drupal\Core\Routing\RouteMatchInterface $routeMatch
|
||||
* @var \Drupal\Core\Routing\RouteMatchInterface
|
||||
*/
|
||||
protected $routeMatch;
|
||||
|
||||
|
||||
@@ -41,9 +41,9 @@ class EntityComment extends EntityContentBase {
|
||||
* The plugin_id for the plugin instance.
|
||||
* @param mixed $plugin_definition
|
||||
* The plugin implementation definition.
|
||||
* @param MigrationInterface $migration
|
||||
* @param \Drupal\migrate\Plugin\MigrationInterface $migration
|
||||
* The migration.
|
||||
* @param EntityStorageInterface $storage
|
||||
* @param \Drupal\Core\Entity\EntityStorageInterface $storage
|
||||
* The storage for this entity type.
|
||||
* @param array $bundles
|
||||
* The list of bundles this entity type has.
|
||||
|
||||
@@ -30,7 +30,7 @@ class CommentVariable extends DrupalSqlBase {
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function count() {
|
||||
public function count($refresh = FALSE) {
|
||||
return count($this->getCommentVariables());
|
||||
}
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@ class Thread extends SortPluginBase {
|
||||
public function query() {
|
||||
$this->ensureMyTable();
|
||||
|
||||
// Read comment_render() in comment.module for an explanation of the
|
||||
// thinking behind this sort.
|
||||
// See \Drupal\comment\CommentStorage::loadThread() for an explanation of
|
||||
// the thinking behind this sort.
|
||||
if ($this->options['order'] == 'DESC') {
|
||||
$this->query->addOrderBy($this->tableAlias, $this->realField, $this->options['order']);
|
||||
}
|
||||
|
||||
@@ -21,6 +21,8 @@ class Comment extends WizardPluginBase {
|
||||
|
||||
/**
|
||||
* Set the created column.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $createdColumn = 'created';
|
||||
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\system\Entity\Action;
|
||||
|
||||
/**
|
||||
* Tests actions provided by the Comment module.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentActionsTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['dblog', 'action'];
|
||||
|
||||
/**
|
||||
* Tests comment publish and unpublish actions.
|
||||
*/
|
||||
public function testCommentPublishUnpublishActions() {
|
||||
$this->drupalLogin($this->webUser);
|
||||
$comment_text = $this->randomMachineName();
|
||||
$subject = $this->randomMachineName();
|
||||
$comment = $this->postComment($this->node, $comment_text, $subject);
|
||||
|
||||
// Unpublish a comment.
|
||||
$action = Action::load('comment_unpublish_action');
|
||||
$action->execute([$comment]);
|
||||
$this->assertTrue($comment->isPublished() === FALSE, 'Comment was unpublished');
|
||||
|
||||
// Publish a comment.
|
||||
$action = Action::load('comment_publish_action');
|
||||
$action->execute([$comment]);
|
||||
$this->assertTrue($comment->isPublished() === TRUE, 'Comment was published');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the unpublish comment by keyword action.
|
||||
*/
|
||||
public function testCommentUnpublishByKeyword() {
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$keyword_1 = $this->randomMachineName();
|
||||
$keyword_2 = $this->randomMachineName();
|
||||
$action = Action::create([
|
||||
'id' => 'comment_unpublish_by_keyword_action',
|
||||
'label' => $this->randomMachineName(),
|
||||
'type' => 'comment',
|
||||
'configuration' => [
|
||||
'keywords' => [$keyword_1, $keyword_2],
|
||||
],
|
||||
'plugin' => 'comment_unpublish_by_keyword_action',
|
||||
]);
|
||||
$action->save();
|
||||
|
||||
$comment = $this->postComment($this->node, $keyword_2, $this->randomMachineName());
|
||||
|
||||
// Load the full comment so that status is available.
|
||||
$comment = Comment::load($comment->id());
|
||||
|
||||
$this->assertTrue($comment->isPublished() === TRUE, 'The comment status was set to published.');
|
||||
|
||||
$action->execute([$comment]);
|
||||
$this->assertTrue($comment->isPublished() === FALSE, 'The comment status was set to not published.');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,218 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\user\RoleInterface;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
|
||||
/**
|
||||
* Tests comment approval functionality.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentAdminTest extends CommentTestBase {
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->drupalPlaceBlock('page_title_block');
|
||||
}
|
||||
|
||||
/**
|
||||
* Test comment approval functionality through admin/content/comment.
|
||||
*/
|
||||
public function testApprovalAdminInterface() {
|
||||
// Set anonymous comments to require approval.
|
||||
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments' => TRUE,
|
||||
'post comments' => TRUE,
|
||||
'skip comment approval' => FALSE,
|
||||
]);
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentAnonymous('0'); // Ensure that doesn't require contact info.
|
||||
|
||||
// Test that the comments page loads correctly when there are no comments
|
||||
$this->drupalGet('admin/content/comment');
|
||||
$this->assertText(t('No comments available.'));
|
||||
|
||||
$this->drupalLogout();
|
||||
|
||||
// Post anonymous comment without contact info.
|
||||
$subject = $this->randomMachineName();
|
||||
$body = $this->randomMachineName();
|
||||
$this->postComment($this->node, $body, $subject, TRUE); // Set $contact to true so that it won't check for id and message.
|
||||
$this->assertText(t('Your comment has been queued for review by site administrators and will be published after approval.'), 'Comment requires approval.');
|
||||
|
||||
// Get unapproved comment id.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$anonymous_comment4 = $this->getUnapprovedComment($subject);
|
||||
$anonymous_comment4 = Comment::create([
|
||||
'cid' => $anonymous_comment4,
|
||||
'subject' => $subject,
|
||||
'comment_body' => $body,
|
||||
'entity_id' => $this->node->id(),
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'comment'
|
||||
]);
|
||||
$this->drupalLogout();
|
||||
|
||||
$this->assertFalse($this->commentExists($anonymous_comment4), 'Anonymous comment was not published.');
|
||||
|
||||
// Approve comment.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->performCommentOperation($anonymous_comment4, 'publish', TRUE);
|
||||
$this->drupalLogout();
|
||||
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertTrue($this->commentExists($anonymous_comment4), 'Anonymous comment visible.');
|
||||
|
||||
// Post 2 anonymous comments without contact info.
|
||||
$comments[] = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
$comments[] = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
|
||||
// Publish multiple comments in one operation.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->drupalGet('admin/content/comment/approval');
|
||||
$this->assertText(t('Unapproved comments (@count)', ['@count' => 2]), 'Two unapproved comments waiting for approval.');
|
||||
$edit = [
|
||||
"comments[{$comments[0]->id()}]" => 1,
|
||||
"comments[{$comments[1]->id()}]" => 1,
|
||||
];
|
||||
$this->drupalPostForm(NULL, $edit, t('Update'));
|
||||
$this->assertText(t('Unapproved comments (@count)', ['@count' => 0]), 'All comments were approved.');
|
||||
|
||||
// Delete multiple comments in one operation.
|
||||
$edit = [
|
||||
'operation' => 'delete',
|
||||
"comments[{$comments[0]->id()}]" => 1,
|
||||
"comments[{$comments[1]->id()}]" => 1,
|
||||
"comments[{$anonymous_comment4->id()}]" => 1,
|
||||
];
|
||||
$this->drupalPostForm(NULL, $edit, t('Update'));
|
||||
$this->assertText(t('Are you sure you want to delete these comments and all their children?'), 'Confirmation required.');
|
||||
$this->drupalPostForm(NULL, $edit, t('Delete comments'));
|
||||
$this->assertText(t('No comments available.'), 'All comments were deleted.');
|
||||
// Test message when no comments selected.
|
||||
$edit = [
|
||||
'operation' => 'delete',
|
||||
];
|
||||
$this->drupalPostForm(NULL, $edit, t('Update'));
|
||||
$this->assertText(t('Select one or more comments to perform the update on.'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests comment approval functionality through the node interface.
|
||||
*/
|
||||
public function testApprovalNodeInterface() {
|
||||
// Set anonymous comments to require approval.
|
||||
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments' => TRUE,
|
||||
'post comments' => TRUE,
|
||||
'skip comment approval' => FALSE,
|
||||
]);
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentAnonymous('0'); // Ensure that doesn't require contact info.
|
||||
$this->drupalLogout();
|
||||
|
||||
// Post anonymous comment without contact info.
|
||||
$subject = $this->randomMachineName();
|
||||
$body = $this->randomMachineName();
|
||||
$this->postComment($this->node, $body, $subject, TRUE); // Set $contact to true so that it won't check for id and message.
|
||||
$this->assertText(t('Your comment has been queued for review by site administrators and will be published after approval.'), 'Comment requires approval.');
|
||||
|
||||
// Get unapproved comment id.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$anonymous_comment4 = $this->getUnapprovedComment($subject);
|
||||
$anonymous_comment4 = Comment::create([
|
||||
'cid' => $anonymous_comment4,
|
||||
'subject' => $subject,
|
||||
'comment_body' => $body,
|
||||
'entity_id' => $this->node->id(),
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'comment'
|
||||
]);
|
||||
$this->drupalLogout();
|
||||
|
||||
$this->assertFalse($this->commentExists($anonymous_comment4), 'Anonymous comment was not published.');
|
||||
|
||||
// Approve comment.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->drupalGet('comment/1/approve');
|
||||
$this->assertResponse(403, 'Forged comment approval was denied.');
|
||||
$this->drupalGet('comment/1/approve', ['query' => ['token' => 'forged']]);
|
||||
$this->assertResponse(403, 'Forged comment approval was denied.');
|
||||
$this->drupalGet('comment/1/edit');
|
||||
$this->assertFieldChecked('edit-status-0');
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->clickLink(t('Approve'));
|
||||
$this->drupalLogout();
|
||||
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertTrue($this->commentExists($anonymous_comment4), 'Anonymous comment visible.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests comment bundle admin.
|
||||
*/
|
||||
public function testCommentAdmin() {
|
||||
// Login.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
// Browse to comment bundle overview.
|
||||
$this->drupalGet('admin/structure/comment');
|
||||
$this->assertResponse(200);
|
||||
// Make sure titles visible.
|
||||
$this->assertText('Comment type');
|
||||
$this->assertText('Description');
|
||||
// Make sure the description is present.
|
||||
$this->assertText('Default comment field');
|
||||
// Manage fields.
|
||||
$this->clickLink('Manage fields');
|
||||
$this->assertResponse(200);
|
||||
// Make sure comment_body field is shown.
|
||||
$this->assertText('comment_body');
|
||||
// Rest from here on in is field_ui.
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests editing a comment as an admin.
|
||||
*/
|
||||
public function testEditComment() {
|
||||
// Enable anonymous user comments.
|
||||
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments',
|
||||
'post comments',
|
||||
'skip comment approval',
|
||||
]);
|
||||
|
||||
// Log in as a web user.
|
||||
$this->drupalLogin($this->webUser);
|
||||
// Post a comment.
|
||||
$comment = $this->postComment($this->node, $this->randomMachineName());
|
||||
|
||||
$this->drupalLogout();
|
||||
|
||||
// Post anonymous comment.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentAnonymous('2'); // Ensure that we need email id before posting comment.
|
||||
$this->drupalLogout();
|
||||
|
||||
// Post comment with contact info (required).
|
||||
$author_name = $this->randomMachineName();
|
||||
$author_mail = $this->randomMachineName() . '@example.com';
|
||||
$anonymous_comment = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), ['name' => $author_name, 'mail' => $author_mail]);
|
||||
|
||||
// Log in as an admin user.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
// Make sure the comment field is not visible when
|
||||
// the comment was posted by an authenticated user.
|
||||
$this->drupalGet('comment/' . $comment->id() . '/edit');
|
||||
$this->assertNoFieldById('edit-mail', $comment->getAuthorEmail());
|
||||
|
||||
// Make sure the comment field is visible when
|
||||
// the comment was posted by an anonymous user.
|
||||
$this->drupalGet('comment/' . $anonymous_comment->id() . '/edit');
|
||||
$this->assertFieldById('edit-mail', $anonymous_comment->getAuthorEmail());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,203 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\user\RoleInterface;
|
||||
|
||||
/**
|
||||
* Tests anonymous commenting.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentAnonymousTest extends CommentTestBase {
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
// Enable anonymous and authenticated user comments.
|
||||
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments',
|
||||
'post comments',
|
||||
'skip comment approval',
|
||||
]);
|
||||
user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, [
|
||||
'access comments',
|
||||
'post comments',
|
||||
'skip comment approval',
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests anonymous comment functionality.
|
||||
*/
|
||||
public function testAnonymous() {
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentAnonymous(COMMENT_ANONYMOUS_MAYNOT_CONTACT);
|
||||
$this->drupalLogout();
|
||||
|
||||
// Preview comments (with `skip comment approval` permission).
|
||||
$edit = [];
|
||||
$title = 'comment title with skip comment approval';
|
||||
$body = 'comment body with skip comment approval';
|
||||
$edit['subject[0][value]'] = $title;
|
||||
$edit['comment_body[0][value]'] = $body;
|
||||
$this->drupalPostForm($this->node->urlInfo(), $edit, t('Preview'));
|
||||
// Cannot use assertRaw here since both title and body are in the form.
|
||||
$preview = (string) $this->cssSelect('.preview')[0]->asXML();
|
||||
$this->assertTrue(strpos($preview, $title) !== FALSE, 'Anonymous user can preview comment title.');
|
||||
$this->assertTrue(strpos($preview, $body) !== FALSE, 'Anonymous user can preview comment body.');
|
||||
|
||||
// Preview comments (without `skip comment approval` permission).
|
||||
user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['skip comment approval']);
|
||||
$edit = [];
|
||||
$title = 'comment title without skip comment approval';
|
||||
$body = 'comment body without skip comment approval';
|
||||
$edit['subject[0][value]'] = $title;
|
||||
$edit['comment_body[0][value]'] = $body;
|
||||
$this->drupalPostForm($this->node->urlInfo(), $edit, t('Preview'));
|
||||
// Cannot use assertRaw here since both title and body are in the form.
|
||||
$preview = (string) $this->cssSelect('.preview')[0]->asXML();
|
||||
$this->assertTrue(strpos($preview, $title) !== FALSE, 'Anonymous user can preview comment title.');
|
||||
$this->assertTrue(strpos($preview, $body) !== FALSE, 'Anonymous user can preview comment body.');
|
||||
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['skip comment approval']);
|
||||
|
||||
// Post anonymous comment without contact info.
|
||||
$anonymous_comment1 = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName());
|
||||
$this->assertTrue($this->commentExists($anonymous_comment1), 'Anonymous comment without contact info found.');
|
||||
|
||||
// Ensure anonymous users cannot post in the name of registered users.
|
||||
$edit = [
|
||||
'name' => $this->adminUser->getUsername(),
|
||||
'comment_body[0][value]' => $this->randomMachineName(),
|
||||
];
|
||||
$this->drupalPostForm('comment/reply/node/' . $this->node->id() . '/comment', $edit, t('Save'));
|
||||
$this->assertRaw(t('The name you used (%name) belongs to a registered user.', [
|
||||
'%name' => $this->adminUser->getUsername(),
|
||||
]));
|
||||
|
||||
// Allow contact info.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentAnonymous(COMMENT_ANONYMOUS_MAY_CONTACT);
|
||||
|
||||
// Attempt to edit anonymous comment.
|
||||
$this->drupalGet('comment/' . $anonymous_comment1->id() . '/edit');
|
||||
$edited_comment = $this->postComment(NULL, $this->randomMachineName(), $this->randomMachineName());
|
||||
$this->assertTrue($this->commentExists($edited_comment, FALSE), 'Modified reply found.');
|
||||
$this->drupalLogout();
|
||||
|
||||
// Post anonymous comment with contact info (optional).
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
|
||||
$this->assertTrue($this->commentContactInfoAvailable(), 'Contact information available.');
|
||||
|
||||
// Check the presence of expected cache tags.
|
||||
$this->assertCacheTag('config:field.field.node.article.comment');
|
||||
$this->assertCacheTag('config:user.settings');
|
||||
|
||||
$anonymous_comment2 = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName());
|
||||
$this->assertTrue($this->commentExists($anonymous_comment2), 'Anonymous comment with contact info (optional) found.');
|
||||
|
||||
// Ensure anonymous users cannot post in the name of registered users.
|
||||
$edit = [
|
||||
'name' => $this->adminUser->getUsername(),
|
||||
'mail' => $this->randomMachineName() . '@example.com',
|
||||
'subject[0][value]' => $this->randomMachineName(),
|
||||
'comment_body[0][value]' => $this->randomMachineName(),
|
||||
];
|
||||
$this->drupalPostForm('comment/reply/node/' . $this->node->id() . '/comment', $edit, t('Save'));
|
||||
$this->assertRaw(t('The name you used (%name) belongs to a registered user.', [
|
||||
'%name' => $this->adminUser->getUsername(),
|
||||
]));
|
||||
|
||||
// Require contact info.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentAnonymous(COMMENT_ANONYMOUS_MUST_CONTACT);
|
||||
$this->drupalLogout();
|
||||
|
||||
// Try to post comment with contact info (required).
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
|
||||
$this->assertTrue($this->commentContactInfoAvailable(), 'Contact information available.');
|
||||
|
||||
$anonymous_comment3 = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
// Name should have 'Anonymous' for value by default.
|
||||
$this->assertText(t('Email field is required.'), 'Email required.');
|
||||
$this->assertFalse($this->commentExists($anonymous_comment3), 'Anonymous comment with contact info (required) not found.');
|
||||
|
||||
// Post comment with contact info (required).
|
||||
$author_name = $this->randomMachineName();
|
||||
$author_mail = $this->randomMachineName() . '@example.com';
|
||||
$anonymous_comment3 = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), ['name' => $author_name, 'mail' => $author_mail]);
|
||||
$this->assertTrue($this->commentExists($anonymous_comment3), 'Anonymous comment with contact info (required) found.');
|
||||
|
||||
// Make sure the user data appears correctly when editing the comment.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->drupalGet('comment/' . $anonymous_comment3->id() . '/edit');
|
||||
$this->assertRaw($author_name, "The anonymous user's name is correct when editing the comment.");
|
||||
$this->assertFieldByName('uid', '', 'The author field is empty (i.e. anonymous) when editing the comment.');
|
||||
$this->assertRaw($author_mail, "The anonymous user's email address is correct when editing the comment.");
|
||||
|
||||
// Unpublish comment.
|
||||
$this->performCommentOperation($anonymous_comment3, 'unpublish');
|
||||
|
||||
$this->drupalGet('admin/content/comment/approval');
|
||||
$this->assertRaw('comments[' . $anonymous_comment3->id() . ']', 'Comment was unpublished.');
|
||||
|
||||
// Publish comment.
|
||||
$this->performCommentOperation($anonymous_comment3, 'publish', TRUE);
|
||||
|
||||
$this->drupalGet('admin/content/comment');
|
||||
$this->assertRaw('comments[' . $anonymous_comment3->id() . ']', 'Comment was published.');
|
||||
|
||||
// Delete comment.
|
||||
$this->performCommentOperation($anonymous_comment3, 'delete');
|
||||
|
||||
$this->drupalGet('admin/content/comment');
|
||||
$this->assertNoRaw('comments[' . $anonymous_comment3->id() . ']', 'Comment was deleted.');
|
||||
$this->drupalLogout();
|
||||
|
||||
// Comment 3 was deleted.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $anonymous_comment3->id());
|
||||
$this->assertResponse(403);
|
||||
|
||||
// Reset.
|
||||
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments' => FALSE,
|
||||
'post comments' => FALSE,
|
||||
'skip comment approval' => FALSE,
|
||||
]);
|
||||
|
||||
// Attempt to view comments while disallowed.
|
||||
// NOTE: if authenticated user has permission to post comments, then a
|
||||
// "Login or register to post comments" type link may be shown.
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertNoPattern('@<h2[^>]*>Comments</h2>@', 'Comments were not displayed.');
|
||||
$this->assertNoLink('Add new comment', 'Link to add comment was found.');
|
||||
|
||||
// Attempt to view node-comment form while disallowed.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
|
||||
$this->assertResponse(403);
|
||||
|
||||
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments' => TRUE,
|
||||
'post comments' => FALSE,
|
||||
'skip comment approval' => FALSE,
|
||||
]);
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertPattern('@<h2[^>]*>Comments</h2>@', 'Comments were displayed.');
|
||||
$this->assertLink('Log in', 1, 'Link to login was found.');
|
||||
$this->assertLink('register', 1, 'Link to register was found.');
|
||||
|
||||
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments' => FALSE,
|
||||
'post comments' => TRUE,
|
||||
'skip comment approval' => TRUE,
|
||||
]);
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertNoPattern('@<h2[^>]*>Comments</h2>@', 'Comments were not displayed.');
|
||||
$this->assertFieldByName('subject[0][value]', '', 'Subject field found.');
|
||||
$this->assertFieldByName('comment_body[0][value]', '', 'Comment field found.');
|
||||
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $anonymous_comment2->id());
|
||||
$this->assertResponse(403);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,90 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\Component\Utility\SafeMarkup;
|
||||
use Drupal\user\RoleInterface;
|
||||
|
||||
/**
|
||||
* Tests comment block functionality.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentBlockTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['block', 'views'];
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
// Update admin user to have the 'administer blocks' permission.
|
||||
$this->adminUser = $this->drupalCreateUser([
|
||||
'administer content types',
|
||||
'administer comments',
|
||||
'skip comment approval',
|
||||
'post comments',
|
||||
'access comments',
|
||||
'access content',
|
||||
'administer blocks',
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the recent comments block.
|
||||
*/
|
||||
public function testRecentCommentBlock() {
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$block = $this->drupalPlaceBlock('views_block:comments_recent-block_1');
|
||||
|
||||
// Add some test comments, with and without subjects. Because the 10 newest
|
||||
// comments should be shown by the block, we create 11 to test that behavior
|
||||
// below.
|
||||
$timestamp = REQUEST_TIME;
|
||||
for ($i = 0; $i < 11; ++$i) {
|
||||
$subject = ($i % 2) ? $this->randomMachineName() : '';
|
||||
$comments[$i] = $this->postComment($this->node, $this->randomMachineName(), $subject);
|
||||
$comments[$i]->created->value = $timestamp--;
|
||||
$comments[$i]->save();
|
||||
}
|
||||
|
||||
// Test that a user without the 'access comments' permission cannot see the
|
||||
// block.
|
||||
$this->drupalLogout();
|
||||
user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['access comments']);
|
||||
$this->drupalGet('');
|
||||
$this->assertNoText(t('Recent comments'));
|
||||
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access comments']);
|
||||
|
||||
// Test that a user with the 'access comments' permission can see the
|
||||
// block.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->drupalGet('');
|
||||
$this->assertText(t('Recent comments'));
|
||||
|
||||
// Test the only the 10 latest comments are shown and in the proper order.
|
||||
$this->assertNoText($comments[10]->getSubject(), 'Comment 11 not found in block.');
|
||||
for ($i = 0; $i < 10; $i++) {
|
||||
$this->assertText($comments[$i]->getSubject(), SafeMarkup::format('Comment @number found in block.', ['@number' => 10 - $i]));
|
||||
if ($i > 1) {
|
||||
$previous_position = $position;
|
||||
$position = strpos($this->getRawContent(), $comments[$i]->getSubject());
|
||||
$this->assertTrue($position > $previous_position, SafeMarkup::format('Comment @a appears after comment @b', ['@a' => 10 - $i, '@b' => 11 - $i]));
|
||||
}
|
||||
$position = strpos($this->getRawContent(), $comments[$i]->getSubject());
|
||||
}
|
||||
|
||||
// Test that links to comments work when comments are across pages.
|
||||
$this->setCommentsPerPage(1);
|
||||
|
||||
for ($i = 0; $i < 10; $i++) {
|
||||
$this->clickLink($comments[$i]->getSubject());
|
||||
$this->assertText($comments[$i]->getSubject(), 'Comment link goes to correct page.');
|
||||
$this->assertRaw('<link rel="canonical"', 'Canonical URL was found in the HTML head');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\CommentInterface;
|
||||
use Drupal\node\Entity\Node;
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
|
||||
/**
|
||||
* Tests visibility of comments on book pages.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentBookTest extends WebTestBase {
|
||||
|
||||
use CommentTestTrait;
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['book', 'comment'];
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
// Create comment field on book.
|
||||
$this->addDefaultCommentField('node', 'book');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests comments in book export.
|
||||
*/
|
||||
public function testBookCommentPrint() {
|
||||
$book_node = Node::create([
|
||||
'type' => 'book',
|
||||
'title' => 'Book title',
|
||||
'body' => 'Book body',
|
||||
]);
|
||||
$book_node->book['bid'] = 'new';
|
||||
$book_node->save();
|
||||
|
||||
$comment_subject = $this->randomMachineName(8);
|
||||
$comment_body = $this->randomMachineName(8);
|
||||
$comment = Comment::create([
|
||||
'subject' => $comment_subject,
|
||||
'comment_body' => $comment_body,
|
||||
'entity_id' => $book_node->id(),
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'comment',
|
||||
'status' => CommentInterface::PUBLISHED,
|
||||
]);
|
||||
$comment->save();
|
||||
|
||||
$commenting_user = $this->drupalCreateUser(['access printer-friendly version', 'access comments', 'post comments']);
|
||||
$this->drupalLogin($commenting_user);
|
||||
|
||||
$this->drupalGet('node/' . $book_node->id());
|
||||
|
||||
$this->assertText($comment_subject, 'Comment subject found');
|
||||
$this->assertText($comment_body, 'Comment body found');
|
||||
$this->assertText(t('Add new comment'), 'Comment form found');
|
||||
$this->assertField('subject[0][value]', 'Comment form subject found');
|
||||
|
||||
$this->drupalGet('book/export/html/' . $book_node->id());
|
||||
|
||||
$this->assertText(t('Comments'), 'Comment thread found');
|
||||
$this->assertText($comment_subject, 'Comment subject found');
|
||||
$this->assertText($comment_body, 'Comment body found');
|
||||
|
||||
$this->assertNoText(t('Add new comment'), 'Comment form not found');
|
||||
$this->assertNoField('subject[0][value]', 'Comment form subject not found');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,134 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\Core\Language\LanguageInterface;
|
||||
use Drupal\comment\CommentInterface;
|
||||
use Drupal\user\RoleInterface;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
|
||||
/**
|
||||
* Tests CSS classes on comments.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentCSSTest extends CommentTestBase {
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
// Allow anonymous users to see comments.
|
||||
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments',
|
||||
'access content'
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests CSS classes on comments.
|
||||
*/
|
||||
public function testCommentClasses() {
|
||||
// Create all permutations for comments, users, and nodes.
|
||||
$parameters = [
|
||||
'node_uid' => [0, $this->webUser->id()],
|
||||
'comment_uid' => [0, $this->webUser->id(), $this->adminUser->id()],
|
||||
'comment_status' => [CommentInterface::PUBLISHED, CommentInterface::NOT_PUBLISHED],
|
||||
'user' => ['anonymous', 'authenticated', 'admin'],
|
||||
];
|
||||
$permutations = $this->generatePermutations($parameters);
|
||||
|
||||
foreach ($permutations as $case) {
|
||||
// Create a new node.
|
||||
$node = $this->drupalCreateNode(['type' => 'article', 'uid' => $case['node_uid']]);
|
||||
|
||||
// Add a comment.
|
||||
/** @var \Drupal\comment\CommentInterface $comment */
|
||||
$comment = Comment::create([
|
||||
'entity_id' => $node->id(),
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'comment',
|
||||
'uid' => $case['comment_uid'],
|
||||
'status' => $case['comment_status'],
|
||||
'subject' => $this->randomMachineName(),
|
||||
'language' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
|
||||
'comment_body' => [LanguageInterface::LANGCODE_NOT_SPECIFIED => [$this->randomMachineName()]],
|
||||
]);
|
||||
$comment->save();
|
||||
|
||||
// Adjust the current/viewing user.
|
||||
switch ($case['user']) {
|
||||
case 'anonymous':
|
||||
if ($this->loggedInUser) {
|
||||
$this->drupalLogout();
|
||||
}
|
||||
$case['user_uid'] = 0;
|
||||
break;
|
||||
|
||||
case 'authenticated':
|
||||
$this->drupalLogin($this->webUser);
|
||||
$case['user_uid'] = $this->webUser->id();
|
||||
break;
|
||||
|
||||
case 'admin':
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$case['user_uid'] = $this->adminUser->id();
|
||||
break;
|
||||
}
|
||||
// Request the node with the comment.
|
||||
$this->drupalGet('node/' . $node->id());
|
||||
$settings = $this->getDrupalSettings();
|
||||
|
||||
// Verify the data-history-node-id attribute, which is necessary for the
|
||||
// by-viewer class and the "new" indicator, see below.
|
||||
$this->assertIdentical(1, count($this->xpath('//*[@data-history-node-id="' . $node->id() . '"]')), 'data-history-node-id attribute is set on node.');
|
||||
|
||||
// Verify classes if the comment is visible for the current user.
|
||||
if ($case['comment_status'] == CommentInterface::PUBLISHED || $case['user'] == 'admin') {
|
||||
// Verify the by-anonymous class.
|
||||
$comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-anonymous")]');
|
||||
if ($case['comment_uid'] == 0) {
|
||||
$this->assertTrue(count($comments) == 1, 'by-anonymous class found.');
|
||||
}
|
||||
else {
|
||||
$this->assertFalse(count($comments), 'by-anonymous class not found.');
|
||||
}
|
||||
|
||||
// Verify the by-node-author class.
|
||||
$comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-node-author")]');
|
||||
if ($case['comment_uid'] > 0 && $case['comment_uid'] == $case['node_uid']) {
|
||||
$this->assertTrue(count($comments) == 1, 'by-node-author class found.');
|
||||
}
|
||||
else {
|
||||
$this->assertFalse(count($comments), 'by-node-author class not found.');
|
||||
}
|
||||
|
||||
// Verify the data-comment-user-id attribute, which is used by the
|
||||
// drupal.comment-by-viewer library to add a by-viewer when the current
|
||||
// user (the viewer) was the author of the comment. We do this in Java-
|
||||
// Script to prevent breaking the render cache.
|
||||
$this->assertIdentical(1, count($this->xpath('//*[contains(@class, "comment") and @data-comment-user-id="' . $case['comment_uid'] . '"]')), 'data-comment-user-id attribute is set on comment.');
|
||||
$this->assertRaw(drupal_get_path('module', 'comment') . '/js/comment-by-viewer.js', 'drupal.comment-by-viewer library is present.');
|
||||
}
|
||||
|
||||
// Verify the unpublished class.
|
||||
$comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "unpublished")]');
|
||||
if ($case['comment_status'] == CommentInterface::NOT_PUBLISHED && $case['user'] == 'admin') {
|
||||
$this->assertTrue(count($comments) == 1, 'unpublished class found.');
|
||||
}
|
||||
else {
|
||||
$this->assertFalse(count($comments), 'unpublished class not found.');
|
||||
}
|
||||
|
||||
// Verify the data-comment-timestamp attribute, which is used by the
|
||||
// drupal.comment-new-indicator library to add a "new" indicator to each
|
||||
// comment that was created or changed after the last time the current
|
||||
// user read the corresponding node.
|
||||
if ($case['comment_status'] == CommentInterface::PUBLISHED || $case['user'] == 'admin') {
|
||||
$this->assertIdentical(1, count($this->xpath('//*[contains(@class, "comment")]/*[@data-comment-timestamp="' . $comment->getChangedTime() . '"]')), 'data-comment-timestamp attribute is set on comment');
|
||||
$expectedJS = ($case['user'] !== 'anonymous');
|
||||
$this->assertIdentical($expectedJS, isset($settings['ajaxPageState']['libraries']) && in_array('comment/drupal.comment-new-indicator', explode(',', $settings['ajaxPageState']['libraries'])), 'drupal.comment-new-indicator library is present.');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,235 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
|
||||
use Drupal\field\Entity\FieldStorageConfig;
|
||||
use Drupal\field\Entity\FieldConfig;
|
||||
use Drupal\comment\Entity\CommentType;
|
||||
|
||||
/**
|
||||
* Tests fields on comments.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentFieldsTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Install the field UI.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['field_ui'];
|
||||
|
||||
/**
|
||||
* Tests that the default 'comment_body' field is correctly added.
|
||||
*/
|
||||
public function testCommentDefaultFields() {
|
||||
// Do not make assumptions on default node types created by the test
|
||||
// installation profile, and create our own.
|
||||
$this->drupalCreateContentType(['type' => 'test_node_type']);
|
||||
$this->addDefaultCommentField('node', 'test_node_type');
|
||||
|
||||
// Check that the 'comment_body' field is present on the comment bundle.
|
||||
$field = FieldConfig::loadByName('comment', 'comment', 'comment_body');
|
||||
$this->assertTrue(!empty($field), 'The comment_body field is added when a comment bundle is created');
|
||||
|
||||
$field->delete();
|
||||
|
||||
// Check that the 'comment_body' field is not deleted since it is persisted
|
||||
// even if it has no fields.
|
||||
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
|
||||
$this->assertTrue($field_storage, 'The comment_body field storage was not deleted');
|
||||
|
||||
// Create a new content type.
|
||||
$type_name = 'test_node_type_2';
|
||||
$this->drupalCreateContentType(['type' => $type_name]);
|
||||
$this->addDefaultCommentField('node', $type_name);
|
||||
|
||||
// Check that the 'comment_body' field exists and has an instance on the
|
||||
// new comment bundle.
|
||||
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
|
||||
$this->assertTrue($field_storage, 'The comment_body field exists');
|
||||
$field = FieldConfig::loadByName('comment', 'comment', 'comment_body');
|
||||
$this->assertTrue(isset($field), format_string('The comment_body field is present for comments on type @type', ['@type' => $type_name]));
|
||||
|
||||
// Test adding a field that defaults to CommentItemInterface::CLOSED.
|
||||
$this->addDefaultCommentField('node', 'test_node_type', 'who_likes_ponies', CommentItemInterface::CLOSED, 'who_likes_ponies');
|
||||
$field = FieldConfig::load('node.test_node_type.who_likes_ponies');;
|
||||
$this->assertEqual($field->getDefaultValueLiteral()[0]['status'], CommentItemInterface::CLOSED);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that you can remove a comment field.
|
||||
*/
|
||||
public function testCommentFieldDelete() {
|
||||
$this->drupalCreateContentType(['type' => 'test_node_type']);
|
||||
$this->addDefaultCommentField('node', 'test_node_type');
|
||||
// We want to test the handling of removing the primary comment field, so we
|
||||
// ensure there is at least one other comment field attached to a node type
|
||||
// so that comment_entity_load() runs for nodes.
|
||||
$this->addDefaultCommentField('node', 'test_node_type', 'comment2');
|
||||
|
||||
// Create a sample node.
|
||||
$node = $this->drupalCreateNode([
|
||||
'title' => 'Baloney',
|
||||
'type' => 'test_node_type',
|
||||
]);
|
||||
|
||||
$this->drupalLogin($this->webUser);
|
||||
|
||||
$this->drupalGet('node/' . $node->nid->value);
|
||||
$elements = $this->cssSelect('.field--type-comment');
|
||||
$this->assertEqual(2, count($elements), 'There are two comment fields on the node.');
|
||||
|
||||
// Delete the first comment field.
|
||||
FieldStorageConfig::loadByName('node', 'comment')->delete();
|
||||
$this->drupalGet('node/' . $node->nid->value);
|
||||
$elements = $this->cssSelect('.field--type-comment');
|
||||
$this->assertEqual(1, count($elements), 'There is one comment field on the node.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests link building with non-default comment field names.
|
||||
*/
|
||||
public function testCommentFieldLinksNonDefaultName() {
|
||||
$this->drupalCreateContentType(['type' => 'test_node_type']);
|
||||
$this->addDefaultCommentField('node', 'test_node_type', 'comment2');
|
||||
|
||||
$web_user2 = $this->drupalCreateUser([
|
||||
'access comments',
|
||||
'post comments',
|
||||
'create article content',
|
||||
'edit own comments',
|
||||
'skip comment approval',
|
||||
'access content',
|
||||
]);
|
||||
|
||||
// Create a sample node.
|
||||
$node = $this->drupalCreateNode([
|
||||
'title' => 'Baloney',
|
||||
'type' => 'test_node_type',
|
||||
]);
|
||||
|
||||
// Go to the node first so that webuser2 see new comments.
|
||||
$this->drupalLogin($web_user2);
|
||||
$this->drupalGet($node->urlInfo());
|
||||
$this->drupalLogout();
|
||||
|
||||
// Test that buildCommentedEntityLinks() does not break when the 'comment'
|
||||
// field does not exist. Requires at least one comment.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->postComment($node, 'Here is a comment', '', NULL, 'comment2');
|
||||
$this->drupalLogout();
|
||||
|
||||
$this->drupalLogin($web_user2);
|
||||
|
||||
// We want to check the attached drupalSettings of
|
||||
// \Drupal\comment\CommentLinkBuilder::buildCommentedEntityLinks. Therefore
|
||||
// we need a node listing, let's use views for that.
|
||||
$this->container->get('module_installer')->install(['views'], TRUE);
|
||||
// We also need a router rebuild, as the router is lazily rebuild in the
|
||||
// module installer.
|
||||
\Drupal::service('router.builder')->rebuild();
|
||||
$this->drupalGet('node');
|
||||
|
||||
$link_info = $this->getDrupalSettings()['comment']['newCommentsLinks']['node']['comment2']['2'];
|
||||
$this->assertIdentical($link_info['new_comment_count'], 1);
|
||||
$this->assertIdentical($link_info['first_new_comment_link'], $node->url('canonical', ['fragment' => 'new']));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests creating a comment field through the interface.
|
||||
*/
|
||||
public function testCommentFieldCreate() {
|
||||
// Create user who can administer user fields.
|
||||
$user = $this->drupalCreateUser([
|
||||
'administer user fields',
|
||||
]);
|
||||
$this->drupalLogin($user);
|
||||
|
||||
// Create comment field in account settings.
|
||||
$edit = [
|
||||
'new_storage_type' => 'comment',
|
||||
'label' => 'User comment',
|
||||
'field_name' => 'user_comment',
|
||||
];
|
||||
$this->drupalPostForm('admin/config/people/accounts/fields/add-field', $edit, 'Save and continue');
|
||||
|
||||
// Try to save the comment field without selecting a comment type.
|
||||
$edit = [];
|
||||
$this->drupalPostForm('admin/config/people/accounts/fields/user.user.field_user_comment/storage', $edit, t('Save field settings'));
|
||||
// We should get an error message.
|
||||
$this->assertText(t('An illegal choice has been detected. Please contact the site administrator.'));
|
||||
|
||||
// Create a comment type for users.
|
||||
$bundle = CommentType::create([
|
||||
'id' => 'user_comment_type',
|
||||
'label' => 'user_comment_type',
|
||||
'description' => '',
|
||||
'target_entity_type_id' => 'user',
|
||||
]);
|
||||
$bundle->save();
|
||||
|
||||
// Select a comment type and try to save again.
|
||||
$edit = [
|
||||
'settings[comment_type]' => 'user_comment_type',
|
||||
];
|
||||
$this->drupalPostForm('admin/config/people/accounts/fields/user.user.field_user_comment/storage', $edit, t('Save field settings'));
|
||||
// We shouldn't get an error message.
|
||||
$this->assertNoText(t('An illegal choice has been detected. Please contact the site administrator.'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that comment module works when installed after a content module.
|
||||
*/
|
||||
public function testCommentInstallAfterContentModule() {
|
||||
// Create a user to do module administration.
|
||||
$this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer modules']);
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
// Drop default comment field added in CommentTestBase::setup().
|
||||
FieldStorageConfig::loadByName('node', 'comment')->delete();
|
||||
if ($field_storage = FieldStorageConfig::loadByName('node', 'comment_forum')) {
|
||||
$field_storage->delete();
|
||||
}
|
||||
|
||||
// Purge field data now to allow comment module to be uninstalled once the
|
||||
// field has been deleted.
|
||||
field_purge_batch(10);
|
||||
|
||||
// Uninstall the comment module.
|
||||
$edit = [];
|
||||
$edit['uninstall[comment]'] = TRUE;
|
||||
$this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
|
||||
$this->drupalPostForm(NULL, [], t('Uninstall'));
|
||||
$this->rebuildContainer();
|
||||
$this->assertFalse($this->container->get('module_handler')->moduleExists('comment'), 'Comment module uninstalled.');
|
||||
|
||||
// Install core content type module (book).
|
||||
$edit = [];
|
||||
$edit['modules[book][enable]'] = 'book';
|
||||
$this->drupalPostForm('admin/modules', $edit, t('Install'));
|
||||
|
||||
// Now install the comment module.
|
||||
$edit = [];
|
||||
$edit['modules[comment][enable]'] = 'comment';
|
||||
$this->drupalPostForm('admin/modules', $edit, t('Install'));
|
||||
$this->rebuildContainer();
|
||||
$this->assertTrue($this->container->get('module_handler')->moduleExists('comment'), 'Comment module enabled.');
|
||||
|
||||
// Create nodes of each type.
|
||||
$this->addDefaultCommentField('node', 'book');
|
||||
$book_node = $this->drupalCreateNode(['type' => 'book']);
|
||||
|
||||
$this->drupalLogout();
|
||||
|
||||
// Try to post a comment on each node. A failure will be triggered if the
|
||||
// comment body is missing on one of these forms, due to postComment()
|
||||
// asserting that the body is actually posted correctly.
|
||||
$this->webUser = $this->drupalCreateUser(['access content', 'access comments', 'post comments', 'skip comment approval']);
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->postComment($book_node, $this->randomMachineName(), $this->randomMachineName());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,347 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\CommentManagerInterface;
|
||||
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\Component\Utility\Unicode;
|
||||
use Drupal\Core\Entity\Entity\EntityViewDisplay;
|
||||
use Drupal\Core\Entity\Entity\EntityViewMode;
|
||||
use Drupal\user\RoleInterface;
|
||||
use Drupal\filter\Entity\FilterFormat;
|
||||
|
||||
/**
|
||||
* Tests comment user interfaces.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentInterfaceTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Set up comments to have subject and preview disabled.
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
$this->drupalLogin($this->adminUser);
|
||||
// Make sure that comment field title is not displayed when there's no
|
||||
// comments posted.
|
||||
$this->drupalGet($this->node->urlInfo());
|
||||
$this->assertNoPattern('@<h2[^>]*>Comments</h2>@', 'Comments title is not displayed.');
|
||||
|
||||
// Set comments to have subject and preview disabled.
|
||||
$this->setCommentPreview(DRUPAL_DISABLED);
|
||||
$this->setCommentForm(TRUE);
|
||||
$this->setCommentSubject(FALSE);
|
||||
$this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
|
||||
$this->drupalLogout();
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the comment interface.
|
||||
*/
|
||||
public function testCommentInterface() {
|
||||
|
||||
// Post comment #1 without subject or preview.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$comment_text = $this->randomMachineName();
|
||||
$comment = $this->postComment($this->node, $comment_text);
|
||||
$this->assertTrue($this->commentExists($comment), 'Comment found.');
|
||||
|
||||
// Test the comment field title is displayed when there's comments.
|
||||
$this->drupalGet($this->node->urlInfo());
|
||||
$this->assertPattern('@<h2[^>]*>Comments</h2>@', 'Comments title is displayed.');
|
||||
|
||||
// Set comments to have subject and preview to required.
|
||||
$this->drupalLogout();
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentSubject(TRUE);
|
||||
$this->setCommentPreview(DRUPAL_REQUIRED);
|
||||
$this->drupalLogout();
|
||||
|
||||
// Create comment #2 that allows subject and requires preview.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$subject_text = $this->randomMachineName();
|
||||
$comment_text = $this->randomMachineName();
|
||||
$comment = $this->postComment($this->node, $comment_text, $subject_text, TRUE);
|
||||
$this->assertTrue($this->commentExists($comment), 'Comment found.');
|
||||
|
||||
// Comment as anonymous with preview required.
|
||||
$this->drupalLogout();
|
||||
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access content', 'access comments', 'post comments', 'skip comment approval']);
|
||||
$anonymous_comment = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
$this->assertTrue($this->commentExists($anonymous_comment), 'Comment found.');
|
||||
$anonymous_comment->delete();
|
||||
|
||||
// Check comment display.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertText($subject_text, 'Individual comment subject found.');
|
||||
$this->assertText($comment_text, 'Individual comment body found.');
|
||||
$arguments = [
|
||||
':link' => base_path() . 'comment/' . $comment->id() . '#comment-' . $comment->id(),
|
||||
];
|
||||
$pattern_permalink = '//footer[contains(@class,"comment__meta")]/a[contains(@href,:link) and text()="Permalink"]';
|
||||
$permalink = $this->xpath($pattern_permalink, $arguments);
|
||||
$this->assertTrue(!empty($permalink), 'Permalink link found.');
|
||||
|
||||
// Set comments to have subject and preview to optional.
|
||||
$this->drupalLogout();
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentSubject(TRUE);
|
||||
$this->setCommentPreview(DRUPAL_OPTIONAL);
|
||||
|
||||
$this->drupalGet('comment/' . $comment->id() . '/edit');
|
||||
$this->assertTitle(t('Edit comment @title | Drupal', [
|
||||
'@title' => $comment->getSubject(),
|
||||
]));
|
||||
|
||||
// Test changing the comment author to "Anonymous".
|
||||
$comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), ['uid' => '']);
|
||||
$this->assertTrue($comment->getAuthorName() == t('Anonymous') && $comment->getOwnerId() == 0, 'Comment author successfully changed to anonymous.');
|
||||
|
||||
// Test changing the comment author to an unverified user.
|
||||
$random_name = $this->randomMachineName();
|
||||
$this->drupalGet('comment/' . $comment->id() . '/edit');
|
||||
$comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), ['name' => $random_name]);
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertText($random_name . ' (' . t('not verified') . ')', 'Comment author successfully changed to an unverified user.');
|
||||
|
||||
// Test changing the comment author to a verified user.
|
||||
$this->drupalGet('comment/' . $comment->id() . '/edit');
|
||||
$comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), ['uid' => $this->webUser->getUsername() . ' (' . $this->webUser->id() . ')']);
|
||||
$this->assertTrue($comment->getAuthorName() == $this->webUser->getUsername() && $comment->getOwnerId() == $this->webUser->id(), 'Comment author successfully changed to a registered user.');
|
||||
|
||||
$this->drupalLogout();
|
||||
|
||||
// Reply to comment #2 creating comment #3 with optional preview and no
|
||||
// subject though field enabled.
|
||||
$this->drupalLogin($this->webUser);
|
||||
// Deliberately use the wrong url to test
|
||||
// \Drupal\comment\Controller\CommentController::redirectNode().
|
||||
$this->drupalGet('comment/' . $this->node->id() . '/reply');
|
||||
// Verify we were correctly redirected.
|
||||
$this->assertUrl(\Drupal::url('comment.reply', ['entity_type' => 'node', 'entity' => $this->node->id(), 'field_name' => 'comment'], ['absolute' => TRUE]));
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $comment->id());
|
||||
$this->assertText($subject_text, 'Individual comment-reply subject found.');
|
||||
$this->assertText($comment_text, 'Individual comment-reply body found.');
|
||||
$reply = $this->postComment(NULL, $this->randomMachineName(), '', TRUE);
|
||||
$reply_loaded = Comment::load($reply->id());
|
||||
$this->assertTrue($this->commentExists($reply, TRUE), 'Reply found.');
|
||||
$this->assertEqual($comment->id(), $reply_loaded->getParentComment()->id(), 'Pid of a reply to a comment is set correctly.');
|
||||
// Check the thread of reply grows correctly.
|
||||
$this->assertEqual(rtrim($comment->getThread(), '/') . '.00/', $reply_loaded->getThread());
|
||||
|
||||
// Second reply to comment #2 creating comment #4.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $comment->id());
|
||||
$this->assertText($comment->getSubject(), 'Individual comment-reply subject found.');
|
||||
$this->assertText($comment->comment_body->value, 'Individual comment-reply body found.');
|
||||
$reply = $this->postComment(NULL, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
$reply_loaded = Comment::load($reply->id());
|
||||
$this->assertTrue($this->commentExists($reply, TRUE), 'Second reply found.');
|
||||
// Check the thread of second reply grows correctly.
|
||||
$this->assertEqual(rtrim($comment->getThread(), '/') . '.01/', $reply_loaded->getThread());
|
||||
|
||||
// Reply to comment #4 creating comment #5.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $reply_loaded->id());
|
||||
$this->assertText($reply_loaded->getSubject(), 'Individual comment-reply subject found.');
|
||||
$this->assertText($reply_loaded->comment_body->value, 'Individual comment-reply body found.');
|
||||
$reply = $this->postComment(NULL, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
$reply_loaded = Comment::load($reply->id());
|
||||
$this->assertTrue($this->commentExists($reply, TRUE), 'Second reply found.');
|
||||
// Check the thread of reply to second reply grows correctly.
|
||||
$this->assertEqual(rtrim($comment->getThread(), '/') . '.01.00/', $reply_loaded->getThread());
|
||||
|
||||
// Edit reply.
|
||||
$this->drupalGet('comment/' . $reply->id() . '/edit');
|
||||
$reply = $this->postComment(NULL, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
$this->assertTrue($this->commentExists($reply, TRUE), 'Modified reply found.');
|
||||
|
||||
// Confirm a new comment is posted to the correct page.
|
||||
$this->setCommentsPerPage(2);
|
||||
$comment_new_page = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
$this->assertTrue($this->commentExists($comment_new_page), 'Page one exists. %s');
|
||||
$this->drupalGet('node/' . $this->node->id(), ['query' => ['page' => 2]]);
|
||||
$this->assertTrue($this->commentExists($reply, TRUE), 'Page two exists. %s');
|
||||
$this->setCommentsPerPage(50);
|
||||
|
||||
// Attempt to reply to an unpublished comment.
|
||||
$reply_loaded->setPublished(FALSE);
|
||||
$reply_loaded->save();
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $reply_loaded->id());
|
||||
$this->assertResponse(403);
|
||||
|
||||
// Attempt to post to node with comments disabled.
|
||||
$this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'comment' => [['status' => CommentItemInterface::HIDDEN]]]);
|
||||
$this->assertTrue($this->node, 'Article node created.');
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
|
||||
$this->assertResponse(403);
|
||||
$this->assertNoField('edit-comment', 'Comment body field found.');
|
||||
|
||||
// Attempt to post to node with read-only comments.
|
||||
$this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'comment' => [['status' => CommentItemInterface::CLOSED]]]);
|
||||
$this->assertTrue($this->node, 'Article node created.');
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
|
||||
$this->assertResponse(403);
|
||||
$this->assertNoField('edit-comment', 'Comment body field found.');
|
||||
|
||||
// Attempt to post to node with comments enabled (check field names etc).
|
||||
$this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'comment' => [['status' => CommentItemInterface::OPEN]]]);
|
||||
$this->assertTrue($this->node, 'Article node created.');
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
|
||||
$this->assertNoText('This discussion is closed', 'Posting to node with comments enabled');
|
||||
$this->assertField('edit-comment-body-0-value', 'Comment body field found.');
|
||||
|
||||
// Delete comment and make sure that reply is also removed.
|
||||
$this->drupalLogout();
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->deleteComment($comment);
|
||||
$this->deleteComment($comment_new_page);
|
||||
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertFalse($this->commentExists($comment), 'Comment not found.');
|
||||
$this->assertFalse($this->commentExists($reply, TRUE), 'Reply not found.');
|
||||
|
||||
// Enabled comment form on node page.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentForm(TRUE);
|
||||
$this->drupalLogout();
|
||||
|
||||
// Submit comment through node form.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$form_comment = $this->postComment(NULL, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
$this->assertTrue($this->commentExists($form_comment), 'Form comment found.');
|
||||
|
||||
// Disable comment form on node page.
|
||||
$this->drupalLogout();
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentForm(FALSE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that the subject is automatically filled if disabled or left blank.
|
||||
*
|
||||
* When the subject field is blank or disabled, the first 29 characters of the
|
||||
* comment body are used for the subject. If this would break within a word,
|
||||
* then the break is put at the previous word boundary instead.
|
||||
*/
|
||||
public function testAutoFilledSubject() {
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
|
||||
// Break when there is a word boundary before 29 characters.
|
||||
$body_text = 'Lorem ipsum Lorem ipsum Loreming ipsum Lorem ipsum';
|
||||
$comment1 = $this->postComment(NULL, $body_text, '', TRUE);
|
||||
$this->assertTrue($this->commentExists($comment1), 'Form comment found.');
|
||||
$this->assertEqual('Lorem ipsum Lorem ipsum…', $comment1->getSubject());
|
||||
|
||||
// Break at 29 characters where there's no boundary before that.
|
||||
$body_text2 = 'LoremipsumloremipsumLoremingipsumLoremipsum';
|
||||
$comment2 = $this->postComment(NULL, $body_text2, '', TRUE);
|
||||
$this->assertEqual('LoremipsumloremipsumLoreming…', $comment2->getSubject());
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that automatic subject is correctly created from HTML comment text.
|
||||
*
|
||||
* This is the same test as in CommentInterfaceTest::testAutoFilledSubject()
|
||||
* with the additional check that HTML is stripped appropriately prior to
|
||||
* character-counting.
|
||||
*/
|
||||
public function testAutoFilledHtmlSubject() {
|
||||
// Set up two default (i.e. filtered HTML) input formats, because then we
|
||||
// can select one of them. Then create a user that can use these formats,
|
||||
// log the user in, and then GET the node page on which to test the
|
||||
// comments.
|
||||
$filtered_html_format = FilterFormat::create([
|
||||
'format' => 'filtered_html',
|
||||
'name' => 'Filtered HTML',
|
||||
]);
|
||||
$filtered_html_format->save();
|
||||
$full_html_format = FilterFormat::create([
|
||||
'format' => 'full_html',
|
||||
'name' => 'Full HTML',
|
||||
]);
|
||||
$full_html_format->save();
|
||||
$html_user = $this->drupalCreateUser([
|
||||
'access comments',
|
||||
'post comments',
|
||||
'edit own comments',
|
||||
'skip comment approval',
|
||||
'access content',
|
||||
$filtered_html_format->getPermissionName(),
|
||||
$full_html_format->getPermissionName(),
|
||||
]);
|
||||
$this->drupalLogin($html_user);
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
|
||||
// HTML should not be included in the character count.
|
||||
$body_text1 = '<span></span><strong> </strong><span> </span><strong></strong>Hello World<br />';
|
||||
$edit1 = [
|
||||
'comment_body[0][value]' => $body_text1,
|
||||
'comment_body[0][format]' => 'filtered_html',
|
||||
];
|
||||
$this->drupalPostForm(NULL, $edit1, t('Save'));
|
||||
$this->assertEqual('Hello World', Comment::load(1)->getSubject());
|
||||
|
||||
// If there's nothing other than HTML, the subject should be '(No subject)'.
|
||||
$body_text2 = '<span></span><strong> </strong><span> </span><strong></strong> <br />';
|
||||
$edit2 = [
|
||||
'comment_body[0][value]' => $body_text2,
|
||||
'comment_body[0][format]' => 'filtered_html',
|
||||
];
|
||||
$this->drupalPostForm(NULL, $edit2, t('Save'));
|
||||
$this->assertEqual('(No subject)', Comment::load(2)->getSubject());
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the comment formatter configured with a custom comment view mode.
|
||||
*/
|
||||
public function testViewMode() {
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->drupalGet($this->node->toUrl());
|
||||
$comment_text = $this->randomMachineName();
|
||||
// Post a comment.
|
||||
$this->postComment($this->node, $comment_text);
|
||||
|
||||
// Comment displayed in 'default' display mode found and has body text.
|
||||
$comment_element = $this->cssSelect('.comment-wrapper');
|
||||
$this->assertTrue(!empty($comment_element));
|
||||
$this->assertRaw('<p>' . $comment_text . '</p>');
|
||||
|
||||
// Create a new comment entity view mode.
|
||||
$mode = Unicode::strtolower($this->randomMachineName());
|
||||
EntityViewMode::create([
|
||||
'targetEntityType' => 'comment',
|
||||
'id' => "comment.$mode",
|
||||
])->save();
|
||||
// Create the corresponding entity view display for article node-type. Note
|
||||
// that this new view display mode doesn't contain the comment body.
|
||||
EntityViewDisplay::create([
|
||||
'targetEntityType' => 'comment',
|
||||
'bundle' => 'comment',
|
||||
'mode' => $mode,
|
||||
])->setStatus(TRUE)->save();
|
||||
|
||||
/** @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface $node_display */
|
||||
$node_display = EntityViewDisplay::load('node.article.default');
|
||||
$formatter = $node_display->getComponent('comment');
|
||||
// Change the node comment field formatter to use $mode mode instead of
|
||||
// 'default' mode.
|
||||
$formatter['settings']['view_mode'] = $mode;
|
||||
$node_display
|
||||
->setComponent('comment', $formatter)
|
||||
->save();
|
||||
|
||||
// Reloading the node page to show the same node with its same comment but
|
||||
// with a different display mode.
|
||||
$this->drupalGet($this->node->toUrl());
|
||||
// The comment should exist but without the body text because we used $mode
|
||||
// mode this time.
|
||||
$comment_element = $this->cssSelect('.comment-wrapper');
|
||||
$this->assertTrue(!empty($comment_element));
|
||||
$this->assertNoRaw('<p>' . $comment_text . '</p>');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,135 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
|
||||
use Drupal\field\Entity\FieldStorageConfig;
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
|
||||
/**
|
||||
* Tests for comment language.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentLanguageTest extends WebTestBase {
|
||||
|
||||
use CommentTestTrait;
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* We also use the language_test module here to be able to turn on content
|
||||
* language negotiation. Drupal core does not provide a way in itself to do
|
||||
* that.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['node', 'language', 'language_test', 'comment_test'];
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
|
||||
|
||||
// Create and log in user.
|
||||
$admin_user = $this->drupalCreateUser(['administer site configuration', 'administer languages', 'access administration pages', 'administer content types', 'administer comments', 'create article content', 'access comments', 'post comments', 'skip comment approval']);
|
||||
$this->drupalLogin($admin_user);
|
||||
|
||||
// Add language.
|
||||
$edit = ['predefined_langcode' => 'fr'];
|
||||
$this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
|
||||
|
||||
// Set "Article" content type to use multilingual support.
|
||||
$edit = ['language_configuration[language_alterable]' => TRUE];
|
||||
$this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
|
||||
|
||||
// Enable content language negotiation UI.
|
||||
\Drupal::state()->set('language_test.content_language_type', TRUE);
|
||||
|
||||
// Set interface language detection to user and content language detection
|
||||
// to URL. Disable inheritance from interface language to ensure content
|
||||
// language will fall back to the default language if no URL language can be
|
||||
// detected.
|
||||
$edit = [
|
||||
'language_interface[enabled][language-user]' => TRUE,
|
||||
'language_content[enabled][language-url]' => TRUE,
|
||||
'language_content[enabled][language-interface]' => FALSE,
|
||||
];
|
||||
$this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
|
||||
|
||||
// Change user language preference, this way interface language is always
|
||||
// French no matter what path prefix the URLs have.
|
||||
$edit = ['preferred_langcode' => 'fr'];
|
||||
$this->drupalPostForm("user/" . $admin_user->id() . "/edit", $edit, t('Save'));
|
||||
|
||||
// Create comment field on article.
|
||||
$this->addDefaultCommentField('node', 'article');
|
||||
|
||||
// Make comment body translatable.
|
||||
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
|
||||
$field_storage->setTranslatable(TRUE);
|
||||
$field_storage->save();
|
||||
$this->assertTrue($field_storage->isTranslatable(), 'Comment body is translatable.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that comment language is properly set.
|
||||
*/
|
||||
public function testCommentLanguage() {
|
||||
|
||||
// Create two nodes, one for english and one for french, and comment each
|
||||
// node using both english and french as content language by changing URL
|
||||
// language prefixes. Meanwhile interface language is always French, which
|
||||
// is the user language preference. This way we can ensure that node
|
||||
// language and interface language do not influence comment language, as
|
||||
// only content language has to.
|
||||
foreach ($this->container->get('language_manager')->getLanguages() as $node_langcode => $node_language) {
|
||||
// Create "Article" content.
|
||||
$title = $this->randomMachineName();
|
||||
$edit = [
|
||||
'title[0][value]' => $title,
|
||||
'body[0][value]' => $this->randomMachineName(),
|
||||
'langcode[0][value]' => $node_langcode,
|
||||
'comment[0][status]' => CommentItemInterface::OPEN,
|
||||
];
|
||||
$this->drupalPostForm("node/add/article", $edit, t('Save'));
|
||||
$node = $this->drupalGetNodeByTitle($title);
|
||||
|
||||
$prefixes = language_negotiation_url_prefixes();
|
||||
foreach ($this->container->get('language_manager')->getLanguages() as $langcode => $language) {
|
||||
// Post a comment with content language $langcode.
|
||||
$prefix = empty($prefixes[$langcode]) ? '' : $prefixes[$langcode] . '/';
|
||||
$comment_values[$node_langcode][$langcode] = $this->randomMachineName();
|
||||
$edit = [
|
||||
'subject[0][value]' => $this->randomMachineName(),
|
||||
'comment_body[0][value]' => $comment_values[$node_langcode][$langcode],
|
||||
];
|
||||
$this->drupalPostForm($prefix . 'node/' . $node->id(), $edit, t('Preview'));
|
||||
$this->drupalPostForm(NULL, $edit, t('Save'));
|
||||
|
||||
// Check that comment language matches the current content language.
|
||||
$cids = \Drupal::entityQuery('comment')
|
||||
->condition('entity_id', $node->id())
|
||||
->condition('entity_type', 'node')
|
||||
->condition('field_name', 'comment')
|
||||
->sort('cid', 'DESC')
|
||||
->range(0, 1)
|
||||
->execute();
|
||||
$comment = Comment::load(reset($cids));
|
||||
$args = ['%node_language' => $node_langcode, '%comment_language' => $comment->langcode->value, '%langcode' => $langcode];
|
||||
$this->assertEqual($comment->langcode->value, $langcode, format_string('The comment posted with content language %langcode and belonging to the node with language %node_language has language %comment_language', $args));
|
||||
$this->assertEqual($comment->comment_body->value, $comment_values[$node_langcode][$langcode], 'Comment body correctly stored.');
|
||||
}
|
||||
}
|
||||
|
||||
// Check that comment bodies appear in the administration UI.
|
||||
$this->drupalGet('admin/content/comment');
|
||||
foreach ($comment_values as $node_values) {
|
||||
foreach ($node_values as $value) {
|
||||
$this->assertRaw($value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
/**
|
||||
* Tests comment links altering.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentLinksAlterTest extends CommentTestBase {
|
||||
|
||||
public static $modules = ['comment_test'];
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
// Enable comment_test.module's hook_comment_links_alter() implementation.
|
||||
$this->container->get('state')->set('comment_test_links_alter_enabled', TRUE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests comment links altering.
|
||||
*/
|
||||
public function testCommentLinksAlter() {
|
||||
$this->drupalLogin($this->webUser);
|
||||
$comment_text = $this->randomMachineName();
|
||||
$subject = $this->randomMachineName();
|
||||
$comment = $this->postComment($this->node, $comment_text, $subject);
|
||||
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
|
||||
$this->assertLink(t('Report'));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,146 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
|
||||
use Drupal\Core\Language\LanguageInterface;
|
||||
use Drupal\comment\CommentInterface;
|
||||
use Drupal\user\RoleInterface;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
|
||||
/**
|
||||
* Basic comment links tests to ensure markup present.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentLinksTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Comment being tested.
|
||||
*
|
||||
* @var \Drupal\comment\CommentInterface
|
||||
*/
|
||||
protected $comment;
|
||||
|
||||
/**
|
||||
* Seen comments, array of comment IDs.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $seen = [];
|
||||
|
||||
/**
|
||||
* Use the main node listing to test rendering on teasers.
|
||||
*
|
||||
* @var array
|
||||
*
|
||||
* @todo Remove this dependency.
|
||||
*/
|
||||
public static $modules = ['views'];
|
||||
|
||||
/**
|
||||
* Tests that comment links are output and can be hidden.
|
||||
*/
|
||||
public function testCommentLinks() {
|
||||
// Bartik theme alters comment links, so use a different theme.
|
||||
\Drupal::service('theme_handler')->install(['stark']);
|
||||
$this->config('system.theme')
|
||||
->set('default', 'stark')
|
||||
->save();
|
||||
|
||||
// Remove additional user permissions from $this->webUser added by setUp(),
|
||||
// since this test is limited to anonymous and authenticated roles only.
|
||||
$roles = $this->webUser->getRoles();
|
||||
entity_delete_multiple('user_role', [reset($roles)]);
|
||||
|
||||
// Create a comment via CRUD API functionality, since
|
||||
// $this->postComment() relies on actual user permissions.
|
||||
$comment = Comment::create([
|
||||
'cid' => NULL,
|
||||
'entity_id' => $this->node->id(),
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'comment',
|
||||
'pid' => 0,
|
||||
'uid' => 0,
|
||||
'status' => CommentInterface::PUBLISHED,
|
||||
'subject' => $this->randomMachineName(),
|
||||
'hostname' => '127.0.0.1',
|
||||
'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
|
||||
'comment_body' => [['value' => $this->randomMachineName()]],
|
||||
]);
|
||||
$comment->save();
|
||||
$this->comment = $comment;
|
||||
|
||||
// Change comment settings.
|
||||
$this->setCommentSettings('form_location', CommentItemInterface::FORM_BELOW, 'Set comment form location');
|
||||
$this->setCommentAnonymous(TRUE);
|
||||
$this->node->comment = CommentItemInterface::OPEN;
|
||||
$this->node->save();
|
||||
|
||||
// Change user permissions.
|
||||
$perms = [
|
||||
'access comments' => 1,
|
||||
'post comments' => 1,
|
||||
'skip comment approval' => 1,
|
||||
'edit own comments' => 1,
|
||||
];
|
||||
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, $perms);
|
||||
|
||||
$nid = $this->node->id();
|
||||
|
||||
// Assert basic link is output, actual functionality is unit-tested in
|
||||
// \Drupal\comment\Tests\CommentLinkBuilderTest.
|
||||
foreach (['node', "node/$nid"] as $path) {
|
||||
$this->drupalGet($path);
|
||||
|
||||
// In teaser view, a link containing the comment count is always
|
||||
// expected.
|
||||
if ($path == 'node') {
|
||||
$this->assertLink(t('1 comment'));
|
||||
}
|
||||
$this->assertLink('Add new comment');
|
||||
}
|
||||
|
||||
// Change weight to make links go before comment body.
|
||||
entity_get_display('comment', 'comment', 'default')
|
||||
->setComponent('links', ['weight' => -100])
|
||||
->save();
|
||||
$this->drupalGet($this->node->urlInfo());
|
||||
$element = $this->cssSelect('article.js-comment > div');
|
||||
// Get last child element.
|
||||
$element = end($element[0]);
|
||||
$this->assertIdentical($element[0]->getName(), 'div', 'Last element is comment body.');
|
||||
|
||||
// Change weight to make links go after comment body.
|
||||
entity_get_display('comment', 'comment', 'default')
|
||||
->setComponent('links', ['weight' => 100])
|
||||
->save();
|
||||
$this->drupalGet($this->node->urlInfo());
|
||||
$element = $this->cssSelect('article.js-comment > div');
|
||||
// Get last child element.
|
||||
$element = end($element[0]);
|
||||
$this->assertIdentical($element[0]->getName(), 'ul', 'Last element is comment links.');
|
||||
|
||||
// Make sure we can hide node links.
|
||||
entity_get_display('node', $this->node->bundle(), 'default')
|
||||
->removeComponent('links')
|
||||
->save();
|
||||
$this->drupalGet($this->node->urlInfo());
|
||||
$this->assertNoLink('1 comment');
|
||||
$this->assertNoLink('Add new comment');
|
||||
|
||||
// Visit the full node, make sure there are links for the comment.
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertText($comment->getSubject());
|
||||
$this->assertLink('Reply');
|
||||
|
||||
// Make sure we can hide comment links.
|
||||
entity_get_display('comment', 'comment', 'default')
|
||||
->removeComponent('links')
|
||||
->save();
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertText($comment->getSubject());
|
||||
$this->assertNoLink('Reply');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\CommentManagerInterface;
|
||||
|
||||
/**
|
||||
* Tests comments with node access.
|
||||
*
|
||||
* Verifies there is no PostgreSQL error when viewing a node with threaded
|
||||
* comments (a comment and a reply), if a node access module is in use.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentNodeAccessTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['node_access_test'];
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
node_access_rebuild();
|
||||
|
||||
// Re-create user.
|
||||
$this->webUser = $this->drupalCreateUser([
|
||||
'access comments',
|
||||
'post comments',
|
||||
'create article content',
|
||||
'edit own comments',
|
||||
'node test view',
|
||||
'skip comment approval',
|
||||
]);
|
||||
|
||||
// Set the author of the created node to the web_user uid.
|
||||
$this->node->setOwnerId($this->webUser->id())->save();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that threaded comments can be viewed.
|
||||
*/
|
||||
public function testThreadedCommentView() {
|
||||
// Set comments to have subject required and preview disabled.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentPreview(DRUPAL_DISABLED);
|
||||
$this->setCommentForm(TRUE);
|
||||
$this->setCommentSubject(TRUE);
|
||||
$this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
|
||||
$this->drupalLogout();
|
||||
|
||||
// Post comment.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$comment_text = $this->randomMachineName();
|
||||
$comment_subject = $this->randomMachineName();
|
||||
$comment = $this->postComment($this->node, $comment_text, $comment_subject);
|
||||
$this->assertTrue($this->commentExists($comment), 'Comment found.');
|
||||
|
||||
// Check comment display.
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertText($comment_subject, 'Individual comment subject found.');
|
||||
$this->assertText($comment_text, 'Individual comment body found.');
|
||||
|
||||
// Reply to comment, creating second comment.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $comment->id());
|
||||
$reply_text = $this->randomMachineName();
|
||||
$reply_subject = $this->randomMachineName();
|
||||
$reply = $this->postComment(NULL, $reply_text, $reply_subject, TRUE);
|
||||
$this->assertTrue($this->commentExists($reply, TRUE), 'Reply found.');
|
||||
|
||||
// Go to the node page and verify comment and reply are visible.
|
||||
$this->drupalGet('node/' . $this->node->id());
|
||||
$this->assertText($comment_text);
|
||||
$this->assertText($comment_subject);
|
||||
$this->assertText($reply_text);
|
||||
$this->assertText($reply_subject);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\field\Entity\FieldConfig;
|
||||
use Drupal\field\Entity\FieldStorageConfig;
|
||||
|
||||
/**
|
||||
* Tests that comments behave correctly when the node is changed.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentNodeChangesTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Tests that comments are deleted with the node.
|
||||
*/
|
||||
public function testNodeDeletion() {
|
||||
$this->drupalLogin($this->webUser);
|
||||
$comment = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName());
|
||||
$this->assertTrue($comment->id(), 'The comment could be loaded.');
|
||||
$this->node->delete();
|
||||
$this->assertFalse(Comment::load($comment->id()), 'The comment could not be loaded after the node was deleted.');
|
||||
// Make sure the comment field storage and all its fields are deleted when
|
||||
// the node type is deleted.
|
||||
$this->assertNotNull(FieldStorageConfig::load('node.comment'), 'Comment field storage exists');
|
||||
$this->assertNotNull(FieldConfig::load('node.article.comment'), 'Comment field exists');
|
||||
// Delete the node type.
|
||||
entity_delete_multiple('node_type', [$this->node->bundle()]);
|
||||
$this->assertNull(FieldStorageConfig::load('node.comment'), 'Comment field storage deleted');
|
||||
$this->assertNull(FieldConfig::load('node.article.comment'), 'Comment field deleted');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,494 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\CommentInterface;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\comment\Entity\CommentType;
|
||||
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
|
||||
use Drupal\entity_test\Entity\EntityTest;
|
||||
use Drupal\field\Entity\FieldConfig;
|
||||
use Drupal\field\Entity\FieldStorageConfig;
|
||||
use Drupal\field_ui\Tests\FieldUiTestTrait;
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
use Drupal\Core\Entity\EntityInterface;
|
||||
use Drupal\user\RoleInterface;
|
||||
|
||||
/**
|
||||
* Tests commenting on a test entity.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentNonNodeTest extends WebTestBase {
|
||||
|
||||
use FieldUiTestTrait;
|
||||
use CommentTestTrait;
|
||||
|
||||
public static $modules = ['comment', 'user', 'field_ui', 'entity_test', 'block'];
|
||||
|
||||
/**
|
||||
* An administrative user with permission to configure comment settings.
|
||||
*
|
||||
* @var \Drupal\user\UserInterface
|
||||
*/
|
||||
protected $adminUser;
|
||||
|
||||
/**
|
||||
* The entity to use within tests.
|
||||
*
|
||||
* @var \Drupal\entity_test\Entity\EntityTest
|
||||
*/
|
||||
protected $entity;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
$this->drupalPlaceBlock('system_breadcrumb_block');
|
||||
$this->drupalPlaceBlock('page_title_block');
|
||||
|
||||
// Create a bundle for entity_test.
|
||||
entity_test_create_bundle('entity_test', 'Entity Test', 'entity_test');
|
||||
CommentType::create([
|
||||
'id' => 'comment',
|
||||
'label' => 'Comment settings',
|
||||
'description' => 'Comment settings',
|
||||
'target_entity_type_id' => 'entity_test',
|
||||
])->save();
|
||||
// Create comment field on entity_test bundle.
|
||||
$this->addDefaultCommentField('entity_test', 'entity_test');
|
||||
|
||||
// Verify that bundles are defined correctly.
|
||||
$bundles = \Drupal::entityManager()->getBundleInfo('comment');
|
||||
$this->assertEqual($bundles['comment']['label'], 'Comment settings');
|
||||
|
||||
// Create test user.
|
||||
$this->adminUser = $this->drupalCreateUser([
|
||||
'administer comments',
|
||||
'skip comment approval',
|
||||
'post comments',
|
||||
'access comments',
|
||||
'view test entity',
|
||||
'administer entity_test content',
|
||||
]);
|
||||
|
||||
// Enable anonymous and authenticated user comments.
|
||||
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments',
|
||||
'post comments',
|
||||
'skip comment approval',
|
||||
]);
|
||||
user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, [
|
||||
'access comments',
|
||||
'post comments',
|
||||
'skip comment approval',
|
||||
]);
|
||||
|
||||
// Create a test entity.
|
||||
$random_label = $this->randomMachineName();
|
||||
$data = ['type' => 'entity_test', 'name' => $random_label];
|
||||
$this->entity = EntityTest::create($data);
|
||||
$this->entity->save();
|
||||
}
|
||||
|
||||
/**
|
||||
* Posts a comment.
|
||||
*
|
||||
* @param \Drupal\Core\Entity\EntityInterface|null $entity
|
||||
* Entity to post comment on or NULL to post to the previously loaded page.
|
||||
* @param string $comment
|
||||
* Comment body.
|
||||
* @param string $subject
|
||||
* Comment subject.
|
||||
* @param mixed $contact
|
||||
* Set to NULL for no contact info, TRUE to ignore success checking, and
|
||||
* array of values to set contact info.
|
||||
*
|
||||
* @return \Drupal\comment\CommentInterface
|
||||
* The new comment entity.
|
||||
*/
|
||||
public function postComment(EntityInterface $entity, $comment, $subject = '', $contact = NULL) {
|
||||
$edit = [];
|
||||
$edit['comment_body[0][value]'] = $comment;
|
||||
|
||||
$field = FieldConfig::loadByName('entity_test', 'entity_test', 'comment');
|
||||
$preview_mode = $field->getSetting('preview');
|
||||
|
||||
// Must get the page before we test for fields.
|
||||
if ($entity !== NULL) {
|
||||
$this->drupalGet('comment/reply/entity_test/' . $entity->id() . '/comment');
|
||||
}
|
||||
|
||||
// Determine the visibility of subject form field.
|
||||
if (entity_get_form_display('comment', 'comment', 'default')->getComponent('subject')) {
|
||||
// Subject input allowed.
|
||||
$edit['subject[0][value]'] = $subject;
|
||||
}
|
||||
else {
|
||||
$this->assertNoFieldByName('subject[0][value]', '', 'Subject field not found.');
|
||||
}
|
||||
|
||||
if ($contact !== NULL && is_array($contact)) {
|
||||
$edit += $contact;
|
||||
}
|
||||
switch ($preview_mode) {
|
||||
case DRUPAL_REQUIRED:
|
||||
// Preview required so no save button should be found.
|
||||
$this->assertNoFieldByName('op', t('Save'), 'Save button not found.');
|
||||
$this->drupalPostForm(NULL, $edit, t('Preview'));
|
||||
// Don't break here so that we can test post-preview field presence and
|
||||
// function below.
|
||||
case DRUPAL_OPTIONAL:
|
||||
$this->assertFieldByName('op', t('Preview'), 'Preview button found.');
|
||||
$this->assertFieldByName('op', t('Save'), 'Save button found.');
|
||||
$this->drupalPostForm(NULL, $edit, t('Save'));
|
||||
break;
|
||||
|
||||
case DRUPAL_DISABLED:
|
||||
$this->assertNoFieldByName('op', t('Preview'), 'Preview button not found.');
|
||||
$this->assertFieldByName('op', t('Save'), 'Save button found.');
|
||||
$this->drupalPostForm(NULL, $edit, t('Save'));
|
||||
break;
|
||||
}
|
||||
$match = [];
|
||||
// Get comment ID
|
||||
preg_match('/#comment-([0-9]+)/', $this->getURL(), $match);
|
||||
|
||||
// Get comment.
|
||||
if ($contact !== TRUE) { // If true then attempting to find error message.
|
||||
if ($subject) {
|
||||
$this->assertText($subject, 'Comment subject posted.');
|
||||
}
|
||||
$this->assertText($comment, 'Comment body posted.');
|
||||
$this->assertTrue((!empty($match) && !empty($match[1])), 'Comment ID found.');
|
||||
}
|
||||
|
||||
if (isset($match[1])) {
|
||||
return Comment::load($match[1]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks current page for specified comment.
|
||||
*
|
||||
* @param \Drupal\comment\CommentInterface $comment
|
||||
* The comment object.
|
||||
* @param bool $reply
|
||||
* Boolean indicating whether the comment is a reply to another comment.
|
||||
*
|
||||
* @return bool
|
||||
* Boolean indicating whether the comment was found.
|
||||
*/
|
||||
public function commentExists(CommentInterface $comment = NULL, $reply = FALSE) {
|
||||
if ($comment) {
|
||||
$regex = '/' . ($reply ? '<div class="indented">(.*?)' : '');
|
||||
$regex .= '<a id="comment-' . $comment->id() . '"(.*?)';
|
||||
$regex .= $comment->getSubject() . '(.*?)';
|
||||
$regex .= $comment->comment_body->value . '(.*?)';
|
||||
$regex .= '/s';
|
||||
|
||||
return (boolean) preg_match($regex, $this->getRawContent());
|
||||
}
|
||||
else {
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether the commenter's contact information is displayed.
|
||||
*
|
||||
* @return bool
|
||||
* Contact info is available.
|
||||
*/
|
||||
public function commentContactInfoAvailable() {
|
||||
return preg_match('/(input).*?(name="name").*?(input).*?(name="mail").*?(input).*?(name="homepage")/s', $this->getRawContent());
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs the specified operation on the specified comment.
|
||||
*
|
||||
* @param object $comment
|
||||
* Comment to perform operation on.
|
||||
* @param string $operation
|
||||
* Operation to perform.
|
||||
* @param bool $approval
|
||||
* Operation is found on approval page.
|
||||
*/
|
||||
public function performCommentOperation($comment, $operation, $approval = FALSE) {
|
||||
$edit = [];
|
||||
$edit['operation'] = $operation;
|
||||
$edit['comments[' . $comment->id() . ']'] = TRUE;
|
||||
$this->drupalPostForm('admin/content/comment' . ($approval ? '/approval' : ''), $edit, t('Update'));
|
||||
|
||||
if ($operation == 'delete') {
|
||||
$this->drupalPostForm(NULL, [], t('Delete comments'));
|
||||
$this->assertRaw(\Drupal::translation()->formatPlural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), format_string('Operation "@operation" was performed on comment.', ['@operation' => $operation]));
|
||||
}
|
||||
else {
|
||||
$this->assertText(t('The update has been performed.'), format_string('Operation "@operation" was performed on comment.', ['@operation' => $operation]));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the comment ID for an unapproved comment.
|
||||
*
|
||||
* @param string $subject
|
||||
* Comment subject to find.
|
||||
*
|
||||
* @return int
|
||||
* Comment ID.
|
||||
*/
|
||||
public function getUnapprovedComment($subject) {
|
||||
$this->drupalGet('admin/content/comment/approval');
|
||||
preg_match('/href="(.*?)#comment-([^"]+)"(.*?)>(' . $subject . ')/', $this->getRawContent(), $match);
|
||||
|
||||
return $match[2];
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests anonymous comment functionality.
|
||||
*/
|
||||
public function testCommentFunctionality() {
|
||||
$limited_user = $this->drupalCreateUser([
|
||||
'administer entity_test fields'
|
||||
]);
|
||||
$this->drupalLogin($limited_user);
|
||||
// Test that default field exists.
|
||||
$this->drupalGet('entity_test/structure/entity_test/fields');
|
||||
$this->assertText(t('Comments'));
|
||||
$this->assertLinkByHref('entity_test/structure/entity_test/fields/entity_test.entity_test.comment');
|
||||
// Test widget hidden option is not visible when there's no comments.
|
||||
$this->drupalGet('entity_test/structure/entity_test/fields/entity_test.entity_test.comment');
|
||||
$this->assertResponse(200);
|
||||
$this->assertNoField('edit-default-value-input-comment-und-0-status-0');
|
||||
// Test that field to change cardinality is not available.
|
||||
$this->drupalGet('entity_test/structure/entity_test/fields/entity_test.entity_test.comment/storage');
|
||||
$this->assertResponse(200);
|
||||
$this->assertNoField('cardinality_number');
|
||||
$this->assertNoField('cardinality');
|
||||
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
// Test breadcrumb on comment add page.
|
||||
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment');
|
||||
$xpath = '//nav[@class="breadcrumb"]/ol/li[last()]/a';
|
||||
$this->assertEqual(current($this->xpath($xpath)), $this->entity->label(), 'Last breadcrumb item is equal to node title on comment reply page.');
|
||||
|
||||
// Post a comment.
|
||||
/** @var \Drupal\comment\CommentInterface $comment1 */
|
||||
$comment1 = $this->postComment($this->entity, $this->randomMachineName(), $this->randomMachineName());
|
||||
$this->assertTrue($this->commentExists($comment1), 'Comment on test entity exists.');
|
||||
|
||||
// Test breadcrumb on comment reply page.
|
||||
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment/' . $comment1->id());
|
||||
$xpath = '//nav[@class="breadcrumb"]/ol/li[last()]/a';
|
||||
$this->assertEqual(current($this->xpath($xpath)), $comment1->getSubject(), 'Last breadcrumb item is equal to comment title on comment reply page.');
|
||||
|
||||
// Test breadcrumb on comment edit page.
|
||||
$this->drupalGet('comment/' . $comment1->id() . '/edit');
|
||||
$xpath = '//nav[@class="breadcrumb"]/ol/li[last()]/a';
|
||||
$this->assertEqual(current($this->xpath($xpath)), $comment1->getSubject(), 'Last breadcrumb item is equal to comment subject on edit page.');
|
||||
|
||||
// Test breadcrumb on comment delete page.
|
||||
$this->drupalGet('comment/' . $comment1->id() . '/delete');
|
||||
$xpath = '//nav[@class="breadcrumb"]/ol/li[last()]/a';
|
||||
$this->assertEqual(current($this->xpath($xpath)), $comment1->getSubject(), 'Last breadcrumb item is equal to comment subject on delete confirm page.');
|
||||
|
||||
// Unpublish the comment.
|
||||
$this->performCommentOperation($comment1, 'unpublish');
|
||||
$this->drupalGet('admin/content/comment/approval');
|
||||
$this->assertRaw('comments[' . $comment1->id() . ']', 'Comment was unpublished.');
|
||||
|
||||
// Publish the comment.
|
||||
$this->performCommentOperation($comment1, 'publish', TRUE);
|
||||
$this->drupalGet('admin/content/comment');
|
||||
$this->assertRaw('comments[' . $comment1->id() . ']', 'Comment was published.');
|
||||
|
||||
// Delete the comment.
|
||||
$this->performCommentOperation($comment1, 'delete');
|
||||
$this->drupalGet('admin/content/comment');
|
||||
$this->assertNoRaw('comments[' . $comment1->id() . ']', 'Comment was deleted.');
|
||||
|
||||
// Post another comment.
|
||||
$comment1 = $this->postComment($this->entity, $this->randomMachineName(), $this->randomMachineName());
|
||||
$this->assertTrue($this->commentExists($comment1), 'Comment on test entity exists.');
|
||||
|
||||
// Check that the comment was found.
|
||||
$this->drupalGet('admin/content/comment');
|
||||
$this->assertRaw('comments[' . $comment1->id() . ']', 'Comment was published.');
|
||||
|
||||
// Check that entity access applies to administrative page.
|
||||
$this->assertText($this->entity->label(), 'Name of commented account found.');
|
||||
$limited_user = $this->drupalCreateUser([
|
||||
'administer comments',
|
||||
]);
|
||||
$this->drupalLogin($limited_user);
|
||||
$this->drupalGet('admin/content/comment');
|
||||
$this->assertNoText($this->entity->label(), 'No commented account name found.');
|
||||
|
||||
$this->drupalLogout();
|
||||
|
||||
// Deny anonymous users access to comments.
|
||||
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments' => FALSE,
|
||||
'post comments' => FALSE,
|
||||
'skip comment approval' => FALSE,
|
||||
'view test entity' => TRUE,
|
||||
]);
|
||||
|
||||
// Attempt to view comments while disallowed.
|
||||
$this->drupalGet('entity-test/' . $this->entity->id());
|
||||
$this->assertNoPattern('@<h2[^>]*>Comments</h2>@', 'Comments were not displayed.');
|
||||
$this->assertNoLink('Add new comment', 'Link to add comment was found.');
|
||||
|
||||
// Attempt to view test entity comment form while disallowed.
|
||||
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment');
|
||||
$this->assertResponse(403);
|
||||
$this->assertNoFieldByName('subject[0][value]', '', 'Subject field not found.');
|
||||
$this->assertNoFieldByName('comment_body[0][value]', '', 'Comment field not found.');
|
||||
|
||||
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments' => TRUE,
|
||||
'post comments' => FALSE,
|
||||
'view test entity' => TRUE,
|
||||
'skip comment approval' => FALSE,
|
||||
]);
|
||||
$this->drupalGet('entity_test/' . $this->entity->id());
|
||||
$this->assertPattern('@<h2[^>]*>Comments</h2>@', 'Comments were displayed.');
|
||||
$this->assertLink('Log in', 0, 'Link to login was found.');
|
||||
$this->assertLink('register', 0, 'Link to register was found.');
|
||||
$this->assertNoFieldByName('subject[0][value]', '', 'Subject field not found.');
|
||||
$this->assertNoFieldByName('comment_body[0][value]', '', 'Comment field not found.');
|
||||
|
||||
// Test the combination of anonymous users being able to post, but not view
|
||||
// comments, to ensure that access to post comments doesn't grant access to
|
||||
// view them.
|
||||
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments' => FALSE,
|
||||
'post comments' => TRUE,
|
||||
'skip comment approval' => TRUE,
|
||||
'view test entity' => TRUE,
|
||||
]);
|
||||
$this->drupalGet('entity_test/' . $this->entity->id());
|
||||
$this->assertNoPattern('@<h2[^>]*>Comments</h2>@', 'Comments were not displayed.');
|
||||
$this->assertFieldByName('subject[0][value]', '', 'Subject field found.');
|
||||
$this->assertFieldByName('comment_body[0][value]', '', 'Comment field found.');
|
||||
|
||||
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment/' . $comment1->id());
|
||||
$this->assertResponse(403);
|
||||
$this->assertNoText($comment1->getSubject(), 'Comment not displayed.');
|
||||
|
||||
// Test comment field widget changes.
|
||||
$limited_user = $this->drupalCreateUser([
|
||||
'administer entity_test fields',
|
||||
'view test entity',
|
||||
'administer entity_test content',
|
||||
'administer comments',
|
||||
]);
|
||||
$this->drupalLogin($limited_user);
|
||||
$this->drupalGet('entity_test/structure/entity_test/fields/entity_test.entity_test.comment');
|
||||
$this->assertNoFieldChecked('edit-default-value-input-comment-0-status-0');
|
||||
$this->assertNoFieldChecked('edit-default-value-input-comment-0-status-1');
|
||||
$this->assertFieldChecked('edit-default-value-input-comment-0-status-2');
|
||||
// Test comment option change in field settings.
|
||||
$edit = [
|
||||
'default_value_input[comment][0][status]' => CommentItemInterface::CLOSED,
|
||||
'settings[anonymous]' => COMMENT_ANONYMOUS_MAY_CONTACT,
|
||||
];
|
||||
$this->drupalPostForm(NULL, $edit, t('Save settings'));
|
||||
$this->drupalGet('entity_test/structure/entity_test/fields/entity_test.entity_test.comment');
|
||||
$this->assertNoFieldChecked('edit-default-value-input-comment-0-status-0');
|
||||
$this->assertFieldChecked('edit-default-value-input-comment-0-status-1');
|
||||
$this->assertNoFieldChecked('edit-default-value-input-comment-0-status-2');
|
||||
$this->assertFieldByName('settings[anonymous]', COMMENT_ANONYMOUS_MAY_CONTACT);
|
||||
|
||||
// Add a new comment-type.
|
||||
$bundle = CommentType::create([
|
||||
'id' => 'foobar',
|
||||
'label' => 'Foobar',
|
||||
'description' => '',
|
||||
'target_entity_type_id' => 'entity_test',
|
||||
]);
|
||||
$bundle->save();
|
||||
|
||||
// Add a new comment field.
|
||||
$storage_edit = [
|
||||
'settings[comment_type]' => 'foobar',
|
||||
];
|
||||
$this->fieldUIAddNewField('entity_test/structure/entity_test', 'foobar', 'Foobar', 'comment', $storage_edit);
|
||||
|
||||
// Add a third comment field.
|
||||
$this->fieldUIAddNewField('entity_test/structure/entity_test', 'barfoo', 'BarFoo', 'comment', $storage_edit);
|
||||
|
||||
// Check the field contains the correct comment type.
|
||||
$field_storage = FieldStorageConfig::load('entity_test.field_barfoo');
|
||||
$this->assertTrue($field_storage);
|
||||
$this->assertEqual($field_storage->getSetting('comment_type'), 'foobar');
|
||||
$this->assertEqual($field_storage->getCardinality(), 1);
|
||||
|
||||
// Test the new entity commenting inherits default.
|
||||
$random_label = $this->randomMachineName();
|
||||
$data = ['bundle' => 'entity_test', 'name' => $random_label];
|
||||
$new_entity = EntityTest::create($data);
|
||||
$new_entity->save();
|
||||
$this->drupalGet('entity_test/manage/' . $new_entity->id() . '/edit');
|
||||
$this->assertNoFieldChecked('edit-field-foobar-0-status-1');
|
||||
$this->assertFieldChecked('edit-field-foobar-0-status-2');
|
||||
$this->assertNoField('edit-field-foobar-0-status-0');
|
||||
|
||||
// @todo Check proper url and form https://www.drupal.org/node/2458323
|
||||
$this->drupalGet('comment/reply/entity_test/comment/' . $new_entity->id());
|
||||
$this->assertNoFieldByName('subject[0][value]', '', 'Subject field found.');
|
||||
$this->assertNoFieldByName('comment_body[0][value]', '', 'Comment field found.');
|
||||
|
||||
// Test removal of comment_body field.
|
||||
$limited_user = $this->drupalCreateUser([
|
||||
'administer entity_test fields',
|
||||
'post comments',
|
||||
'administer comment fields',
|
||||
'administer comment types',
|
||||
]);
|
||||
$this->drupalLogin($limited_user);
|
||||
|
||||
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment');
|
||||
$this->assertFieldByName('comment_body[0][value]', '', 'Comment body field found.');
|
||||
$this->fieldUIDeleteField('admin/structure/comment/manage/comment', 'comment.comment.comment_body', 'Comment', 'Comment settings');
|
||||
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment');
|
||||
$this->assertNoFieldByName('comment_body[0][value]', '', 'Comment body field not found.');
|
||||
// Set subject field to autogenerate it.
|
||||
$edit = ['subject[0][value]' => ''];
|
||||
$this->drupalPostForm(NULL, $edit, t('Save'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests comment fields cannot be added to entity types without integer IDs.
|
||||
*/
|
||||
public function testsNonIntegerIdEntities() {
|
||||
// Create a bundle for entity_test_string_id.
|
||||
entity_test_create_bundle('entity_test', 'Entity Test', 'entity_test_string_id');
|
||||
$limited_user = $this->drupalCreateUser([
|
||||
'administer entity_test_string_id fields',
|
||||
]);
|
||||
$this->drupalLogin($limited_user);
|
||||
// Visit the Field UI field add page.
|
||||
$this->drupalGet('entity_test_string_id/structure/entity_test/fields/add-field');
|
||||
// Ensure field isn't shown for string IDs.
|
||||
$this->assertNoOption('edit-new-storage-type', 'comment');
|
||||
// Ensure a core field type shown.
|
||||
$this->assertOption('edit-new-storage-type', 'boolean');
|
||||
|
||||
// Create a bundle for entity_test_no_id.
|
||||
entity_test_create_bundle('entity_test', 'Entity Test', 'entity_test_no_id');
|
||||
$this->drupalLogin($this->drupalCreateUser([
|
||||
'administer entity_test_no_id fields',
|
||||
]));
|
||||
// Visit the Field UI field add page.
|
||||
$this->drupalGet('entity_test_no_id/structure/entity_test/fields/add-field');
|
||||
// Ensure field isn't shown for empty IDs.
|
||||
$this->assertNoOption('edit-new-storage-type', 'comment');
|
||||
// Ensure a core field type shown.
|
||||
$this->assertOption('edit-new-storage-type', 'boolean');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,208 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\CommentManagerInterface;
|
||||
use Drupal\Component\Render\MarkupInterface;
|
||||
use Drupal\Core\Datetime\DrupalDateTime;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
|
||||
/**
|
||||
* Tests comment preview.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentPreviewTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* The profile to install as a basis for testing.
|
||||
*
|
||||
* Using the standard profile to test user picture display in comments.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $profile = 'standard';
|
||||
|
||||
/**
|
||||
* Tests comment preview.
|
||||
*/
|
||||
public function testCommentPreview() {
|
||||
// As admin user, configure comment settings.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentPreview(DRUPAL_OPTIONAL);
|
||||
$this->setCommentForm(TRUE);
|
||||
$this->setCommentSubject(TRUE);
|
||||
$this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
|
||||
$this->drupalLogout();
|
||||
|
||||
// Log in as web user.
|
||||
$this->drupalLogin($this->webUser);
|
||||
|
||||
// Test escaping of the username on the preview form.
|
||||
\Drupal::service('module_installer')->install(['user_hooks_test']);
|
||||
\Drupal::state()->set('user_hooks_test_user_format_name_alter', TRUE);
|
||||
$edit = [];
|
||||
$edit['subject[0][value]'] = $this->randomMachineName(8);
|
||||
$edit['comment_body[0][value]'] = $this->randomMachineName(16);
|
||||
$this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
|
||||
$this->assertEscaped('<em>' . $this->webUser->id() . '</em>');
|
||||
|
||||
\Drupal::state()->set('user_hooks_test_user_format_name_alter_safe', TRUE);
|
||||
$this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
|
||||
$this->assertTrue($this->webUser->getDisplayName() instanceof MarkupInterface, 'Username is marked safe');
|
||||
$this->assertNoEscaped('<em>' . $this->webUser->id() . '</em>');
|
||||
$this->assertRaw('<em>' . $this->webUser->id() . '</em>');
|
||||
|
||||
// Add a user picture.
|
||||
$image = current($this->drupalGetTestFiles('image'));
|
||||
$user_edit['files[user_picture_0]'] = drupal_realpath($image->uri);
|
||||
$this->drupalPostForm('user/' . $this->webUser->id() . '/edit', $user_edit, t('Save'));
|
||||
|
||||
// As the web user, fill in the comment form and preview the comment.
|
||||
$this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
|
||||
|
||||
// Check that the preview is displaying the title and body.
|
||||
$this->assertTitle(t('Preview comment | Drupal'), 'Page title is "Preview comment".');
|
||||
$this->assertText($edit['subject[0][value]'], 'Subject displayed.');
|
||||
$this->assertText($edit['comment_body[0][value]'], 'Comment displayed.');
|
||||
|
||||
// Check that the title and body fields are displayed with the correct values.
|
||||
$this->assertFieldByName('subject[0][value]', $edit['subject[0][value]'], 'Subject field displayed.');
|
||||
$this->assertFieldByName('comment_body[0][value]', $edit['comment_body[0][value]'], 'Comment field displayed.');
|
||||
|
||||
// Check that the user picture is displayed.
|
||||
$this->assertFieldByXPath("//article[contains(@class, 'preview')]//div[contains(@class, 'user-picture')]//img", NULL, 'User picture displayed.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests comment preview.
|
||||
*/
|
||||
public function testCommentPreviewDuplicateSubmission() {
|
||||
// As admin user, configure comment settings.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentPreview(DRUPAL_OPTIONAL);
|
||||
$this->setCommentForm(TRUE);
|
||||
$this->setCommentSubject(TRUE);
|
||||
$this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
|
||||
$this->drupalLogout();
|
||||
|
||||
// Log in as web user.
|
||||
$this->drupalLogin($this->webUser);
|
||||
|
||||
// As the web user, fill in the comment form and preview the comment.
|
||||
$edit = [];
|
||||
$edit['subject[0][value]'] = $this->randomMachineName(8);
|
||||
$edit['comment_body[0][value]'] = $this->randomMachineName(16);
|
||||
$this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
|
||||
|
||||
// Check that the preview is displaying the title and body.
|
||||
$this->assertTitle(t('Preview comment | Drupal'), 'Page title is "Preview comment".');
|
||||
$this->assertText($edit['subject[0][value]'], 'Subject displayed.');
|
||||
$this->assertText($edit['comment_body[0][value]'], 'Comment displayed.');
|
||||
|
||||
// Check that the title and body fields are displayed with the correct values.
|
||||
$this->assertFieldByName('subject[0][value]', $edit['subject[0][value]'], 'Subject field displayed.');
|
||||
$this->assertFieldByName('comment_body[0][value]', $edit['comment_body[0][value]'], 'Comment field displayed.');
|
||||
|
||||
// Store the content of this page.
|
||||
$content = $this->getRawContent();
|
||||
$this->drupalPostForm(NULL, [], 'Save');
|
||||
$this->assertText('Your comment has been posted.');
|
||||
$elements = $this->xpath('//section[contains(@class, "comment-wrapper")]/article');
|
||||
$this->assertEqual(1, count($elements));
|
||||
|
||||
// Reset the content of the page to simulate the browser's back button, and
|
||||
// re-submit the form.
|
||||
$this->setRawContent($content);
|
||||
$this->drupalPostForm(NULL, [], 'Save');
|
||||
$this->assertText('Your comment has been posted.');
|
||||
$elements = $this->xpath('//section[contains(@class, "comment-wrapper")]/article');
|
||||
$this->assertEqual(2, count($elements));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests comment edit, preview, and save.
|
||||
*/
|
||||
public function testCommentEditPreviewSave() {
|
||||
$web_user = $this->drupalCreateUser(['access comments', 'post comments', 'skip comment approval', 'edit own comments']);
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentPreview(DRUPAL_OPTIONAL);
|
||||
$this->setCommentForm(TRUE);
|
||||
$this->setCommentSubject(TRUE);
|
||||
$this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
|
||||
|
||||
$edit = [];
|
||||
$date = new DrupalDateTime('2008-03-02 17:23');
|
||||
$edit['subject[0][value]'] = $this->randomMachineName(8);
|
||||
$edit['comment_body[0][value]'] = $this->randomMachineName(16);
|
||||
$edit['uid'] = $web_user->getUsername() . ' (' . $web_user->id() . ')';
|
||||
$edit['date[date]'] = $date->format('Y-m-d');
|
||||
$edit['date[time]'] = $date->format('H:i:s');
|
||||
$raw_date = $date->getTimestamp();
|
||||
$expected_text_date = format_date($raw_date);
|
||||
$expected_form_date = $date->format('Y-m-d');
|
||||
$expected_form_time = $date->format('H:i:s');
|
||||
$comment = $this->postComment($this->node, $edit['subject[0][value]'], $edit['comment_body[0][value]'], TRUE);
|
||||
$this->drupalPostForm('comment/' . $comment->id() . '/edit', $edit, t('Preview'));
|
||||
|
||||
// Check that the preview is displaying the subject, comment, author and date correctly.
|
||||
$this->assertTitle(t('Preview comment | Drupal'), 'Page title is "Preview comment".');
|
||||
$this->assertText($edit['subject[0][value]'], 'Subject displayed.');
|
||||
$this->assertText($edit['comment_body[0][value]'], 'Comment displayed.');
|
||||
$this->assertText($web_user->getUsername(), 'Author displayed.');
|
||||
$this->assertText($expected_text_date, 'Date displayed.');
|
||||
|
||||
// Check that the subject, comment, author and date fields are displayed with the correct values.
|
||||
$this->assertFieldByName('subject[0][value]', $edit['subject[0][value]'], 'Subject field displayed.');
|
||||
$this->assertFieldByName('comment_body[0][value]', $edit['comment_body[0][value]'], 'Comment field displayed.');
|
||||
$this->assertFieldByName('uid', $edit['uid'], 'Author field displayed.');
|
||||
$this->assertFieldByName('date[date]', $edit['date[date]'], 'Date field displayed.');
|
||||
$this->assertFieldByName('date[time]', $edit['date[time]'], 'Time field displayed.');
|
||||
|
||||
// Check that saving a comment produces a success message.
|
||||
$this->drupalPostForm('comment/' . $comment->id() . '/edit', $edit, t('Save'));
|
||||
$this->assertText(t('Your comment has been posted.'), 'Comment posted.');
|
||||
|
||||
// Check that the comment fields are correct after loading the saved comment.
|
||||
$this->drupalGet('comment/' . $comment->id() . '/edit');
|
||||
$this->assertFieldByName('subject[0][value]', $edit['subject[0][value]'], 'Subject field displayed.');
|
||||
$this->assertFieldByName('comment_body[0][value]', $edit['comment_body[0][value]'], 'Comment field displayed.');
|
||||
$this->assertFieldByName('uid', $edit['uid'], 'Author field displayed.');
|
||||
$this->assertFieldByName('date[date]', $expected_form_date, 'Date field displayed.');
|
||||
$this->assertFieldByName('date[time]', $expected_form_time, 'Time field displayed.');
|
||||
|
||||
// Submit the form using the displayed values.
|
||||
$displayed = [];
|
||||
$displayed['subject[0][value]'] = (string) current($this->xpath("//input[@id='edit-subject-0-value']/@value"));
|
||||
$displayed['comment_body[0][value]'] = (string) current($this->xpath("//textarea[@id='edit-comment-body-0-value']"));
|
||||
$displayed['uid'] = (string) current($this->xpath("//input[@id='edit-uid']/@value"));
|
||||
$displayed['date[date]'] = (string) current($this->xpath("//input[@id='edit-date-date']/@value"));
|
||||
$displayed['date[time]'] = (string) current($this->xpath("//input[@id='edit-date-time']/@value"));
|
||||
$this->drupalPostForm('comment/' . $comment->id() . '/edit', $displayed, t('Save'));
|
||||
|
||||
// Check that the saved comment is still correct.
|
||||
$comment_storage = \Drupal::entityManager()->getStorage('comment');
|
||||
$comment_storage->resetCache([$comment->id()]);
|
||||
/** @var \Drupal\comment\CommentInterface $comment_loaded */
|
||||
$comment_loaded = Comment::load($comment->id());
|
||||
$this->assertEqual($comment_loaded->getSubject(), $edit['subject[0][value]'], 'Subject loaded.');
|
||||
$this->assertEqual($comment_loaded->comment_body->value, $edit['comment_body[0][value]'], 'Comment body loaded.');
|
||||
$this->assertEqual($comment_loaded->getOwner()->id(), $web_user->id(), 'Name loaded.');
|
||||
$this->assertEqual($comment_loaded->getCreatedTime(), $raw_date, 'Date loaded.');
|
||||
$this->drupalLogout();
|
||||
|
||||
// Check that the date and time of the comment are correct when edited by
|
||||
// non-admin users.
|
||||
$user_edit = [];
|
||||
$expected_created_time = $comment_loaded->getCreatedTime();
|
||||
$this->drupalLogin($web_user);
|
||||
// Web user cannot change the comment author.
|
||||
unset($edit['uid']);
|
||||
$this->drupalPostForm('comment/' . $comment->id() . '/edit', $user_edit, t('Save'));
|
||||
$comment_storage->resetCache([$comment->id()]);
|
||||
$comment_loaded = Comment::load($comment->id());
|
||||
$this->assertEqual($comment_loaded->getCreatedTime(), $expected_created_time, 'Expected date and time for comment edited.');
|
||||
$this->drupalLogout();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,79 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
|
||||
use Drupal\Core\Cache\Cache;
|
||||
use Drupal\Core\Entity\Entity\EntityViewDisplay;
|
||||
use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
|
||||
|
||||
/**
|
||||
* Tests comments as part of an RSS feed.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentRssTest extends CommentTestBase {
|
||||
|
||||
use AssertPageCacheContextsAndTagsTrait;
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['views'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
// Setup the rss view display.
|
||||
EntityViewDisplay::create([
|
||||
'status' => TRUE,
|
||||
'targetEntityType' => 'node',
|
||||
'bundle' => 'article',
|
||||
'mode' => 'rss',
|
||||
'content' => ['links' => ['weight' => 100]],
|
||||
])->save();
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests comments as part of an RSS feed.
|
||||
*/
|
||||
public function testCommentRss() {
|
||||
// Find comment in RSS feed.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName());
|
||||
$this->drupalGet('rss.xml');
|
||||
|
||||
$cache_contexts = [
|
||||
'languages:language_interface',
|
||||
'theme',
|
||||
'url.site',
|
||||
'user.node_grants:view',
|
||||
'user.permissions',
|
||||
'timezone',
|
||||
];
|
||||
$this->assertCacheContexts($cache_contexts);
|
||||
|
||||
$cache_context_tags = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($cache_contexts)->getCacheTags();
|
||||
$this->assertCacheTags(Cache::mergeTags($cache_context_tags, [
|
||||
'config:views.view.frontpage',
|
||||
'node:1', 'node_list',
|
||||
'node_view',
|
||||
'user:3',
|
||||
]));
|
||||
|
||||
$raw = '<comments>' . $this->node->url('canonical', ['fragment' => 'comments', 'absolute' => TRUE]) . '</comments>';
|
||||
$this->assertRaw($raw, 'Comments as part of RSS feed.');
|
||||
|
||||
// Hide comments from RSS feed and check presence.
|
||||
$this->node->set('comment', CommentItemInterface::HIDDEN);
|
||||
$this->node->save();
|
||||
$this->drupalGet('rss.xml');
|
||||
$this->assertNoRaw($raw, 'Hidden comments is not a part of RSS feed.');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,118 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\CommentManagerInterface;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\user\RoleInterface;
|
||||
|
||||
/**
|
||||
* Tests comment statistics on nodes.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentStatisticsTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* A secondary user for posting comments.
|
||||
*
|
||||
* @var \Drupal\user\UserInterface
|
||||
*/
|
||||
protected $webUser2;
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
// Create a second user to post comments.
|
||||
$this->webUser2 = $this->drupalCreateUser([
|
||||
'post comments',
|
||||
'create article content',
|
||||
'edit own comments',
|
||||
'post comments',
|
||||
'skip comment approval',
|
||||
'access comments',
|
||||
'access content',
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the node comment statistics.
|
||||
*/
|
||||
public function testCommentNodeCommentStatistics() {
|
||||
$node_storage = $this->container->get('entity.manager')->getStorage('node');
|
||||
// Set comments to have subject and preview disabled.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentPreview(DRUPAL_DISABLED);
|
||||
$this->setCommentForm(TRUE);
|
||||
$this->setCommentSubject(FALSE);
|
||||
$this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
|
||||
$this->drupalLogout();
|
||||
|
||||
// Checks the initial values of node comment statistics with no comment.
|
||||
$node = $node_storage->load($this->node->id());
|
||||
$this->assertEqual($node->get('comment')->last_comment_timestamp, $this->node->getCreatedTime(), 'The initial value of node last_comment_timestamp is the node created date.');
|
||||
$this->assertEqual($node->get('comment')->last_comment_name, NULL, 'The initial value of node last_comment_name is NULL.');
|
||||
$this->assertEqual($node->get('comment')->last_comment_uid, $this->webUser->id(), 'The initial value of node last_comment_uid is the node uid.');
|
||||
$this->assertEqual($node->get('comment')->comment_count, 0, 'The initial value of node comment_count is zero.');
|
||||
|
||||
// Post comment #1 as web_user2.
|
||||
$this->drupalLogin($this->webUser2);
|
||||
$comment_text = $this->randomMachineName();
|
||||
$this->postComment($this->node, $comment_text);
|
||||
|
||||
// Checks the new values of node comment statistics with comment #1.
|
||||
// The node cache needs to be reset before reload.
|
||||
$node_storage->resetCache([$this->node->id()]);
|
||||
$node = $node_storage->load($this->node->id());
|
||||
$this->assertEqual($node->get('comment')->last_comment_name, NULL, 'The value of node last_comment_name is NULL.');
|
||||
$this->assertEqual($node->get('comment')->last_comment_uid, $this->webUser2->id(), 'The value of node last_comment_uid is the comment #1 uid.');
|
||||
$this->assertEqual($node->get('comment')->comment_count, 1, 'The value of node comment_count is 1.');
|
||||
|
||||
// Prepare for anonymous comment submission (comment approval enabled).
|
||||
$this->drupalLogin($this->adminUser);
|
||||
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments' => TRUE,
|
||||
'post comments' => TRUE,
|
||||
'skip comment approval' => FALSE,
|
||||
]);
|
||||
// Ensure that the poster can leave some contact info.
|
||||
$this->setCommentAnonymous('1');
|
||||
$this->drupalLogout();
|
||||
|
||||
// Post comment #2 as anonymous (comment approval enabled).
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
|
||||
$anonymous_comment = $this->postComment($this->node, $this->randomMachineName(), '', TRUE);
|
||||
|
||||
// Checks the new values of node comment statistics with comment #2 and
|
||||
// ensure they haven't changed since the comment has not been moderated.
|
||||
// The node needs to be reloaded with the cache reset.
|
||||
$node_storage->resetCache([$this->node->id()]);
|
||||
$node = $node_storage->load($this->node->id());
|
||||
$this->assertEqual($node->get('comment')->last_comment_name, NULL, 'The value of node last_comment_name is still NULL.');
|
||||
$this->assertEqual($node->get('comment')->last_comment_uid, $this->webUser2->id(), 'The value of node last_comment_uid is still the comment #1 uid.');
|
||||
$this->assertEqual($node->get('comment')->comment_count, 1, 'The value of node comment_count is still 1.');
|
||||
|
||||
// Prepare for anonymous comment submission (no approval required).
|
||||
$this->drupalLogin($this->adminUser);
|
||||
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
|
||||
'access comments' => TRUE,
|
||||
'post comments' => TRUE,
|
||||
'skip comment approval' => TRUE,
|
||||
]);
|
||||
$this->drupalLogout();
|
||||
|
||||
// Post comment #3 as anonymous.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
|
||||
$anonymous_comment = $this->postComment($this->node, $this->randomMachineName(), '', ['name' => $this->randomMachineName()]);
|
||||
$comment_loaded = Comment::load($anonymous_comment->id());
|
||||
|
||||
// Checks the new values of node comment statistics with comment #3.
|
||||
// The node needs to be reloaded with the cache reset.
|
||||
$node_storage->resetCache([$this->node->id()]);
|
||||
$node = $node_storage->load($this->node->id());
|
||||
$this->assertEqual($node->get('comment')->last_comment_name, $comment_loaded->getAuthorName(), 'The value of node last_comment_name is the name of the anonymous user.');
|
||||
$this->assertEqual($node->get('comment')->last_comment_uid, 0, 'The value of node last_comment_uid is zero.');
|
||||
$this->assertEqual($node->get('comment')->comment_count, 2, 'The value of node comment_count is 2.');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,171 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\CommentManagerInterface;
|
||||
|
||||
/**
|
||||
* Tests to make sure the comment number increments properly.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentThreadingTest extends CommentTestBase {
|
||||
/**
|
||||
* Tests the comment threading.
|
||||
*/
|
||||
public function testCommentThreading() {
|
||||
// Set comments to have a subject with preview disabled.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->setCommentPreview(DRUPAL_DISABLED);
|
||||
$this->setCommentForm(TRUE);
|
||||
$this->setCommentSubject(TRUE);
|
||||
$this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
|
||||
$this->drupalLogout();
|
||||
|
||||
// Create a node.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()]);
|
||||
|
||||
// Post comment #1.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$subject_text = $this->randomMachineName();
|
||||
$comment_text = $this->randomMachineName();
|
||||
|
||||
$comment1 = $this->postComment($this->node, $comment_text, $subject_text, TRUE);
|
||||
// Confirm that the comment was created and has the correct threading.
|
||||
$this->assertTrue($this->commentExists($comment1), 'Comment #1. Comment found.');
|
||||
$this->assertEqual($comment1->getThread(), '01/');
|
||||
// Confirm that there is no reference to a parent comment.
|
||||
$this->assertNoParentLink($comment1->id());
|
||||
|
||||
// Post comment #2 following the comment #1 to test if it correctly jumps
|
||||
// out the indentation in case there is a thread above.
|
||||
$subject_text = $this->randomMachineName();
|
||||
$comment_text = $this->randomMachineName();
|
||||
$this->postComment($this->node, $comment_text, $subject_text, TRUE);
|
||||
|
||||
// Reply to comment #1 creating comment #1_3.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $comment1->id());
|
||||
$comment1_3 = $this->postComment(NULL, $this->randomMachineName(), '', TRUE);
|
||||
|
||||
// Confirm that the comment was created and has the correct threading.
|
||||
$this->assertTrue($this->commentExists($comment1_3, TRUE), 'Comment #1_3. Reply found.');
|
||||
$this->assertEqual($comment1_3->getThread(), '01.00/');
|
||||
// Confirm that there is a link to the parent comment.
|
||||
$this->assertParentLink($comment1_3->id(), $comment1->id());
|
||||
|
||||
|
||||
// Reply to comment #1_3 creating comment #1_3_4.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $comment1_3->id());
|
||||
$comment1_3_4 = $this->postComment(NULL, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
|
||||
// Confirm that the comment was created and has the correct threading.
|
||||
$this->assertTrue($this->commentExists($comment1_3_4, TRUE), 'Comment #1_3_4. Second reply found.');
|
||||
$this->assertEqual($comment1_3_4->getThread(), '01.00.00/');
|
||||
// Confirm that there is a link to the parent comment.
|
||||
$this->assertParentLink($comment1_3_4->id(), $comment1_3->id());
|
||||
|
||||
// Reply to comment #1 creating comment #1_5.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $comment1->id());
|
||||
|
||||
$comment1_5 = $this->postComment(NULL, $this->randomMachineName(), '', TRUE);
|
||||
|
||||
// Confirm that the comment was created and has the correct threading.
|
||||
$this->assertTrue($this->commentExists($comment1_5), 'Comment #1_5. Third reply found.');
|
||||
$this->assertEqual($comment1_5->getThread(), '01.01/');
|
||||
// Confirm that there is a link to the parent comment.
|
||||
$this->assertParentLink($comment1_5->id(), $comment1->id());
|
||||
|
||||
// Post comment #3 overall comment #5.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$subject_text = $this->randomMachineName();
|
||||
$comment_text = $this->randomMachineName();
|
||||
|
||||
$comment5 = $this->postComment($this->node, $comment_text, $subject_text, TRUE);
|
||||
// Confirm that the comment was created and has the correct threading.
|
||||
$this->assertTrue($this->commentExists($comment5), 'Comment #5. Second comment found.');
|
||||
$this->assertEqual($comment5->getThread(), '03/');
|
||||
// Confirm that there is no link to a parent comment.
|
||||
$this->assertNoParentLink($comment5->id());
|
||||
|
||||
// Reply to comment #5 creating comment #5_6.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $comment5->id());
|
||||
$comment5_6 = $this->postComment(NULL, $this->randomMachineName(), '', TRUE);
|
||||
|
||||
// Confirm that the comment was created and has the correct threading.
|
||||
$this->assertTrue($this->commentExists($comment5_6, TRUE), 'Comment #6. Reply found.');
|
||||
$this->assertEqual($comment5_6->getThread(), '03.00/');
|
||||
// Confirm that there is a link to the parent comment.
|
||||
$this->assertParentLink($comment5_6->id(), $comment5->id());
|
||||
|
||||
// Reply to comment #5_6 creating comment #5_6_7.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $comment5_6->id());
|
||||
$comment5_6_7 = $this->postComment(NULL, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
|
||||
// Confirm that the comment was created and has the correct threading.
|
||||
$this->assertTrue($this->commentExists($comment5_6_7, TRUE), 'Comment #5_6_7. Second reply found.');
|
||||
$this->assertEqual($comment5_6_7->getThread(), '03.00.00/');
|
||||
// Confirm that there is a link to the parent comment.
|
||||
$this->assertParentLink($comment5_6_7->id(), $comment5_6->id());
|
||||
|
||||
// Reply to comment #5 creating comment #5_8.
|
||||
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $comment5->id());
|
||||
$comment5_8 = $this->postComment(NULL, $this->randomMachineName(), '', TRUE);
|
||||
|
||||
// Confirm that the comment was created and has the correct threading.
|
||||
$this->assertTrue($this->commentExists($comment5_8), 'Comment #5_8. Third reply found.');
|
||||
$this->assertEqual($comment5_8->getThread(), '03.01/');
|
||||
// Confirm that there is a link to the parent comment.
|
||||
$this->assertParentLink($comment5_8->id(), $comment5->id());
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts that the link to the specified parent comment is present.
|
||||
*
|
||||
* @param int $cid
|
||||
* The comment ID to check.
|
||||
* @param int $pid
|
||||
* The expected parent comment ID.
|
||||
*/
|
||||
protected function assertParentLink($cid, $pid) {
|
||||
// This pattern matches a markup structure like:
|
||||
// <a id="comment-2"></a>
|
||||
// <article>
|
||||
// <p class="parent">
|
||||
// <a href="...comment-1"></a>
|
||||
// </p>
|
||||
// </article>
|
||||
$pattern = "//a[@id='comment-$cid']/following-sibling::article//p[contains(@class, 'parent')]//a[contains(@href, 'comment-$pid')]";
|
||||
|
||||
$this->assertFieldByXpath($pattern, NULL, format_string(
|
||||
'Comment %cid has a link to parent %pid.',
|
||||
[
|
||||
'%cid' => $cid,
|
||||
'%pid' => $pid,
|
||||
]
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts that the specified comment does not have a link to a parent.
|
||||
*
|
||||
* @param int $cid
|
||||
* The comment ID to check.
|
||||
*/
|
||||
protected function assertNoParentLink($cid) {
|
||||
// This pattern matches a markup structure like:
|
||||
// <a id="comment-2"></a>
|
||||
// <article>
|
||||
// <p class="parent"></p>
|
||||
// </article>
|
||||
|
||||
$pattern = "//a[@id='comment-$cid']/following-sibling::article//p[contains(@class, 'parent')]";
|
||||
$this->assertNoFieldByXpath($pattern, NULL, format_string(
|
||||
'Comment %cid does not have a link to a parent.',
|
||||
[
|
||||
'%cid' => $cid,
|
||||
]
|
||||
));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
/**
|
||||
* Tests to ensure that appropriate and accessible markup is created for comment
|
||||
* titles.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentTitleTest extends CommentTestBase {
|
||||
/**
|
||||
* Tests markup for comments with empty titles.
|
||||
*/
|
||||
public function testCommentEmptyTitles() {
|
||||
// Installs module that sets comments to an empty string.
|
||||
\Drupal::service('module_installer')->install(['comment_empty_title_test']);
|
||||
|
||||
// Set comments to have a subject with preview disabled.
|
||||
$this->setCommentPreview(DRUPAL_DISABLED);
|
||||
$this->setCommentForm(TRUE);
|
||||
$this->setCommentSubject(TRUE);
|
||||
|
||||
// Create a node.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()]);
|
||||
|
||||
// Post comment #1 and verify that h3's are not rendered.
|
||||
$subject_text = $this->randomMachineName();
|
||||
$comment_text = $this->randomMachineName();
|
||||
$comment = $this->postComment($this->node, $comment_text, $subject_text, TRUE);
|
||||
// Confirm that the comment was created.
|
||||
$regex = '/<a id="comment-' . $comment->id() . '"(.*?)';
|
||||
$regex .= $comment->comment_body->value . '(.*?)';
|
||||
$regex .= '/s';
|
||||
$this->assertPattern($regex, 'Comment is created successfully');
|
||||
// Tests that markup is not generated for the comment without header.
|
||||
$this->assertNoPattern('|<h3[^>]*></h3>|', 'Comment title H3 element not found when title is an empty string.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests markup for comments with populated titles.
|
||||
*/
|
||||
public function testCommentPopulatedTitles() {
|
||||
// Set comments to have a subject with preview disabled.
|
||||
$this->setCommentPreview(DRUPAL_DISABLED);
|
||||
$this->setCommentForm(TRUE);
|
||||
$this->setCommentSubject(TRUE);
|
||||
|
||||
// Create a node.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()]);
|
||||
|
||||
// Post comment #1 and verify that title is rendered in h3.
|
||||
$subject_text = $this->randomMachineName();
|
||||
$comment_text = $this->randomMachineName();
|
||||
$comment1 = $this->postComment($this->node, $comment_text, $subject_text, TRUE);
|
||||
// Confirm that the comment was created.
|
||||
$this->assertTrue($this->commentExists($comment1), 'Comment #1. Comment found.');
|
||||
// Tests that markup is created for comment with heading.
|
||||
$this->assertPattern('|<h3[^>]*><a[^>]*>' . $subject_text . '</a></h3>|', 'Comment title is rendered in h3 when title populated.');
|
||||
// Tests that the comment's title link is the permalink of the comment.
|
||||
$comment_permalink = $this->cssSelect('.permalink');
|
||||
$comment_permalink = (string) $comment_permalink[0]['href'];
|
||||
// Tests that the comment's title link contains the url fragment.
|
||||
$this->assertTrue(strpos($comment_permalink, '#comment-' . $comment1->id()), "The comment's title link contains the url fragment.");
|
||||
$this->assertEqual($comment1->permalink()->toString(), $comment_permalink, "The comment's title has the correct link.");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,181 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
|
||||
use Drupal\Component\Render\FormattableMarkup;
|
||||
use Drupal\Component\Utility\Html;
|
||||
use Drupal\Component\Utility\UrlHelper;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\Core\Render\BubbleableMetadata;
|
||||
use Drupal\node\Entity\Node;
|
||||
use Drupal\taxonomy\Entity\Term;
|
||||
use Drupal\taxonomy\Entity\Vocabulary;
|
||||
use Drupal\user\Entity\User;
|
||||
|
||||
/**
|
||||
* Generates text using placeholders for dummy content to check comment token
|
||||
* replacement.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentTokenReplaceTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['taxonomy'];
|
||||
|
||||
/**
|
||||
* Creates a comment, then tests the tokens generated from it.
|
||||
*/
|
||||
public function testCommentTokenReplacement() {
|
||||
$token_service = \Drupal::token();
|
||||
$language_interface = \Drupal::languageManager()->getCurrentLanguage();
|
||||
$url_options = [
|
||||
'absolute' => TRUE,
|
||||
'language' => $language_interface,
|
||||
];
|
||||
|
||||
// Setup vocabulary.
|
||||
Vocabulary::create([
|
||||
'vid' => 'tags',
|
||||
'name' => 'Tags',
|
||||
])->save();
|
||||
|
||||
// Change the title of the admin user.
|
||||
$this->adminUser->name->value = 'This is a title with some special & > " stuff.';
|
||||
$this->adminUser->save();
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
// Set comment variables.
|
||||
$this->setCommentSubject(TRUE);
|
||||
|
||||
// Create a node and a comment.
|
||||
$node = $this->drupalCreateNode(['type' => 'article', 'title' => '<script>alert("123")</script>']);
|
||||
$parent_comment = $this->postComment($node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
|
||||
|
||||
// Post a reply to the comment.
|
||||
$this->drupalGet('comment/reply/node/' . $node->id() . '/comment/' . $parent_comment->id());
|
||||
$child_comment = $this->postComment(NULL, $this->randomMachineName(), $this->randomMachineName());
|
||||
$comment = Comment::load($child_comment->id());
|
||||
$comment->setHomepage('http://example.org/');
|
||||
|
||||
// Add HTML to ensure that sanitation of some fields tested directly.
|
||||
$comment->setSubject('<blink>Blinking Comment</blink>');
|
||||
|
||||
// Generate and test tokens.
|
||||
$tests = [];
|
||||
$tests['[comment:cid]'] = $comment->id();
|
||||
$tests['[comment:hostname]'] = $comment->getHostname();
|
||||
$tests['[comment:author]'] = Html::escape($comment->getAuthorName());
|
||||
$tests['[comment:mail]'] = $this->adminUser->getEmail();
|
||||
$tests['[comment:homepage]'] = UrlHelper::filterBadProtocol($comment->getHomepage());
|
||||
$tests['[comment:title]'] = Html::escape($comment->getSubject());
|
||||
$tests['[comment:body]'] = $comment->comment_body->processed;
|
||||
$tests['[comment:langcode]'] = $comment->language()->getId();
|
||||
$tests['[comment:url]'] = $comment->url('canonical', $url_options + ['fragment' => 'comment-' . $comment->id()]);
|
||||
$tests['[comment:edit-url]'] = $comment->url('edit-form', $url_options);
|
||||
$tests['[comment:created]'] = \Drupal::service('date.formatter')->format($comment->getCreatedTime(), 'medium', ['langcode' => $language_interface->getId()]);
|
||||
$tests['[comment:created:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($comment->getCreatedTime(), ['langcode' => $language_interface->getId()]);
|
||||
$tests['[comment:changed:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($comment->getChangedTimeAcrossTranslations(), ['langcode' => $language_interface->getId()]);
|
||||
$tests['[comment:parent:cid]'] = $comment->hasParentComment() ? $comment->getParentComment()->id() : NULL;
|
||||
$tests['[comment:parent:title]'] = $parent_comment->getSubject();
|
||||
$tests['[comment:entity]'] = Html::escape($node->getTitle());
|
||||
// Test node specific tokens.
|
||||
$tests['[comment:entity:nid]'] = $comment->getCommentedEntityId();
|
||||
$tests['[comment:entity:title]'] = Html::escape($node->getTitle());
|
||||
$tests['[comment:author:uid]'] = $comment->getOwnerId();
|
||||
$tests['[comment:author:name]'] = Html::escape($this->adminUser->getDisplayName());
|
||||
|
||||
$base_bubbleable_metadata = BubbleableMetadata::createFromObject($comment);
|
||||
$metadata_tests = [];
|
||||
$metadata_tests['[comment:cid]'] = $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:hostname]'] = $base_bubbleable_metadata;
|
||||
$bubbleable_metadata = clone $base_bubbleable_metadata;
|
||||
$bubbleable_metadata->addCacheableDependency($this->adminUser);
|
||||
$metadata_tests['[comment:author]'] = $bubbleable_metadata;
|
||||
$bubbleable_metadata = clone $base_bubbleable_metadata;
|
||||
$bubbleable_metadata->addCacheableDependency($this->adminUser);
|
||||
$metadata_tests['[comment:mail]'] = $bubbleable_metadata;
|
||||
$metadata_tests['[comment:homepage]'] = $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:title]'] = $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:body]'] = $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:langcode]'] = $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:url]'] = $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:edit-url]'] = $base_bubbleable_metadata;
|
||||
$bubbleable_metadata = clone $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:created]'] = $bubbleable_metadata->addCacheTags(['rendered']);
|
||||
$bubbleable_metadata = clone $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:created:since]'] = $bubbleable_metadata->setCacheMaxAge(0);
|
||||
$bubbleable_metadata = clone $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:changed:since]'] = $bubbleable_metadata->setCacheMaxAge(0);
|
||||
$bubbleable_metadata = clone $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:parent:cid]'] = $bubbleable_metadata->addCacheTags(['comment:1']);
|
||||
$metadata_tests['[comment:parent:title]'] = $bubbleable_metadata;
|
||||
$bubbleable_metadata = clone $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:entity]'] = $bubbleable_metadata->addCacheTags(['node:2']);
|
||||
// Test node specific tokens.
|
||||
$metadata_tests['[comment:entity:nid]'] = $bubbleable_metadata;
|
||||
$metadata_tests['[comment:entity:title]'] = $bubbleable_metadata;
|
||||
$bubbleable_metadata = clone $base_bubbleable_metadata;
|
||||
$metadata_tests['[comment:author:uid]'] = $bubbleable_metadata->addCacheTags(['user:2']);
|
||||
$metadata_tests['[comment:author:name]'] = $bubbleable_metadata;
|
||||
|
||||
// Test to make sure that we generated something for each token.
|
||||
$this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
|
||||
|
||||
foreach ($tests as $input => $expected) {
|
||||
$bubbleable_metadata = new BubbleableMetadata();
|
||||
$output = $token_service->replace($input, ['comment' => $comment], ['langcode' => $language_interface->getId()], $bubbleable_metadata);
|
||||
$this->assertEqual($output, $expected, new FormattableMarkup('Comment token %token replaced.', ['%token' => $input]));
|
||||
$this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
|
||||
}
|
||||
|
||||
// Test anonymous comment author.
|
||||
$author_name = 'This is a random & " > string';
|
||||
$comment->setOwnerId(0)->setAuthorName($author_name);
|
||||
$input = '[comment:author]';
|
||||
$output = $token_service->replace($input, ['comment' => $comment], ['langcode' => $language_interface->getId()]);
|
||||
$this->assertEqual($output, Html::escape($author_name), format_string('Comment author token %token replaced.', ['%token' => $input]));
|
||||
// Add comment field to user and term entities.
|
||||
$this->addDefaultCommentField('user', 'user', 'comment', CommentItemInterface::OPEN, 'comment_user');
|
||||
$this->addDefaultCommentField('taxonomy_term', 'tags', 'comment', CommentItemInterface::OPEN, 'comment_term');
|
||||
|
||||
// Create a user and a comment.
|
||||
$user = User::create(['name' => 'alice']);
|
||||
$user->save();
|
||||
$this->postComment($user, 'user body', 'user subject', TRUE);
|
||||
|
||||
// Create a term and a comment.
|
||||
$term = Term::create([
|
||||
'vid' => 'tags',
|
||||
'name' => 'term',
|
||||
]);
|
||||
$term->save();
|
||||
$this->postComment($term, 'term body', 'term subject', TRUE);
|
||||
|
||||
// Load node, user and term again so comment_count gets computed.
|
||||
$node = Node::load($node->id());
|
||||
$user = User::load($user->id());
|
||||
$term = Term::load($term->id());
|
||||
|
||||
// Generate comment tokens for node (it has 2 comments, both new),
|
||||
// user and term.
|
||||
$tests = [];
|
||||
$tests['[entity:comment-count]'] = 2;
|
||||
$tests['[entity:comment-count-new]'] = 2;
|
||||
$tests['[node:comment-count]'] = 2;
|
||||
$tests['[node:comment-count-new]'] = 2;
|
||||
$tests['[user:comment-count]'] = 1;
|
||||
$tests['[user:comment-count-new]'] = 1;
|
||||
$tests['[term:comment-count]'] = 1;
|
||||
$tests['[term:comment-count-new]'] = 1;
|
||||
|
||||
foreach ($tests as $input => $expected) {
|
||||
$output = $token_service->replace($input, ['entity' => $node, 'node' => $node, 'user' => $user, 'term' => $term], ['langcode' => $language_interface->getId()]);
|
||||
$this->assertEqual($output, $expected, format_string('Comment token %token replaced.', ['%token' => $input]));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,225 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
|
||||
use Drupal\content_translation\Tests\ContentTranslationUITestBase;
|
||||
use Drupal\language\Entity\ConfigurableLanguage;
|
||||
|
||||
/**
|
||||
* Tests the Comment Translation UI.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentTranslationUITest extends ContentTranslationUITestBase {
|
||||
|
||||
use CommentTestTrait;
|
||||
|
||||
/**
|
||||
* The subject of the test comment.
|
||||
*/
|
||||
protected $subject;
|
||||
|
||||
/**
|
||||
* An administrative user with permission to administer comments.
|
||||
*
|
||||
* @var \Drupal\user\UserInterface
|
||||
*/
|
||||
protected $adminUser;
|
||||
|
||||
/**
|
||||
* {inheritdoc}
|
||||
*/
|
||||
protected $defaultCacheContexts = [
|
||||
'languages:language_interface',
|
||||
'session',
|
||||
'theme',
|
||||
'timezone',
|
||||
'url.query_args:_wrapper_format',
|
||||
'url.query_args.pagers:0',
|
||||
'user.permissions',
|
||||
'user.roles',
|
||||
];
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['language', 'content_translation', 'node', 'comment'];
|
||||
|
||||
protected function setUp() {
|
||||
$this->entityTypeId = 'comment';
|
||||
$this->nodeBundle = 'article';
|
||||
$this->bundle = 'comment_article';
|
||||
$this->testLanguageSelector = FALSE;
|
||||
$this->subject = $this->randomMachineName();
|
||||
parent::setUp();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function setupBundle() {
|
||||
parent::setupBundle();
|
||||
$this->drupalCreateContentType(['type' => $this->nodeBundle, 'name' => $this->nodeBundle]);
|
||||
// Add a comment field to the article content type.
|
||||
$this->addDefaultCommentField('node', 'article', 'comment_article', CommentItemInterface::OPEN, 'comment_article');
|
||||
// Create a page content type.
|
||||
$this->drupalCreateContentType(['type' => 'page', 'name' => 'page']);
|
||||
// Add a comment field to the page content type - this one won't be
|
||||
// translatable.
|
||||
$this->addDefaultCommentField('node', 'page', 'comment');
|
||||
// Mark this bundle as translatable.
|
||||
$this->container->get('content_translation.manager')->setEnabled('comment', 'comment_article', TRUE);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function getTranslatorPermissions() {
|
||||
return array_merge(parent::getTranslatorPermissions(), ['post comments', 'administer comments', 'access comments']);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function createEntity($values, $langcode, $comment_type = 'comment_article') {
|
||||
if ($comment_type == 'comment_article') {
|
||||
// This is the article node type, with the 'comment_article' field.
|
||||
$node_type = 'article';
|
||||
$field_name = 'comment_article';
|
||||
}
|
||||
else {
|
||||
// This is the page node type with the non-translatable 'comment' field.
|
||||
$node_type = 'page';
|
||||
$field_name = 'comment';
|
||||
}
|
||||
$node = $this->drupalCreateNode([
|
||||
'type' => $node_type,
|
||||
$field_name => [
|
||||
['status' => CommentItemInterface::OPEN]
|
||||
],
|
||||
]);
|
||||
$values['entity_id'] = $node->id();
|
||||
$values['entity_type'] = 'node';
|
||||
$values['field_name'] = $field_name;
|
||||
$values['uid'] = $node->getOwnerId();
|
||||
return parent::createEntity($values, $langcode, $comment_type);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function getNewEntityValues($langcode) {
|
||||
// Comment subject is not translatable hence we use a fixed value.
|
||||
return [
|
||||
'subject' => [['value' => $this->subject]],
|
||||
'comment_body' => [['value' => $this->randomMachineName(16)]],
|
||||
] + parent::getNewEntityValues($langcode);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function doTestPublishedStatus() {
|
||||
$entity_manager = \Drupal::entityManager();
|
||||
$storage = $entity_manager->getStorage($this->entityTypeId);
|
||||
|
||||
$storage->resetCache();
|
||||
$entity = $storage->load($this->entityId);
|
||||
|
||||
// Unpublish translations.
|
||||
foreach ($this->langcodes as $index => $langcode) {
|
||||
if ($index > 0) {
|
||||
$edit = ['status' => 0];
|
||||
$url = $entity->urlInfo('edit-form', ['language' => ConfigurableLanguage::load($langcode)]);
|
||||
$this->drupalPostForm($url, $edit, $this->getFormSubmitAction($entity, $langcode));
|
||||
$storage->resetCache();
|
||||
$entity = $storage->load($this->entityId);
|
||||
$this->assertFalse($this->manager->getTranslationMetadata($entity->getTranslation($langcode))->isPublished(), 'The translation has been correctly unpublished.');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function doTestAuthoringInfo() {
|
||||
$storage = $this->container->get('entity_type.manager')
|
||||
->getStorage($this->entityTypeId);
|
||||
$storage->resetCache([$this->entityId]);
|
||||
$entity = $storage->load($this->entityId);
|
||||
$languages = $this->container->get('language_manager')->getLanguages();
|
||||
$values = [];
|
||||
|
||||
// Post different authoring information for each translation.
|
||||
foreach ($this->langcodes as $langcode) {
|
||||
$url = $entity->urlInfo('edit-form', ['language' => $languages[$langcode]]);
|
||||
$user = $this->drupalCreateUser();
|
||||
$values[$langcode] = [
|
||||
'uid' => $user->id(),
|
||||
'created' => REQUEST_TIME - mt_rand(0, 1000),
|
||||
];
|
||||
$edit = [
|
||||
'uid' => $user->getUsername() . ' (' . $user->id() . ')',
|
||||
'date[date]' => format_date($values[$langcode]['created'], 'custom', 'Y-m-d'),
|
||||
'date[time]' => format_date($values[$langcode]['created'], 'custom', 'H:i:s'),
|
||||
];
|
||||
$this->drupalPostForm($url, $edit, $this->getFormSubmitAction($entity, $langcode));
|
||||
}
|
||||
|
||||
$storage->resetCache([$this->entityId]);
|
||||
$entity = $storage->load($this->entityId);
|
||||
foreach ($this->langcodes as $langcode) {
|
||||
$metadata = $this->manager->getTranslationMetadata($entity->getTranslation($langcode));
|
||||
$this->assertEqual($metadata->getAuthor()->id(), $values[$langcode]['uid'], 'Translation author correctly stored.');
|
||||
$this->assertEqual($metadata->getCreatedTime(), $values[$langcode]['created'], 'Translation date correctly stored.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests translate link on comment content admin page.
|
||||
*/
|
||||
public function testTranslateLinkCommentAdminPage() {
|
||||
$this->adminUser = $this->drupalCreateUser(array_merge(parent::getTranslatorPermissions(), ['access administration pages', 'administer comments', 'skip comment approval']));
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
$cid_translatable = $this->createEntity([], $this->langcodes[0]);
|
||||
$cid_untranslatable = $this->createEntity([], $this->langcodes[0], 'comment');
|
||||
|
||||
// Verify translation links.
|
||||
$this->drupalGet('admin/content/comment');
|
||||
$this->assertResponse(200);
|
||||
$this->assertLinkByHref('comment/' . $cid_translatable . '/translations');
|
||||
$this->assertNoLinkByHref('comment/' . $cid_untranslatable . '/translations');
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function doTestTranslationEdit() {
|
||||
$storage = $this->container->get('entity_type.manager')
|
||||
->getStorage($this->entityTypeId);
|
||||
$storage->resetCache([$this->entityId]);
|
||||
$entity = $storage->load($this->entityId);
|
||||
$languages = $this->container->get('language_manager')->getLanguages();
|
||||
|
||||
foreach ($this->langcodes as $langcode) {
|
||||
// We only want to test the title for non-english translations.
|
||||
if ($langcode != 'en') {
|
||||
$options = ['language' => $languages[$langcode]];
|
||||
$url = $entity->urlInfo('edit-form', $options);
|
||||
$this->drupalGet($url);
|
||||
|
||||
$title = t('Edit @type @title [%language translation]', [
|
||||
'@type' => $this->entityTypeId,
|
||||
'@title' => $entity->getTranslation($langcode)->label(),
|
||||
'%language' => $languages[$langcode]->getName(),
|
||||
]);
|
||||
$this->assertRaw($title);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,190 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\comment\Entity\CommentType;
|
||||
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
|
||||
use Drupal\field\Entity\FieldStorageConfig;
|
||||
use Drupal\field\Entity\FieldConfig;
|
||||
use Drupal\node\Entity\Node;
|
||||
|
||||
/**
|
||||
* Ensures that comment type functions work correctly.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentTypeTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Admin user.
|
||||
*
|
||||
* @var \Drupal\Core\Session\AccountInterface
|
||||
*/
|
||||
protected $adminUser;
|
||||
|
||||
/**
|
||||
* Permissions to grant admin user.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $permissions = [
|
||||
'administer comments',
|
||||
'administer comment fields',
|
||||
'administer comment types',
|
||||
];
|
||||
|
||||
/**
|
||||
* Sets the test up.
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->drupalPlaceBlock('page_title_block');
|
||||
|
||||
$this->adminUser = $this->drupalCreateUser($this->permissions);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests creating a comment type programmatically and via a form.
|
||||
*/
|
||||
public function testCommentTypeCreation() {
|
||||
// Create a comment type programmatically.
|
||||
$type = $this->createCommentType('other');
|
||||
|
||||
$comment_type = CommentType::load('other');
|
||||
$this->assertTrue($comment_type, 'The new comment type has been created.');
|
||||
|
||||
// Log in a test user.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
$this->drupalGet('admin/structure/comment/manage/' . $type->id());
|
||||
$this->assertResponse(200, 'The new comment type can be accessed at the edit form.');
|
||||
|
||||
// Create a comment type via the user interface.
|
||||
$edit = [
|
||||
'id' => 'foo',
|
||||
'label' => 'title for foo',
|
||||
'description' => '',
|
||||
'target_entity_type_id' => 'node',
|
||||
];
|
||||
$this->drupalPostForm('admin/structure/comment/types/add', $edit, t('Save'));
|
||||
$comment_type = CommentType::load('foo');
|
||||
$this->assertTrue($comment_type, 'The new comment type has been created.');
|
||||
|
||||
// Check that the comment type was created in site default language.
|
||||
$default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
|
||||
$this->assertEqual($comment_type->language()->getId(), $default_langcode);
|
||||
|
||||
// Edit the comment-type and ensure that we cannot change the entity-type.
|
||||
$this->drupalGet('admin/structure/comment/manage/foo');
|
||||
$this->assertNoField('target_entity_type_id', 'Entity type file not present');
|
||||
$this->assertText(t('Target entity type'));
|
||||
// Save the form and ensure the entity-type value is preserved even though
|
||||
// the field isn't present.
|
||||
$this->drupalPostForm(NULL, [], t('Save'));
|
||||
\Drupal::entityManager()->getStorage('comment_type')->resetCache(['foo']);
|
||||
$comment_type = CommentType::load('foo');
|
||||
$this->assertEqual($comment_type->getTargetEntityTypeId(), 'node');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests editing a comment type using the UI.
|
||||
*/
|
||||
public function testCommentTypeEditing() {
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
$field = FieldConfig::loadByName('comment', 'comment', 'comment_body');
|
||||
$this->assertEqual($field->getLabel(), 'Comment', 'Comment body field was found.');
|
||||
|
||||
// Change the comment type name.
|
||||
$this->drupalGet('admin/structure/comment');
|
||||
$edit = [
|
||||
'label' => 'Bar',
|
||||
];
|
||||
$this->drupalPostForm('admin/structure/comment/manage/comment', $edit, t('Save'));
|
||||
|
||||
$this->drupalGet('admin/structure/comment');
|
||||
$this->assertRaw('Bar', 'New name was displayed.');
|
||||
$this->clickLink('Manage fields');
|
||||
$this->assertUrl(\Drupal::url('entity.comment.field_ui_fields', ['comment_type' => 'comment'], ['absolute' => TRUE]), [], 'Original machine name was used in URL.');
|
||||
$this->assertTrue($this->cssSelect('tr#comment-body'), 'Body field exists.');
|
||||
|
||||
// Remove the body field.
|
||||
$this->drupalPostForm('admin/structure/comment/manage/comment/fields/comment.comment.comment_body/delete', [], t('Delete'));
|
||||
// Resave the settings for this type.
|
||||
$this->drupalPostForm('admin/structure/comment/manage/comment', [], t('Save'));
|
||||
// Check that the body field doesn't exist.
|
||||
$this->drupalGet('admin/structure/comment/manage/comment/fields');
|
||||
$this->assertFalse($this->cssSelect('tr#comment-body'), 'Body field does not exist.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests deleting a comment type that still has content.
|
||||
*/
|
||||
public function testCommentTypeDeletion() {
|
||||
// Create a comment type programmatically.
|
||||
$type = $this->createCommentType('foo');
|
||||
$this->drupalCreateContentType(['type' => 'page']);
|
||||
$this->addDefaultCommentField('node', 'page', 'foo', CommentItemInterface::OPEN, 'foo');
|
||||
$field_storage = FieldStorageConfig::loadByName('node', 'foo');
|
||||
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
// Create a node.
|
||||
$node = Node::create([
|
||||
'type' => 'page',
|
||||
'title' => 'foo',
|
||||
]);
|
||||
$node->save();
|
||||
|
||||
// Add a new comment of this type.
|
||||
$comment = Comment::create([
|
||||
'comment_type' => 'foo',
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'foo',
|
||||
'entity_id' => $node->id(),
|
||||
]);
|
||||
$comment->save();
|
||||
|
||||
// Attempt to delete the comment type, which should not be allowed.
|
||||
$this->drupalGet('admin/structure/comment/manage/' . $type->id() . '/delete');
|
||||
$this->assertRaw(
|
||||
t('%label is used by 1 comment on your site. You can not remove this comment type until you have removed all of the %label comments.', ['%label' => $type->label()]),
|
||||
'The comment type will not be deleted until all comments of that type are removed.'
|
||||
);
|
||||
$this->assertRaw(
|
||||
t('%label is used by the %field field on your site. You can not remove this comment type until you have removed the field.', [
|
||||
'%label' => 'foo',
|
||||
'%field' => 'node.foo',
|
||||
]),
|
||||
'The comment type will not be deleted until all fields of that type are removed.'
|
||||
);
|
||||
$this->assertNoText(t('This action cannot be undone.'), 'The comment type deletion confirmation form is not available.');
|
||||
|
||||
// Delete the comment and the field.
|
||||
$comment->delete();
|
||||
$field_storage->delete();
|
||||
// Attempt to delete the comment type, which should now be allowed.
|
||||
$this->drupalGet('admin/structure/comment/manage/' . $type->id() . '/delete');
|
||||
$this->assertRaw(
|
||||
t('Are you sure you want to delete the comment type %type?', ['%type' => $type->id()]),
|
||||
'The comment type is available for deletion.'
|
||||
);
|
||||
$this->assertText(t('This action cannot be undone.'), 'The comment type deletion confirmation form is available.');
|
||||
|
||||
// Test exception thrown when re-using an existing comment type.
|
||||
try {
|
||||
$this->addDefaultCommentField('comment', 'comment', 'bar');
|
||||
$this->fail('Exception not thrown.');
|
||||
}
|
||||
catch (\InvalidArgumentException $e) {
|
||||
$this->pass('Exception thrown if attempting to re-use comment-type from another entity type.');
|
||||
}
|
||||
|
||||
// Delete the comment type.
|
||||
$this->drupalPostForm('admin/structure/comment/manage/' . $type->id() . '/delete', [], t('Delete'));
|
||||
$this->assertNull(CommentType::load($type->id()), 'Comment type deleted.');
|
||||
$this->assertRaw(t('The comment type %label has been deleted.', ['%label' => $type->label()]));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests;
|
||||
|
||||
use Drupal\field\Entity\FieldStorageConfig;
|
||||
use Drupal\Core\Extension\ModuleUninstallValidatorException;
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
|
||||
/**
|
||||
* Tests comment module uninstallation.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentUninstallTest extends WebTestBase {
|
||||
|
||||
use CommentTestTrait;
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['comment', 'node'];
|
||||
|
||||
protected function setUp() {
|
||||
parent::setup();
|
||||
|
||||
// Create an article content type.
|
||||
$this->drupalCreateContentType(['type' => 'article', 'name' => t('Article')]);
|
||||
// Create comment field on article so that adds 'comment_body' field.
|
||||
$this->addDefaultCommentField('node', 'article');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests if comment module uninstallation fails if the field exists.
|
||||
*
|
||||
* @throws \Drupal\Core\Extension\ModuleUninstallValidatorException
|
||||
*/
|
||||
public function testCommentUninstallWithField() {
|
||||
// Ensure that the field exists before uninstallation.
|
||||
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
|
||||
$this->assertNotNull($field_storage, 'The comment_body field exists.');
|
||||
|
||||
// Uninstall the comment module which should trigger an exception.
|
||||
try {
|
||||
$this->container->get('module_installer')->uninstall(['comment']);
|
||||
$this->fail("Expected an exception when uninstall was attempted.");
|
||||
}
|
||||
catch (ModuleUninstallValidatorException $e) {
|
||||
$this->pass("Caught an exception when uninstall was attempted.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Tests if uninstallation succeeds if the field has been deleted beforehand.
|
||||
*/
|
||||
public function testCommentUninstallWithoutField() {
|
||||
// Manually delete the comment_body field before module uninstallation.
|
||||
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
|
||||
$this->assertNotNull($field_storage, 'The comment_body field exists.');
|
||||
$field_storage->delete();
|
||||
|
||||
// Check that the field is now deleted.
|
||||
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
|
||||
$this->assertNull($field_storage, 'The comment_body field has been deleted.');
|
||||
|
||||
// Manually delete the comment field on the node before module uninstallation.
|
||||
$field_storage = FieldStorageConfig::loadByName('node', 'comment');
|
||||
$this->assertNotNull($field_storage, 'The comment field exists.');
|
||||
$field_storage->delete();
|
||||
|
||||
// Check that the field is now deleted.
|
||||
$field_storage = FieldStorageConfig::loadByName('node', 'comment');
|
||||
$this->assertNull($field_storage, 'The comment field has been deleted.');
|
||||
|
||||
field_purge_batch(10);
|
||||
// Ensure that uninstallation succeeds even if the field has already been
|
||||
// deleted manually beforehand.
|
||||
$this->container->get('module_installer')->uninstall(['comment']);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Update;
|
||||
|
||||
use Drupal\system\Tests\Update\UpdatePathTestBase;
|
||||
|
||||
/**
|
||||
* Tests that comment settings are properly updated during database updates.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentUpdateTest extends UpdatePathTestBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setDatabaseDumpFiles() {
|
||||
$this->databaseDumpFiles = [
|
||||
__DIR__ . '/../../../../system/tests/fixtures/update/drupal-8-rc1.filled.standard.php.gz',
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests comment_update_8200().
|
||||
*
|
||||
* @see comment_update_8200()
|
||||
*/
|
||||
public function testCommentUpdate8101() {
|
||||
// Load the 'node.article.default' entity view display config, and check
|
||||
// that component 'comment' does not contain the 'view_mode' setting.
|
||||
$config = $this->config('core.entity_view_display.node.article.default');
|
||||
$this->assertNull($config->get('content.comment.settings.view_mode'));
|
||||
|
||||
// Load the 'node.forum.default' entity view display config, and check that
|
||||
// component 'comment_forum' does not contain the 'view_mode' setting.
|
||||
$config = $this->config('core.entity_view_display.node.forum.default');
|
||||
$this->assertNull($config->get('content.comment_forum.settings.view_mode'));
|
||||
|
||||
// Run updates.
|
||||
$this->runUpdates();
|
||||
|
||||
// Check that 'node.article.default' entity view display setting 'view_mode'
|
||||
// has the value 'default'.
|
||||
$config = $this->config('core.entity_view_display.node.article.default');
|
||||
$this->assertIdentical($config->get('content.comment.settings.view_mode'), 'default');
|
||||
|
||||
// Check that 'node.forum.default' entity view display setting 'view_mode'
|
||||
// has the value 'default'.
|
||||
$config = $this->config('core.entity_view_display.node.forum.default');
|
||||
$this->assertIdentical($config->get('content.comment_forum.settings.view_mode'), 'default');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that the comment entity type has a 'published' entity key.
|
||||
*
|
||||
* @see comment_update_8301()
|
||||
*/
|
||||
public function testPublishedEntityKey() {
|
||||
// Check that the 'published' entity key does not exist prior to the update.
|
||||
$entity_type = \Drupal::entityDefinitionUpdateManager()->getEntityType('comment');
|
||||
$this->assertFalse($entity_type->getKey('published'));
|
||||
|
||||
// Run updates.
|
||||
$this->runUpdates();
|
||||
|
||||
// Check that the entity key exists and it has the correct value.
|
||||
$entity_type = \Drupal::entityDefinitionUpdateManager()->getEntityType('comment');
|
||||
$this->assertEqual('status', $entity_type->getKey('published'));
|
||||
|
||||
// Check that the {comment_field_data} table status index has been created.
|
||||
$this->assertTrue(\Drupal::database()->schema()->indexExists('comment_field_data', 'comment__status_comment_type'));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Views;
|
||||
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\user\Entity\User;
|
||||
use Drupal\views\Views;
|
||||
|
||||
/**
|
||||
* Tests the user posted or commented argument handler.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class ArgumentUserUIDTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = ['test_comment_user_uid'];
|
||||
|
||||
public function testCommentUserUIDTest() {
|
||||
// Add an additional comment which is not created by the user.
|
||||
$new_user = User::create(['name' => 'new user']);
|
||||
$new_user->save();
|
||||
|
||||
$comment = Comment::create([
|
||||
'uid' => $new_user->uid->value,
|
||||
'entity_id' => $this->nodeUserCommented->id(),
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'comment',
|
||||
'subject' => 'if a woodchuck could chuck wood.',
|
||||
]);
|
||||
$comment->save();
|
||||
|
||||
$view = Views::getView('test_comment_user_uid');
|
||||
$this->executeView($view, [$this->account->id()]);
|
||||
$result_set = [
|
||||
[
|
||||
'nid' => $this->nodeUserPosted->id(),
|
||||
],
|
||||
[
|
||||
'nid' => $this->nodeUserCommented->id(),
|
||||
],
|
||||
];
|
||||
$column_map = ['nid' => 'nid'];
|
||||
$this->assertIdenticalResultset($view, $result_set, $column_map);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,120 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Views;
|
||||
|
||||
use Drupal\language\Entity\ConfigurableLanguage;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
|
||||
/**
|
||||
* Tests comment field filters with translations.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentFieldFilterTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['language'];
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = ['test_field_filters'];
|
||||
|
||||
/**
|
||||
* List of comment titles by language.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public $commentTitles = [];
|
||||
|
||||
public function setUp() {
|
||||
parent::setUp();
|
||||
$this->drupalLogin($this->drupalCreateUser(['access comments']));
|
||||
|
||||
// Add two new languages.
|
||||
ConfigurableLanguage::createFromLangcode('fr')->save();
|
||||
ConfigurableLanguage::createFromLangcode('es')->save();
|
||||
|
||||
// Set up comment titles.
|
||||
$this->commentTitles = [
|
||||
'en' => 'Food in Paris',
|
||||
'es' => 'Comida en Paris',
|
||||
'fr' => 'Nouriture en Paris',
|
||||
];
|
||||
|
||||
// Create a new comment. Using the one created earlier will not work,
|
||||
// as it predates the language set-up.
|
||||
$comment = [
|
||||
'uid' => $this->loggedInUser->id(),
|
||||
'entity_id' => $this->nodeUserCommented->id(),
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'comment',
|
||||
'cid' => '',
|
||||
'pid' => '',
|
||||
'node_type' => '',
|
||||
];
|
||||
$this->comment = Comment::create($comment);
|
||||
|
||||
// Add field values and translate the comment.
|
||||
$this->comment->subject->value = $this->commentTitles['en'];
|
||||
$this->comment->comment_body->value = $this->commentTitles['en'];
|
||||
$this->comment->langcode = 'en';
|
||||
$this->comment->save();
|
||||
foreach (['es', 'fr'] as $langcode) {
|
||||
$translation = $this->comment->addTranslation($langcode, []);
|
||||
$translation->comment_body->value = $this->commentTitles[$langcode];
|
||||
$translation->subject->value = $this->commentTitles[$langcode];
|
||||
}
|
||||
$this->comment->save();
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests body and title filters.
|
||||
*/
|
||||
public function testFilters() {
|
||||
// Test the title filter page, which filters for title contains 'Comida'.
|
||||
// Should show just the Spanish translation, once.
|
||||
$this->assertPageCounts('test-title-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida title filter');
|
||||
|
||||
// Test the body filter page, which filters for body contains 'Comida'.
|
||||
// Should show just the Spanish translation, once.
|
||||
$this->assertPageCounts('test-body-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida body filter');
|
||||
|
||||
// Test the title Paris filter page, which filters for title contains
|
||||
// 'Paris'. Should show each translation once.
|
||||
$this->assertPageCounts('test-title-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris title filter');
|
||||
|
||||
// Test the body Paris filter page, which filters for body contains
|
||||
// 'Paris'. Should show each translation once.
|
||||
$this->assertPageCounts('test-body-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris body filter');
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts that the given comment translation counts are correct.
|
||||
*
|
||||
* @param string $path
|
||||
* Path of the page to test.
|
||||
* @param array $counts
|
||||
* Array whose keys are languages, and values are the number of times
|
||||
* that translation should be shown on the given page.
|
||||
* @param string $message
|
||||
* Message suffix to display.
|
||||
*/
|
||||
protected function assertPageCounts($path, $counts, $message) {
|
||||
// Get the text of the page.
|
||||
$this->drupalGet($path);
|
||||
$text = $this->getTextContent();
|
||||
|
||||
// Check the counts. Note that the title and body are both shown on the
|
||||
// page, and they are the same. So the title/body string should appear on
|
||||
// the page twice as many times as the input count.
|
||||
foreach ($counts as $langcode => $count) {
|
||||
$this->assertEqual(substr_count($text, $this->commentTitles[$langcode]), 2 * $count, 'Translation ' . $langcode . ' has count ' . $count . ' with ' . $message);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Views;
|
||||
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\Core\Render\RenderContext;
|
||||
use Drupal\Core\Session\AnonymousUserSession;
|
||||
use Drupal\user\RoleInterface;
|
||||
use Drupal\views\Views;
|
||||
|
||||
/**
|
||||
* Tests the comment field name field.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentFieldNameTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = ['test_comment_field_name'];
|
||||
|
||||
/**
|
||||
* The second comment entity used by this test.
|
||||
*
|
||||
* @var \Drupal\comment\CommentInterface
|
||||
*/
|
||||
protected $customComment;
|
||||
|
||||
/**
|
||||
* The comment field name used by this test.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $fieldName = 'comment_custom';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
$this->addDefaultCommentField('node', 'page', $this->fieldName);
|
||||
$this->customComment = Comment::create([
|
||||
'entity_id' => $this->nodeUserCommented->id(),
|
||||
'entity_type' => 'node',
|
||||
'field_name' => $this->fieldName,
|
||||
]);
|
||||
$this->customComment->save();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test comment field name.
|
||||
*/
|
||||
public function testCommentFieldName() {
|
||||
/** @var \Drupal\Core\Render\RendererInterface $renderer */
|
||||
$renderer = \Drupal::service('renderer');
|
||||
// Grant permission to properly check view access on render.
|
||||
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access comments']);
|
||||
$this->container->get('account_switcher')->switchTo(new AnonymousUserSession());
|
||||
$view = Views::getView('test_comment_field_name');
|
||||
$this->executeView($view);
|
||||
|
||||
$expected_result = [
|
||||
[
|
||||
'cid' => $this->comment->id(),
|
||||
'field_name' => $this->comment->getFieldName(),
|
||||
],
|
||||
[
|
||||
'cid' => $this->customComment->id(),
|
||||
'field_name' => $this->customComment->getFieldName(),
|
||||
],
|
||||
];
|
||||
$column_map = [
|
||||
'cid' => 'cid',
|
||||
'comment_field_data_field_name' => 'field_name',
|
||||
];
|
||||
$this->assertIdenticalResultset($view, $expected_result, $column_map);
|
||||
|
||||
// Test that data rendered.
|
||||
$output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
|
||||
return $view->field['field_name']->advancedRender($view->result[0]);
|
||||
});
|
||||
$this->assertEqual($this->comment->getFieldName(), $output);
|
||||
$output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
|
||||
return $view->field['field_name']->advancedRender($view->result[1]);
|
||||
});
|
||||
$this->assertEqual($this->customComment->getFieldName(), $output);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Views;
|
||||
|
||||
/**
|
||||
* Tests comment operations.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentOperationsTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = ['test_comment_operations'];
|
||||
|
||||
/**
|
||||
* Test the operations field plugin.
|
||||
*/
|
||||
public function testCommentOperations() {
|
||||
$admin_account = $this->drupalCreateUser(['administer comments']);
|
||||
$this->drupalLogin($admin_account);
|
||||
$this->drupalGet('test-comment-operations');
|
||||
$this->assertResponse(200);
|
||||
$operation = $this->cssSelect('.views-field-operations li.edit a');
|
||||
$this->assertEqual(count($operation), 1, 'Found edit operation for comment.');
|
||||
$operation = $this->cssSelect('.views-field-operations li.delete a');
|
||||
$this->assertEqual(count($operation), 1, 'Found delete operation for comment.');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,67 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Views;
|
||||
|
||||
use Drupal\Component\Serialization\Json;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
|
||||
/**
|
||||
* Tests a comment rest export view.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentRestExportTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = ['test_comment_rest'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['node', 'comment', 'comment_test_views', 'rest', 'hal'];
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
// Add another anonymous comment.
|
||||
$comment = [
|
||||
'uid' => 0,
|
||||
'entity_id' => $this->nodeUserCommented->id(),
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'comment',
|
||||
'subject' => 'A lot, apparently',
|
||||
'cid' => '',
|
||||
'pid' => $this->comment->id(),
|
||||
'mail' => 'someone@example.com',
|
||||
'name' => 'bobby tables',
|
||||
'hostname' => 'public.example.com',
|
||||
];
|
||||
$this->comment = Comment::create($comment);
|
||||
$this->comment->save();
|
||||
|
||||
$user = $this->drupalCreateUser(['access comments']);
|
||||
$this->drupalLogin($user);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Test comment row.
|
||||
*/
|
||||
public function testCommentRestExport() {
|
||||
$this->drupalGetWithFormat(sprintf('node/%d/comments', $this->nodeUserCommented->id()), 'hal_json');
|
||||
$this->assertResponse(200);
|
||||
$contents = Json::decode($this->getRawContent());
|
||||
$this->assertEqual($contents[0]['subject'], 'How much wood would a woodchuck chuck');
|
||||
$this->assertEqual($contents[1]['subject'], 'A lot, apparently');
|
||||
$this->assertEqual(count($contents), 2);
|
||||
|
||||
// Ensure field-level access is respected - user shouldn't be able to see
|
||||
// mail or hostname fields.
|
||||
$this->assertNoText('someone@example.com');
|
||||
$this->assertNoText('public.example.com');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Views;
|
||||
|
||||
/**
|
||||
* Tests the comment row plugin.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class CommentRowTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = ['test_comment_row'];
|
||||
|
||||
/**
|
||||
* Test comment row.
|
||||
*/
|
||||
public function testCommentRow() {
|
||||
$this->drupalGet('test-comment-row');
|
||||
|
||||
$result = $this->xpath('//article[contains(@class, "comment")]');
|
||||
$this->assertEqual(1, count($result), 'One rendered comment found.');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,140 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Views;
|
||||
|
||||
use Drupal\comment\CommentInterface;
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\comment\Tests\CommentTestTrait;
|
||||
use Drupal\views\Views;
|
||||
use Drupal\views\Tests\ViewTestBase;
|
||||
|
||||
/**
|
||||
* Tests results for the Recent Comments view shipped with the module.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class DefaultViewRecentCommentsTest extends ViewTestBase {
|
||||
|
||||
use CommentTestTrait;
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['node', 'comment', 'block'];
|
||||
|
||||
/**
|
||||
* Number of results for the Master display.
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
protected $masterDisplayResults = 5;
|
||||
|
||||
/**
|
||||
* Number of results for the Block display.
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
protected $blockDisplayResults = 5;
|
||||
|
||||
/**
|
||||
* Number of results for the Page display.
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
protected $pageDisplayResults = 5;
|
||||
|
||||
/**
|
||||
* Will hold the comments created for testing.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $commentsCreated = [];
|
||||
|
||||
/**
|
||||
* Contains the node object used for comments of this test.
|
||||
*
|
||||
* @var \Drupal\node\Node
|
||||
*/
|
||||
public $node;
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
// Create a new content type
|
||||
$content_type = $this->drupalCreateContentType();
|
||||
|
||||
// Add a node of the new content type.
|
||||
$node_data = [
|
||||
'type' => $content_type->id(),
|
||||
];
|
||||
|
||||
$this->addDefaultCommentField('node', $content_type->id());
|
||||
$this->node = $this->drupalCreateNode($node_data);
|
||||
|
||||
// Force a flush of the in-memory storage.
|
||||
$this->container->get('views.views_data')->clear();
|
||||
|
||||
// Create some comments and attach them to the created node.
|
||||
for ($i = 0; $i < $this->masterDisplayResults; $i++) {
|
||||
/** @var \Drupal\comment\CommentInterface $comment */
|
||||
$comment = Comment::create([
|
||||
'status' => CommentInterface::PUBLISHED,
|
||||
'field_name' => 'comment',
|
||||
'entity_type' => 'node',
|
||||
'entity_id' => $this->node->id(),
|
||||
]);
|
||||
$comment->setOwnerId(0);
|
||||
$comment->setSubject('Test comment ' . $i);
|
||||
$comment->comment_body->value = 'Test body ' . $i;
|
||||
$comment->comment_body->format = 'full_html';
|
||||
|
||||
// Ensure comments are sorted in ascending order.
|
||||
$time = REQUEST_TIME + ($this->masterDisplayResults - $i);
|
||||
$comment->setCreatedTime($time);
|
||||
$comment->changed->value = $time;
|
||||
|
||||
$comment->save();
|
||||
}
|
||||
|
||||
// Store all the nodes just created to access their properties on the tests.
|
||||
$this->commentsCreated = Comment::loadMultiple();
|
||||
|
||||
// Sort created comments in descending order.
|
||||
ksort($this->commentsCreated, SORT_NUMERIC);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the block defined by the comments_recent view.
|
||||
*/
|
||||
public function testBlockDisplay() {
|
||||
$user = $this->drupalCreateUser(['access comments']);
|
||||
$this->drupalLogin($user);
|
||||
|
||||
$view = Views::getView('comments_recent');
|
||||
$view->setDisplay('block_1');
|
||||
$this->executeView($view);
|
||||
|
||||
$map = [
|
||||
'subject' => 'subject',
|
||||
'cid' => 'cid',
|
||||
'comment_field_data_created' => 'created'
|
||||
];
|
||||
$expected_result = [];
|
||||
foreach (array_values($this->commentsCreated) as $key => $comment) {
|
||||
$expected_result[$key]['subject'] = $comment->getSubject();
|
||||
$expected_result[$key]['cid'] = $comment->id();
|
||||
$expected_result[$key]['created'] = $comment->getCreatedTime();
|
||||
}
|
||||
$this->assertIdenticalResultset($view, $expected_result, $map);
|
||||
|
||||
// Check the number of results given by the display is the expected.
|
||||
$this->assertEqual(sizeof($view->result), $this->blockDisplayResults,
|
||||
format_string('There are exactly @results comments. Expected @expected',
|
||||
['@results' => count($view->result), '@expected' => $this->blockDisplayResults]
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Views;
|
||||
|
||||
use Drupal\comment\Entity\Comment;
|
||||
use Drupal\user\Entity\User;
|
||||
use Drupal\views\Views;
|
||||
|
||||
/**
|
||||
* Tests the user posted or commented filter handler.
|
||||
*
|
||||
* The actual stuff is done in the parent class.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class FilterUserUIDTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = ['test_comment_user_uid'];
|
||||
|
||||
public function testCommentUserUIDTest() {
|
||||
$view = Views::getView('test_comment_user_uid');
|
||||
$view->setDisplay();
|
||||
$view->removeHandler('default', 'argument', 'uid_touch');
|
||||
|
||||
// Add an additional comment which is not created by the user.
|
||||
$new_user = User::create(['name' => 'new user']);
|
||||
$new_user->save();
|
||||
|
||||
$comment = Comment::create([
|
||||
'uid' => $new_user->uid->value,
|
||||
'entity_id' => $this->nodeUserCommented->id(),
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'comment',
|
||||
'subject' => 'if a woodchuck could chuck wood.',
|
||||
]);
|
||||
$comment->save();
|
||||
|
||||
$options = [
|
||||
'id' => 'uid_touch',
|
||||
'table' => 'node_field_data',
|
||||
'field' => 'uid_touch',
|
||||
'value' => [$this->loggedInUser->id()],
|
||||
];
|
||||
$view->addHandler('default', 'filter', 'node_field_data', 'uid_touch', $options);
|
||||
$this->executeView($view, [$this->account->id()]);
|
||||
$result_set = [
|
||||
[
|
||||
'nid' => $this->nodeUserPosted->id(),
|
||||
],
|
||||
[
|
||||
'nid' => $this->nodeUserCommented->id(),
|
||||
],
|
||||
];
|
||||
$column_map = ['nid' => 'nid'];
|
||||
$this->assertIdenticalResultset($view, $result_set, $column_map);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Views;
|
||||
|
||||
/**
|
||||
* Tests comments on nodes.
|
||||
*
|
||||
* @group comment
|
||||
*/
|
||||
class NodeCommentsTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['history'];
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = ['test_new_comments'];
|
||||
|
||||
/**
|
||||
* Test the new comments field plugin.
|
||||
*/
|
||||
public function testNewComments() {
|
||||
$this->drupalGet('test-new-comments');
|
||||
$this->assertResponse(200);
|
||||
$new_comments = $this->cssSelect(".views-field-new-comments a:contains('1')");
|
||||
$this->assertEqual(count($new_comments), 1, 'Found the number of new comments for a certain node.');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Views;
|
||||
|
||||
/**
|
||||
* Tests the comment rss row plugin.
|
||||
*
|
||||
* @group comment
|
||||
* @see \Drupal\comment\Plugin\views\row\Rss
|
||||
*/
|
||||
class RowRssTest extends CommentTestBase {
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = ['test_comment_rss'];
|
||||
|
||||
/**
|
||||
* Test comment rss output.
|
||||
*/
|
||||
public function testRssRow() {
|
||||
$this->drupalGet('test-comment-rss');
|
||||
|
||||
$result = $this->xpath('//item');
|
||||
$this->assertEqual(count($result), 1, 'Just one comment was found in the rss output.');
|
||||
|
||||
$this->assertEqual($result[0]->pubdate, gmdate('r', $this->comment->getCreatedTime()), 'The right pubDate appears in the rss output.');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,97 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\comment\Tests\Views;
|
||||
|
||||
use Drupal\comment\Tests\CommentTestTrait;
|
||||
use Drupal\views\Views;
|
||||
use Drupal\views\Tests\Wizard\WizardTestBase;
|
||||
|
||||
/**
|
||||
* Tests the comment module integration into the wizard.
|
||||
*
|
||||
* @group comment
|
||||
* @see \Drupal\comment\Plugin\views\wizard\Comment
|
||||
*/
|
||||
class WizardTest extends WizardTestBase {
|
||||
|
||||
use CommentTestTrait;
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['node', 'comment'];
|
||||
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
$this->drupalCreateContentType(['type' => 'page', 'name' => t('Basic page')]);
|
||||
// Add comment field to page node type.
|
||||
$this->addDefaultCommentField('node', 'page');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests adding a view of comments.
|
||||
*/
|
||||
public function testCommentWizard() {
|
||||
$view = [];
|
||||
$view['label'] = $this->randomMachineName(16);
|
||||
$view['id'] = strtolower($this->randomMachineName(16));
|
||||
$view['show[wizard_key]'] = 'comment';
|
||||
$view['page[create]'] = TRUE;
|
||||
$view['page[path]'] = $this->randomMachineName(16);
|
||||
|
||||
// Just triggering the saving should automatically choose a proper row
|
||||
// plugin.
|
||||
$this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
|
||||
$this->assertUrl('admin/structure/views/view/' . $view['id'], [], 'Make sure the view saving was successful and the browser got redirected to the edit page.');
|
||||
|
||||
// If we update the type first we should get a selection of comment valid
|
||||
// row plugins as the select field.
|
||||
|
||||
$this->drupalGet('admin/structure/views/add');
|
||||
$this->drupalPostForm('admin/structure/views/add', $view, t('Update "of type" choice'));
|
||||
|
||||
// Check for available options of the row plugin.
|
||||
$xpath = $this->constructFieldXpath('name', 'page[style][row_plugin]');
|
||||
$fields = $this->xpath($xpath);
|
||||
$options = [];
|
||||
foreach ($fields as $field) {
|
||||
$items = $this->getAllOptions($field);
|
||||
foreach ($items as $item) {
|
||||
$options[] = $item->attributes()->value;
|
||||
}
|
||||
}
|
||||
$expected_options = ['entity:comment', 'fields'];
|
||||
$this->assertEqual($options, $expected_options);
|
||||
|
||||
$view['id'] = strtolower($this->randomMachineName(16));
|
||||
$this->drupalPostForm(NULL, $view, t('Save and edit'));
|
||||
$this->assertUrl('admin/structure/views/view/' . $view['id'], [], 'Make sure the view saving was successful and the browser got redirected to the edit page.');
|
||||
|
||||
$user = $this->drupalCreateUser(['access comments']);
|
||||
$this->drupalLogin($user);
|
||||
|
||||
$view = Views::getView($view['id']);
|
||||
$view->initHandlers();
|
||||
$row = $view->display_handler->getOption('row');
|
||||
$this->assertEqual($row['type'], 'entity:comment');
|
||||
|
||||
// Check for the default filters.
|
||||
$this->assertEqual($view->filter['status']->table, 'comment_field_data');
|
||||
$this->assertEqual($view->filter['status']->field, 'status');
|
||||
$this->assertTrue($view->filter['status']->value);
|
||||
$this->assertEqual($view->filter['status_node']->table, 'node_field_data');
|
||||
$this->assertEqual($view->filter['status_node']->field, 'status');
|
||||
$this->assertTrue($view->filter['status_node']->value);
|
||||
|
||||
// Check for the default fields.
|
||||
$this->assertEqual($view->field['subject']->table, 'comment_field_data');
|
||||
$this->assertEqual($view->field['subject']->field, 'subject');
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user