Skip to content
Snippets Groups Projects
Commit 579208e4 authored by catch's avatar catch
Browse files

Issue #3271050 by xjm, Wim Leers, bbrala: Update REST and JSON:API Editor... 

Issue #3271050 by xjm, Wim Leers, bbrala: Update REST and JSON:API Editor tests to rely on CKEditor 5 instead of CKEditor
parent 650da65b
No related branches found
No related tags found
37 merge requests!12227Issue #3181946 by jonmcl, mglaman,!7471uncessary 5 files are moved from media-library folder to misc folder,!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4289Issue #1344552 by marcingy, Niklas Fiekas, Ravi.J, aleevas, Eduardo Morales...,!4114Issue #2707291: Disable body-level scrolling when a dialog is open as a modal,!3630Issue #2815301 by Chi, DanielVeza, kostyashupenko, smustgrave: Allow to create...,!3291Issue #3336463: Rewrite rules for gzipped CSS and JavaScript aggregates never match,!3143Issue #3313342: [PHP 8.1] Deprecated function: strpos(): Passing null to parameter #1 LayoutBuilderUiCacheContext.php on line 28,!3102Issue #3164428 by DonAtt, longwave, sahil.goyal, Anchal_gupta, alexpott: Use...,!2853#3274419 Makes BaseFieldOverride inherit the internal property from the base field.,!2719Issue #3110137: Remove Classy from core.,!2437Issue #3238257 by hooroomoo, Wim Leers: Fragment link pointing to <textarea>...,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2074Issue #2707689: NodeForm::actions() checks for delete access on new entities,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1484Exposed filters get values from URL when Ajax is on,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1254Issue #3238915: Refactor (if feasible) uses of the jQuery ready function to use VanillaJS,!1162Issue #3100350: Unable to save '/' root path alias,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!957Added throwing of InvalidPluginDefinitionException from getDefinition().,!925Issue #2339235: Remove taxonomy hard dependency on node module,!877Issue #2708101: Default value for link text is not saved,!873Issue #2875228: Site install not using batch API service,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!844Resolve #3036010 "Updaters",!712Issue #2909128: Autocomplete intermittent on Chrome Android,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
Hide whitespace changes
Inline Side-by-side
core/modules/editor/tests/src/Functional/Rest/EditorResourceTestBase.php
+ 7
− 45
View file @ 579208e4
......@@ -2,6 +2,7 @@
namespace Drupal\Tests\editor\Functional\Rest;
use Drupal\ckeditor5\Plugin\CKEditor5Plugin\Heading;
use Drupal\editor\Entity\Editor;
use Drupal\filter\Entity\FilterFormat;
use Drupal\Tests\rest\Functional\EntityResource\ConfigEntityResourceTestBase;
......@@ -14,7 +15,7 @@ abstract class EditorResourceTestBase extends ConfigEntityResourceTestBase {
/**
* {@inheritdoc}
*/
protected static $modules = ['ckeditor', 'editor'];
protected static $modules = ['ckeditor5', 'editor'];
/**
* {@inheritdoc}
......@@ -59,7 +60,7 @@ protected function createEntity() {
// Create a "Camelids" editor.
$camelids = Editor::create([
'format' => 'llama',
'editor' => 'ckeditor',
'editor' => 'ckeditor5',
]);
$camelids
->setImageUploadSettings([
......@@ -87,10 +88,10 @@ protected function getExpectedNormalizedEntity() {
'filter.format.llama',
],
'module' => [
'ckeditor',
'ckeditor5',
],
],
'editor' => 'ckeditor',
'editor' => 'ckeditor5',
'format' => 'llama',
'image_upload' => [
'status' => FALSE,
......@@ -105,49 +106,10 @@ protected function getExpectedNormalizedEntity() {
'langcode' => 'en',
'settings' => [
'toolbar' => [
'rows' => [
[
[
'name' => 'Formatting',
'items' => [
'Bold',
'Italic',
],
],
[
'name' => 'Links',
'items' => [
'DrupalLink',
'DrupalUnlink',
],
],
[
'name' => 'Lists',
'items' => [
'BulletedList',
'NumberedList',
],
],
[
'name' => 'Media',
'items' => [
'Blockquote',
'DrupalImage',
],
],
[
'name' => 'Tools',
'items' => [
'Source',
],
],
],
],
'items' => ['heading', 'bold', 'italic'],
],
'plugins' => [
'language' => [
'language_list' => 'un',
],
'ckeditor5_heading' => Heading::DEFAULT_CONFIGURATION,
],
],
'status' => TRUE,
......
core/modules/jsonapi/tests/src/Functional/EditorTest.php
+ 8
− 46
View file @ 579208e4
......@@ -2,6 +2,7 @@
namespace Drupal\Tests\jsonapi\Functional;
use Drupal\ckeditor5\Plugin\CKEditor5Plugin\Heading;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Url;
......@@ -18,7 +19,7 @@ class EditorTest extends ConfigEntityResourceTestBase {
/**
* {@inheritdoc}
*/
protected static $modules = ['filter', 'editor', 'ckeditor'];
protected static $modules = ['filter', 'editor', 'ckeditor5'];
/**
* {@inheritdoc}
......@@ -73,7 +74,7 @@ protected function createEntity() {
// Create a "Camelids" editor.
$camelids = Editor::create([
'format' => 'llama',
'editor' => 'ckeditor',
'editor' => 'ckeditor5',
]);
$camelids
->setImageUploadSettings([
......@@ -120,10 +121,10 @@ protected function getExpectedDocument() {
'filter.format.llama',
],
'module' => [
'ckeditor',
'ckeditor5',
],
],
'editor' => 'ckeditor',
'editor' => 'ckeditor5',
'image_upload' => [
'status' => FALSE,
'scheme' => 'public',
......@@ -137,49 +138,10 @@ protected function getExpectedDocument() {
'langcode' => 'en',
'settings' => [
'toolbar' => [
'rows' => [
[
[
'name' => 'Formatting',
'items' => [
'Bold',
'Italic',
],
],
[
'name' => 'Links',
'items' => [
'DrupalLink',
'DrupalUnlink',
],
],
[
'name' => 'Lists',
'items' => [
'BulletedList',
'NumberedList',
],
],
[
'name' => 'Media',
'items' => [
'Blockquote',
'DrupalImage',
],
],
[
'name' => 'Tools',
'items' => [
'Source',
],
],
],
],
'items' => ['heading', 'bold', 'italic'],
],
'plugins' => [
'language' => [
'language_list' => 'un',
],
'ckeditor5_heading' => Heading::DEFAULT_CONFIGURATION,
],
],
'status' => TRUE,
......@@ -223,7 +185,7 @@ protected function createAnotherEntity($key) {
$entity = Editor::create([
'format' => 'pachyderm',
'editor' => 'ckeditor',
'editor' => 'ckeditor5',
]);
$entity->setImageUploadSettings([
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment