Added test for asserting flash after they're rendered

jeremyharris · jeremyharris · commit a33cb7f372ed · 2017-05-05T09:01:59.000-05:00
diff --git a/tests/TestCase/TestSuite/IntegrationTestCaseTest.php b/tests/TestCase/TestSuite/IntegrationTestCaseTest.php
@@ -405,6 +405,20 @@ public function testFlashSessionAndCookieAssertsHttpServer()
         $this->assertCookie(1, 'remember_me');
     }
 
+    /**
+     * Test flash assertions stored with enableRememberFlashMessages() after they
+     * are rendered
+     *
+     * @return void
+     */
+    public function testFlashAssertionsAfterRender()
+    {
+        $this->enableRememberFlashMessages();
+        $this->get('/posts/index/with_flash');
+
+        $this->assertSession('An error message', 'Flash.flash.0.message');
+    }
+
     /**
      * Tests the failure message for assertCookieNotSet
      *
diff --git a/tests/test_app/TestApp/Controller/PostsController.php b/tests/test_app/TestApp/Controller/PostsController.php
@@ -48,16 +48,18 @@ public function beforeFilter(Event $event)
     /**
      * Index method.
      *
+     * @param string $layout
      * @return void
      */
-    public function index()
+    public function index($layout = 'default')
     {
         $this->Flash->error('An error message');
         $this->response->cookie([
             'name' => 'remember_me',
             'value' => 1
         ]);
         $this->set('test', 'value');
+        $this->viewBuilder()->setLayout($layout);
     }
 
     /**
diff --git a/tests/test_app/TestApp/Template/Element/Flash/error.ctp b/tests/test_app/TestApp/Template/Element/Flash/error.ctp
@@ -0,0 +1 @@
+<div class="message"><?= h($message); ?></div>
diff --git a/tests/test_app/TestApp/Template/Layout/with_flash.ctp b/tests/test_app/TestApp/Template/Layout/with_flash.ctp
@@ -0,0 +1,43 @@
+<?php
+$this->loadHelper('Html');
+
+$cakeDescription = 'CakePHP: the rapid development php framework';
+?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <?= $this->Html->charset(); ?>
+    <title>
+        <?= $cakeDescription ?>:
+        <?= $this->fetch('title'); ?>
+    </title>
+    <?php
+        echo $this->Html->meta('icon');
+
+        echo $this->Html->css('cake.generic');
+
+        echo $this->fetch('script');
+    ?>
+</head>
+<body>
+    <div id="container">
+        <div id="header">
+            <h1><?= $this->Html->link($cakeDescription, 'http://cakephp.org'); ?></h1>
+        </div>
+        <div id="content">
+
+            <?= $this->Flash->render(); ?>
+            <?= $this->fetch('content'); ?>
+
+        </div>
+        <div id="footer">
+            <?= $this->Html->link(
+                    $this->Html->image('cake.power.gif', ['alt' => $cakeDescription, 'border' => '0']),
+                    'http://www.cakephp.org/',
+                    ['target' => '_blank', 'escape' => false]
+                );
+            ?>
+        </div>
+    </div>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -48,16 +48,18 @@ public function beforeFilter(Event $event)`
`48`	`48`	`/**`
`49`	`49`	`* Index method.`
`50`	`50`	`*`
	`51`	`+ * @param string $layout`
`51`	`52`	`* @return void`
`52`	`53`	`*/`
`53`		`- public function index()`
	`54`	`+ public function index($layout = 'default')`
`54`	`55`	`{`
`55`	`56`	`$this->Flash->error('An error message');`
`56`	`57`	`$this->response->cookie([`
`57`	`58`	`'name' => 'remember_me',`
`58`	`59`	`'value' => 1`
`59`	`60`	`]);`
`60`	`61`	`$this->set('test', 'value');`
	`62`	`+ $this->viewBuilder()->setLayout($layout);`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<div class="message"><?= h($message); ?></div>`