[#14349] - Fixing tests

phalcon · Sep 7, 2019 · ced0bb4 · ced0bb4
1 parent 6000b5a
commit ced0bb4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/tests/unit/Flash/Direct/Helper/FlashBase.php b/tests/unit/Flash/Direct/Helper/FlashBase.php
@@ -12,18 +12,15 @@
 
 namespace Phalcon\Test\Unit\Flash\Direct\Helper;
 
+use Phalcon\Escaper;
 use Phalcon\Flash\Direct;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class FlashBase
 {
-    use DiTrait;
-
-    private $notImplicit = false;
-    private $notHtml     = false;
     private $classes     = null;
-    private $escaper     = null;
+    private $notHtml     = false;
+    private $notImplicit = false;
 
     private $default = [
         'success' => 'successMessage',
@@ -32,11 +29,6 @@ class FlashBase
         'error'   => 'errorMessage',
     ];
 
-    public function _before(UnitTester $I)
-    {
-        $this->escaper = $this->newEscaper();
-    }
-
     /**
      * Tests warning (implicit flush)
      *
@@ -65,7 +57,7 @@ public function testFlashDirectImplicitFlushHtml(UnitTester $I)
      */
     private function stringTest(UnitTester $I, string $function)
     {
-        $flash   = new Direct($this->escaper);
+        $flash = new Direct(new Escaper());
         $flash->setClasses($this->classes);
 
         $message = 'sample message';
@@ -216,7 +208,7 @@ public function testFlashDirectNoImplicitFlushNoHtml(UnitTester $I)
      */
     public function testFlashDirectWithAutoEscaping(UnitTester $I)
     {
-        $flash   = new Direct($this->escaper);
+        $flash = new Direct(new Escaper());
         $flash->setClasses($this->classes);
 
         $flash->setAutomaticHtml(false);

diff --git a/tests/unit/Flash/DirectCest.php b/tests/unit/Flash/DirectCest.php
@@ -101,9 +101,9 @@ protected function getFlash()
     {
         $container = $this->getDi();
 
-        $flash = new Direct($this->classes);
-
+        $flash = new Direct();
         $flash->setDI($container);
+        $flash->setClasses($this->classes);
 
         return $flash;
     }

diff --git a/tests/unit/Flash/Session/OutputCest.php b/tests/unit/Flash/Session/OutputCest.php
@@ -77,9 +77,9 @@ public function emptyFlashSessionOutput(UnitTester $I)
     protected function getFlash()
     {
         $container = $this->getDi();
-        $flash     = new Session($this->classes);
-
+        $flash     = new Session();
         $flash->setDI($container);
+        $flash->setClasses($this->classes);
 
         return $flash;
     }

diff --git a/tests/unit/Flash/Session/SetCustomTemplateCest.php b/tests/unit/Flash/Session/SetCustomTemplateCest.php
@@ -44,9 +44,9 @@ protected function getFlash()
     {
         $container = $this->getDi();
 
-        $flash = new Session($this->classes);
-
+        $flash     = new Session();
         $flash->setDI($container);
+        $flash->setClasses($this->classes);
 
         return $flash;
     }