diff -u b/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php --- b/core/modules/migrate_drupal/tests/fixtures/drupal7.php +++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php @@ -3463,6 +3463,32 @@ 'mysql_character_set' => 'utf8', )); +$connection->insert('entity_translation_revision') +->fields(array( + 'entity_type', + 'entity_id', + 'revision_id', + 'language', + 'source', + 'uid', + 'status', + 'translate', + 'created', + 'changed', +)) +->values(array( + 'entity_type' => 'node', + 'entity_id' => '1', + 'revision_id' => '1', + 'language' => 'en', + 'source' => '', + 'uid' => '1', + 'status' => '1', + 'translate' => '0', + 'created' => '1529615790', + 'changed' => '1529615790', +)) +->execute(); $connection->schema()->createTable('field_config', array( 'fields' => array( 'id' => array( diff -u b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php --- b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php @@ -166,8 +166,8 @@ 'status' => '1', 'uid' => '2', 'title' => 'An English Node', - 'created' => '1421727515', - 'changed' => '1441032132', + 'created' => '1529615790', + 'changed' => '1529615790', 'promote' => '1', 'sticky' => '0', 'default_langcode' => '1', @@ -356,8 +356,8 @@ 'status' => '1', 'uid' => '2', 'title' => 'An English Node', - 'created' => '1421727515', - 'changed' => '1441032132', + 'created' => '1529615790', + 'changed' => '1529615790', 'promote' => '1', 'sticky' => '0', 'default_langcode' => '1', @@ -756,8 +756,8 @@ [ 'log' => NULL, 'field_text_long_plain' => NULL, - 'created' => '1441032132', - 'changed' => '1441032132', + 'created' => '1529615790', + 'changed' => '1529615790', ], // Node 2, revision 2, en. 1 => diff -u b/core/modules/node/tests/src/Kernel/MigrationPluginAlterTest.php b/core/modules/node/tests/src/Kernel/MigrationPluginAlterTest.php --- b/core/modules/node/tests/src/Kernel/MigrationPluginAlterTest.php +++ b/core/modules/node/tests/src/Kernel/MigrationPluginAlterTest.php @@ -7,11 +7,7 @@ use Drupal\Tests\migrate_drupal\Traits\NodeMigrateTypeTestTrait; /** -<<<<<<< HEAD:core/modules/node/tests/src/Kernel/MigrationPluginAlterTest.php * Tests node_migrations_plugin_alter. -======= - * Tests migrate_drupal_migrations_plugin_alter. ->>>>>>> a:core/modules/migrate_drupal/tests/src/Kernel/MigrationPluginAlterTest.php * * @group node */