Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2907316 by timmillwood: The entity type dialog title is a little odd

8.5.x
xjm 2017-09-07 14:29:07 -05:00
parent c28199f69f
commit df074f63ba
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/content_moderation/src/Form/ContentModerationConfigureEntityTypesForm.php
View File

@ -190,9 +190,9 @@ class ContentModerationConfigureEntityTypesForm extends FormBase {
public function getTitle(WorkflowInterface $workflow = NULL, $entity_type_id) { public function getTitle(WorkflowInterface $workflow = NULL, $entity_type_id) {
$this->entityType = $this->entityTypeManager->getDefinition($entity_type_id); $this->entityType = $this->entityTypeManager->getDefinition($entity_type_id);
$title = $this->t('Select the @entity_type types for the @workflow', ['@entity_type' => $this->entityType->getLabel(), '@workflow' => $workflow->label()]); $title = $this->t('Select the @entity_type types for the @workflow workflow', ['@entity_type' => $this->entityType->getLabel(), '@workflow' => $workflow->label()]);
if ($bundle_entity_type_id = $this->entityType->getBundleEntityType()) { if ($bundle_entity_type_id = $this->entityType->getBundleEntityType()) {
$title = $this->t('Select the @entity_type_plural_label for the @workflow', ['@entity_type_plural_label' => $this->entityTypeManager->getDefinition($bundle_entity_type_id)->getPluralLabel(), '@workflow' => $workflow->label()]); $title = $this->t('Select the @entity_type_plural_label for the @workflow workflow', ['@entity_type_plural_label' => $this->entityTypeManager->getDefinition($bundle_entity_type_id)->getPluralLabel(), '@workflow' => $workflow->label()]);
} }
return $title; return $title;

49
core/modules/content_moderation/tests/src/Functional/ContentModerationWorkflowTypeTest.php
View File

@ -36,22 +36,27 @@ class ContentModerationWorkflowTypeTest extends BrowserTestBase {
* Test creating a new workflow using the content moderation plugin. * Test creating a new workflow using the content moderation plugin.
*/ */
public function testNewWorkflow() { public function testNewWorkflow() {
$types[] = $this->createContentType();
$types[] = $this->createContentType();
$types[] = $this->createContentType();
$entity_bundle_info = \Drupal::service('entity_type.bundle.info'); $entity_bundle_info = \Drupal::service('entity_type.bundle.info');
$this->drupalPostForm('admin/config/workflow/workflows/add', [ $this->drupalPostForm('admin/config/workflow/workflows/add', [
'label' => 'Test Workflow', 'label' => 'Test',
'id' => 'test_workflow', 'id' => 'test',
'workflow_type' => 'content_moderation', 'workflow_type' => 'content_moderation',
], 'Save'); ], 'Save');
$session = $this->assertSession();
// Make sure the test workflow includes the default states and transitions. // Make sure the test workflow includes the default states and transitions.
$this->assertSession()->pageTextContains('Draft'); $session->pageTextContains('Draft');
$this->assertSession()->pageTextContains('Published'); $session->pageTextContains('Published');
$this->assertSession()->pageTextContains('Create New Draft'); $session->pageTextContains('Create New Draft');
$this->assertSession()->pageTextContains('Publish'); $session->pageTextContains('Publish');
$this->assertSession()->linkByHrefNotExists('/admin/config/workflow/workflows/manage/test_workflow/state/draft/delete'); $session->linkByHrefNotExists('/admin/config/workflow/workflows/manage/test/state/draft/delete');
$this->assertSession()->linkByHrefNotExists('/admin/config/workflow/workflows/manage/test_workflow/state/published/delete'); $session->linkByHrefNotExists('/admin/config/workflow/workflows/manage/test/state/published/delete');
// Ensure after a workflow is created, the bundle information can be // Ensure after a workflow is created, the bundle information can be
// refreshed. // refreshed.
@ -65,26 +70,32 @@ class ContentModerationWorkflowTypeTest extends BrowserTestBase {
'type_settings[published]' => TRUE, 'type_settings[published]' => TRUE,
'type_settings[default_revision]' => FALSE, 'type_settings[default_revision]' => FALSE,
], 'Save'); ], 'Save');
$this->assertSession()->pageTextContains('Created Test State state.'); $session->pageTextContains('Created Test State state.');
$this->assertSession()->linkByHrefExists('/admin/config/workflow/workflows/manage/test_workflow/state/test_state/delete'); $session->linkByHrefExists('/admin/config/workflow/workflows/manage/test/state/test_state/delete');
// Check there is a link to delete a default transition. // Check there is a link to delete a default transition.
$this->assertSession()->linkByHrefExists('/admin/config/workflow/workflows/manage/test_workflow/transition/publish/delete'); $session->linkByHrefExists('/admin/config/workflow/workflows/manage/test/transition/publish/delete');
// Delete the transition. // Delete the transition.
$this->drupalGet('/admin/config/workflow/workflows/manage/test_workflow/transition/publish/delete'); $this->drupalGet('/admin/config/workflow/workflows/manage/test/transition/publish/delete');
$this->submitForm([], 'Delete'); $this->submitForm([], 'Delete');
// The link to delete the transition should now be gone. // The link to delete the transition should now be gone.
$this->assertSession()->linkByHrefNotExists('/admin/config/workflow/workflows/manage/test_workflow/transition/publish/delete'); $session->linkByHrefNotExists('/admin/config/workflow/workflows/manage/test/transition/publish/delete');
// Ensure that the published settings cannot be changed. // Ensure that the published settings cannot be changed.
$this->drupalGet('admin/config/workflow/workflows/manage/test_workflow/state/published'); $this->drupalGet('admin/config/workflow/workflows/manage/test/state/published');
$this->assertSession()->fieldDisabled('type_settings[published]'); $session->fieldDisabled('type_settings[published]');
$this->assertSession()->fieldDisabled('type_settings[default_revision]'); $session->fieldDisabled('type_settings[default_revision]');
// Ensure that the draft settings cannot be changed. // Ensure that the draft settings cannot be changed.
$this->drupalGet('admin/config/workflow/workflows/manage/test_workflow/state/draft'); $this->drupalGet('admin/config/workflow/workflows/manage/test/state/draft');
$this->assertSession()->fieldDisabled('type_settings[published]'); $session->fieldDisabled('type_settings[published]');
$this->assertSession()->fieldDisabled('type_settings[default_revision]'); $session->fieldDisabled('type_settings[default_revision]');
$this->drupalGet('admin/config/workflow/workflows/manage/test/type/node');
$session->pageTextContains('Select the content type entities for the Test workflow');
foreach ($types as $type) {
$session->pageTextContains($type->label());
}
} }
} }