Adjust tests.

src/View/Helper/FlashHelper.php

@@ -36,14 +36,14 @@ class FlashHelper extends Helper {
 	 */
 	public function render(array $types = array()) {
 		// Get the messages from the session
-		$messages = (array)$this->Session->read('messages');
-		$cMessages = (array)Configure::read('messages');
+		$messages = (array)$this->Session->read('FlashMessage');
+		$cMessages = (array)Configure::read('FlashMessage');
 		if (!empty($cMessages)) {
 			$messages = (array)Hash::merge($messages, $cMessages);
 		}
 		$html = '';
 		if (!empty($messages)) {
-			$html = '<div class="flash-messages flashMessages">';
+			$html = '<div class="flash-messages">';
 
 			if ($types) {
 				foreach ($types as $type) {
@@ -67,12 +67,12 @@ class FlashHelper extends Helper {
 			$html .= '</div>';
 			if ($types) {
 				foreach ($types as $type) {
-					$this->request->session()->delete('messages.' . $type);
-					Configure::delete('messages.' . $type);
+					$this->request->session()->delete('FlashMessage.' . $type);
+					Configure::delete('FlashMessage.' . $type);
 				}
 			} else {
-				$this->request->session()->delete('messages');
-				Configure::delete('messages');
+				$this->request->session()->delete('FlashMessage');
+				Configure::delete('FlashMessage');
 			}
 		}
 
@@ -89,7 +89,7 @@ class FlashHelper extends Helper {
 	 * @return string HTML
 	 */
 	public function message($msg, $type = 'info', $escape = true) {
-		$html = '<div class="flash-messages flashMessages">';
+		$html = '<div class="flash-messages">';
 		if ($escape) {
 			$msg = h($msg);
 		}

tests/TestCase/View/Helper/FlashHelperTest.php

@@ -31,7 +31,7 @@ class FlashHelperTest extends TestCase {
 	 */
 	public function testMessage() {
 		$result = $this->Flash->message(h('Foo & bar'), 'success');
-		$expected = '<div class="flash-messages flashMessages"><div class="message success">Foo &amp;amp; bar</div></div>';
+		$expected = '<div class="flash-messages"><div class="message success">Foo &amp;amp; bar</div></div>';
 		$this->assertEquals($expected, $result);
 	}
 
@@ -44,7 +44,7 @@ class FlashHelperTest extends TestCase {
 		$this->Flash->addTransientMessage(h('Foo & bar'), 'success');
 
 		$result = $this->Flash->render();
-		$expected = '<div class="flash-messages flashMessages"><div class="message success">Foo &amp; bar</div></div>';
+		$expected = '<div class="flash-messages"><div class="message success">Foo &amp; bar</div></div>';
 		$this->assertEquals($expected, $result);
 
 		$this->Flash->addTransientMessage('I am an error', 'error');
@@ -77,15 +77,15 @@ class FlashHelperTest extends TestCase {
 		$this->Flash->addTransientMessage('I am sth custom', 'custom');
 
 		$result = $this->Flash->render(array('warning', 'error'));
-		$expected = '<div class="flash-messages flashMessages"><div class="message warning">I am a warning</div><div class="message error">I am an error</div></div>';
+		$expected = '<div class="flash-messages"><div class="message warning">I am a warning</div><div class="message error">I am an error</div></div>';
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Flash->render(array('info'));
-		$expected = '<div class="flash-messages flashMessages"><div class="message info">I am some info</div><div class="message info">I am also some info</div></div>';
+		$expected = '<div class="flash-messages"><div class="message info">I am some info</div><div class="message info">I am also some info</div></div>';
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Flash->render();
-		$expected = '<div class="flash-messages flashMessages"><div class="message custom">I am sth custom</div></div>';
+		$expected = '<div class="flash-messages"><div class="message custom">I am sth custom</div></div>';
 		$this->assertEquals($expected, $result);
 	}