upgrades core to 8.4.2

core/modules/tracker/tests/modules/tracker_test_views/tracker_test_views.info.yml

@@ -8,8 +8,8 @@ dependencies:
   - tracker
   - views
 
-# Information added by Drupal.org packaging script on 2017-08-16
-version: '8.3.7'
+# Information added by Drupal.org packaging script on 2017-11-03
+version: '8.4.2'
 core: '8.x'
 project: 'drupal'
-datestamp: 1502903957
+datestamp: 1509719929

core/modules/tracker/tests/src/Functional/TrackerTest.php

@@ -9,8 +9,8 @@ use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\Node;
-use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
 
 /**
  * Create and delete nodes and check for their display in the tracker listings.

core/modules/tracker/tests/src/Functional/Views/TrackerTestBase.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Drupal\Tests\tracker\Functional\Views;
+
+use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Tests\views\Functional\ViewTestBase;
+use Drupal\views\Tests\ViewTestData;
+use Drupal\comment\Entity\Comment;
+
+/**
+ * Base class for all tracker tests.
+ */
+abstract class TrackerTestBase extends ViewTestBase {
+
+  use CommentTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['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($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    ViewTestData::createTestViews(get_class($this), ['tracker_test_views']);
+
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+    // Add a comment field.
+    $this->addDefaultCommentField('node', 'page');
+
+    $permissions = ['access comments', 'create page content', 'post comments', 'skip comment approval'];
+    $account = $this->drupalCreateUser($permissions);
+
+    $this->drupalLogin($account);
+
+    $this->node = $this->drupalCreateNode([
+      'title' => $this->randomMachineName(8),
+      'uid' => $account->id(),
+      'status' => 1,
+    ]);
+
+    $this->comment = Comment::create([
+      '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),
+    ]);
+
+  }
+
+}

core/modules/tracker/tests/src/Functional/Views/TrackerUserUidTest.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Drupal\Tests\tracker\Functional\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 = ['test_tracker_user_uid'];
+
+  /**
+   * Tests the user uid filter and argument.
+   */
+  public function testUserUid() {
+    $map = [
+      'nid' => 'nid',
+      'title' => 'title',
+    ];
+
+    $expected = [
+      [
+        '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, [], $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, [rand()]);
+    $this->assertIdenticalResultSet($view, [], $map);
+    $view->destroy();
+
+    // Test the correct argument UID.
+    $view->initHandlers();
+    $this->executeView($view, [$this->node->getOwnerId()]);
+    $this->assertIdenticalResultSet($view, $expected, $map);
+  }
+
+}