Revert "Issue #3276974 by hooroomoo, Wim Leers: [drupalMedia] Media View Modes don't work if alignment not enabled"
This reverts commit 72c250879a
.
merge-requests/3886/head
parent
1e3566902e
commit
45ee80dd72
|
@ -630,7 +630,6 @@ media_media:
|
||||||
ckeditor5:
|
ckeditor5:
|
||||||
plugins:
|
plugins:
|
||||||
- drupalMedia.DrupalMedia
|
- drupalMedia.DrupalMedia
|
||||||
- drupalMedia.DrupalElementStyle
|
|
||||||
config:
|
config:
|
||||||
drupalMedia:
|
drupalMedia:
|
||||||
toolbar: [mediaImageTextAlternative]
|
toolbar: [mediaImageTextAlternative]
|
||||||
|
|
|
@ -229,7 +229,12 @@ class MediaLibraryTest extends WebDriverTestBase {
|
||||||
->setFilterConfig('media_embed', [
|
->setFilterConfig('media_embed', [
|
||||||
'status' => TRUE,
|
'status' => TRUE,
|
||||||
'settings' => [
|
'settings' => [
|
||||||
|
'default_view_mode' => 'view_mode_1',
|
||||||
'allowed_media_types' => $allowed_media_types,
|
'allowed_media_types' => $allowed_media_types,
|
||||||
|
'allowed_view_modes' => [
|
||||||
|
'view_mode_1' => 'view_mode_1',
|
||||||
|
'view_mode_2' => 'view_mode_2',
|
||||||
|
],
|
||||||
],
|
],
|
||||||
])->save();
|
])->save();
|
||||||
|
|
||||||
|
|
|
@ -1196,10 +1196,8 @@ class MediaTest extends WebDriverTestBase {
|
||||||
* Tests that view mode is reflected onto the CKEditor 5 Widget wrapper, that
|
* Tests that view mode is reflected onto the CKEditor 5 Widget wrapper, that
|
||||||
* the media style toolbar allows changing the view mode and that the changes
|
* the media style toolbar allows changing the view mode and that the changes
|
||||||
* are reflected on the widget and downcast drupal-media tag.
|
* are reflected on the widget and downcast drupal-media tag.
|
||||||
*
|
|
||||||
* @dataProvider providerTestViewMode
|
|
||||||
*/
|
*/
|
||||||
public function testViewMode(bool $with_alignment) {
|
public function testViewMode() {
|
||||||
EntityViewMode::create([
|
EntityViewMode::create([
|
||||||
'id' => 'media.view_mode_1',
|
'id' => 'media.view_mode_1',
|
||||||
'targetEntityType' => 'media',
|
'targetEntityType' => 'media',
|
||||||
|
@ -1265,10 +1263,6 @@ class MediaTest extends WebDriverTestBase {
|
||||||
],
|
],
|
||||||
])->save();
|
])->save();
|
||||||
|
|
||||||
if (!$with_alignment) {
|
|
||||||
$filter_format->filters('filter_align')->setConfiguration(array_merge($filter_format->filters('filter_align')->getConfiguration(), ['status' => FALSE]));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test that view mode dependencies are returned from the MediaEmbed
|
// Test that view mode dependencies are returned from the MediaEmbed
|
||||||
// filter's ::getDependencies() method.
|
// filter's ::getDependencies() method.
|
||||||
$expected_config_dependencies = [
|
$expected_config_dependencies = [
|
||||||
|
@ -1484,16 +1478,6 @@ class MediaTest extends WebDriverTestBase {
|
||||||
$this->assertNotEmpty($this->getBalloonButton('View Mode 4'));
|
$this->assertNotEmpty($this->getBalloonButton('View Mode 4'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* For testing view modes in different scenarios.
|
|
||||||
*/
|
|
||||||
public function providerTestViewMode(): array {
|
|
||||||
return [
|
|
||||||
'with alignment' => [TRUE],
|
|
||||||
'without alignment' => [FALSE],
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Verifies value of an attribute on the downcast <drupal-media> element.
|
* Verifies value of an attribute on the downcast <drupal-media> element.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue