tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Fixed SiteTreeTest->testCompareVersions() to work regardless of used HTMLCleaner implementation (was failing if lib_tidy wasn't available)

Browse Source
This commit is contained in:
Ingo Schommer 2011-04-06 22:16:46 +12:00
parent 842c38fbc4
commit 446b8bae63
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/model/SiteTreeTest.php
View File

@ -509,11 +509,18 @@ class SiteTreeTest extends SapphireTest {
} }
function testCompareVersions() { function testCompareVersions() {
// Necessary to avoid
$oldCleanerClass = Diff::$html_cleaner_class;
Diff::$html_cleaner_class = 'SiteTreeTest_NullHtmlCleaner';
$page = new Page(); $page = new Page();
$page->write(); $page->write();
$this->assertEquals(1, $page->Version); $this->assertEquals(1, $page->Version);
$page->Content = "<p>This is a test</p>"; // Use inline element to avoid double wrapping applied to
// blocklevel elements depending on HTMLCleaner implementation:
// <ins><p> gets converted to <ins><p><inst>
$page->Content = "<span>This is a test</span>";
$page->write(); $page->write();
$this->assertEquals(2, $page->Version); $this->assertEquals(2, $page->Version);
@ -522,8 +529,9 @@ class SiteTreeTest extends SapphireTest {
$processedContent = trim($diff->Content); $processedContent = trim($diff->Content);
$processedContent = preg_replace('/\s*</','<',$processedContent); $processedContent = preg_replace('/\s*</','<',$processedContent);
$processedContent = preg_replace('/>\s*/','>',$processedContent); $processedContent = preg_replace('/>\s*/','>',$processedContent);
$this->assertEquals("<ins><p><ins>This is a test</ins></p></ins>", $processedContent); $this->assertEquals("<ins><span>This is a test</span></ins>", $processedContent);
Diff::$html_cleaner_class = $oldCleanerClass;
} }
function testAuthorIDAndPublisherIDFilledOutOnPublish() { function testAuthorIDAndPublisherIDFilledOutOnPublish() {
@ -759,4 +767,8 @@ class SiteTreeTest_Conflicted_Controller extends Page_Controller implements Test
} }
/**#@-*/ class SiteTreeTest_NullHtmlCleaner extends HTMLCleaner {
function cleanHTML($html) {
return $html;
}
}