Merge branch 'develop'

guenbakku · Jul 27, 2017 · 9c4c518 · 9c4c518
2 parents 1f6bf22 + cbef400
commit 9c4c518
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Pdf.php b/src/Pdf.php
@@ -99,7 +99,9 @@ public function add($html, $breakPage = false) {
      * @return  string|null: pdf content or null if output to file
      */
     public function render($output = null, $options = array(), $overwrite = false) {
-        $this->output($output);
+        if ($output !== null) {
+            $this->output($output);
+        }
         if (empty($this->output)) {
             return $this->Snappy->getOutputFromHtml($this->html, $options);
         } else {

diff --git a/tests/TestCase/PdfTest.php b/tests/TestCase/PdfTest.php
@@ -36,6 +36,13 @@ public function testInstanceSnappy() {
         $this->assertEquals($Snappy, $this->Pdf->getSnappy());
     }
 
+    public function testOuput() {
+        $this->Pdf->add('<p>Test</p>');
+        $this->Pdf->output($this->output);
+        $this->Pdf->render();
+        $this->assertEquals(true, is_file($this->output));
+    }
+
     public function testGenerateFileByAdd() {
         $this->Pdf->add('<p>Test</p>');
         $this->Pdf->render($this->output);