Update to drupal-org-drupal 8.0.0-rc2. For more information, see https://www.drupal.org/node/2598668

core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php

@@ -8,7 +8,6 @@
 namespace Drupal\comment\Tests;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Session\UserSession;
 use Drupal\comment\CommentInterface;
 use Drupal\system\Tests\Entity\EntityUnitTestBase;
 use Symfony\Component\HttpFoundation\Request;

core/modules/comment/src/Tests/CommentFieldAccessTest.php

@@ -243,7 +243,7 @@ class CommentFieldAccessTest extends EntityUnitTestBase {
       foreach ($permutations as $set) {
         $may_view = $set['comment']->{$field}->access('view', $set['user']);
         $may_update = $set['comment']->{$field}->access('edit', $set['user']);
-        // Nobody has access to to view the hostname field.
+        // Nobody has access to view the hostname field.
         if ($field === 'hostname') {
           $view_access = FALSE;
           $state = 'cannot';

core/modules/comment/src/Tests/CommentFieldsTest.php

@@ -94,6 +94,55 @@ class CommentFieldsTest extends CommentTestBase {
     $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.
    */

core/modules/comment/src/Tests/CommentNonNodeTest.php

@@ -435,7 +435,7 @@ class CommentNonNodeTest extends WebTestBase {
     $data = array('bundle' => 'entity_test', 'name' => $random_label);
     $new_entity = entity_create('entity_test', $data);
     $new_entity->save();
-    $this->drupalGet('entity_test/manage/' . $new_entity->id());
+    $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');

core/modules/comment/src/Tests/CommentPagerTest.php

@@ -250,7 +250,7 @@ class CommentPagerTest extends CommentTestBase {
     $node = Node::load($node->id());
     foreach ($expected_pages as $new_replies => $expected_page) {
       $returned_page = \Drupal::entityManager()->getStorage('comment')
-        ->getNewCommentPageNumber($node->get('comment')->comment_count, $new_replies, $node);
+        ->getNewCommentPageNumber($node->get('comment')->comment_count, $new_replies, $node, 'comment');
       $this->assertIdentical($expected_page, $returned_page, format_string('Flat mode, @new replies: expected page @expected, returned page @returned.', array('@new' => $new_replies, '@expected' => $expected_page, '@returned' => $returned_page)));
     }
 
@@ -269,7 +269,7 @@ class CommentPagerTest extends CommentTestBase {
     $node = Node::load($node->id());
     foreach ($expected_pages as $new_replies => $expected_page) {
       $returned_page = \Drupal::entityManager()->getStorage('comment')
-        ->getNewCommentPageNumber($node->get('comment')->comment_count, $new_replies, $node);
+        ->getNewCommentPageNumber($node->get('comment')->comment_count, $new_replies, $node, 'comment');
       $this->assertEqual($expected_page, $returned_page, format_string('Threaded mode, @new replies: expected page @expected, returned page @returned.', array('@new' => $new_replies, '@expected' => $expected_page, '@returned' => $returned_page)));
     }
   }

core/modules/comment/src/Tests/CommentTokenReplaceTest.php

@@ -10,7 +10,6 @@ namespace Drupal\comment\Tests;
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\UrlHelper;
-use Drupal\Component\Utility\Xss;
 use Drupal\comment\Entity\Comment;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\node\Entity\Node;

core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php

@@ -7,6 +7,7 @@
 
 namespace Drupal\comment\Tests\Migrate\d6;
 
+use Drupal\comment\CommentManagerInterface;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\Node;
 
@@ -44,21 +45,21 @@ class MigrateCommentVariableInstanceTest extends MigrateDrupal6TestBase {
     $this->assertIdentical(0, $node->comment->status);
     $this->assertIdentical('comment', $node->comment->getFieldDefinition()->getName());
     $settings = $node->comment->getFieldDefinition()->getSettings();
-    $this->assertIdentical(4, $settings['default_mode']);
+    $this->assertIdentical(CommentManagerInterface::COMMENT_MODE_THREADED, $settings['default_mode']);
     $this->assertIdentical(50, $settings['per_page']);
-    $this->assertIdentical(0, $settings['anonymous']);
-    $this->assertIdentical(FALSE, $settings['form_location']);
-    $this->assertIdentical(1, $settings['preview']);
+    $this->assertFalse($settings['anonymous']);
+    $this->assertFalse($settings['form_location']);
+    $this->assertTrue($settings['preview']);
 
     $node = Node::create(['type' => 'story']);
     $this->assertIdentical(2, $node->comment_no_subject->status);
     $this->assertIdentical('comment_no_subject', $node->comment_no_subject->getFieldDefinition()->getName());
     $settings = $node->comment_no_subject->getFieldDefinition()->getSettings();
-    $this->assertIdentical(2, $settings['default_mode']);
+    $this->assertIdentical(CommentManagerInterface::COMMENT_MODE_FLAT, $settings['default_mode']);
     $this->assertIdentical(70, $settings['per_page']);
-    $this->assertIdentical(1, $settings['anonymous']);
-    $this->assertIdentical(FALSE, $settings['form_location']);
-    $this->assertIdentical(0, $settings['preview']);
+    $this->assertTrue($settings['anonymous']);
+    $this->assertFalse($settings['form_location']);
+    $this->assertFalse($settings['preview']);
   }
 
 }

core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTest.php

@@ -11,7 +11,6 @@ use Drupal\comment\CommentInterface;
 use Drupal\comment\Entity\Comment;
 use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
 use Drupal\node\NodeInterface;
-use Drupal\user\Entity\User;
 
 /**
  * Tests migration of comments from Drupal 7.
@@ -37,12 +36,6 @@ class MigrateCommentTest extends MigrateDrupal7TestBase {
       'd7_user_role',
       'd7_user',
     ]);
-    // The test database doesn't include uid 1, so we'll need to create it.
-    User::create(array(
-      'uid' => 1,
-      'name' => 'admin',
-      'mail' => 'admin@local.host',
-    ))->save();
     $this->executeMigration('d7_node_type');
     // We only need the test_content_type node migration to run for real, so
     // mock all the others.