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
1 file
+ 29
30
Preferences
Compare changes
@@ -1011,20 +1011,33 @@ abstract class Admin_NewsletterControllerPreviewActionTestCase
class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHoldersTest
extends Admin_NewsletterControllerPreviewActionTestCase {
abstract class Admin_NewsletterControllerPreviewActionPlaceHoldersTestCase extends Admin_NewsletterControllerPreviewActionTestCase{
protected Class_Newsletter $_newsletter;
public function setUp() {
parent::setUp();
Class_Newsletter::find(3)->setContenu("Top\n[newsletter_records]\nMiddle\n[newsletter_articles]\nfooter")
->save();
$this->_newsletter = Class_Newsletter::find(3);
$this->_newsletter
->setContenu("Top\n[newsletter_records]\nMiddle\n[newsletter_articles]\nfooter");
$this->_customizeNewsletter($this->_newsletter);
$this->_newsletter
->save();
$this->dispatch('/admin/newsletter/preview/id/3');
}
protected function _customizeNewsletter(Class_Newsletter $newsletter){
}
}
class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHoldersTest
extends Admin_NewsletterControllerPreviewActionPlaceHoldersTestCase {
protected function _expectedText() {
return file_get_contents(__DIR__.'/newsletter_placeholder_content_expected.txt');
}
@@ -1062,18 +1075,11 @@ class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHolder
class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHoldersWithoutCatalogueTest
extends Admin_NewsletterControllerPreviewActionTestCase {
extends Admin_NewsletterControllerPreviewActionPlaceHoldersTestCase {
public function setUp() {
parent::setUp();
Class_Newsletter::find(3)
->setIdCatalogue(0)
->setContenu("Top\n[newsletter_records]\nMiddle\n[newsletter_articles]\nfooter")
->save();
$this->dispatch('/admin/newsletter/preview/id/3');
protected function _customizeNewsletter(Class_Newsletter $newsletter) {
$newsletter
->setIdCatalogue(0);
}
@@ -1083,7 +1089,7 @@ class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHolder
/** @test */
public function pageShouldLoad() {
public function pageShouldContainsExpectedText() {
$this->assertContains($this->_expectedText(), $this->_response->getBody());
}
}
@@ -1092,19 +1098,12 @@ class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHolder
class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHoldersWithoutArticlesTes
extends Admin_NewsletterControllerPreviewActionTestCase {
extends Admin_NewsletterControllerPreviewActionPlaceHoldersTestCase {
public function setUp() {
parent::setUp();
Class_Newsletter::find(3)
protected function _customizeNewsletter(Class_Newsletter $newsletter) {
$newsletter
->setArticlesIds(0)
->setArticlesCategoriesIds(0)
->setContenu("Top\n[newsletter_records]\nMiddle\n[newsletter_articles]\nfooter")
->save();
$this->dispatch('/admin/newsletter/preview/id/3');
->setArticlesCategoriesIds(0);
}
@@ -1114,7 +1113,7 @@ class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHolder
/** @test */
public function pageShouldLoad() {
public function pageShouldContainsExpectedText() {
$this->assertContains($this->_expectedText(), $this->_response->getBody());
}
}