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

Issue #2003430 by Wim Leers, ebeyrent, DmitryDrozdik, pwieck: Convert CKEditor tests to use ->container instead of drupal_container().

8.0.x
webchick 2013-08-10 00:55:58 -07:00
parent c8a5c8e364
commit aac3160d50
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
View File

@ -47,8 +47,7 @@ class CKEditorAdminTest extends WebTestBase {
}
function testAdmin() {
$manager = drupal_container()->get('plugin.manager.editor');
$ckeditor = $manager->createInstance('ckeditor');
$ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
$this->drupalLogin($this->admin_user);
$this->drupalGet('admin/config/content/formats/manage/filtered_html');
@ -147,7 +146,7 @@ class CKEditorAdminTest extends WebTestBase {
// Now enable the ckeditor_test module, which provides one configurable
// CKEditor plugin — this should not affect the Editor config entity.
module_enable(array('ckeditor_test'));
drupal_container()->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
$this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
$this->drupalGet('admin/config/content/formats/manage/filtered_html');
$ultra_llama_mode_checkbox = $this->xpath('//input[@type="checkbox" and @name="editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]" and not(@checked)]');
$this->assertTrue(count($ultra_llama_mode_checkbox) === 1, 'The "Ultra llama mode" checkbox exists and is not checked.');

15
core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php
View File

@ -74,8 +74,7 @@ class CKEditorTest extends DrupalUnitTestBase {
$editor->save();
// Create "CKEditor" text editor plugin instance.
$this->manager = $this->container->get('plugin.manager.editor');
$this->ckeditor = $this->manager->createInstance('ckeditor');
$this->ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
}
/**
@ -108,8 +107,8 @@ class CKEditorTest extends DrupalUnitTestBase {
// Customize the configuration: add button, have two contextually enabled
// buttons, and configure a CKEditor plugin setting.
$this->enableModules(array('ckeditor_test'));
$this->manager->clearCachedDefinitions();
$this->ckeditor = $this->manager->createInstance('ckeditor');
$this->container->get('plugin.manager.editor')->clearCachedDefinitions();
$this->ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
$this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
$editor->settings['toolbar']['buttons'][0][] = 'Strike';
$editor->settings['toolbar']['buttons'][1][] = 'Format';
@ -218,7 +217,7 @@ class CKEditorTest extends DrupalUnitTestBase {
// Enable the editor_test module, customize further.
$this->enableModules(array('ckeditor_test'));
drupal_container()->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
$this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
$editor->settings['toolbar']['buttons'][0][] = 'Llama';
$editor->save();
$expected[count($expected)-2]['items'][] = 'Llama';
@ -248,8 +247,7 @@ class CKEditorTest extends DrupalUnitTestBase {
*/
function testInternalGetConfig() {
$editor = entity_load('editor', 'filtered_html');
$manager = drupal_container()->get('plugin.manager.ckeditor.plugin');
$internal_plugin = $manager->createInstance('internal');
$internal_plugin = $this->container->get('plugin.manager.ckeditor.plugin')->createInstance('internal');
// Default toolbar.
$expected = $this->getDefaultInternalConfig();
@ -267,8 +265,7 @@ class CKEditorTest extends DrupalUnitTestBase {
*/
function testStylesComboGetConfig() {
$editor = entity_load('editor', 'filtered_html');
$manager = drupal_container()->get('plugin.manager.ckeditor.plugin');
$stylescombo_plugin = $manager->createInstance('stylescombo');
$stylescombo_plugin = $this->container->get('plugin.manager.ckeditor.plugin')->createInstance('stylescombo');
// Styles dropdown/button enabled: new setting should be present.
$editor->settings['toolbar']['buttons'][0][] = 'Styles';