Browse Source

Merge pull request #2134 from dereuromark/master-test-case

Make tests pass on win.
Mark Story 12 years ago
parent
commit
d4ecb7d185

+ 1 - 0
lib/Cake/Test/Case/Utility/DebuggerTest.php

@@ -451,6 +451,7 @@ TEXT;
 		if (file_exists(LOGS . 'debug.log')) {
 			unlink(LOGS . 'debug.log');
 		}
+		CakeLog::config('file', array('engine' => 'File', 'path' => TMP . 'logs' . DS));
 
 		Debugger::log('cool');
 		$result = file_get_contents(LOGS . 'debug.log');

+ 4 - 4
lib/Cake/Test/Case/Utility/XmlTest.php

@@ -454,7 +454,7 @@ XML;
 
 XML;
 		$xmlResponse = Xml::fromArray($xml, array('pretty' => false));
-		$this->assertEquals($expected, $xmlResponse->asXML());
+		$this->assertTextEquals($expected, $xmlResponse->asXML());
 
 		$expected = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
@@ -471,7 +471,7 @@ XML;
 
 XML;
 		$xmlResponse = Xml::fromArray($xml, array('pretty' => true));
-		$this->assertEquals($expected, $xmlResponse->asXML());
+		$this->assertTextEquals($expected, $xmlResponse->asXML());
 
 				$xml = array(
 			'tags' => array(
@@ -494,7 +494,7 @@ XML;
 
 XML;
 		$xmlResponse = Xml::fromArray($xml, array('pretty' => false, 'format' => 'attributes'));
-		$this->assertEquals($expected, $xmlResponse->asXML());
+		$this->assertTextEquals($expected, $xmlResponse->asXML());
 
 		$expected = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
@@ -505,7 +505,7 @@ XML;
 
 XML;
 		$xmlResponse = Xml::fromArray($xml, array('pretty' => true, 'format' => 'attributes'));
-		$this->assertEquals($expected, $xmlResponse->asXML());
+		$this->assertTextEquals($expected, $xmlResponse->asXML());
 	}
 
 /**