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

Issue #2843693 by droplet, michielnugter, xjm, Mixologic, klausi: Random test failure in CKEditor AjaxCss

8.4.x
Alex Pott 2017-03-28 14:19:58 +01:00
parent 5222fbfefd
commit 956497377e
1 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
core/modules/ckeditor/tests/src/FunctionalJavascript/AjaxCssTest.php
View File

@ -41,31 +41,41 @@ class AjaxCssTest extends JavascriptTestBase {
* Tests adding style sheets dynamically to CKEditor. * Tests adding style sheets dynamically to CKEditor.
*/ */
public function testCkeditorAjaxAddCss() { public function testCkeditorAjaxAddCss() {
// Skip test until #2843693 is fixed.
$this->markTestSkipped();
$this->drupalGet('/ckeditor_test/ajax_css'); $this->drupalGet('/ckeditor_test/ajax_css');
$session = $this->getSession(); $session = $this->getSession();
$assert = $this->assertSession(); $page = $session->getPage();
$this->waitOnCkeditorInstance('edit-iframe-value');
$this->waitOnCkeditorInstance('edit-inline');
$style_color = 'rgb(255, 0, 0)'; $style_color = 'rgb(255, 0, 0)';
// Add the inline CSS and assert that the style is applied to the main body, // Add the inline CSS and assert that the style is applied to the main body,
// but not the iframe. // but not the iframe.
$session->getPage()->pressButton('Add CSS to inline CKEditor instance'); $page->pressButton('Add CSS to inline CKEditor instance');
$assert->assertWaitOnAjaxRequest();
$this->assertEquals($style_color, $this->getEditorStyle('edit-inline', 'color')); $result = $page->waitFor(10, function() use ($style_color) {
$this->assertNotEquals($style_color, $this->getEditorStyle('edit-iframe-value', 'color')); return ($this->getEditorStyle('edit-inline', 'color') == $style_color)
&& ($this->getEditorStyle('edit-iframe-value', 'color') != $style_color);
});
$this->assertTrue($result);
$session->reload(); $session->reload();
$this->waitOnCkeditorInstance('edit-iframe-value');
$this->waitOnCkeditorInstance('edit-inline');
// Add the iframe CSS and assert that the style is applied to the iframe, // Add the iframe CSS and assert that the style is applied to the iframe,
// but not the main body. // but not the main body.
$session->getPage()->pressButton('Add CSS to iframe CKEditor instance'); $page->pressButton('Add CSS to iframe CKEditor instance');
$assert->assertWaitOnAjaxRequest();
$this->assertNotEquals($style_color, $this->getEditorStyle('edit-inline', 'color')); $result = $page->waitFor(10, function() use ($style_color) {
$this->assertEquals($style_color, $this->getEditorStyle('edit-iframe-value', 'color')); return ($this->getEditorStyle('edit-inline', 'color') != $style_color)
&& ($this->getEditorStyle('edit-iframe-value', 'color') == $style_color);
});
$this->assertTrue($result);
} }
/** /**
@ -88,4 +98,26 @@ class AjaxCssTest extends JavascriptTestBase {
return $this->getSession()->evaluateScript($js); return $this->getSession()->evaluateScript($js);
} }
/**
* Wait for a CKEditor instance to finish loading and initializing.
*
* @param string $instance_id
* The CKEditor instance ID.
* @param int $timeout
* (optional) Timeout in milliseconds, defaults to 10000.
*/
protected function waitOnCkeditorInstance($instance_id, $timeout = 10000) {
$condition = <<<JS
(function() {
return (
typeof CKEDITOR !== 'undefined'
&& typeof CKEDITOR.instances["$instance_id"] !== 'undefined'
&& CKEDITOR.instances["$instance_id"].instanceReady
);
}());
JS;
$this->getSession()->wait($timeout, $condition);
}
} }