Fixed testcase for empty enclosure to be Cake 3.x compliant.

Changed strict check for enclosure from null to '' null delimiter is changed to '"'.
FriendsOfCake · Aug 30, 2015 · eda31f4 · eda31f4
1 parent 591a70f
commit eda31f4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/View/CsvView.php b/src/View/CsvView.php
@@ -350,7 +350,7 @@ protected function _generateRow($row = null)
         $newline = $this->viewVars['_newline'];
 
         $row = str_replace(["\r\n", "\n", "\r"], $newline, $row);
-        if ($enclosure === null) {
+        if ($enclosure === '') {
             // fputcsv does not supports empty enclosure
             if (fputs($fp, implode($delimiter, $row) . "\n") === false) {
                 return false;

diff --git a/tests/TestCase/View/CsvViewTest.php b/tests/TestCase/View/CsvViewTest.php
@@ -267,8 +267,8 @@ public function testPassingQueryAsData()
      */
     public function testRenderEnclosure() 
     {
-        $Request = new CakeRequest();
-        $Response = new CakeResponse();
+        $Request = new Request();
+        $Response = new Response();
         $Controller = new Controller($Request, $Response);
         $data = array(array('user', 'fake apple', 'list', 'a b c', 'item2'));
         $testData = array(
@@ -277,12 +277,15 @@ public function testRenderEnclosure()
             '' => "user,fake apple,list,a b c,item2" . PHP_EOL,
         );
 
-        foreach ($testData as $enclosure => $output) {
-            $Controller->set(array('data' => $data, '_serialize' => 'data', '_enclosure' => $enclosure));
-            $View = new CsvView($Controller);
-            $renderOutput = $View->render(false);
-            $this->assertSame($renderOutput, $output);
-            $this->assertSame('text/csv', $Response->type());
+        foreach ($testData as $enclosure => $expected) {
+            $_serialize = 'data';
+            $this->view->set('data', $data);
+            $this->view->set(['_serialize' => 'data']);
+            $this->view->viewVars['_enclosure'] = $enclosure;
+            $output = $this->view->render(false);
+
+            $this->assertSame($expected, $output);
+            $this->assertSame('text/csv', $this->response->type());
         }
     }
 }