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

Issue #2691659 by Sam152, Jo Fitzgerald: d7 filter weights not migrating to d8

8.2.x
Alex Pott 2016-06-18 14:33:28 +01:00
parent 3d2798e84c
commit 788d8077e0
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/modules/filter/migration_templates/d7_filter_format.yml
View File

@ -26,5 +26,6 @@ process:
status: status:
plugin: default_value plugin: default_value
default_value: true default_value: true
weight: weight
destination: destination:
plugin: entity:filter_format plugin: entity:filter_format

17
core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
View File

@ -35,8 +35,8 @@ class MigrateFilterFormatTest extends MigrateDrupal7TestBase {
* @param string $label * @param string $label
* The expected label of the format. * The expected label of the format.
* @param array $enabled_filters * @param array $enabled_filters
* The expected filters in the format, keyed by ID. * The expected filters in the format, keyed by ID with weight as values.
* @param array $weight * @param int $weight
* The weight of the filter. * The weight of the filter.
*/ */
protected function assertEntity($id, $label, array $enabled_filters, $weight) { protected function assertEntity($id, $label, array $enabled_filters, $weight) {
@ -45,18 +45,21 @@ class MigrateFilterFormatTest extends MigrateDrupal7TestBase {
$this->assertTrue($entity instanceof FilterFormatInterface); $this->assertTrue($entity instanceof FilterFormatInterface);
$this->assertIdentical($label, $entity->label()); $this->assertIdentical($label, $entity->label());
// get('filters') will return enabled filters only, not all of them. // get('filters') will return enabled filters only, not all of them.
$this->assertIdentical($enabled_filters, array_keys($entity->get('filters'))); $this->assertIdentical(array_keys($enabled_filters), array_keys($entity->get('filters')));
$this->assertIdentical($weight, $entity->get('weight')); $this->assertIdentical($weight, $entity->get('weight'));
foreach ($entity->get('filters') as $filter_id => $filter) {
$this->assertIdentical($filter['weight'], $enabled_filters[$filter_id]);
}
} }
/** /**
* Tests the Drupal 7 filter format to Drupal 8 migration. * Tests the Drupal 7 filter format to Drupal 8 migration.
*/ */
public function testFilterFormat() { public function testFilterFormat() {
$this->assertEntity('custom_text_format', 'Custom Text format', ['filter_autop', 'filter_html'], 0); $this->assertEntity('custom_text_format', 'Custom Text format', ['filter_autop' => 0, 'filter_html' => -10], 0);
$this->assertEntity('filtered_html', 'Filtered HTML', ['filter_autop', 'filter_html', 'filter_htmlcorrector', 'filter_url'], 0); $this->assertEntity('filtered_html', 'Filtered HTML', ['filter_autop' => 2, 'filter_html' => 1, 'filter_htmlcorrector' => 10, 'filter_url' => 0], 0);
$this->assertEntity('full_html', 'Full HTML', ['filter_autop', 'filter_htmlcorrector', 'filter_url'], 1); $this->assertEntity('full_html', 'Full HTML', ['filter_autop' => 1, 'filter_htmlcorrector' => 10, 'filter_url' => 0], 1);
$this->assertEntity('plain_text', 'Plain text', ['filter_html_escape', 'filter_url', 'filter_autop'], 10); $this->assertEntity('plain_text', 'Plain text', ['filter_html_escape' => 0, 'filter_url' => 1, 'filter_autop' => 2], 10);
// This assertion covers issue #2555089. Drupal 7 formats are identified // This assertion covers issue #2555089. Drupal 7 formats are identified
// by machine names, so migrated formats should be merged into existing // by machine names, so migrated formats should be merged into existing
// ones. // ones.