Skip to content
Snippets Groups Projects

dev#160166 : CkEditor placeholders plugin

Merged Alex Arnaud requested to merge dev#160166_newsletters_placeholders into master
All threads resolved!
Compare and Show latest version
4 files
+ 28
33
Preferences
Compare changes
Files
4
@@ -1067,11 +1067,6 @@ abstract class Admin_NewsletterControllerPreviewActionPlaceHoldersTestCase exten
}
public function expectedLine() {
return array_map(fn($elt)=> [$elt],file($this->_file_path));
}
/** @test */
public function placeholderNewsletterRecordsShouldHaveBeenRemoved() {
$this->assertNotXPathContentContains('//body', '[newsletter_records]');
@@ -1084,11 +1079,10 @@ abstract class Admin_NewsletterControllerPreviewActionPlaceHoldersTestCase exten
}
/** @test
* @dataProvider expectedLine
*/
public function contentShouldBeAsExpected(string $expected_line) {
$this->assertContains( $expected_line, $this->_response->getBody());
/** @test */
public function contentShouldBeAsExpected() {
$this->assertContains( str_replace('ROOT_URL', BASE_URL, file_get_contents($this->_file_path)),
$this->_response->getBody());
}
}
@@ -1096,12 +1090,19 @@ abstract class Admin_NewsletterControllerPreviewActionPlaceHoldersTestCase exten
class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHoldersTest
class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHoldersAsTextTest
extends Admin_NewsletterControllerPreviewActionPlaceHoldersTestCase {
protected string $_file_path =__DIR__.'/newsletter_placeholder_content_expected.txt';
}
class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHoldersAsHtmlTest
extends Admin_NewsletterControllerPreviewActionPlaceHoldersTestCase {
protected string $_file_path =__DIR__.'/newsletter_placeholder_content_expected.html';
}
@@ -1160,7 +1161,7 @@ class Admin_NewsletterControllerPreviewActionWithPlaceHoldersAndRenderWidgetTest
/**
* @group ignore
*/
public function contentShouldBeAsExpected(string $expected_line) {}
public function contentShouldBeAsExpected() {}
}
@@ -1192,7 +1193,7 @@ class Admin_NewsletterControllerPreviewActionWithPlaceHoldersAndRenderWidgetWith
/**
* @group ignore
*/
public function contentShouldBeAsExpected(string $expected_line) {}
public function contentShouldBeAsExpected() {}
}
@@ -1224,7 +1225,7 @@ class Admin_NewsletterControllerPreviewActionWithPlaceHoldersAndRenderWidgetWith
/**
* @group ignore
*/
public function contentShouldBeAsExpected(string $expected_line) {}
public function contentShouldBeAsExpected() {}
}