X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fcore%2Fmodules%2Fcomment%2Fsrc%2FTests%2FCommentPreviewTest.php;fp=web%2Fcore%2Fmodules%2Fcomment%2Fsrc%2FTests%2FCommentPreviewTest.php;h=0000000000000000000000000000000000000000;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hp=1b07fe600b08abd105d1d9ecea533b661b887318;hpb=aea91e65e895364e460983b890e295aa5d5540a5;p=yaffs-website

diff --git a/web/core/modules/comment/src/Tests/CommentPreviewTest.php b/web/core/modules/comment/src/Tests/CommentPreviewTest.php
deleted file mode 100644
index 1b07fe600..000000000
--- a/web/core/modules/comment/src/Tests/CommentPreviewTest.php
+++ /dev/null
@@ -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();
-  }
-
-}