Drupal 8.0.0 beta 12. More info: https://www.drupal.org/node/2514176
This commit is contained in:
commit
9921556621
13277 changed files with 1459781 additions and 0 deletions
|
@ -0,0 +1,34 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\tracker\Access\ViewOwnTrackerAccessCheck.
|
||||
*/
|
||||
|
||||
namespace Drupal\tracker\Access;
|
||||
|
||||
use Drupal\Core\Access\AccessResult;
|
||||
use Drupal\Core\Routing\Access\AccessInterface;
|
||||
use Drupal\Core\Session\AccountInterface;
|
||||
use Drupal\user\UserInterface;
|
||||
|
||||
/**
|
||||
* Access check for user tracker routes.
|
||||
*/
|
||||
class ViewOwnTrackerAccessCheck implements AccessInterface {
|
||||
|
||||
/**
|
||||
* Checks access.
|
||||
*
|
||||
* @param \Drupal\Core\Session\AccountInterface $account
|
||||
* The currently logged in account.
|
||||
* @param \Drupal\user\UserInterface $user
|
||||
* The user whose tracker page is being accessed.
|
||||
*
|
||||
* @return \Drupal\Core\Access\AccessResultInterface
|
||||
* The access result.
|
||||
*/
|
||||
public function access(AccountInterface $account, UserInterface $user) {
|
||||
return AccessResult::allowedIf($user && $account->isAuthenticated() && ($user->id() == $account->id()))->cachePerUser();
|
||||
}
|
||||
}
|
24
core/modules/tracker/src/Controller/TrackerPage.php
Normal file
24
core/modules/tracker/src/Controller/TrackerPage.php
Normal file
|
@ -0,0 +1,24 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\tracker\Controller\TrackerPage.
|
||||
*/
|
||||
|
||||
namespace Drupal\tracker\Controller;
|
||||
|
||||
use Drupal\Core\Controller\ControllerBase;
|
||||
|
||||
/**
|
||||
* Controller for tracker.page route.
|
||||
*/
|
||||
class TrackerPage extends ControllerBase {
|
||||
|
||||
/**
|
||||
* Content callback for the tracker.page route.
|
||||
*/
|
||||
public function getContent() {
|
||||
module_load_include('inc', 'tracker', 'tracker.pages');
|
||||
return tracker_page();
|
||||
}
|
||||
}
|
25
core/modules/tracker/src/Controller/TrackerUserRecent.php
Normal file
25
core/modules/tracker/src/Controller/TrackerUserRecent.php
Normal file
|
@ -0,0 +1,25 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\tracker\Controller\TrackerUserRecent.
|
||||
*/
|
||||
|
||||
namespace Drupal\tracker\Controller;
|
||||
|
||||
use Drupal\Core\Controller\ControllerBase;
|
||||
use Drupal\user\UserInterface;
|
||||
|
||||
/**
|
||||
* Controller for tracker.users_recent_content route.
|
||||
*/
|
||||
class TrackerUserRecent extends ControllerBase {
|
||||
|
||||
/**
|
||||
* Content callback for the tracker.users_recent_content route.
|
||||
*/
|
||||
public function getContent(UserInterface $user) {
|
||||
module_load_include('inc', 'tracker', 'tracker.pages');
|
||||
return tracker_page($user);
|
||||
}
|
||||
}
|
33
core/modules/tracker/src/Controller/TrackerUserTab.php
Normal file
33
core/modules/tracker/src/Controller/TrackerUserTab.php
Normal file
|
@ -0,0 +1,33 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\tracker\Controller\TrackerUserTab.
|
||||
*/
|
||||
|
||||
namespace Drupal\tracker\Controller;
|
||||
|
||||
use Drupal\Core\Controller\ControllerBase;
|
||||
use Drupal\user\UserInterface;
|
||||
use Drupal\Component\Utility\SafeMarkup;
|
||||
|
||||
/**
|
||||
* Controller for tracker.user_tab route.
|
||||
*/
|
||||
class TrackerUserTab extends ControllerBase {
|
||||
|
||||
/**
|
||||
* Content callback for the tracker.user_tab route.
|
||||
*/
|
||||
public function getContent(UserInterface $user) {
|
||||
module_load_include('inc', 'tracker', 'tracker.pages');
|
||||
return tracker_page($user);
|
||||
}
|
||||
|
||||
/**
|
||||
* Title callback for the tracker.user_tab route.
|
||||
*/
|
||||
public function getTitle(UserInterface $user) {
|
||||
return SafeMarkup::checkPlain($user->getUsername());
|
||||
}
|
||||
}
|
48
core/modules/tracker/src/Plugin/Menu/UserTrackerTab.php
Normal file
48
core/modules/tracker/src/Plugin/Menu/UserTrackerTab.php
Normal file
|
@ -0,0 +1,48 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\tracker\Plugin\Menu\UserTrackerTab.
|
||||
*/
|
||||
|
||||
namespace Drupal\tracker\Plugin\Menu;
|
||||
|
||||
use Drupal\Core\Menu\LocalTaskDefault;
|
||||
use Drupal\Core\Routing\RouteMatchInterface;
|
||||
|
||||
/**
|
||||
* Provides route parameters needed to link to the current user tracker tab.
|
||||
*/
|
||||
class UserTrackerTab extends LocalTaskDefault {
|
||||
|
||||
/**
|
||||
* Current user object.
|
||||
*
|
||||
* @var \Drupal\Core\Session\AccountInterface
|
||||
*/
|
||||
protected $currentUser;
|
||||
|
||||
/**
|
||||
* Gets the current active user.
|
||||
*
|
||||
* @todo: https://www.drupal.org/node/2105123 put this method in
|
||||
* \Drupal\Core\Plugin\PluginBase instead.
|
||||
*
|
||||
* @return \Drupal\Core\Session\AccountInterface
|
||||
*/
|
||||
protected function currentUser() {
|
||||
if (!$this->currentUser) {
|
||||
$this->currentUser = \Drupal::currentUser();
|
||||
}
|
||||
return $this->currentUser;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getRouteParameters(RouteMatchInterface $route_match) {
|
||||
return array('user' => $this->currentUser()->Id());
|
||||
}
|
||||
|
||||
}
|
32
core/modules/tracker/src/Plugin/views/argument/UserUid.php
Normal file
32
core/modules/tracker/src/Plugin/views/argument/UserUid.php
Normal file
|
@ -0,0 +1,32 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\tracker\Plugin\views\argument\UserUid.
|
||||
*/
|
||||
|
||||
namespace Drupal\tracker\Plugin\views\argument;
|
||||
|
||||
use Drupal\comment\Plugin\views\argument\UserUid as CommentUserUid;
|
||||
|
||||
/**
|
||||
* UID argument to check for nodes that user posted or commented on.
|
||||
*
|
||||
* @ingroup views_argument_handlers
|
||||
*
|
||||
* @ViewsArgument("tracker_user_uid")
|
||||
*/
|
||||
class UserUid extends CommentUserUid {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function query($group_by = FALSE) {
|
||||
// Because this handler thinks it's an argument for a field on the {node}
|
||||
// table, we need to make sure {tracker_user} is JOINed and use its alias
|
||||
// for the WHERE clause.
|
||||
$tracker_user_alias = $this->query->ensureTable('tracker_user');
|
||||
$this->query->addWhere(0, "$tracker_user_alias.uid", $this->argument);
|
||||
}
|
||||
|
||||
}
|
33
core/modules/tracker/src/Plugin/views/filter/UserUid.php
Normal file
33
core/modules/tracker/src/Plugin/views/filter/UserUid.php
Normal file
|
@ -0,0 +1,33 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\tracker\Plugin\views\filter\UserUid.
|
||||
*/
|
||||
|
||||
namespace Drupal\tracker\Plugin\views\filter;
|
||||
|
||||
use Drupal\user\Plugin\views\filter\Name;
|
||||
|
||||
/**
|
||||
* UID filter to check for nodes that a user posted or commented on.
|
||||
*
|
||||
* @ingroup views_filter_handlers
|
||||
*
|
||||
* @ViewsFilter("tracker_user_uid")
|
||||
*/
|
||||
class UserUid extends Name {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function query() {
|
||||
// Because this handler thinks it's an argument for a field on the {node}
|
||||
// table, we need to make sure {tracker_user} is JOINed and use its alias
|
||||
// for the WHERE clause.
|
||||
$tracker_user_alias = $this->query->ensureTable('tracker_user');
|
||||
// Cast scalars to array so we can consistently use an IN condition.
|
||||
$this->query->addWhere(0, "$tracker_user_alias.uid", (array) $this->value, 'IN');
|
||||
}
|
||||
|
||||
}
|
79
core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
Normal file
79
core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
Normal file
|
@ -0,0 +1,79 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\tracker\Tests\TrackerNodeAccessTest.
|
||||
*/
|
||||
|
||||
namespace Drupal\tracker\Tests;
|
||||
|
||||
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
|
||||
use Drupal\comment\Tests\CommentTestTrait;
|
||||
use Drupal\node\Entity\NodeType;
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
|
||||
/**
|
||||
* Tests for private node access on /tracker.
|
||||
*
|
||||
* @group tracker
|
||||
*/
|
||||
class TrackerNodeAccessTest extends WebTestBase {
|
||||
|
||||
use CommentTestTrait;
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('node', 'comment', 'tracker', 'node_access_test');
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
node_access_rebuild();
|
||||
$this->drupalCreateContentType(array('type' => 'page'));
|
||||
node_access_test_add_field(NodeType::load('page'));
|
||||
$this->addDefaultCommentField('node', 'page', 'comment', CommentItemInterface::OPEN);
|
||||
\Drupal::state()->set('node_access_test.private', TRUE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensure private node on /tracker is only visible to users with permission.
|
||||
*/
|
||||
function testTrackerNodeAccess() {
|
||||
// Create user with node test view permission.
|
||||
$access_user = $this->drupalCreateUser(array('node test view', 'access user profiles'));
|
||||
|
||||
// Create user without node test view permission.
|
||||
$no_access_user = $this->drupalCreateuser(array('access user profiles'));
|
||||
|
||||
$this->drupalLogin($access_user);
|
||||
|
||||
// Create some nodes.
|
||||
$private_node = $this->drupalCreateNode(array(
|
||||
'title' => t('Private node test'),
|
||||
'private' => TRUE,
|
||||
));
|
||||
$public_node = $this->drupalCreateNode(array(
|
||||
'title' => t('Public node test'),
|
||||
'private' => FALSE,
|
||||
));
|
||||
|
||||
// User with access should see both nodes created.
|
||||
$this->drupalGet('activity');
|
||||
$this->assertText($private_node->getTitle(), 'Private node is visible to user with private access.');
|
||||
$this->assertText($public_node->getTitle(), 'Public node is visible to user with private access.');
|
||||
$this->drupalGet('user/' . $access_user->id() . '/activity');
|
||||
$this->assertText($private_node->getTitle(), 'Private node is visible to user with private access.');
|
||||
$this->assertText($public_node->getTitle(), 'Public node is visible to user with private access.');
|
||||
|
||||
// User without access should not see private node.
|
||||
$this->drupalLogin($no_access_user);
|
||||
$this->drupalGet('activity');
|
||||
$this->assertNoText($private_node->getTitle(), 'Private node is not visible to user without private access.');
|
||||
$this->assertText($public_node->getTitle(), 'Public node is visible to user without private access.');
|
||||
$this->drupalGet('user/' . $access_user->id() . '/activity');
|
||||
$this->assertNoText($private_node->getTitle(), 'Private node is not visible to user without private access.');
|
||||
$this->assertText($public_node->getTitle(), 'Public node is visible to user without private access.');
|
||||
}
|
||||
}
|
414
core/modules/tracker/src/Tests/TrackerTest.php
Normal file
414
core/modules/tracker/src/Tests/TrackerTest.php
Normal file
|
@ -0,0 +1,414 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\tracker\Tests\TrackerTest.
|
||||
*/
|
||||
|
||||
namespace Drupal\tracker\Tests;
|
||||
|
||||
use Drupal\comment\CommentInterface;
|
||||
use Drupal\comment\Tests\CommentTestTrait;
|
||||
use Drupal\Core\Cache\Cache;
|
||||
use Drupal\field\Entity\FieldStorageConfig;
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
|
||||
|
||||
/**
|
||||
* Create and delete nodes and check for their display in the tracker listings.
|
||||
*
|
||||
* @group tracker
|
||||
*/
|
||||
class TrackerTest extends WebTestBase {
|
||||
|
||||
use CommentTestTrait;
|
||||
use AssertPageCacheContextsAndTagsTrait;
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('comment', 'tracker', 'history', 'node_test');
|
||||
|
||||
/**
|
||||
* The main user for testing.
|
||||
*
|
||||
* @var \Drupal\user\UserInterface
|
||||
*/
|
||||
protected $user;
|
||||
|
||||
/**
|
||||
* A second user that will 'create' comments and nodes.
|
||||
*
|
||||
* @var \Drupal\user\UserInterface
|
||||
*/
|
||||
protected $otherUser;
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
|
||||
|
||||
$permissions = array('access comments', 'create page content', 'post comments', 'skip comment approval');
|
||||
$this->user = $this->drupalCreateUser($permissions);
|
||||
$this->otherUser = $this->drupalCreateUser($permissions);
|
||||
$this->addDefaultCommentField('node', 'page');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests for the presence of nodes on the global tracker listing.
|
||||
*/
|
||||
function testTrackerAll() {
|
||||
$this->drupalLogin($this->user);
|
||||
|
||||
$unpublished = $this->drupalCreateNode(array(
|
||||
'title' => $this->randomMachineName(8),
|
||||
'status' => 0,
|
||||
));
|
||||
$published = $this->drupalCreateNode(array(
|
||||
'title' => $this->randomMachineName(8),
|
||||
'status' => 1,
|
||||
));
|
||||
|
||||
$this->drupalGet('activity');
|
||||
$this->assertNoText($unpublished->label(), 'Unpublished node does not show up in the tracker listing.');
|
||||
$this->assertText($published->label(), 'Published node shows up in the tracker listing.');
|
||||
$this->assertLink(t('My recent content'), 0, 'User tab shows up on the global tracker page.');
|
||||
|
||||
// Assert cache contexts, specifically the pager and node access contexts.
|
||||
$this->assertCacheContexts(['languages:language_interface', 'theme', 'url.query_args.pagers:0', 'user.node_grants:view', 'user.permissions']);
|
||||
// Assert cache tags for the visible node and node list cache tag.
|
||||
$this->assertCacheTags(Cache::mergeTags($published->getCacheTags(), $published->getOwner()->getCacheTags(), ['node_list', 'rendered']));
|
||||
|
||||
// Delete a node and ensure it no longer appears on the tracker.
|
||||
$published->delete();
|
||||
$this->drupalGet('activity');
|
||||
$this->assertNoText($published->label(), 'Deleted node does not show up in the tracker listing.');
|
||||
|
||||
// Test proper display of time on activity page when comments are disabled.
|
||||
// Disable comments.
|
||||
FieldStorageConfig::loadByName('node', 'comment')->delete();
|
||||
$node = $this->drupalCreateNode([
|
||||
// This title is required to trigger the custom changed time set in the
|
||||
// node_test module. This is needed in order to ensure a sufficiently
|
||||
// large 'time ago' interval that isn't numbered in seconds.
|
||||
'title' => 'testing_node_presave',
|
||||
'status' => 1,
|
||||
]);
|
||||
|
||||
$this->drupalGet('activity');
|
||||
$this->assertText($node->label(), 'Published node shows up in the tracker listing.');
|
||||
$this->assertText(\Drupal::service('date.formatter')->formatTimeDiffSince($node->getChangedTime()), 'The changed time was displayed on the tracker listing.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests for the presence of nodes on a user's tracker listing.
|
||||
*/
|
||||
function testTrackerUser() {
|
||||
$this->drupalLogin($this->user);
|
||||
|
||||
$unpublished = $this->drupalCreateNode(array(
|
||||
'title' => $this->randomMachineName(8),
|
||||
'uid' => $this->user->id(),
|
||||
'status' => 0,
|
||||
));
|
||||
$my_published = $this->drupalCreateNode(array(
|
||||
'title' => $this->randomMachineName(8),
|
||||
'uid' => $this->user->id(),
|
||||
'status' => 1,
|
||||
));
|
||||
$other_published_no_comment = $this->drupalCreateNode(array(
|
||||
'title' => $this->randomMachineName(8),
|
||||
'uid' => $this->otherUser->id(),
|
||||
'status' => 1,
|
||||
));
|
||||
$other_published_my_comment = $this->drupalCreateNode(array(
|
||||
'title' => $this->randomMachineName(8),
|
||||
'uid' => $this->otherUser->id(),
|
||||
'status' => 1,
|
||||
));
|
||||
$comment = array(
|
||||
'subject[0][value]' => $this->randomMachineName(),
|
||||
'comment_body[0][value]' => $this->randomMachineName(20),
|
||||
);
|
||||
$this->drupalPostForm('comment/reply/node/' . $other_published_my_comment->id() . '/comment', $comment, t('Save'));
|
||||
|
||||
$this->drupalGet('user/' . $this->user->id() . '/activity');
|
||||
$this->assertNoText($unpublished->label(), "Unpublished nodes do not show up in the user's tracker listing.");
|
||||
$this->assertText($my_published->label(), "Published nodes show up in the user's tracker listing.");
|
||||
$this->assertNoText($other_published_no_comment->label(), "Another user's nodes do not show up in the user's tracker listing.");
|
||||
$this->assertText($other_published_my_comment->label(), "Nodes that the user has commented on appear in the user's tracker listing.");
|
||||
|
||||
// Assert cache contexts; the node grant context is not directly visible due
|
||||
// to it being implied by the user context.
|
||||
$this->assertCacheContexts(['languages:language_interface', 'theme', 'url.query_args.pagers:0', 'user']);
|
||||
// Assert cache tags for the visible nodes (including owners) and node list
|
||||
// cache tag.
|
||||
$tags = Cache::mergeTags(
|
||||
$my_published->getCacheTags(),
|
||||
$my_published->getOwner()->getCacheTags(),
|
||||
$other_published_my_comment->getCacheTags(),
|
||||
$other_published_my_comment->getOwner()->getCacheTags(),
|
||||
['node_list', 'rendered']
|
||||
);
|
||||
$this->assertCacheTags($tags);
|
||||
|
||||
$this->assertLink($my_published->label());
|
||||
$this->assertNoLink($unpublished->label());
|
||||
// Verify that title and tab title have been set correctly.
|
||||
$this->assertText('Activity', 'The user activity tab has the name "Activity".');
|
||||
$this->assertTitle(t('@name | @site', array('@name' => $this->user->getUsername(), '@site' => $this->config('system.site')->get('name'))), 'The user tracker page has the correct page title.');
|
||||
|
||||
// Verify that unpublished comments are removed from the tracker.
|
||||
$admin_user = $this->drupalCreateUser(array('post comments', 'administer comments', 'access user profiles'));
|
||||
$this->drupalLogin($admin_user);
|
||||
$this->drupalPostForm('comment/1/edit', array('status' => CommentInterface::NOT_PUBLISHED), t('Save'));
|
||||
$this->drupalGet('user/' . $this->user->id() . '/activity');
|
||||
$this->assertNoText($other_published_my_comment->label(), 'Unpublished comments are not counted on the tracker listing.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests for the presence of the "new" flag for nodes.
|
||||
*/
|
||||
function testTrackerNewNodes() {
|
||||
$this->drupalLogin($this->user);
|
||||
|
||||
$edit = array(
|
||||
'title' => $this->randomMachineName(8),
|
||||
);
|
||||
|
||||
$node = $this->drupalCreateNode($edit);
|
||||
$title = $edit['title'];
|
||||
$this->drupalGet('activity');
|
||||
$this->assertPattern('/' . $title . '.*new/', 'New nodes are flagged as such in the activity listing.');
|
||||
|
||||
$this->drupalGet('node/' . $node->id());
|
||||
// Simulate the JavaScript on the node page to mark the node as read.
|
||||
// @todo Get rid of curlExec() once https://www.drupal.org/node/2074037
|
||||
// lands.
|
||||
$this->curlExec(array(
|
||||
CURLOPT_URL => \Drupal::url('history.read_node', ['node' => $node->id()], array('absolute' => TRUE)),
|
||||
CURLOPT_HTTPHEADER => array(
|
||||
'Accept: application/json',
|
||||
),
|
||||
));
|
||||
$this->drupalGet('activity');
|
||||
$this->assertNoPattern('/' . $title . '.*new/', 'Visited nodes are not flagged as new.');
|
||||
|
||||
$this->drupalLogin($this->otherUser);
|
||||
$this->drupalGet('activity');
|
||||
$this->assertPattern('/' . $title . '.*new/', 'For another user, new nodes are flagged as such in the tracker listing.');
|
||||
|
||||
$this->drupalGet('node/' . $node->id());
|
||||
// Simulate the JavaScript on the node page to mark the node as read.
|
||||
// @todo Get rid of curlExec() once https://www.drupal.org/node/2074037
|
||||
// lands.
|
||||
$this->curlExec(array(
|
||||
CURLOPT_URL => \Drupal::url('history.read_node', ['node' => $node->id()], array('absolute' => TRUE)),
|
||||
CURLOPT_HTTPHEADER => array(
|
||||
'Accept: application/json',
|
||||
),
|
||||
));
|
||||
$this->drupalGet('activity');
|
||||
$this->assertNoPattern('/' . $title . '.*new/', 'For another user, visited nodes are not flagged as new.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests for comment counters on the tracker listing.
|
||||
*/
|
||||
function testTrackerNewComments() {
|
||||
$this->drupalLogin($this->user);
|
||||
|
||||
$node = $this->drupalCreateNode(array(
|
||||
'title' => $this->randomMachineName(8),
|
||||
));
|
||||
|
||||
// Add a comment to the page.
|
||||
$comment = array(
|
||||
'subject[0][value]' => $this->randomMachineName(),
|
||||
'comment_body[0][value]' => $this->randomMachineName(20),
|
||||
);
|
||||
$this->drupalPostForm('comment/reply/node/' . $node->id() . '/comment', $comment, t('Save'));
|
||||
// The new comment is automatically viewed by the current user. Simulate the
|
||||
// JavaScript that does this.
|
||||
// @todo Get rid of curlExec() once https://www.drupal.org/node/2074037
|
||||
// lands.
|
||||
$this->curlExec(array(
|
||||
CURLOPT_URL => \Drupal::url('history.read_node', ['node' => $node->id()], array('absolute' => TRUE)),
|
||||
CURLOPT_HTTPHEADER => array(
|
||||
'Accept: application/json',
|
||||
),
|
||||
));
|
||||
|
||||
$this->drupalLogin($this->otherUser);
|
||||
$this->drupalGet('activity');
|
||||
$this->assertText('1 new', 'New comments are counted on the tracker listing pages.');
|
||||
$this->drupalGet('node/' . $node->id());
|
||||
|
||||
// Add another comment as otherUser.
|
||||
$comment = array(
|
||||
'subject[0][value]' => $this->randomMachineName(),
|
||||
'comment_body[0][value]' => $this->randomMachineName(20),
|
||||
);
|
||||
// If the comment is posted in the same second as the last one then Drupal
|
||||
// can't tell the difference, so we wait one second here.
|
||||
sleep(1);
|
||||
$this->drupalPostForm('comment/reply/node/' . $node->id(). '/comment', $comment, t('Save'));
|
||||
|
||||
$this->drupalLogin($this->user);
|
||||
$this->drupalGet('activity');
|
||||
$this->assertText('1 new', 'New comments are counted on the tracker listing pages.');
|
||||
$this->assertLink(t('1 new'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests for ordering on a users tracker listing when comments are posted.
|
||||
*/
|
||||
function testTrackerOrderingNewComments() {
|
||||
$this->drupalLogin($this->user);
|
||||
|
||||
$node_one = $this->drupalCreateNode(array(
|
||||
'title' => $this->randomMachineName(8),
|
||||
));
|
||||
|
||||
$node_two = $this->drupalCreateNode(array(
|
||||
'title' => $this->randomMachineName(8),
|
||||
));
|
||||
|
||||
// Now get otherUser to track these pieces of content.
|
||||
$this->drupalLogin($this->otherUser);
|
||||
|
||||
// Add a comment to the first page.
|
||||
$comment = array(
|
||||
'subject[0][value]' => $this->randomMachineName(),
|
||||
'comment_body[0][value]' => $this->randomMachineName(20),
|
||||
);
|
||||
$this->drupalPostForm('comment/reply/node/' . $node_one->id() . '/comment', $comment, t('Save'));
|
||||
|
||||
// If the comment is posted in the same second as the last one then Drupal
|
||||
// can't tell the difference, so we wait one second here.
|
||||
sleep(1);
|
||||
|
||||
// Add a comment to the second page.
|
||||
$comment = array(
|
||||
'subject[0][value]' => $this->randomMachineName(),
|
||||
'comment_body[0][value]' => $this->randomMachineName(20),
|
||||
);
|
||||
$this->drupalPostForm('comment/reply/node/' . $node_two->id() . '/comment', $comment, t('Save'));
|
||||
|
||||
// We should at this point have in our tracker for otherUser:
|
||||
// 1. node_two
|
||||
// 2. node_one
|
||||
// Because that's the reverse order of the posted comments.
|
||||
|
||||
// Now we're going to post a comment to node_one which should jump it to the
|
||||
// top of the list.
|
||||
|
||||
$this->drupalLogin($this->user);
|
||||
// If the comment is posted in the same second as the last one then Drupal
|
||||
// can't tell the difference, so we wait one second here.
|
||||
sleep(1);
|
||||
|
||||
// Add a comment to the second page.
|
||||
$comment = array(
|
||||
'subject[0][value]' => $this->randomMachineName(),
|
||||
'comment_body[0][value]' => $this->randomMachineName(20),
|
||||
);
|
||||
$this->drupalPostForm('comment/reply/node/' . $node_one->id() . '/comment', $comment, t('Save'));
|
||||
|
||||
// Switch back to the otherUser and assert that the order has swapped.
|
||||
$this->drupalLogin($this->otherUser);
|
||||
$this->drupalGet('user/' . $this->otherUser->id() . '/activity');
|
||||
// This is a cheeky way of asserting that the nodes are in the right order
|
||||
// on the tracker page.
|
||||
// It's almost certainly too brittle.
|
||||
$pattern = '/' . preg_quote($node_one->getTitle()) . '.+' . preg_quote($node_two->getTitle()) . '/s';
|
||||
$this->verbose($pattern);
|
||||
$this->assertPattern($pattern, 'Most recently commented on node appears at the top of tracker');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that existing nodes are indexed by cron.
|
||||
*/
|
||||
function testTrackerCronIndexing() {
|
||||
$this->drupalLogin($this->user);
|
||||
|
||||
// Create 3 nodes.
|
||||
$edits = array();
|
||||
$nodes = array();
|
||||
for ($i = 1; $i <= 3; $i++) {
|
||||
$edits[$i] = array(
|
||||
'title' => $this->randomMachineName(),
|
||||
);
|
||||
$nodes[$i] = $this->drupalCreateNode($edits[$i]);
|
||||
}
|
||||
|
||||
// Add a comment to the last node as other user.
|
||||
$this->drupalLogin($this->otherUser);
|
||||
$comment = array(
|
||||
'subject[0][value]' => $this->randomMachineName(),
|
||||
'comment_body[0][value]' => $this->randomMachineName(20),
|
||||
);
|
||||
$this->drupalPostForm('comment/reply/node/' . $nodes[3]->id() . '/comment', $comment, t('Save'));
|
||||
|
||||
// Start indexing backwards from node 3.
|
||||
\Drupal::state()->set('tracker.index_nid', 3);
|
||||
|
||||
// Clear the current tracker tables and rebuild them.
|
||||
db_delete('tracker_node')
|
||||
->execute();
|
||||
db_delete('tracker_user')
|
||||
->execute();
|
||||
tracker_cron();
|
||||
|
||||
$this->drupalLogin($this->user);
|
||||
|
||||
// Fetch the user's tracker.
|
||||
$this->drupalGet('activity/' . $this->user->id());
|
||||
|
||||
// Assert that all node titles are displayed.
|
||||
foreach ($nodes as $i => $node) {
|
||||
$this->assertText($node->label(), format_string('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
|
||||
}
|
||||
$this->assertText('1 new', 'One new comment is counted on the tracker listing pages.');
|
||||
$this->assertText('updated', 'Node is listed as updated');
|
||||
|
||||
// Fetch the site-wide tracker.
|
||||
$this->drupalGet('activity');
|
||||
|
||||
// Assert that all node titles are displayed.
|
||||
foreach ($nodes as $i => $node) {
|
||||
$this->assertText($node->label(), format_string('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
|
||||
}
|
||||
$this->assertText('1 new', 'New comment is counted on the tracker listing pages.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that publish/unpublish works at admin/content/node.
|
||||
*/
|
||||
function testTrackerAdminUnpublish() {
|
||||
\Drupal::service('module_installer')->install(array('views'));
|
||||
\Drupal::service('router.builder')->rebuild();
|
||||
$admin_user = $this->drupalCreateUser(array('access content overview', 'administer nodes', 'bypass node access'));
|
||||
$this->drupalLogin($admin_user);
|
||||
|
||||
$node = $this->drupalCreateNode(array(
|
||||
'title' => $this->randomMachineName(),
|
||||
));
|
||||
|
||||
// Assert that the node is displayed.
|
||||
$this->drupalGet('activity');
|
||||
$this->assertText($node->label(), 'A node is displayed on the tracker listing pages.');
|
||||
|
||||
// Unpublish the node and ensure that it's no longer displayed.
|
||||
$edit = array(
|
||||
'action' => 'node_unpublish_action',
|
||||
'node_bulk_form[0]' => $node->id(),
|
||||
);
|
||||
$this->drupalPostForm('admin/content', $edit, t('Apply'));
|
||||
|
||||
$this->drupalGet('activity');
|
||||
$this->assertText(t('No content available.'), 'A node is displayed on the tracker listing pages.');
|
||||
}
|
||||
}
|
73
core/modules/tracker/src/Tests/Views/TrackerTestBase.php
Normal file
73
core/modules/tracker/src/Tests/Views/TrackerTestBase.php
Normal file
|
@ -0,0 +1,73 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\tracker\Tests\Views\TrackerTestBase.
|
||||
*/
|
||||
|
||||
namespace Drupal\tracker\Tests\Views;
|
||||
|
||||
use Drupal\comment\Tests\CommentTestTrait;
|
||||
use Drupal\Core\Language\LanguageInterface;
|
||||
use Drupal\views\Tests\ViewTestBase;
|
||||
use Drupal\views\Tests\ViewTestData;
|
||||
|
||||
/**
|
||||
* Base class for all tracker tests.
|
||||
*/
|
||||
abstract class TrackerTestBase extends ViewTestBase {
|
||||
|
||||
use CommentTestTrait;
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('comment', 'tracker', 'tracker_test_views');
|
||||
|
||||
/**
|
||||
* The node used for testing.
|
||||
*
|
||||
* @var \Drupal\node\NodeInterface
|
||||
*/
|
||||
protected $node;
|
||||
|
||||
/**
|
||||
* The comment used for testing.
|
||||
*
|
||||
* @var \Drupal\comment\CommentInterface
|
||||
*/
|
||||
protected $comment;
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
ViewTestData::createTestViews(get_class($this), array('tracker_test_views'));
|
||||
|
||||
$this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
|
||||
// Add a comment field.
|
||||
$this->addDefaultCommentField('node', 'page');
|
||||
|
||||
$permissions = array('access comments', 'create page content', 'post comments', 'skip comment approval');
|
||||
$account = $this->drupalCreateUser($permissions);
|
||||
|
||||
$this->drupalLogin($account);
|
||||
|
||||
$this->node = $this->drupalCreateNode(array(
|
||||
'title' => $this->randomMachineName(8),
|
||||
'uid' => $account->id(),
|
||||
'status' => 1,
|
||||
));
|
||||
|
||||
$this->comment = entity_create('comment', array(
|
||||
'entity_id' => $this->node->id(),
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'comment',
|
||||
'subject' => $this->randomMachineName(),
|
||||
'comment_body[' . LanguageInterface::LANGCODE_NOT_SPECIFIED . '][0][value]' => $this->randomMachineName(20),
|
||||
));
|
||||
|
||||
}
|
||||
|
||||
}
|
73
core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php
Normal file
73
core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php
Normal file
|
@ -0,0 +1,73 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\tracker\Tests\Views\TrackerUserUidTest.
|
||||
*/
|
||||
|
||||
namespace Drupal\tracker\Tests\Views;
|
||||
|
||||
use Drupal\views\Views;
|
||||
|
||||
/**
|
||||
* Tests the tracker user uid handlers.
|
||||
*
|
||||
* @group tracker
|
||||
*/
|
||||
class TrackerUserUidTest extends TrackerTestBase {
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = array('test_tracker_user_uid');
|
||||
|
||||
/**
|
||||
* Tests the user uid filter and argument.
|
||||
*/
|
||||
public function testUserUid() {
|
||||
$map = array(
|
||||
'nid' => 'nid',
|
||||
'title' => 'title',
|
||||
);
|
||||
|
||||
$expected = array(
|
||||
array(
|
||||
'nid' => $this->node->id(),
|
||||
'title' => $this->node->label(),
|
||||
)
|
||||
);
|
||||
|
||||
$view = Views::getView('test_tracker_user_uid');
|
||||
$this->executeView($view);
|
||||
|
||||
// We should have no results as the filter is set for uid 0.
|
||||
$this->assertIdenticalResultSet($view, array(), $map);
|
||||
$view->destroy();
|
||||
|
||||
// Change the filter value to our user.
|
||||
$view->initHandlers();
|
||||
$view->filter['uid_touch_tracker']->value = $this->node->getOwnerId();
|
||||
$this->executeView($view);
|
||||
|
||||
// We should have one result as the filter is set for the created user.
|
||||
$this->assertIdenticalResultSet($view, $expected, $map);
|
||||
$view->destroy();
|
||||
|
||||
// Remove the filter now, so only the argument will affect the query.
|
||||
$view->removeHandler('default', 'filter', 'uid_touch_tracker');
|
||||
|
||||
// Test the incorrect argument UID.
|
||||
$view->initHandlers();
|
||||
$this->executeView($view, array(rand()));
|
||||
$this->assertIdenticalResultSet($view, array(), $map);
|
||||
$view->destroy();
|
||||
|
||||
// Test the correct argument UID.
|
||||
$view->initHandlers();
|
||||
$this->executeView($view, array($this->node->getOwnerId()));
|
||||
$this->assertIdenticalResultSet($view, $expected, $map);
|
||||
}
|
||||
|
||||
}
|
Reference in a new issue