diff -u b/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/core/modules/migrate_drupal/tests/fixtures/drupal6.php --- b/core/modules/migrate_drupal/tests/fixtures/drupal6.php +++ b/core/modules/migrate_drupal/tests/fixtures/drupal6.php @@ -8034,7 +8034,17 @@ ->values(array( 'uid' => '1', 'nid' => '9', - 'timestamp' => '1457655127', + 'timestamp' => '1468384961', +)) +->values(array( + 'uid' => '1', + 'nid' => '12', + 'timestamp' => '1468384823', +)) +->values(array( + 'uid' => '1', + 'nid' => '13', + 'timestamp' => '1468384931', )) ->execute(); @@ -41320,7 +41330,24 @@ ->values(array( 'nid' => '9', 'vid' => '12', - 'type' => 'article', + 'type' => 'story', + 'language' => '', + 'title' => 'Once upon a time', + 'uid' => '1', + 'status' => '1', + 'created' => '1444671588', + 'changed' => '1444671588', + 'comment' => '2', + 'promote' => '1', + 'moderate' => '0', + 'sticky' => '0', + 'tnid' => '0', + 'translate' => '0', +)) +->values(array( + 'nid' => '10', + 'vid' => '13', + 'type' => 'page', 'language' => 'en', 'title' => 'The Real McCoy', 'uid' => '1', @@ -41331,13 +41358,13 @@ 'promote' => '1', 'moderate' => '0', 'sticky' => '0', - 'tnid' => '9', + 'tnid' => '10', 'translate' => '0', )) ->values(array( - 'nid' => '10', - 'vid' => '13', - 'type' => 'article', + 'nid' => '11', + 'vid' => '14', + 'type' => 'page', 'language' => 'fr', 'title' => 'Le Vrai McCoy', 'uid' => '1', @@ -41348,7 +41375,7 @@ 'promote' => '1', 'moderate' => '0', 'sticky' => '0', - 'tnid' => '9', + 'tnid' => '10', 'translate' => '0', )) ->execute(); @@ -41405,25 +41432,6 @@ 'mysql_character_set' => 'utf8', )); -$connection->insert('node_access') -->fields(array( - 'nid', - 'gid', - 'realm', - 'grant_view', - 'grant_update', - 'grant_delete', -)) -->values(array( - 'nid' => '0', - 'gid' => '0', - 'realm' => 'all', - 'grant_view' => '1', - 'grant_update' => '0', - 'grant_delete' => '0', -)) -->execute(); - $connection->schema()->createTable('node_comment_statistics', array( 'fields' => array( 'nid' => array( @@ -41481,6 +41489,13 @@ 'comment_count', )) ->values(array( + 'nid' => '0', + 'last_comment_timestamp' => '1468384735', + 'last_comment_name' => NULL, + 'last_comment_uid' => '1', + 'comment_count' => '0', +)) +->values(array( 'nid' => '1', 'last_comment_timestamp' => '1388271197', 'last_comment_name' => NULL, @@ -41744,6 +41759,17 @@ 'nid' => '9', 'vid' => '12', 'uid' => '1', + 'title' => 'Once upon a time', + 'body' => 'Come on kid, go to sleep.', + 'teaser' => 'Come on kid, go to sleep.', + 'log' => '', + 'timestamp' => '1444671588', + 'format' => '1', +)) +->values(array( + 'nid' => '10', + 'vid' => '13', + 'uid' => '1', 'title' => 'The Real McCoy', 'body' => "In the original, Queen's English.", 'teaser' => "In the original, Queen's English.", @@ -41752,8 +41778,8 @@ 'format' => '1', )) ->values(array( - 'nid' => '10', - 'vid' => '13', + 'nid' => '11', + 'vid' => '14', 'uid' => '1', 'title' => 'Le Vrai McCoy', 'body' => 'Ooh là là!', @@ -44500,8 +44526,8 @@ 'signature' => '', 'signature_format' => '0', 'created' => '0', - 'access' => '1458198052', - 'login' => '1458193160', + 'access' => '1468384823', + 'login' => '1468384420', 'status' => '1', 'timezone' => NULL, 'language' => '', @@ -45437,6 +45463,18 @@ 'value' => 's:22:"\S\H\O\R\T m/d/Y - H:i";', )) ->values(array( + 'name' => 'date_max_year', + 'value' => 'i:4000;', +)) +->values(array( + 'name' => 'date_min_year', + 'value' => 'i:1;', +)) +->values(array( + 'name' => 'date_php_min_year', + 'value' => 'i:1901;', +)) +->values(array( 'name' => 'dblog_row_limit', 'value' => 'i:10000;', )) @@ -45565,6 +45603,14 @@ 'value' => 'a:2:{i:0;i:1;i:1;i:2;}', )) ->values(array( + 'name' => 'i18ntaxonomy_vocabulary', + 'value' => 'a:1:{i:4;s:1:"0";}', +)) +->values(array( + 'name' => 'i18n_lock_node_article', + 'value' => 'i:1;', +)) +->values(array( 'name' => 'image_jpeg_quality', 'value' => 'i:75;', )) @@ -45574,7 +45620,7 @@ )) ->values(array( 'name' => 'javascript_parsed', - 'value' => 'a:21:{i:0;s:14:"misc/jquery.js";i:1;s:14:"misc/drupal.js";i:2;s:19:"misc/tableheader.js";i:3;s:16:"misc/collapse.js";i:4;s:16:"misc/textarea.js";i:5;s:20:"modules/user/user.js";i:6;s:17:"misc/tabledrag.js";i:7;s:26:"modules/profile/profile.js";i:8;s:12:"misc/form.js";i:9;s:19:"misc/tableselect.js";i:10;s:20:"misc/autocomplete.js";s:10:"refresh:ga";s:7:"waiting";s:10:"refresh:ab";s:7:"waiting";s:10:"refresh:ca";s:7:"waiting";s:10:"refresh:fi";s:7:"waiting";s:10:"refresh:es";s:7:"waiting";i:11;s:16:"misc/progress.js";i:12;s:13:"misc/batch.js";s:10:"refresh:nl";s:7:"waiting";s:10:"refresh:de";s:7:"waiting";s:10:"refresh:pl";s:7:"waiting";}', + 'value' => 'a:28:{i:0;s:14:"misc/jquery.js";i:1;s:14:"misc/drupal.js";i:2;s:19:"misc/tableheader.js";i:3;s:16:"misc/collapse.js";i:4;s:16:"misc/textarea.js";i:5;s:20:"modules/user/user.js";i:6;s:17:"misc/tabledrag.js";i:7;s:26:"modules/profile/profile.js";i:8;s:12:"misc/form.js";i:9;s:19:"misc/tableselect.js";i:10;s:20:"misc/autocomplete.js";s:10:"refresh:ga";s:7:"waiting";s:10:"refresh:ab";s:7:"waiting";s:10:"refresh:ca";s:7:"waiting";s:10:"refresh:fi";s:7:"waiting";s:10:"refresh:es";s:7:"waiting";i:11;s:16:"misc/progress.js";i:12;s:13:"misc/batch.js";s:10:"refresh:nl";s:7:"waiting";s:10:"refresh:de";s:7:"waiting";s:10:"refresh:pl";s:7:"waiting";i:13;s:32:"sites/all/modules/cck/content.js";s:10:"refresh:fr";s:7:"waiting";s:10:"refresh:zu";s:7:"waiting";i:14;s:19:"misc/jquery.form.js";i:15;s:12:"misc/ahah.js";i:16;s:14:"misc/teaser.js";i:17;s:51:"sites/all/modules/i18n/i18ntaxonomy/i18ntaxonomy.js";}', )) ->values(array( 'name' => 'language_content_type_article', @@ -45585,10 +45631,6 @@ 'value' => 's:1:"2";', )) ->values(array( - 'name' => 'i18n_lock_node_article', - 'value' => 'i:1;', -)) -->values(array( 'name' => 'language_count', 'value' => 'i:11;', )) @@ -46088,7 +46130,7 @@ 'relations' => '1', 'hierarchy' => '0', 'multiple' => '0', - 'required' => '1', + 'required' => '0', 'tags' => '0', 'module' => 'taxonomy', 'weight' => '0', @@ -46143,10 +46185,6 @@ 'type' => 'article', )) ->values(array( - 'vid' => '4', - 'type' => 'page', -)) -->values(array( 'vid' => '1', 'type' => 'story', )) diff -u b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php --- b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php +++ b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php @@ -42,14 +42,14 @@ 'contact_form' => 5, 'configurable_language' => 5, 'editor' => 2, - 'field_config' => 63, + 'field_config' => 62, 'field_storage_config' => 43, 'file' => 7, 'filter_format' => 7, 'image_style' => 5, 'language_content_settings' => 2, 'migration' => 105, - 'node' => 9, + 'node' => 10, 'node_type' => 11, 'rdf_mapping' => 5, 'search_page' => 2, diff -u b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php --- b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php @@ -91,13 +91,13 @@ $this->assertSame(['attributes' => ['target' => '_blank']], $node->field_test_link->options); // Test that translations are working. - $node = Node::load(9); + $node = Node::load(10); $this->assertIdentical('en', $node->langcode->value); $this->assertIdentical('The Real McCoy', $node->title->value); - $this->assertTrue($node->hasTranslation('fr'), "Node 9 has french translation"); + $this->assertTrue($node->hasTranslation('fr'), "Node 10 has french translation"); - // Node 10 is a translation of node 9, and should not be imported separately. - $this->assertNull(Node::load(10), "Node 10 doesn't exist in D8, it was a translation"); + // Node 11 is a translation of node 10, and should not be imported separately. + $this->assertNull(Node::load(11), "Node 11 doesn't exist in D8, it was a translation"); // Rerun migration with two source database changes. // 1. Add an invalid link attributes and a different URL and