Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663

core/modules/editor/css/editor.css

@@ -1,16 +0,0 @@
-/**
- * @file
- * Styles for text editors.
- */
-
-.editor-dialog {
-  /* This !important is required to override inline CSS of jQuery UI. */
-  width: 80% !important;
-  max-width: 500px;
-}
-
-@media screen and (max-width: 600px) {
-  .editor-dialog {
-    width: 95% !important;
-  }
-}

core/modules/editor/editor.install

@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Install, update and uninstall functions for the Editor module.
+ */
+
+/**
+ * Synchronizes the editor status with the paired text format status.
+ */
+function editor_update_8001() {
+  $config_factory = \Drupal::configFactory();
+  // Iterate on all text formats config entities.
+  foreach ($config_factory->listAll('filter.format.') as $name) {
+    list(,, $id) = explode('.', $name, 3);
+    $status = $config_factory->get($name)->get('status');
+    $editor = $config_factory->getEditable("editor.editor.$id");
+    if (!$editor->isNew() && $editor->get('status') !== $status) {
+      $editor->set('status', $status)->save();
+    }
+  }
+}

core/modules/editor/editor.module

@@ -6,12 +6,13 @@
  */
 
 use Drupal\Component\Utility\Html;
+use Drupal\editor\Entity\Editor;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\StringTranslation\TranslationWrapper;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\filter\FilterFormatInterface;
 use Drupal\filter\Plugin\FilterInterface;
@@ -24,13 +25,13 @@ function editor_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.editor':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Text Editor module provides a framework that other modules (such as <a href="!ckeditor">CKEditor module</a>) can use to provide toolbars and other functionality that allow users to format text more easily than typing HTML tags directly. For more information, see the <a href="!documentation">online documentation for the Text Editor module</a>.', array('!documentation' => 'https://www.drupal.org/documentation/modules/editor', '!ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? \Drupal::url('help.page', array('name' => 'ckeditor')) : '#')) . '</p>';
+      $output .= '<p>' . t('The Text Editor module provides a framework that other modules (such as <a href=":ckeditor">CKEditor module</a>) can use to provide toolbars and other functionality that allow users to format text more easily than typing HTML tags directly. For more information, see the <a href=":documentation">online documentation for the Text Editor module</a>.', array(':documentation' => 'https://www.drupal.org/documentation/modules/editor', ':ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? \Drupal::url('help.page', array('name' => 'ckeditor')) : '#')) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Installing text editors') . '</dt>';
-      $output .= '<dd>' . t('The Text Editor module provides a framework for managing editors. To use it, you also need to enable a text editor. This can either be the core <a href="!ckeditor">CKEditor module</a>, which can be enabled on the <a href="!extend">Extend page</a>, or a contributed module for any other text editor. When installing a contributed text editor module, be sure to check the installation instructions, because you will most likely need to download and install an external library as well as the Drupal module.', array('!ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? \Drupal::url('help.page', array('name' => 'ckeditor')) : '#', '!extend' => \Drupal::url('system.modules_list'))) . '</dd>';
+      $output .= '<dd>' . t('The Text Editor module provides a framework for managing editors. To use it, you also need to enable a text editor. This can either be the core <a href=":ckeditor">CKEditor module</a>, which can be enabled on the <a href=":extend">Extend page</a>, or a contributed module for any other text editor. When installing a contributed text editor module, be sure to check the installation instructions, because you will most likely need to download and install an external library as well as the Drupal module.', array(':ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? \Drupal::url('help.page', array('name' => 'ckeditor')) : '#', ':extend' => \Drupal::url('system.modules_list'))) . '</dd>';
       $output .= '<dt>' . t('Enabling a text editor for a text format') . '</dt>';
-      $output .= '<dd>' . t('On the <a href="!formats">Text formats and editors page</a> you can see which text editor is associated with each text format. You can change this by clicking on the <em>Configure</em> link, and then choosing a text editor or <em>none</em> from the <em>Text editor</em> drop-down list. The text editor will then be displayed with any text field for which this text format is chosen.', array('!formats' => \Drupal::url('filter.admin_overview'))) . '</dd>';
+      $output .= '<dd>' . t('On the <a href=":formats">Text formats and editors page</a> you can see which text editor is associated with each text format. You can change this by clicking on the <em>Configure</em> link, and then choosing a text editor or <em>none</em> from the <em>Text editor</em> drop-down list. The text editor will then be displayed with any text field for which this text format is chosen.', array(':formats' => \Drupal::url('filter.admin_overview'))) . '</dd>';
       $output .= '<dt>' . t('Configuring a text editor') . '</dt>';
       $output .= '<dd>' . t('Once a text editor is associated with a text format, you can configure it by clicking on the <em>Configure</em> link for this format. Depending on the specific text editor, you can configure it for example by adding buttons to its toolbar. Typically these buttons provide formatting or editing tools, and they often insert HTML tags into the field source. For details, see the help page of the specific text editor.') . '</dd>';
       $output .= '<dt>' . t('Using different text editors and formats') . '</dt>';
@@ -47,8 +48,8 @@ function editor_help($route_name, RouteMatchInterface $route_match) {
  * of text editors.
  */
 function editor_menu_links_discovered_alter(array &$links) {
-  $links['filter.admin_overview']['title'] = new TranslationWrapper('Text formats and editors');
-  $links['filter.admin_overview']['description'] = new TranslationWrapper('Configure how user-contributed content is filtered and formatted, as well as the text editor user interface (WYSIWYGs or toolbars).');
+  $links['filter.admin_overview']['title'] = new TranslatableMarkup('Text formats and editors');
+  $links['filter.admin_overview']['description'] = new TranslatableMarkup('Select and configure text editors, and how content is filtered when displayed.');
 }
 
 /**
@@ -509,3 +510,30 @@ function _editor_parse_file_uuids($text) {
   }
   return $uuids;
 }
+
+/**
+ * Implements hook_ENTITY_TYPE_presave().
+ *
+ * Synchronizes the editor status to its paired text format status.
+ */
+function editor_filter_format_presave(FilterFormatInterface $format) {
+  // The text format being created cannot have a text editor yet.
+  if ($format->isNew()) {
+    return;
+  }
+
+  /** @var \Drupal\filter\FilterFormatInterface $original */
+  $original = \Drupal::entityManager()
+    ->getStorage('filter_format')
+    ->loadUnchanged($format->getOriginalId());
+
+  // If the text format status is the same, return early.
+  if (($status = $format->status()) === $original->status()) {
+    return;
+  }
+
+  /** @var \Drupal\editor\EditorInterface $editor */
+  if ($editor = Editor::load($format->id())) {
+    $editor->setStatus($status)->save();
+  }
+}

core/modules/editor/js/editor.admin.js

@@ -821,17 +821,32 @@
    * @see Drupal.FilterStatus
    */
   Drupal.FilterHTMLRule = function () {
-    return {
-      // Allow or forbid tags.
+    // Allow or forbid tags.
+    this.tags = [];
+    this.allow = null;
+
+    // Apply restrictions to properties set on tags.
+    this.restrictedTags = {
       tags: [],
-      allow: null,
-      // Apply restrictions to properties set on tags.
-      restrictedTags: {
-        tags: [],
-        allowed: {attributes: [], styles: [], classes: []},
-        forbidden: {attributes: [], styles: [], classes: []}
-      }
+      allowed: {attributes: [], styles: [], classes: []},
+      forbidden: {attributes: [], styles: [], classes: []}
     };
+
+    return this;
+  };
+
+  Drupal.FilterHTMLRule.prototype.clone = function () {
+    var clone = new Drupal.FilterHTMLRule();
+    clone.tags = this.tags.slice(0);
+    clone.allow = this.allow;
+    clone.restrictedTags.tags = this.restrictedTags.tags.slice(0);
+    clone.restrictedTags.allowed.attributes = this.restrictedTags.allowed.attributes.slice(0);
+    clone.restrictedTags.allowed.styles = this.restrictedTags.allowed.styles.slice(0);
+    clone.restrictedTags.allowed.classes = this.restrictedTags.allowed.classes.slice(0);
+    clone.restrictedTags.forbidden.attributes = this.restrictedTags.forbidden.attributes.slice(0);
+    clone.restrictedTags.forbidden.styles = this.restrictedTags.forbidden.styles.slice(0);
+    clone.restrictedTags.forbidden.classes = this.restrictedTags.forbidden.classes.slice(0);
+    return clone;
   };
 
   /**

core/modules/editor/js/editor.formattedTextEditor.js

@@ -63,7 +63,7 @@
 
       // Store the actual value of this field. We'll need this to restore the
       // original value when the user discards his modifications.
-      var $fieldItems = this.$el.find('.field__item');
+      var $fieldItems = this.$el.find('.quickedit-field');
       if ($fieldItems.length) {
         this.$textElement = $fieldItems.eq(0);
       }

core/modules/editor/js/editor.js

@@ -238,15 +238,6 @@
    */
   Drupal.editorAttach = function (field, format) {
     if (format.editor) {
-      // HTML5 validation cannot ever work for WYSIWYG editors, because WYSIWYG
-      // editors always hide the underlying textarea element, which prevents
-      // browsers from putting the error message bubble in the right location.
-      // Hence: disable HTML5 validation for this element.
-      if ('required' in field.attributes) {
-        field.setAttribute('data-editor-required', true);
-        field.removeAttribute('required');
-      }
-
       // Attach the text editor.
       Drupal.editors[format.editor].attach(field, format);
 
@@ -275,13 +266,6 @@
    */
   Drupal.editorDetach = function (field, format, trigger) {
     if (format.editor) {
-      // Restore the HTML5 validation "required" attribute if it was removed in
-      // Drupal.editorAttach().
-      if ('data-editor-required' in field.attributes) {
-        field.setAttribute('required', 'required');
-        field.removeAttribute('data-editor-required');
-      }
-
       Drupal.editors[format.editor].detach(field, format, trigger);
 
       // Restore the original value if the user didn't make any changes yet.

core/modules/editor/src/Ajax/GetUntransformedTextCommand.php

@@ -7,8 +7,7 @@
 
 namespace Drupal\editor\Ajax;
 
-use Drupal\Core\Ajax\CommandInterface;
-use Drupal\quickedit\Ajax\BaseCommand;
+use Drupal\Core\Ajax\BaseCommand;
 
 /**
  * AJAX command to rerender a formatted text field without any transformation

core/modules/editor/src/Element.php

@@ -10,6 +10,7 @@ namespace Drupal\editor;
 use Drupal\editor\Entity\Editor;
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 
 /**
  * Defines a service for Text Editor's render elements.
@@ -93,7 +94,7 @@ class Element {
     $element['#attached']['library'][] = 'editor/drupal.editor';
 
     // Attach attachments for all available editors.
-    $element['#attached'] = drupal_merge_attached($element['#attached'], $this->pluginManager->getAttachments($format_ids));
+    $element['#attached'] = BubbleableMetadata::mergeAttachments($element['#attached'], $this->pluginManager->getAttachments($format_ids));
 
     // Apply XSS filters when editing content if necessary. Some types of text
     // editors cannot guarantee that the end user won't become a victim of XSS.

core/modules/editor/src/Entity/Editor.php

@@ -107,7 +107,7 @@ class Editor extends ConfigEntityBase implements EditorInterface {
     //   config entity and dependency on provider is managed automatically.
     $definition = $this->editorPluginManager()->createInstance($this->editor)->getPluginDefinition();
     $this->addDependency('module', $definition['provider']);
-    return $this->dependencies;
+    return $this;
   }
 
   /**

core/modules/editor/src/Form/EditorImageDialog.php

@@ -63,12 +63,22 @@ class EditorImageDialog extends FormBase {
    *   The filter format for which this dialog corresponds.
    */
   public function buildForm(array $form, FormStateInterface $form_state, FilterFormat $filter_format = NULL) {
-    // The default values are set directly from \Drupal::request()->request,
-    // provided by the editor plugin opening the dialog.
-    if (!$image_element = $form_state->get('image_element')) {
-      $user_input = $form_state->getUserInput();
-      $image_element = isset($user_input['editor_object']) ? $user_input['editor_object'] : [];
+    // This form is special, in that the default values do not come from the
+    // server side, but from the client side, from a text editor. We must cache
+    // this data in form state, because when the form is rebuilt, we will be
+    // receiving values from the form, instead of the values from the text
+    // editor. If we don't cache it, this data will be lost.
+    if (isset($form_state->getUserInput()['editor_object'])) {
+      // By convention, the data that the text editor sends to any dialog is in
+      // the 'editor_object' key. And the image dialog for text editors expects
+      // that data to be the attributes for an <img> element.
+      $image_element = $form_state->getUserInput()['editor_object'];
       $form_state->set('image_element', $image_element);
+      $form_state->setCached(TRUE);
+    }
+    else {
+      // Retrieve the image element's attributes from form state.
+      $image_element = $form_state->get('image_element') ?: [];
     }
 
     $form['#tree'] = TRUE;
@@ -143,41 +153,6 @@ class EditorImageDialog extends FormBase {
       '#default_value' => $alt,
       '#maxlength' => 2048,
     );
-    $form['dimensions'] = array(
-      '#type' => 'fieldset',
-      '#title' => $this->t('Image size'),
-      '#attributes' => array('class' => array(
-        'container-inline',
-        'fieldgroup',
-        'form-composite',
-      )),
-    );
-    $form['dimensions']['width'] = array(
-      '#title' => $this->t('Width'),
-      '#title_display' => 'invisible',
-      '#type' => 'number',
-      '#default_value' => isset($image_element['width']) ? $image_element['width'] : '',
-      '#size' => 8,
-      '#maxlength' => 8,
-      '#min' => 1,
-      '#max' => 99999,
-      '#placeholder' => $this->t('width'),
-      '#field_suffix' => ' × ',
-      '#parents' => array('attributes', 'width'),
-    );
-    $form['dimensions']['height'] = array(
-      '#title' => $this->t('Height'),
-      '#title_display' => 'invisible',
-      '#type' => 'number',
-      '#default_value' => isset($image_element['height']) ? $image_element['height'] : '',
-      '#size' => 8,
-      '#maxlength' => 8,
-      '#min' => 1,
-      '#max' => 99999,
-      '#placeholder' => $this->t('height'),
-      '#field_suffix' => $this->t('pixels'),
-      '#parents' => array('attributes', 'height'),
-    );
 
     // When Drupal core's filter_align is being used, the text editor may
     // offer the ability to change the alignment.

core/modules/editor/src/Plugin/EditorManager.php

@@ -61,7 +61,7 @@ class EditorManager extends DefaultPluginManager {
    * @return array
    *   An array of attachments, for use with #attached.
    *
-   * @see drupal_process_attached()
+   * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments()
    */
   public function getAttachments(array $format_ids) {
     $attachments = array('library' => array());

core/modules/editor/src/Plugin/EditorPluginInterface.php

@@ -95,7 +95,7 @@ interface EditorPluginInterface extends PluginInspectionInterface {
    *   An array of settings that will be added to the page for use by this text
    *   editor's JavaScript integration.
    *
-   * @see drupal_process_attached()
+   * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments()
    * @see EditorManager::getAttachments()
    */
   public function getJSSettings(Editor $editor);
@@ -114,7 +114,7 @@ interface EditorPluginInterface extends PluginInspectionInterface {
    *   An array of libraries that will be added to the page for use by this text
    *   editor.
    *
-   * @see drupal_process_attached()
+   * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments()
    * @see EditorManager::getAttachments()
    */
   public function getLibraries(Editor $editor);

core/modules/editor/src/Tests/EditorImageDialogTest.php

@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\editor\Tests\EditorImageDialogTest.
+ */
+
+namespace Drupal\editor\Tests;
+
+use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Form\FormState;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\Element\PathElement;
+use Drupal\Core\Url;
+use Drupal\editor\Entity\Editor;
+use Drupal\editor\Form\EditorImageDialog;
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\node\Entity\NodeType;
+use Drupal\simpletest\KernelTestBase;
+use Drupal\system\Tests\Entity\EntityUnitTestBase;
+use Drupal\user\Entity\Role;
+use Drupal\user\Entity\User;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Tests EditorImageDialog validation and conversion functionality.
+ *
+ * @group editor
+ */
+class EditorImageDialogTest extends EntityUnitTestBase {
+
+  /**
+   * Filter format for testing.
+   *
+   * @var \Drupal\filter\FilterFormatInterface
+   */
+  protected $format;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'file', 'editor', 'editor_test', 'user', 'system'];
+
+  /**
+   * Sets up the test.
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('file');
+    $this->installSchema('system', ['router', 'key_value_expire']);
+    $this->installSchema('node', array('node_access'));
+    $this->installSchema('file', array('file_usage'));
+    $this->installConfig(['node']);
+
+    // Add text formats.
+    $this->format = FilterFormat::create([
+      'format' => 'filtered_html',
+      'name' => 'Filtered HTML',
+      'weight' => 0,
+      'filters' => [
+        'filter_align' => ['status' => TRUE],
+        'filter_caption' => ['status' => TRUE],
+      ],
+    ]);
+    $this->format->save();
+
+    // Set up text editor.
+    $editor = Editor::create([
+      'format' => 'filtered_html',
+      'editor' => 'unicorn',
+      'image_upload' => [
+        'max_size' => 100,
+        'scheme' => 'public',
+        'directory' => '',
+        'status' => TRUE,
+      ],
+    ]);
+    $editor->save();
+
+    // Create a node type for testing.
+    $type = NodeType::create(['type' => 'page', 'name' => 'page']);
+    $type->save();
+    node_add_body_field($type);
+    $this->installEntitySchema('user');
+    \Drupal::service('router.builder')->rebuild();
+  }
+
+  /**
+   * Tests that editor image dialog works as expected.
+   */
+  public function testEditorImageDialog() {
+    $input = [
+      'editor_object' => [
+        'src' => '/sites/default/files/inline-images/somefile.png',
+        'alt' => 'fda',
+        'width' => '',
+        'height' => '',
+        'data-entity-type' => 'file',
+        'data-entity-uuid' => 'some-uuid',
+        'data-align' => 'none',
+        'hasCaption' => 'false',
+      ],
+      'dialogOptions' => [
+        'title' => 'Edit Image',
+        'dialogClass' => 'editor-image-dialog',
+        'autoResize' => 'true',
+      ],
+      '_drupal_ajax' => '1',
+      'ajax_page_state' => [
+        'theme' => 'bartik',
+        'theme_token' => 'some-token',
+        'libraries' => '',
+      ],
+    ];
+    $form_state = (new FormState())
+      ->setRequestMethod('POST')
+      ->setUserInput($input)
+      ->addBuildInfo('args', [$this->format]);
+
+    $form_builder = $this->container->get('form_builder');
+    $form_object = new EditorImageDialog(\Drupal::entityManager()->getStorage('file'));
+    $form_id = $form_builder->getFormId($form_object, $form_state);
+    $form = $form_builder->retrieveForm($form_id, $form_state);
+    $form_builder->prepareForm($form_id, $form, $form_state);
+    $form_builder->processForm($form_id, $form, $form_state);
+
+    // Assert these two values are present and we don't get the 'not-this'
+    // default back.
+    $this->assertEqual(FALSE, $form_state->getValue(['attributes', 'hasCaption'], 'not-this'));
+  }
+
+}

core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php

@@ -86,7 +86,7 @@ class QuickEditIntegrationLoadingTest extends WebTestBase {
       $this->drupalGet('node/1');
 
       // Ensure the text is transformed.
-      $this->assertRaw('<p>Do you also love Drupal?</p><figure class="caption caption-img"><img src="druplicon.png" /><figcaption>Druplicon</figcaption></figure>');
+      $this->assertRaw('<p>Do you also love Drupal?</p><figure role="group" class="caption caption-img"><img src="druplicon.png" /><figcaption>Druplicon</figcaption></figure>');
 
       // Retrieving the untransformed text should result in an empty 403 response.
       $response = $this->drupalPost('editor/' . 'node/1/body/en/full', '', array(), array('query' => array(MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax')));
@@ -104,7 +104,7 @@ class QuickEditIntegrationLoadingTest extends WebTestBase {
     $this->drupalGet('node/1');
 
     // Ensure the text is transformed.
-    $this->assertRaw('<p>Do you also love Drupal?</p><figure class="caption caption-img"><img src="druplicon.png" /><figcaption>Druplicon</figcaption></figure>');
+    $this->assertRaw('<p>Do you also love Drupal?</p><figure role="group" class="caption caption-img"><img src="druplicon.png" /><figcaption>Druplicon</figcaption></figure>');
 
     $response = $this->drupalPost('editor/' . 'node/1/body/en/full', 'application/vnd.drupal-ajax', array());
     $this->assertResponse(200);

core/modules/editor/src/Tests/QuickEditIntegrationTest.php

@@ -117,7 +117,7 @@ class QuickEditIntegrationTest extends QuickEditTestBase {
    */
   protected function getSelectedEditor($entity_id, $field_name, $view_mode = 'default') {
     $entity = entity_load('entity_test', $entity_id, TRUE);
-    $items = $entity->getTranslation(LanguageInterface::LANGCODE_NOT_SPECIFIED)->get($field_name);
+    $items = $entity->get($field_name);
     $options = entity_get_display('entity_test', 'entity_test', $view_mode)->getComponent($field_name);
     return $this->editorSelector->getEditor($options['type'], $items);
   }
@@ -170,7 +170,7 @@ class QuickEditIntegrationTest extends QuickEditTestBase {
     $entity = entity_load('entity_test', $entity->id());
 
     // Verify metadata.
-    $items = $entity->getTranslation(LanguageInterface::LANGCODE_NOT_SPECIFIED)->get($this->fieldName);
+    $items = $entity->get($this->fieldName);
     $metadata = $this->metadataGenerator->generateFieldMetadata($items, 'default');
     $expected = array(
       'access' => TRUE,
@@ -209,7 +209,7 @@ class QuickEditIntegrationTest extends QuickEditTestBase {
     // Verify AJAX response.
     $controller = new EditorController();
     $request = new Request();
-    $response = $controller->getUntransformedText($entity, $this->fieldName, LanguageInterface::LANGCODE_NOT_SPECIFIED, 'default');
+    $response = $controller->getUntransformedText($entity, $this->fieldName, LanguageInterface::LANGCODE_DEFAULT, 'default');
     $expected = array(
       array(
         'command' => 'editorGetUntransformedText',

core/modules/editor/src/Tests/Update/EditorUpdateTest.php

@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\editor\Tests\Update\EditorUpdateTest.
+ */
+
+namespace Drupal\editor\Tests\Update;
+
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+
+/**
+ * Tests Editor module database updates.
+ *
+ * @group editor
+ */
+class EditorUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      // Simulate an un-synchronized environment.
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.editor-editor_update_8001.php',
+    ];
+  }
+
+  /**
+   * Tests editor_update_8001().
+   *
+   * @see editor_update_8001()
+   */
+  public function testEditorUpdate8001() {
+    /** @var \Drupal\Core\Config\ConfigFactoryInterface $config_factory */
+    $config_factory = $this->container->get('config.factory');
+
+    $format_basic_html = $config_factory->get('filter.format.basic_html');
+    $editor_basic_html = $config_factory->get('editor.editor.basic_html');
+    $format_full_html = $config_factory->get('filter.format.full_html');
+    $editor_full_html = $config_factory->get('editor.editor.full_html');
+
+    // Checks if the 'basic_html' format and editor statuses differ.
+    $this->assertTrue($format_basic_html->get('status'));
+    $this->assertFalse($editor_basic_html->get('status'));
+    $this->assertNotIdentical($format_basic_html->get('status'), $editor_basic_html->get('status'));
+
+    // Checks if the 'full_html' format and editor statuses differ.
+    $this->assertFalse($format_full_html->get('status'));
+    $this->assertTrue($editor_full_html->get('status'));
+    $this->assertNotIdentical($format_full_html->get('status'), $editor_full_html->get('status'));
+
+
+    // Run updates.
+    $this->runUpdates();
+
+    // Reload text formats and editors.
+    $format_basic_html = $config_factory->get('filter.format.basic_html');
+    $editor_basic_html = $config_factory->get('editor.editor.basic_html');
+    $format_full_html = $config_factory->get('filter.format.full_html');
+    $editor_full_html = $config_factory->get('editor.editor.full_html');
+
+    // Checks if the 'basic_html' format and editor statuses are in sync.
+    $this->assertTrue($format_basic_html->get('status'));
+    $this->assertTrue($editor_basic_html->get('status'));
+    $this->assertIdentical($format_basic_html->get('status'), $editor_basic_html->get('status'));
+
+    // Checks if the 'full_html' format and editor statuses are in sync.
+    $this->assertFalse($format_full_html->get('status'));
+    $this->assertFalse($editor_full_html->get('status'));
+    $this->assertIdentical($format_full_html->get('status'), $editor_full_html->get('status'));
+  }
+
+}

core/modules/editor/tests/src/Kernel/EditorFilterIntegrationTest.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\editor\Kernel\EditorFilterIntegration.
+ */
+
+namespace Drupal\Tests\editor\Kernel;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\editor\Entity\Editor;
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests integration with filter module.
+ *
+ * @group editor
+ */
+class EditorFilterIntegrationTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['filter', 'editor', 'editor_test'];
+
+  /**
+   * Tests text format removal or disabling.
+   */
+  public function testTextFormatIntegration() {
+    // Create an arbitrary text format.
+    $format = FilterFormat::create([
+      'format' => Unicode::strtolower($this->randomMachineName()),
+      'name' => $this->randomString(),
+    ]);
+    $format->save();
+
+    // Create a paired editor.
+    Editor::create(['format' => $format->id(), 'editor' => 'unicorn'])->save();
+
+    // Disable the text format.
+    $format->disable()->save();
+
+    // The paired editor should be disabled too.
+    $this->assertFalse(Editor::load($format->id())->status());
+
+    // Re-enable the text format.
+    $format->enable()->save();
+
+    // The paired editor should be enabled too.
+    $this->assertTrue(Editor::load($format->id())->status());
+
+    // Completely remove the text format. Usually this cannot occur via UI, but
+    // can be triggered from API.
+    $format->delete();
+
+    // The paired editor should be removed.
+    $this->assertNull(Editor::load($format->id()));
+  }
+
+}

core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php

@@ -130,7 +130,7 @@ class EditorConfigEntityUnitTest extends UnitTestCase {
                         ->with('filter_format')
                         ->will($this->returnValue($storage));
 
-    $dependencies = $entity->calculateDependencies();
+    $dependencies = $entity->calculateDependencies()->getDependencies();
     $this->assertContains('test_module', $dependencies['module']);
     $this->assertContains('filter.format.test', $dependencies['config']);
   }