Merge branch 'hotline_6.59' into 'master'

Hotline 6.59

See merge request !614

tests/application/modules/AbstractControllerTestCase.php

@@ -219,15 +219,10 @@ abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTe
 		if ($content == null)
 			$content = $this->_response->getBody();
 
-		$httpClient = new Zend_Http_Client();
-		$httpClient->setUri('https://html5.validator.nu/');
-		$httpClient->setMethod(Zend_Http_Client::POST);
-		$httpClient->setEncType(Zend_Http_Client::ENC_FORMDATA);
-		$httpClient->setParameterPost('out', 'text');
-		$httpClient->setParameterPost('parser', 'html5');
-		$httpClient->setParameterPost('content', $content);
-		$httpClient->setParameterPost('showsource', 'yes');
-		$httpClient->setParameterPost('showoutline', 'yes');
+		$httpClient = (new Zend_Http_Client('http://sandbox.pergame.net/html-validator/'))
+			->setMethod(Zend_Http_Client::POST)
+			->setEncType(Zend_Http_Client::ENC_FORMDATA)
+			->setParameterPost('content', $content);
 		$response = $httpClient->request()->getBody();
 
 		$content_lines = explode("\n", $content);
@@ -236,7 +231,7 @@ abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTe
 			$content_with_lines .= sprintf("%4s %s\n", $i + 1, $line);
 		}
 
-		$this->assertContains('is valid HTML', $response, $content_with_lines);
+		$this->assertContains('No errors found', $response, $content_with_lines);
 	}
 
 

tests/library/ZendAfi/View/Helper/CkEditorTest.php

@@ -78,6 +78,6 @@ class CkEditorViewHelperTest extends ViewHelperTestCase {
 
 	/** @test */
 	public function cmsFormulaireShouldAllowStyleAttribute() {
-		$this->assertContains('"extraAllowedContent":{"audio video":{"attributes":"*"},"source":{"attributes":["src","type"]},"map":{"attributes":"name"},"area":{"attributes":["shape","coords","href","alt"]},"span":{"classes":"*"},"*":{"styles":"*"}}', $this->_html);
+		$this->assertContains('"extraAllowedContent":{"audio video":{"attributes":"*"},"source":{"attributes":["src","type"]},"map":{"attributes":"name"},"area":{"attributes":["shape","coords","href","alt"]},"span":{"classes":"*"},"*":{"attributes":"id","styles":"*"}}', $this->_html);
 	}
 }