use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
use Drupal\workflows\Entity\Workflow;
/**
*/
class ContentModerationStateTest extends KernelTestBase {
+ use ContentModerationTestTrait;
+
/**
* {@inheritdoc}
*/
}
/**
- * Tests removal of content moderation state entity field data.
+ * Tests removal of content moderation state entity.
*
* @dataProvider basicModerationTestCases
*/
public function testContentModerationStateDataRemoval($entity_type_id) {
- // Test content moderation state deletion.
/** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
$entity = $this->createEntity($entity_type_id);
$entity->save();
$entity->delete();
$content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
$this->assertFalse($content_moderation_state);
+ }
- // Test content moderation state revision deletion.
- /** @var \Drupal\Core\Entity\ContentEntityInterface $entity2 */
- $entity2 = $this->createEntity($entity_type_id);
- $entity2->save();
- $revision = clone $entity2;
+ /**
+ * Tests removal of content moderation state entity revisions.
+ *
+ * @dataProvider basicModerationTestCases
+ */
+ public function testContentModerationStateRevisionDataRemoval($entity_type_id) {
+ /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+ $entity = $this->createEntity($entity_type_id);
+ $entity->save();
+ $revision = clone $entity;
$revision->isDefaultRevision(FALSE);
$content_moderation_state = ContentModerationState::loadFromModeratedEntity($revision);
$this->assertTrue($content_moderation_state);
- $entity2 = $this->reloadEntity($entity2);
- $entity2->setNewRevision(TRUE);
- $entity2->save();
+ $entity = $this->reloadEntity($entity);
+ $entity->setNewRevision(TRUE);
+ $entity->save();
$entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
$entity_storage->deleteRevision($revision->getRevisionId());
$content_moderation_state = ContentModerationState::loadFromModeratedEntity($revision);
$this->assertFalse($content_moderation_state);
- $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity2);
+ $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
+ $this->assertTrue($content_moderation_state);
+ }
+
+ /**
+ * Tests removal of content moderation state pending entity revisions.
+ *
+ * @dataProvider basicModerationTestCases
+ */
+ public function testContentModerationStatePendingRevisionDataRemoval($entity_type_id) {
+ $entity = $this->createEntity($entity_type_id);
+ $entity->moderation_state = 'published';
+ $entity->save();
+ $entity->setNewRevision(TRUE);
+ $entity->moderation_state = 'draft';
+ $entity->save();
+
+ $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
$this->assertTrue($content_moderation_state);
+ $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
+ $entity_storage->deleteRevision($entity->getRevisionId());
+
+ $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
+ $this->assertFalse($content_moderation_state);
+ }
+
+ /**
+ * Tests removal of content moderation state translations.
+ *
+ * @dataProvider basicModerationTestCases
+ */
+ public function testContentModerationStateTranslationDataRemoval($entity_type_id) {
// Test content moderation state translation deletion.
if ($this->entityTypeManager->getDefinition($entity_type_id)->isTranslatable()) {
- /** @var \Drupal\Core\Entity\ContentEntityInterface $entity3 */
- $entity3 = $this->createEntity($entity_type_id);
+ /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+ $entity = $this->createEntity($entity_type_id);
$langcode = 'it';
ConfigurableLanguage::createFromLangcode($langcode)
->save();
- $entity3->save();
- $translation = $entity3->addTranslation($langcode, ['title' => 'Titolo test']);
+ $entity->save();
+ $translation = $entity->addTranslation($langcode, ['title' => 'Titolo test']);
// Make sure we add values for all of the required fields.
if ($entity_type_id == 'block_content') {
$translation->info = $this->randomString();
}
$translation->save();
- $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity3);
+ $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
$this->assertTrue($content_moderation_state->hasTranslation($langcode));
- $entity3->removeTranslation($langcode);
- $entity3->save();
- $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity3);
+ $entity->removeTranslation($langcode);
+ $entity->save();
+ $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
$this->assertFalse($content_moderation_state->hasTranslation($langcode));
}
}
]);
$node_type->save();
- $workflow = Workflow::load('editorial');
+ $workflow = $this->createEditorialWorkflow();
$workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
$workflow->save();
// Create a French translation.
$french_node = $english_node->addTranslation('fr', ['title' => 'French title']);
$french_node->setUnpublished();
- // Revision 1 (fr).
+ // Revision 2 (fr).
$french_node->save();
$french_node = $this->reloadEntity($english_node)->getTranslation('fr');
$this->assertEquals('draft', $french_node->moderation_state->value);
// Move English node to create another draft.
$english_node = $this->reloadEntity($english_node);
$english_node->moderation_state->value = 'draft';
- // Revision 2 (en, fr).
+ // Revision 3 (en, fr).
$english_node->save();
$english_node = $this->reloadEntity($english_node);
$this->assertEquals('draft', $english_node->moderation_state->value);
// Publish the French node.
$french_node->moderation_state->value = 'published';
- // Revision 3 (en, fr).
+ // Revision 4 (en, fr).
$french_node->save();
$french_node = $this->reloadEntity($french_node)->getTranslation('fr');
$this->assertTrue($french_node->isPublished());
// Publish the English node.
$english_node->moderation_state->value = 'published';
- // Revision 4 (en, fr).
+ // Revision 5 (en, fr).
$english_node->save();
$english_node = $this->reloadEntity($english_node);
$this->assertTrue($english_node->isPublished());
$french_node = $this->reloadEntity($english_node)->getTranslation('fr');
$this->assertTrue($french_node->isPublished());
$french_node->moderation_state->value = 'draft';
- // Revision 5 (en, fr).
+ // Revision 6 (en, fr).
$french_node->save();
- $french_node = $this->reloadEntity($english_node, 5)->getTranslation('fr');
+ $french_node = $this->reloadEntity($english_node, 6)->getTranslation('fr');
$this->assertFalse($french_node->isPublished());
$this->assertTrue($french_node->getTranslation('en')->isPublished());
// Republish the French node.
$french_node->moderation_state->value = 'published';
- // Revision 6 (en, fr).
+ // Revision 7 (en, fr).
$french_node->save();
$french_node = $this->reloadEntity($english_node)->getTranslation('fr');
$this->assertTrue($french_node->isPublished());
$content_moderation_state = ContentModerationState::load(1);
$content_moderation_state->set('moderation_state', 'draft');
$content_moderation_state->setNewRevision(TRUE);
- // Revision 7 (en, fr).
+ // Revision 8 (en, fr).
$content_moderation_state->save();
$english_node = $this->reloadEntity($french_node, $french_node->getRevisionId() + 1);
$content_moderation_state = $content_moderation_state->getTranslation('fr');
$content_moderation_state->set('moderation_state', 'draft');
$content_moderation_state->setNewRevision(TRUE);
- // Revision 8 (en, fr).
+ // Revision 9 (en, fr).
$content_moderation_state->save();
$english_node = $this->reloadEntity($english_node, $english_node->getRevisionId());
$this->assertEquals('draft', $english_node->moderation_state->value);
- $french_node = $this->reloadEntity($english_node, '8')->getTranslation('fr');
+ $french_node = $this->reloadEntity($english_node, '9')->getTranslation('fr');
$this->assertEquals('draft', $french_node->moderation_state->value);
// Switching the moderation state to an unpublished state should update the
// entity.
// Get the default english node.
$english_node = $this->reloadEntity($english_node);
$this->assertTrue($english_node->isPublished());
- $this->assertEquals(6, $english_node->getRevisionId());
+ $this->assertEquals(7, $english_node->getRevisionId());
}
/**
'type' => 'test_type',
])->save();
- $workflow = Workflow::load('editorial');
+ $workflow = $this->createEditorialWorkflow();
$workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'test_type');
$workflow->save();
/**
* Tests that entities with special languages can be moderated.
+ *
+ * @dataProvider moderationWithSpecialLanguagesTestCases
*/
- public function testModerationWithSpecialLanguages() {
- $workflow = Workflow::load('editorial');
+ public function testModerationWithSpecialLanguages($original_language, $updated_language) {
+ $workflow = $this->createEditorialWorkflow();
$workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
$workflow->save();
// Create a test entity.
$entity = EntityTestRev::create([
- 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+ 'langcode' => $original_language,
]);
$entity->save();
$this->assertEquals('draft', $entity->moderation_state->value);
$entity->moderation_state->value = 'published';
+ $entity->langcode = $updated_language;
$entity->save();
$this->assertEquals('published', EntityTestRev::load($entity->id())->moderation_state->value);
}
+ /**
+ * Test cases for ::testModerationWithSpecialLanguages().
+ */
+ public function moderationWithSpecialLanguagesTestCases() {
+ return [
+ 'Not specified to not specified' => [
+ LanguageInterface::LANGCODE_NOT_SPECIFIED,
+ LanguageInterface::LANGCODE_NOT_SPECIFIED,
+ ],
+ 'English to not specified' => [
+ 'en',
+ LanguageInterface::LANGCODE_NOT_SPECIFIED,
+ ],
+ 'Not specified to english' => [
+ LanguageInterface::LANGCODE_NOT_SPECIFIED,
+ 'en',
+ ],
+ ];
+ }
+
+ /**
+ * Test changing the language of content without adding a translation.
+ */
+ public function testChangingContentLangcode() {
+ ConfigurableLanguage::createFromLangcode('fr')->save();
+ NodeType::create([
+ 'type' => 'test_type',
+ ])->save();
+ $workflow = $this->createEditorialWorkflow();
+ $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'test_type');
+ $workflow->save();
+
+ $entity = Node::create([
+ 'title' => 'Test node',
+ 'langcode' => 'en',
+ 'type' => 'test_type',
+ ]);
+ $entity->save();
+
+ $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
+ $this->assertCount(1, $entity->getTranslationLanguages());
+ $this->assertCount(1, $content_moderation_state->getTranslationLanguages());
+ $this->assertEquals('en', $entity->langcode->value);
+ $this->assertEquals('en', $content_moderation_state->langcode->value);
+
+ $entity->langcode = 'fr';
+ $entity->save();
+
+ $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
+ $this->assertCount(1, $entity->getTranslationLanguages());
+ $this->assertCount(1, $content_moderation_state->getTranslationLanguages());
+ $this->assertEquals('fr', $entity->langcode->value);
+ $this->assertEquals('fr', $content_moderation_state->langcode->value);
+ }
+
/**
* Tests that a non-translatable entity type with a langcode can be moderated.
*/
public function testNonTranslatableEntityTypeModeration() {
- $workflow = Workflow::load('editorial');
+ $workflow = $this->createEditorialWorkflow();
$workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
$workflow->save();
// Update the entity type in order to remove the 'langcode' field.
\Drupal::entityDefinitionUpdateManager()->applyUpdates();
- $workflow = Workflow::load('editorial');
+ $workflow = $this->createEditorialWorkflow();
$workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
$workflow->save();
]);
$node_type->save();
- $workflow = Workflow::load('editorial');
+ $workflow = $this->createEditorialWorkflow();
// Test both a config and non-config based bundle and entity type.
$workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
$workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
$this->assertEquals([
'entity_test_no_bundle',
'entity_test_rev',
- 'node'
+ 'node',
], $workflow->getTypePlugin()->getEntityTypes());
// Delete the node type and ensure it is removed from the workflow.
// Create a bundle not based on any particular configuration.
entity_test_create_bundle('test_bundle');
- $workflow = Workflow::load('editorial');
+ $workflow = $this->createEditorialWorkflow();
$workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test', 'test_bundle');
$workflow->save();
], $workflow->getDependencies());
}
+ /**
+ * Test the revision default state of the moderation state entity revisions.
+ *
+ * @param string $entity_type_id
+ * The ID of entity type to be tested.
+ *
+ * @dataProvider basicModerationTestCases
+ */
+ public function testRevisionDefaultState($entity_type_id) {
+ // Check that the revision default state of the moderated entity and the
+ // content moderation state entity always match.
+ /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
+ $storage = $this->entityTypeManager->getStorage($entity_type_id);
+ /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $cms_storage */
+ $cms_storage = $this->entityTypeManager->getStorage('content_moderation_state');
+
+ $entity = $this->createEntity($entity_type_id);
+ $entity->get('moderation_state')->value = 'published';
+ $storage->save($entity);
+ /** @var \Drupal\Core\Entity\ContentEntityInterface $cms_entity */
+ $cms_entity = $cms_storage->loadUnchanged(1);
+ $this->assertEquals($entity->getLoadedRevisionId(), $cms_entity->get('content_entity_revision_id')->value);
+
+ $entity->get('moderation_state')->value = 'published';
+ $storage->save($entity);
+ /** @var \Drupal\Core\Entity\ContentEntityInterface $cms_entity */
+ $cms_entity = $cms_storage->loadUnchanged(1);
+ $this->assertEquals($entity->getLoadedRevisionId(), $cms_entity->get('content_entity_revision_id')->value);
+
+ $entity->get('moderation_state')->value = 'draft';
+ $storage->save($entity);
+ /** @var \Drupal\Core\Entity\ContentEntityInterface $cms_entity */
+ $cms_entity = $cms_storage->loadUnchanged(1);
+ $this->assertEquals($entity->getLoadedRevisionId() - 1, $cms_entity->get('content_entity_revision_id')->value);
+
+ $entity->get('moderation_state')->value = 'published';
+ $storage->save($entity);
+ /** @var \Drupal\Core\Entity\ContentEntityInterface $cms_entity */
+ $cms_entity = $cms_storage->loadUnchanged(1);
+ $this->assertEquals($entity->getLoadedRevisionId(), $cms_entity->get('content_entity_revision_id')->value);
+ }
+
/**
* Creates an entity.
*
}
}
- $workflow = Workflow::load('editorial');
+ $workflow = $this->createEditorialWorkflow();
$workflow->getTypePlugin()->addEntityTypeAndBundle($entity_type_id, $bundle_id);
$workflow->save();
projects / yaffs-website / blobdiff