summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2016-08-26 14:08:33 +0100
committerAlex Pott2016-08-26 14:08:56 +0100
commitc5ce86234f84acab47b7dc892b55504536875ccd (patch)
treeef37ff1bb8461b780f89ee1f5c1ccd49cfe7bfb8
parent7a3fa2bc2efc095c210fd2b1cdc54ef8cf43efc1 (diff)
Issue #2785241 by quietone, Gábor Hojtsy: Add a translated node to d7_dump
(cherry picked from commit 437ebf7c4f2266e543c99b8db4a4d140751d392f)
-rw-r--r--core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php2
-rw-r--r--core/modules/migrate_drupal/tests/fixtures/drupal7.php180
-rw-r--r--core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php4
-rw-r--r--core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php2
-rw-r--r--core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php2
-rw-r--r--core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php2
6 files changed, 183 insertions, 9 deletions
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
index ed19178..4d4df03 100644
--- a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
@@ -40,7 +40,7 @@ class MigrateCommentTest extends MigrateDrupal7TestBase {
),
));
$this->executeMigrations([
- 'd7_node:test_content_type',
+ 'd7_node',
'd7_comment_type',
'd7_comment',
]);
diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index bbc8088..a02d12f 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -3835,6 +3835,18 @@ $connection->insert('field_data_body')
'body_summary' => '',
'body_format' => 'filtered_html',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'body_value' => "is - ...is that it's the absolute best show ever. Trust me, I would know.",
+ 'body_summary' => '',
+ 'body_format' => 'filtered_html',
+))
->execute();
$connection->schema()->createTable('field_data_comment_body', array(
@@ -4930,6 +4942,18 @@ $connection->insert('field_data_field_link')
'field_link_title' => 'Home',
'field_link_attributes' => 'a:0:{}',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_link_url' => '<front>',
+ 'field_link_title' => 'Home',
+ 'field_link_attributes' => 'a:1:{s:5:"title";s:0:"";}',
+))
->execute();
$connection->schema()->createTable('field_data_field_long_text', array(
@@ -5171,6 +5195,16 @@ $connection->insert('field_data_field_tags')
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_tags_tid' => '9',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
'entity_id' => '2',
'revision_id' => '2',
'language' => 'und',
@@ -5181,12 +5215,32 @@ $connection->insert('field_data_field_tags')
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '1',
+ 'field_tags_tid' => '14',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
'entity_id' => '2',
'revision_id' => '2',
'language' => 'und',
'delta' => '2',
'field_tags_tid' => '17',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '2',
+ 'field_tags_tid' => '17',
+))
->execute();
$connection->schema()->createTable('field_data_field_term_reference', array(
@@ -5603,6 +5657,18 @@ $connection->insert('field_revision_body')
'body_summary' => '',
'body_format' => 'filtered_html',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'body_value' => "is - ...is that it's the absolute best show ever. Trust me, I would know.",
+ 'body_summary' => '',
+ 'body_format' => 'filtered_html',
+))
->execute();
$connection->schema()->createTable('field_revision_comment_body', array(
@@ -6710,6 +6776,18 @@ $connection->insert('field_revision_field_link')
'field_link_title' => 'Home',
'field_link_attributes' => 'a:0:{}',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_link_url' => '<front>',
+ 'field_link_title' => 'Home',
+ 'field_link_attributes' => 'a:1:{s:5:"title";s:0:"";}',
+))
->execute();
$connection->schema()->createTable('field_revision_field_long_text', array(
@@ -6954,6 +7032,16 @@ $connection->insert('field_revision_field_tags')
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_tags_tid' => '9',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
'entity_id' => '2',
'revision_id' => '2',
'language' => 'und',
@@ -6964,12 +7052,32 @@ $connection->insert('field_revision_field_tags')
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '1',
+ 'field_tags_tid' => '14',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
'entity_id' => '2',
'revision_id' => '2',
'language' => 'und',
'delta' => '2',
'field_tags_tid' => '17',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '2',
+ 'field_tags_tid' => '17',
+))
->execute();
$connection->schema()->createTable('field_revision_field_term_reference', array(
@@ -29674,7 +29782,23 @@ $connection->insert('node')
'comment' => '2',
'promote' => '1',
'sticky' => '0',
- 'tnid' => '0',
+ 'tnid' => '2',
+ 'translate' => '0',
+))
+->values(array(
+ 'nid' => '3',
+ 'vid' => '3',
+ 'type' => 'article',
+ 'language' => 'is',
+ 'title' => 'is - The thing about Deep Space 9',
+ 'uid' => '1',
+ 'status' => '1',
+ 'created' => '1471428152',
+ 'changed' => '1471428152',
+ 'comment' => '2',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'tnid' => '2',
'translate' => '0',
))
->execute();
@@ -29813,6 +29937,14 @@ $connection->insert('node_comment_statistics')
'last_comment_uid' => '1',
'comment_count' => '1',
))
+->values(array(
+ 'nid' => '3',
+ 'cid' => '0',
+ 'last_comment_timestamp' => '1471428152',
+ 'last_comment_name' => NULL,
+ 'last_comment_uid' => '1',
+ 'comment_count' => '0',
+))
->execute();
$connection->schema()->createTable('node_counter', array(
@@ -29864,6 +29996,18 @@ $connection->insert('node_counter')
'daycount' => '0',
'timestamp' => '1421727536',
))
+->values(array(
+ 'nid' => '2',
+ 'totalcount' => '1',
+ 'daycount' => '1',
+ 'timestamp' => '1471428059',
+))
+->values(array(
+ 'nid' => '3',
+ 'totalcount' => '1',
+ 'daycount' => '1',
+ 'timestamp' => '1471428153',
+))
->execute();
$connection->schema()->createTable('node_revision', array(
@@ -29972,6 +30116,18 @@ $connection->insert('node_revision')
'promote' => '1',
'sticky' => '0',
))
+->values(array(
+ 'nid' => '3',
+ 'vid' => '3',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Deep Space 9',
+ 'log' => '',
+ 'timestamp' => '1471428152',
+ 'status' => '1',
+ 'comment' => '2',
+ 'promote' => '1',
+ 'sticky' => '0',
+))
->execute();
$connection->schema()->createTable('node_type', array(
@@ -40112,6 +40268,24 @@ $connection->insert('taxonomy_index')
'sticky' => '0',
'created' => '1441306772',
))
+->values(array(
+ 'nid' => '3',
+ 'tid' => '9',
+ 'sticky' => '0',
+ 'created' => '1471428152',
+))
+->values(array(
+ 'nid' => '3',
+ 'tid' => '14',
+ 'sticky' => '0',
+ 'created' => '1471428152',
+))
+->values(array(
+ 'nid' => '3',
+ 'tid' => '17',
+ 'sticky' => '0',
+ 'created' => '1471428152',
+))
->execute();
$connection->schema()->createTable('taxonomy_term_data', array(
@@ -41342,7 +41516,7 @@ $connection->insert('variable')
))
->values(array(
'name' => 'language_content_type_article',
- 'value' => 's:1:"0";',
+ 'value' => 's:1:"2";',
))
->values(array(
'name' => 'language_content_type_blog',
@@ -41442,7 +41616,7 @@ $connection->insert('variable')
))
->values(array(
'name' => 'menu_override_parent_selector',
- 'value' => 'b:1;',
+ 'value' => 'b:0;',
))
->values(array(
'name' => 'menu_parent_article',
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
index 6b30ade..2769b44 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
@@ -48,9 +48,9 @@ class MigrateUpgrade7Test extends MigrateUpgradeTestBase {
'file' => 1,
'filter_format' => 7,
'image_style' => 6,
- 'language_content_settings' => 1,
+ 'language_content_settings' => 2,
'migration' => 59,
- 'node' => 2,
+ 'node' => 3,
'node_type' => 6,
'rdf_mapping' => 5,
'search_page' => 2,
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
index cb75257..404e358 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
@@ -47,7 +47,7 @@ class MigrateNodeTest extends MigrateDrupal7TestBase {
'd7_taxonomy_vocabulary',
'd7_field',
'd7_field_instance',
- 'd7_node:test_content_type',
+ 'd7_node',
'd7_node:article',
]);
}
diff --git a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
index 1b6a4ed..d72f13d 100644
--- a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
@@ -36,7 +36,7 @@ class MigrateTrackerNodeTest extends MigrateDrupal7TestBase {
'd7_user_role',
'd7_user',
'd7_node_type',
- 'd7_node:test_content_type',
+ 'd7_node',
'd7_tracker_node',
]);
}
diff --git a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
index 8e679c4..e3ed88e 100644
--- a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
@@ -36,7 +36,7 @@ class MigrateTrackerUserTest extends MigrateDrupal7TestBase {
'd7_user_role',
'd7_user',
'd7_node_type',
- 'd7_node:test_content_type',
+ 'd7_node',
'd7_tracker_node',
]);
}