MDL-76867 core_admin: Remove tinymce following MDL-77308

moodle · Mar 14, 2023 · 0b54a57 · 0b54a57
1 parent 734f544
commit 0b54a57
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/admin/tests/external/set_plugin_order_test.php b/admin/tests/external/set_plugin_order_test.php
@@ -77,50 +77,46 @@ public function execute_editor_provider(): array {
             [
                 'initialstate' => 'textarea,tiny',
                 'pluginname' => 'editor_textarea',
-                1, // DOWN.
+                'direction' => 1, // DOWN.
                 'expected' => [
                     'tiny',
                     'textarea',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'tiny,textarea',
             ],
             [
                 'initialstate' => 'textarea,tiny',
                 'pluginname' => 'editor_textarea',
-                -1, // UP.
+                'direction' => -1, // UP.
                 'expected' => [
                     'textarea',
                     'tiny',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'textarea,tiny',
             ],
             [
                 'initialstate' => 'textarea,tiny',
                 'pluginname' => 'editor_tiny',
-                1, // DOWN.
+                'direction' => 1, // DOWN.
                 // Tiny is already at the bottom of the list of enabled plugins.
                 'expected' => [
                     'textarea',
                     'tiny',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'textarea,tiny',
             ],
             [
                 'initialstate' => 'textarea,tiny',
                 'pluginname' => 'editor_atto',
-                1, // DOWN.
+                'direction' => 1, // DOWN.
                 // Atto is not enabled. Disabled editors are listed lexically after enabled editors.
                 'expected' => [
                     'textarea',
                     'tiny',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'textarea,tiny',
             ],

diff --git a/lib/tests/plugininfo/editor_test.php b/lib/tests/plugininfo/editor_test.php
@@ -141,7 +141,6 @@ public function get_sorted_plugins_provider(): array {
 
                     // Disabled editors are listed alphabetically at the end.
                     'atto',
-                    'tinymce',
                 ],
             ],
             [
@@ -153,7 +152,6 @@ public function get_sorted_plugins_provider(): array {
                     // Disabled editors are listed alphabetically at the end.
                     'atto',
                     'textarea',
-                    'tinymce',
                 ],
             ],
         ];
@@ -204,7 +202,6 @@ public function change_plugin_order_provider(): array {
                     'tiny',
                     'textarea',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'tiny,textarea',
             ],
@@ -217,7 +214,6 @@ public function change_plugin_order_provider(): array {
                     'textarea',
                     'tiny',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'textarea,tiny',
             ],
@@ -230,7 +226,6 @@ public function change_plugin_order_provider(): array {
                     'textarea',
                     'tiny',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'textarea,tiny',
             ],
@@ -242,7 +237,6 @@ public function change_plugin_order_provider(): array {
                     'tiny',
                     'textarea',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'tiny,textarea',
             ],
@@ -255,7 +249,6 @@ public function change_plugin_order_provider(): array {
                     'tiny',
                     'textarea',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'tiny,textarea',
             ],
@@ -268,20 +261,18 @@ public function change_plugin_order_provider(): array {
                     'textarea',
                     'tiny',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'textarea,tiny',
             ],
             [
                 'texteditors' => 'textarea,tiny',
-                'pluginname' => 'tinymce',
+                'pluginname' => 'atto',
                 'direction' => base::MOVE_UP,
-                // TinyMCE is not enabled. No change expected.
+                // Atto is not enabled. No change expected.
                 'expected' => [
                     'textarea',
                     'tiny',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'textarea,tiny',
             ],
@@ -294,7 +285,6 @@ public function change_plugin_order_provider(): array {
                     'textarea',
                     'tiny',
                     'atto',
-                    'tinymce',
                 ],
                 'newtexteditors' => 'textarea,tiny',
             ],