commit 1706f225dc3825083cad88d437e4e88cc188d833 Author: Erik Stielstra Date: Wed Jul 16 18:02:41 2014 +0200 #10 diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml index 550ccc4..d7f8dba 100644 --- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml +++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml @@ -9,13 +9,9 @@ process: vid: vid type: type langcode: - - - plugin: get - source: language - - - plugin: default_value - default_value: "und" - strict: false + plugin: default_value + source: language + default_value: "und" title: title uid: uid status: status @@ -28,6 +24,9 @@ process: migration: d6_filter_format source: format 'body/value': body + revision_uid: uid + revision_log: log + revision_timestamp: timestamp # unmapped d6 fields. # tnid diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml index 03bfe95..824e611 100644 --- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml +++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml @@ -9,13 +9,9 @@ process: vid: vid type: type langcode: - - - plugin: get - source: language - - - plugin: default_value - default_value: "und" - strict: false + plugin: default_value + source: language + default_value: "und" title: title uid: uid status: status diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php index f80438a..3ce530e 100644 --- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php +++ b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php @@ -33,8 +33,19 @@ public function load() { 'title' => 'Test title rev 2', 'body' => 'body test rev 2', 'teaser' => 'teaser test rev 2', - 'log' => 'modified rev 2', - 'timestamp' => 1390095701, + 'log' => '', + 'timestamp' => 1390095702, + 'format' => 1, + )) + ->values(array( + 'nid' => 1, + 'vid' => 4, + 'uid' => 1, + 'title' => 'Test title rev 3', + 'body' => 'body test rev 3', + 'teaser' => 'teaser test rev 3', + 'log' => 'modified rev 3', + 'timestamp' => 1390095703, 'format' => 1, )) ->execute(); diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php index 5e50642..44447dd 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php @@ -50,8 +50,15 @@ public function testNodeRevision() { $this->assertEqual($node->body->value, 'body test rev 2'); $this->assertEqual($node->body->summary, 'teaser test rev 2'); $this->assertEqual($node->revision_uid->target_id, 1); - $this->assertEqual($node->revision_log->value, 'modified rev 2'); - $this->assertEqual($node->revision_timestamp->value, '1390095701'); + $this->assertEqual($node->revision_log->value, ''); + $this->assertEqual($node->revision_timestamp->value, '1390095702'); + + $node = \Drupal::entityManager()->getStorage('node')->loadRevision(4); + $this->assertEqual($node->id(), 1); + $this->assertEqual($node->body->value, 'body test rev 3'); + $this->assertEqual($node->revision_uid->target_id, 1); + $this->assertEqual($node->revision_log->value, 'modified rev 3'); + $this->assertEqual($node->revision_timestamp->value, '1390095703'); } } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php index e6dd322..26d0c62 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php @@ -46,7 +46,11 @@ public function testNode() { $this->assertEqual($node->getCreatedTime(), 1388271197, 'Node has the correct created time.'); $this->assertEqual($node->isSticky(), FALSE); $this->assertEqual($node->getOwnerId(), 1); - //$this->assertEqual($node->getRevisionCreationTime(), 1390095701, 'Node has the correct revision timestamp.'); + $this->assertEqual($node->getRevisionCreationTime(), 1390095701, 'Node has the correct revision timestamp.'); + + $node_revision = \Drupal::entityManager()->getStorage('node')->loadRevision(1); + $this->assertEqual($node_revision->revision_uid->target_id, 1, 'Node revision has the correct user'); + $this->assertEqual($node_revision->revision_log->value, '', 'Node revision has the correct log message'); // It is pointless to run the second half from MigrateDrupal6Test. if (empty($this->standalone)) {