Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Issue #1399896 by xjm: Fixed testCommentNewCommentsIndicator() is ins…

…ide CommentHelperCase and therefore gets run repeatedly.
  • Loading branch information...
commit 2bdebdb7a57bfbd2c0580f22055275a4a3312baf 1 parent 86aa81e
@webchick webchick authored
Showing with 50 additions and 50 deletions.
  1. +50 −50 modules/comment/comment.test
View
100 modules/comment/comment.test
@@ -251,56 +251,6 @@ class CommentHelperCase extends DrupalWebTestCase {
return $match[2];
}
-
- /**
- * Tests new comment marker.
- */
- public function testCommentNewCommentsIndicator() {
- // Test if the right links are displayed when no comment is present for the
- // node.
- $this->drupalLogin($this->admin_user);
- $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => COMMENT_NODE_OPEN));
- $this->drupalGet('node');
- $this->assertNoLink(t('@count comments', array('@count' => 0)));
- $this->assertNoLink(t('@count new comments', array('@count' => 0)));
- $this->assertLink(t('Read more'));
- $count = $this->xpath('//div[@id=:id]/div[@class=:class]/ul/li', array(':id' => 'node-' . $this->node->nid, ':class' => 'link-wrapper'));
- $this->assertTrue(count($count) == 1, t('One child found'));
-
- // Create a new comment. This helper function may be run with different
- // comment settings so use comment_save() to avoid complex setup.
- $comment = (object) array(
- 'cid' => NULL,
- 'nid' => $this->node->nid,
- 'node_type' => $this->node->type,
- 'pid' => 0,
- 'uid' => $this->loggedInUser->uid,
- 'status' => COMMENT_PUBLISHED,
- 'subject' => $this->randomName(),
- 'hostname' => ip_address(),
- 'language' => LANGUAGE_NONE,
- 'comment_body' => array(LANGUAGE_NONE => array($this->randomName())),
- );
- comment_save($comment);
- $this->drupalLogout();
-
- // Log in with 'web user' and check comment links.
- $this->drupalLogin($this->web_user);
- $this->drupalGet('node');
- $this->assertLink(t('1 new comment'));
- $this->clickLink(t('1 new comment'));
- $this->assertRaw('<a id="new"></a>', t('Found "new" marker.'));
- $this->assertTrue($this->xpath('//a[@id=:new]/following-sibling::a[1][@id=:comment_id]', array(':new' => 'new', ':comment_id' => 'comment-1')), t('The "new" anchor is positioned at the right comment.'));
-
- // Test if "new comment" link is correctly removed.
- $this->drupalGet('node');
- $this->assertLink(t('1 comment'));
- $this->assertLink(t('Read more'));
- $this->assertNoLink(t('1 new comment'));
- $this->assertNoLink(t('@count new comments', array('@count' => 0)));
- $count = $this->xpath('//div[@id=:id]/div[@class=:class]/ul/li', array(':id' => 'node-' . $this->node->nid, ':class' => 'link-wrapper'));
- $this->assertTrue(count($count) == 2, print_r($count, TRUE));
- }
}
class CommentInterfaceTest extends CommentHelperCase {
@@ -473,6 +423,56 @@ class CommentInterfaceTest extends CommentHelperCase {
}
/**
+ * Tests new comment marker.
+ */
+ public function testCommentNewCommentsIndicator() {
+ // Test if the right links are displayed when no comment is present for the
+ // node.
+ $this->drupalLogin($this->admin_user);
+ $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => COMMENT_NODE_OPEN));
+ $this->drupalGet('node');
+ $this->assertNoLink(t('@count comments', array('@count' => 0)));
+ $this->assertNoLink(t('@count new comments', array('@count' => 0)));
+ $this->assertLink(t('Read more'));
+ $count = $this->xpath('//div[@id=:id]/div[@class=:class]/ul/li', array(':id' => 'node-' . $this->node->nid, ':class' => 'link-wrapper'));
+ $this->assertTrue(count($count) == 1, t('One child found'));
+
+ // Create a new comment. This helper function may be run with different
+ // comment settings so use comment_save() to avoid complex setup.
+ $comment = (object) array(
+ 'cid' => NULL,
+ 'nid' => $this->node->nid,
+ 'node_type' => $this->node->type,
+ 'pid' => 0,
+ 'uid' => $this->loggedInUser->uid,
+ 'status' => COMMENT_PUBLISHED,
+ 'subject' => $this->randomName(),
+ 'hostname' => ip_address(),
+ 'language' => LANGUAGE_NONE,
+ 'comment_body' => array(LANGUAGE_NONE => array($this->randomName())),
+ );
+ comment_save($comment);
+ $this->drupalLogout();
+
+ // Log in with 'web user' and check comment links.
+ $this->drupalLogin($this->web_user);
+ $this->drupalGet('node');
+ $this->assertLink(t('1 new comment'));
+ $this->clickLink(t('1 new comment'));
+ $this->assertRaw('<a id="new"></a>', t('Found "new" marker.'));
+ $this->assertTrue($this->xpath('//a[@id=:new]/following-sibling::a[1][@id=:comment_id]', array(':new' => 'new', ':comment_id' => 'comment-1')), t('The "new" anchor is positioned at the right comment.'));
+
+ // Test if "new comment" link is correctly removed.
+ $this->drupalGet('node');
+ $this->assertLink(t('1 comment'));
+ $this->assertLink(t('Read more'));
+ $this->assertNoLink(t('1 new comment'));
+ $this->assertNoLink(t('@count new comments', array('@count' => 0)));
+ $count = $this->xpath('//div[@id=:id]/div[@class=:class]/ul/li', array(':id' => 'node-' . $this->node->nid, ':class' => 'link-wrapper'));
+ $this->assertTrue(count($count) == 2, print_r($count, TRUE));
+ }
+
+ /**
* Tests the node comment statistics.
*/
function testCommentNodeCommentStatistics() {
Please sign in to comment.
Something went wrong with that request. Please try again.