Issue #2780705 by timmillwood: Fix "Manage moderation" dropbutton on /admin/structure/types

core/modules/content_moderation/content_moderation.module

@@ -67,7 +67,7 @@ function content_moderation_entity_type_alter(array &$entity_types) {
  * Implements hook_entity_operation().
  */
 function content_moderation_entity_operation(EntityInterface $entity) {
-  _content_moderation_create_entity_type_info()->entityOperation($entity);
+  return _content_moderation_create_entity_type_info()->entityOperation($entity);
 }
 
 /**

core/modules/content_moderation/src/Tests/ModerationStateTestBase.php

@@ -106,6 +106,8 @@ protected function createContentTypeFromUi($content_type_name, $content_type_id,
    *   Default state.
    */
   protected function enableModerationThroughUi($content_type_id, array $allowed_states, $default_state) {
+    $this->drupalGet('admin/structure/types');
+    $this->assertLinkByHref('admin/structure/types/manage/' . $content_type_id . '/moderation');
     $this->drupalGet('admin/structure/types/manage/' . $content_type_id . '/moderation');
     $this->assertFieldByName('enable_moderation_state');
     $this->assertNoFieldChecked('edit-enable-moderation-state');