X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fnode%2Fsrc%2FTests%2FNodeRevisionsTest.php;h=da5b260537794623e43f1e8f7f5e5a557ed5a2be;hp=198226616d5ca55064b5345287c96b2228cc9e02;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5
diff --git a/web/core/modules/node/src/Tests/NodeRevisionsTest.php b/web/core/modules/node/src/Tests/NodeRevisionsTest.php
index 198226616..da5b26053 100644
--- a/web/core/modules/node/src/Tests/NodeRevisionsTest.php
+++ b/web/core/modules/node/src/Tests/NodeRevisionsTest.php
@@ -117,7 +117,8 @@ class NodeRevisionsTest extends NodeTestBase {
$node->save();
- $node = Node::load($node->id()); // Make sure we get revision information.
+ // Make sure we get revision information.
+ $node = Node::load($node->id());
$nodes[] = clone $node;
}
@@ -165,12 +166,13 @@ class NodeRevisionsTest extends NodeTestBase {
$expected = '
Delete';
$this->assertTrue(strstr($json[$ids[0]], $expected), 'The "Delete" contextual link is shown for the default revision.');
-
// Confirm that revisions revert properly.
$this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionid() . "/revert", [], t('Revert'));
- $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.',
- ['@type' => 'Basic page', '%title' => $nodes[1]->label(),
- '%revision-date' => format_date($nodes[1]->getRevisionCreationTime())]), 'Revision reverted.');
+ $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.', [
+ '@type' => 'Basic page',
+ '%title' => $nodes[1]->label(),
+ '%revision-date' => format_date($nodes[1]->getRevisionCreationTime())
+ ]), 'Revision reverted.');
$node_storage->resetCache([$node->id()]);
$reverted_node = $node_storage->load($node->id());
$this->assertTrue(($nodes[1]->body->value == $reverted_node->body->value), 'Node reverted correctly.');
@@ -188,12 +190,13 @@ class NodeRevisionsTest extends NodeTestBase {
$this->assertFalse(strstr($json[$ids[0]], ''), 'The "Edit" contextual link is not shown for a non-default revision.');
$this->assertFalse(strstr($json[$ids[0]], ''), 'The "Delete" contextual link is not shown for a non-default revision.');
-
// Confirm revisions delete properly.
$this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/delete", [], t('Delete'));
- $this->assertRaw(t('Revision from %revision-date of @type %title has been deleted.',
- ['%revision-date' => format_date($nodes[1]->getRevisionCreationTime()),
- '@type' => 'Basic page', '%title' => $nodes[1]->label()]), 'Revision deleted.');
+ $this->assertRaw(t('Revision from %revision-date of @type %title has been deleted.', [
+ '%revision-date' => format_date($nodes[1]->getRevisionCreationTime()),
+ '@type' => 'Basic page',
+ '%title' => $nodes[1]->label(),
+ ]), 'Revision deleted.');
$this->assertTrue(db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid and vid = :vid', [':nid' => $node->id(), ':vid' => $nodes[1]->getRevisionId()])->fetchField() == 0, 'Revision not found.');
$this->assertTrue(db_query('SELECT COUNT(vid) FROM {node_field_revision} WHERE nid = :nid and vid = :vid', [':nid' => $node->id(), ':vid' => $nodes[1]->getRevisionId()])->fetchField() == 0, 'Field revision not found.');