diff --git a/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml b/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml index d8daa5135a..96250653fe 100644 --- a/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml +++ b/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml @@ -23,7 +23,7 @@ transitions: to: archived weight: 2 archived_draft: - label: 'Restore to Draft' + label: 'Restore to draft' from: - archived to: draft @@ -35,7 +35,7 @@ transitions: to: published weight: 4 create_new_draft: - label: 'Create New Draft' + label: 'Create new draft' from: - draft - published diff --git a/core/modules/content_moderation/src/EntityTypeInfo.php b/core/modules/content_moderation/src/EntityTypeInfo.php index 8f6ac4d79e..a7075e2a02 100644 --- a/core/modules/content_moderation/src/EntityTypeInfo.php +++ b/core/modules/content_moderation/src/EntityTypeInfo.php @@ -250,11 +250,11 @@ public function entityBaseFieldInfo(EntityTypeInterface $entity_type) { ]) ->setDisplayOptions('form', [ 'type' => 'moderation_state_default', - 'weight' => 5, + 'weight' => 100, 'settings' => [], ]) ->addConstraint('ModerationState', []) - ->setDisplayConfigurable('form', FALSE) + ->setDisplayConfigurable('form', TRUE) ->setDisplayConfigurable('view', FALSE) ->setReadOnly(FALSE) ->setTranslatable(TRUE); @@ -290,6 +290,10 @@ public function formAlter(array &$form, FormStateInterface $form_state, $form_id ->enforceRevisionsEntityFormAlter($form, $form_state, $form_id); // Submit handler to redirect to the latest version, if available. $form['actions']['submit']['#submit'][] = [EntityTypeInfo::class, 'bundleFormRedirect']; + if (isset($form['footer'])) { + $form['footer']['moderation_state'] = $form['moderation_state']; + unset($form['moderation_state']); + } } } } diff --git a/core/modules/content_moderation/src/Form/EntityModerationForm.php b/core/modules/content_moderation/src/Form/EntityModerationForm.php index ea2fedd010..66d7b11a2d 100644 --- a/core/modules/content_moderation/src/Form/EntityModerationForm.php +++ b/core/modules/content_moderation/src/Form/EntityModerationForm.php @@ -88,7 +88,7 @@ public function buildForm(array $form, FormStateInterface $form_state, ContentEn if ($current_state) { $form['current'] = [ '#type' => 'item', - '#title' => $this->t('Status'), + '#title' => $this->t('Moderation state'), '#markup' => $workflow->getState($current_state)->label(), ]; } @@ -98,7 +98,7 @@ public function buildForm(array $form, FormStateInterface $form_state, ContentEn $form['new_state'] = [ '#type' => 'select', - '#title' => $this->t('Moderate'), + '#title' => $this->t('Change to'), '#options' => $target_states, ]; diff --git a/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php b/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php index 74e305209c..95493da3f5 100644 --- a/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php +++ b/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php @@ -2,7 +2,7 @@ namespace Drupal\content_moderation\Plugin\Field\FieldWidget; -use Drupal\Core\Entity\ContentEntityInterface; +use Drupal\content_moderation\Plugin\Field\ModerationStateFieldItemList; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemListInterface; @@ -75,7 +75,7 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact * @param \Drupal\content_moderation\ModerationInformation $moderation_information * Moderation information service. * @param \Drupal\content_moderation\StateTransitionValidation $validator - * Moderation state transition validation service + * Moderation state transition validation service. */ public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, array $third_party_settings, AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, ModerationInformation $moderation_information, StateTransitionValidation $validator) { parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $third_party_settings); @@ -106,7 +106,7 @@ public static function create(ContainerInterface $container, array $configuratio * {@inheritdoc} */ public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { - /** @var ContentEntityInterface $entity */ + /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */ $entity = $items->getEntity(); /* @var \Drupal\Core\Config\Entity\ConfigEntityInterface $bundle_entity */ @@ -121,95 +121,61 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen /** @var \Drupal\workflows\Transition[] $transitions */ $transitions = $this->validator->getValidTransitions($entity, $this->currentUser); - $target_states = []; + $transition_labels = []; + $default_value = NULL; foreach ($transitions as $transition) { - $target_states[$transition->to()->id()] = $transition->label(); + $transition_to_state = $transition->to(); + if ($transition_to_state->id() === $default->id() && !$entity->isNew()) { + $default_value = $transition_to_state->id(); + // Add the default transition to the top of the list. + $transition_labels = [ + $transition_to_state->id() => $this->t('Keep @state', ['@state' => $transition_to_state->label()]), + ] + $transition_labels; + } + else { + $transition_labels[$transition_to_state->id()] = $transition->label(); + } } - // @todo https://www.drupal.org/node/2779933 write a test for this. $element += [ - '#access' => FALSE, - '#type' => 'select', - '#options' => $target_states, - '#default_value' => $default->id(), - '#published' => $default->isPublishedState(), - '#key_column' => $this->column, + '#type' => 'container', + 'current' => [ + '#type' => 'item', + '#title' => $this->t('Current state'), + '#markup' => $default->label(), + '#access' => !$entity->isNew(), + '#wrapper_attributes' => [ + 'class' => ['container-inline'], + ], + ], + 'state' => [ + '#type' => 'select', + '#title' => $this->t('On save'), + '#key_column' => $this->column, + '#options' => $transition_labels, + '#default_value' => $default_value, + '#wrapper_attributes' => [ + 'class' => ['container-inline'], + ], + ], ]; $element['#element_validate'][] = [get_class($this), 'validateElement']; - // Use the dropbutton. - $element['#process'][] = [get_called_class(), 'processActions']; return $element; } /** - * Entity builder updating the node moderation state with the submitted value. - * - * @param string $entity_type_id - * The entity type identifier. - * @param \Drupal\Core\Entity\ContentEntityInterface $entity - * The entity updated with the submitted values. - * @param array $form - * The complete form array. - * @param \Drupal\Core\Form\FormStateInterface $form_state - * The current state of the form. - */ - public static function updateStatus($entity_type_id, ContentEntityInterface $entity, array $form, FormStateInterface $form_state) { - $element = $form_state->getTriggeringElement(); - if (isset($element['#moderation_state'])) { - $entity->moderation_state->value = $element['#moderation_state']; - } - } - - /** - * Process callback to alter action buttons. + * {@inheritdoc} */ - public static function processActions($element, FormStateInterface $form_state, array &$form) { - - // We'll steal most of the button configuration from the default submit - // button. However, NodeForm also hides that button for admins (as it adds - // its own, too), so we have to restore it. - $default_button = $form['actions']['submit']; - $default_button['#access'] = TRUE; - - // Add a custom button for each transition we're allowing. The #dropbutton - // property tells FAPI to cluster them all together into a single widget. - $options = $element['#options']; - - $entity = $form_state->getFormObject()->getEntity(); - $translatable = !$entity->isNew() && $entity->isTranslatable(); - foreach ($options as $id => $label) { - $button = [ - '#dropbutton' => 'save', - '#moderation_state' => $id, - '#weight' => -10, - ]; - - $button['#value'] = $translatable - ? t('Save and @transition (this translation)', ['@transition' => $label]) - : t('Save and @transition', ['@transition' => $label]); - - $form['actions']['moderation_state_' . $id] = $button + $default_button; - } - - // Hide the default buttons, including the specialty ones added by - // NodeForm. - foreach (['publish', 'unpublish', 'submit'] as $key) { - $form['actions'][$key]['#access'] = FALSE; - unset($form['actions'][$key]['#dropbutton']); - } - - // Setup a callback to translate the button selection back into field - // widget, so that it will get saved properly. - $form['#entity_builders']['update_moderation_state'] = [get_called_class(), 'updateStatus']; - return $element; + public static function validateElement(array $element, FormStateInterface $form_state) { + $form_state->setValueForElement($element, [$element['state']['#key_column'] => $element['state']['#value']]); } /** * {@inheritdoc} */ public static function isApplicable(FieldDefinitionInterface $field_definition) { - return $field_definition->getName() === 'moderation_state'; + return is_a($field_definition->getClass(), ModerationStateFieldItemList::class, TRUE); } } diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php index 3882c764f1..e14d2ca362 100644 --- a/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php +++ b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php @@ -36,7 +36,8 @@ public function testModerationForm() { $this->drupalPostForm('node/add/moderated_content', [ 'title[0][value]' => 'Some moderated content', 'body[0][value]' => 'First version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0][state]' => 'draft', + ], t('Save')); $node = $this->drupalGetNodeByTitle('Some moderated content'); $canonical_path = sprintf('node/%d', $node->id()); @@ -59,7 +60,8 @@ public function testModerationForm() { // Update the draft. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Second version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0][state]' => 'draft', + ], t('Save')); // The canonical view should have a moderation form, because it is not the // live revision. @@ -75,7 +77,8 @@ public function testModerationForm() { // Publish the draft. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Third version of the content.', - ], t('Save and Publish')); + 'moderation_state[0][state]' => 'published', + ], t('Save')); // The published view should not have a moderation form, because it is the // live revision. @@ -91,7 +94,8 @@ public function testModerationForm() { // Make a forward revision. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Fourth version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0][state]' => 'draft', + ], t('Save')); // The published view should not have a moderation form, because it is the // live revision. @@ -127,7 +131,7 @@ public function testNonBundleModerationForm() { $workflow->save(); // Create new moderated content in draft. - $this->drupalPostForm('entity_test_mulrevpub/add', [], t('Save and Create New Draft')); + $this->drupalPostForm('entity_test_mulrevpub/add', ['moderation_state[0][state]' => 'draft'], t('Save')); // The latest version page should not show, because there is no forward // revision. @@ -135,7 +139,7 @@ public function testNonBundleModerationForm() { $this->assertResponse(403); // Update the draft. - $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', [], t('Save and Create New Draft')); + $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'draft'], t('Save')); // The latest version page should not show, because there is still no // forward revision. @@ -143,7 +147,7 @@ public function testNonBundleModerationForm() { $this->assertResponse(403); // Publish the draft. - $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', [], t('Save and Publish')); + $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'published'], t('Save')); // The published view should not have a moderation form, because it is the // default revision. @@ -157,7 +161,7 @@ public function testNonBundleModerationForm() { $this->assertResponse(403); // Make a forward revision. - $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', [], t('Save and Create New Draft')); + $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'draft'], t('Save')); // The published view should not have a moderation form, because it is the // default revision. @@ -169,7 +173,7 @@ public function testNonBundleModerationForm() { // status, because the forward revision is in "Draft". $this->drupalGet('entity_test_mulrevpub/manage/1/latest'); $this->assertResponse(200); - $this->assertText('Status', 'Form text found on the latest-version page.'); + $this->assertText('Moderation state', 'Form text found on the latest-version page.'); $this->assertText('Draft', 'Correct status found on the latest-version page.'); // Submit the moderation form to change status to published. diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php index a9d95f0b9f..56f61f18a4 100644 --- a/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php +++ b/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php @@ -53,8 +53,9 @@ public function testTranslateModeratedContent() { $edit = [ 'title[0][value]' => 'Published English node', 'langcode[0][value]' => 'en', + 'moderation_state[0][state]' => 'published', ]; - $this->drupalPostForm('node/add/article', $edit, t('Save and Publish')); + $this->drupalPostForm('node/add/article', $edit, t('Save')); $this->assertText(t('Article Published English node has been created.')); $english_node = $this->drupalGetNodeByTitle('Published English node'); @@ -63,8 +64,9 @@ public function testTranslateModeratedContent() { $this->clickLink(t('Add')); $edit = [ 'title[0][value]' => 'French node Draft', + 'moderation_state[0][state]' => 'draft', ]; - $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)')); + $this->drupalPostForm(NULL, $edit, t('Save (this translation)')); // Here the error has occurred "The website encountered an unexpected error. // Please try again later." // If the translation has got lost. @@ -74,8 +76,9 @@ public function testTranslateModeratedContent() { $edit = [ 'title[0][value]' => 'English node', 'langcode[0][value]' => 'en', + 'moderation_state[0][state]' => 'draft', ]; - $this->drupalPostForm('node/add/article', $edit, t('Save and Create New Draft')); + $this->drupalPostForm('node/add/article', $edit, t('Save')); $this->assertText(t('Article English node has been created.')); $english_node = $this->drupalGetNodeByTitle('English node'); @@ -84,14 +87,17 @@ public function testTranslateModeratedContent() { $this->clickLink(t('Add')); $edit = [ 'title[0][value]' => 'French node', + 'moderation_state[0][state]' => 'draft', ]; - $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)')); + $this->drupalPostForm(NULL, $edit, t('Save (this translation)')); $this->assertText(t('Article French node has been updated.')); $english_node = $this->drupalGetNodeByTitle('English node', TRUE); // Publish the English article and check that the translation stays // unpublished. - $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)')); + $this->drupalPostForm('node/' . $english_node->id() . '/edit', [ + 'moderation_state[0][state]' => 'published', + ], t('Save (this translation)')); $this->assertText(t('Article English node has been updated.')); $english_node = $this->drupalGetNodeByTitle('English node', TRUE); $french_node = $english_node->getTranslation('fr'); @@ -106,8 +112,9 @@ public function testTranslateModeratedContent() { // the translation first. $edit = [ 'title[0][value]' => 'Another node', + 'moderation_state[0][state]' => 'draft', ]; - $this->drupalPostForm('node/add/article', $edit, t('Save and Create New Draft')); + $this->drupalPostForm('node/add/article', $edit, t('Save')); $this->assertText(t('Article Another node has been created.')); $english_node = $this->drupalGetNodeByTitle('Another node'); @@ -116,14 +123,17 @@ public function testTranslateModeratedContent() { $this->clickLink(t('Add')); $edit = [ 'title[0][value]' => 'Translated node', + 'moderation_state[0][state]' => 'draft', ]; - $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)')); + $this->drupalPostForm(NULL, $edit, t('Save (this translation)')); $this->assertText(t('Article Translated node has been updated.')); $english_node = $this->drupalGetNodeByTitle('Another node', TRUE); // Publish the translation and check that the source language version stays // unpublished. - $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)')); + $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [ + 'moderation_state[0][state]' => 'published', + ], t('Save (this translation)')); $this->assertText(t('Article Translated node has been updated.')); $english_node = $this->drupalGetNodeByTitle('Another node', TRUE); $french_node = $english_node->getTranslation('fr'); @@ -135,8 +145,9 @@ public function testTranslateModeratedContent() { // Now check that we can create a new draft of the translation. $edit = [ 'title[0][value]' => 'New draft of translated node', + 'moderation_state[0][state]' => 'draft', ]; - $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save and Create New Draft (this translation)')); + $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save (this translation)')); $this->assertText(t('Article New draft of translated node has been updated.')); $english_node = $this->drupalGetNodeByTitle('Another node', TRUE); $french_node = $english_node->getTranslation('fr'); @@ -157,15 +168,21 @@ public function testTranslateModeratedContent() { $this->assertEqual($french_node->getTitle(), 'New draft of translated node', 'The draft has replaced the published revision.'); // Publish the English article before testing the archive transition. - $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)')); + $this->drupalPostForm('node/' . $english_node->id() . '/edit', [ + 'moderation_state[0][state]' => 'published', + ], t('Save (this translation)')); $this->assertText(t('Article Another node has been updated.')); $english_node = $this->drupalGetNodeByTitle('Another node', TRUE); $this->assertEqual($english_node->moderation_state->value, 'published'); // Archive the node and its translation. - $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Archive (this translation)')); + $this->drupalPostForm('node/' . $english_node->id() . '/edit', [ + 'moderation_state[0][state]' => 'archived', + ], t('Save (this translation)')); $this->assertText(t('Article Another node has been updated.')); - $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Archive (this translation)')); + $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [ + 'moderation_state[0][state]' => 'archived', + ], t('Save (this translation)')); $this->assertText(t('Article New draft of translated node has been updated.')); $english_node = $this->drupalGetNodeByTitle('Another node', TRUE); $french_node = $english_node->getTranslation('fr'); @@ -178,8 +195,9 @@ public function testTranslateModeratedContent() { // after creating a forward french revision. $edit = [ 'title[0][value]' => 'An english node', + 'moderation_state[0][state]' => 'draft', ]; - $this->drupalPostForm('node/add/article', $edit, t('Save and Create New Draft')); + $this->drupalPostForm('node/add/article', $edit, t('Save')); $this->assertText(t('Article An english node has been created.')); $english_node = $this->drupalGetNodeByTitle('An english node'); $this->assertFalse($english_node->isPublished()); @@ -189,15 +207,18 @@ public function testTranslateModeratedContent() { $this->clickLink(t('Add')); $edit = [ 'title[0][value]' => 'A french node', + 'moderation_state[0][state]' => 'published', ]; - $this->drupalPostForm(NULL, $edit, t('Save and Publish (this translation)')); + $this->drupalPostForm(NULL, $edit, t('Save (this translation)')); $english_node = $this->drupalGetNodeByTitle('An english node', TRUE); $french_node = $english_node->getTranslation('fr'); $this->assertTrue($french_node->isPublished()); $this->assertFalse($english_node->isPublished()); - // Create a forward revision - $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Create New Draft (this translation)')); + // Create a forward revision. + $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [ + 'moderation_state[0][state]' => 'draft', + ], t('Save (this translation)')); $english_node = $this->drupalGetNodeByTitle('An english node', TRUE); $french_node = $english_node->getTranslation('fr'); $this->assertTrue($french_node->isPublished()); @@ -205,7 +226,9 @@ public function testTranslateModeratedContent() { // Publish the english node and the default french node not the latest // french node should be used. - $this->drupalPostForm('/node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)')); + $this->drupalPostForm('/node/' . $english_node->id() . '/edit', [ + 'moderation_state[0][state]' => 'published', + ], t('Save (this translation)')); $english_node = $this->drupalGetNodeByTitle('An english node', TRUE); $french_node = $english_node->getTranslation('fr'); $this->assertTrue($french_node->isPublished()); diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationRevisionRevertTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationRevisionRevertTest.php index 7dac15667f..c054d9d92e 100644 --- a/core/modules/content_moderation/tests/src/Functional/ModerationRevisionRevertTest.php +++ b/core/modules/content_moderation/tests/src/Functional/ModerationRevisionRevertTest.php @@ -55,10 +55,16 @@ public function setUp() { */ public function testEditingAfterRevertRevision() { // Create a draft. - $this->drupalPostForm('node/add/moderated_bundle', ['title[0][value]' => 'First draft node'], t('Save and Create New Draft')); + $this->drupalPostForm('node/add/moderated_bundle', [ + 'title[0][value]' => 'First draft node', + 'moderation_state[0][state]' => 'draft', + ], t('Save')); // Now make it published. - $this->drupalPostForm('node/1/edit', ['title[0][value]' => 'Published node'], t('Save and Publish')); + $this->drupalPostForm('node/1/edit', [ + 'title[0][value]' => 'Published node', + 'moderation_state[0][state]' => 'published', + ], t('Save')); // Check the editing form that show the published title. $this->drupalGet('node/1/edit'); @@ -76,7 +82,9 @@ public function testEditingAfterRevertRevision() { $this->assertSession() ->pageTextContains('First draft node'); // Try to save the node. - $this->click('.moderation-state-draft > input'); + $this->drupalPostForm('node/1/edit', [ + 'moderation_state[0][state]' => 'draft', + ], t('Save')); // Check if the submission passed the EntityChangedConstraintValidator. $this->assertSession() diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php index 1a8f78c504..3b0cffbe88 100644 --- a/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php +++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php @@ -59,9 +59,10 @@ public function testCustomBlockModeration() { $body = 'Body of moderated block'; $edit = [ 'info[0][value]' => 'Moderated block', + 'moderation_state[0][state]' => 'draft', 'body[0][value]' => $body, ]; - $this->drupalPostForm('block/add', $edit, t('Save and Create New Draft')); + $this->drupalPostForm('block/add', $edit, t('Save')); $this->assertText(t('basic Moderated block has been created.')); // Place the block in the Sidebar First region. @@ -83,8 +84,9 @@ public function testCustomBlockModeration() { $updated_body = 'This is the new body value'; $edit = [ 'body[0][value]' => $updated_body, + 'moderation_state[0][state]' => 'draft', ]; - $this->drupalPostForm('block/' . $block->id(), $edit, t('Save and Create New Draft')); + $this->drupalPostForm('block/' . $block->id(), $edit, t('Save')); $this->assertText(t('basic Moderated block has been updated.')); // Navigate to the home page and check that the block shows the updated @@ -94,14 +96,17 @@ public function testCustomBlockModeration() { $this->assertText($updated_body); // Publish the block so we can create a forward revision. - $this->drupalPostForm('block/' . $block->id(), [], t('Save and Publish')); + $this->drupalPostForm('block/' . $block->id(), [ + 'moderation_state[0][state]' => 'published', + ], t('Save')); // Create a forward revision. $forward_revision_body = 'This is the forward revision body value'; $edit = [ 'body[0][value]' => $forward_revision_body, + 'moderation_state[0][state]' => 'draft', ]; - $this->drupalPostForm('block/' . $block->id(), $edit, t('Save and Create New Draft')); + $this->drupalPostForm('block/' . $block->id(), $edit, t('Save')); $this->assertText(t('basic Moderated block has been updated.')); // Navigate to home page and check that the forward revision doesn't show, diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php index 277acdfadd..3218241be9 100644 --- a/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php +++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php @@ -28,7 +28,8 @@ protected function setUp() { public function testCreatingContent() { $this->drupalPostForm('node/add/moderated_content', [ 'title[0][value]' => 'moderated content', - ], t('Save and Create New Draft')); + 'moderation_state[0][state]' => 'draft', + ], t('Save')); $node = $this->getNodeByTitle('moderated content'); if (!$node) { $this->fail('Test node was not saved correctly.'); @@ -37,7 +38,9 @@ public function testCreatingContent() { $path = 'node/' . $node->id() . '/edit'; // Set up published revision. - $this->drupalPostForm($path, [], t('Save and Publish')); + $this->drupalPostForm($path, [ + 'moderation_state[0][state]' => 'published', + ], t('Save')); \Drupal::entityTypeManager()->getStorage('node')->resetCache([$node->id()]); /* @var \Drupal\node\NodeInterface $node */ $node = \Drupal::entityTypeManager()->getStorage('node')->load($node->id()); @@ -79,7 +82,8 @@ public function testFormSaveDestination() { $this->drupalPostForm('node/add/moderated_content', [ 'title[0][value]' => 'Some moderated content', 'body[0][value]' => 'First version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0][state]' => 'draft', + ], t('Save')); $node = $this->drupalGetNodeByTitle('Some moderated content'); $edit_path = sprintf('node/%d/edit', $node->id()); @@ -93,7 +97,8 @@ public function testFormSaveDestination() { // URL, but viewing the second revision. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Second version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0][state]' => 'draft', + ], t('Save')); $this->assertUrl(Url::fromRoute('entity.node.canonical', ['node' => $node->id()])); $this->assertText('Second version of the content.'); @@ -101,7 +106,8 @@ public function testFormSaveDestination() { // canonical URL. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Third version of the content.', - ], t('Save and Publish')); + 'moderation_state[0][state]' => 'published', + ], t('Save')); $this->assertUrl(Url::fromRoute('entity.node.canonical', ['node' => $node->id()])); $this->assertText('Third version of the content.'); @@ -109,7 +115,8 @@ public function testFormSaveDestination() { // version" tab. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Fourth version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0][state]' => 'draft', + ], t('Save')); $this->assertUrl(Url::fromRoute('entity.node.latest_version', ['node' => $node->id()])); $this->assertText('Fourth version of the content.'); } diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php index 055512095f..e57df8cf03 100644 --- a/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php +++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php @@ -72,14 +72,14 @@ public function testEnablingOnExistingContent() { $this->assertLinkByHref('node/' . $node->id() . '/edit'); $this->drupalGet('node/' . $node->id() . '/edit'); $this->assertResponse(200); - $this->assertRaw('Save and Create New Draft'); - $this->assertNoRaw('Save and Publish'); + $this->assertRaw('Create new draft'); + $this->assertNoRaw('Keep Published'); $this->drupalLogin($editor_with_publish); $this->drupalGet('node/' . $node->id() . '/edit'); $this->assertResponse(200); - $this->assertRaw('Save and Create New Draft'); - $this->assertRaw('Save and Publish'); + $this->assertRaw('Create new draft'); + $this->assertRaw('Keep Published'); } } diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php index 8a3a2d0cea..fe3c1d1c7f 100644 --- a/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php +++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php @@ -38,6 +38,9 @@ 'access content overview', 'use editorial transition create_new_draft', 'use editorial transition publish', + 'use editorial transition archive', + 'use editorial transition archived_draft', + 'use editorial transition archived_published', ]; /** diff --git a/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php b/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php index eeac1cea93..223dbbe40a 100644 --- a/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php +++ b/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php @@ -75,7 +75,8 @@ public function testPageAccess() { // Create a node to test with. $this->drupalPostForm(NULL, [ 'title[0][value]' => 'moderated content', - ], t('Save and Create New Draft')); + 'moderation_state[0][state]' => 'draft', + ], t('Save')); $node = $this->getNodeByTitle('moderated content'); if (!$node) { $this->fail('Test node was not saved correctly.'); @@ -103,7 +104,9 @@ public function testPageAccess() { // Publish the node. $this->drupalLogin($this->adminUser); - $this->drupalPostForm($edit_path, [], t('Save and Publish')); + $this->drupalPostForm($edit_path, [ + 'moderation_state[0][state]' => 'published', + ], t('Save')); // Ensure access works correctly for anonymous users. $this->drupalLogout(); @@ -120,7 +123,8 @@ public function testPageAccess() { $this->drupalLogin($this->adminUser); $this->drupalPostForm($edit_path, [ 'title[0][value]' => 'moderated content revised', - ], t('Save and Create New Draft')); + 'moderation_state[0][state]' => 'draft', + ], t('Save')); $this->drupalLogin($user);