Merge pull request #76 from KnightAR/FixTests

Fix tests
spiritix · Nov 14, 2019 · 2320216 · 2320216
2 parents 7a2690c + b3c9a3c
commit 2320216
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "phpunit/phpunit": "~7.0",
         "codeclimate/php-test-reporter": "dev-master",
         "orchestra/testbench": "~3.7",
-        "laracasts/TestDummy": "~2.3",
+        "laracasts/testdummy": "~2.3",
         "mockery/mockery": "^1.0"
     },
     "suggest": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -7,8 +7,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
+         stopOnFailure="false">
     <logging>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>

diff --git a/tests/CacheTest.php b/tests/CacheTest.php
@@ -6,7 +6,7 @@ class CacheTest extends TestCase
 {
     private $cache;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/EncoderTest.php b/tests/EncoderTest.php
@@ -8,7 +8,7 @@ class EncoderTest extends TestCase
 {
     private $encoder;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/HasherTest.php b/tests/HasherTest.php
@@ -9,7 +9,7 @@ class HasherTest extends TestCase
 {
     private $hasher;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php
@@ -11,7 +11,7 @@ class IntegrationTest extends TestCase
 {
     private $cache;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/InvalidatorTest.php b/tests/InvalidatorTest.php
@@ -8,7 +8,7 @@ class InvalidatorTest extends TestCase
 
     private $invalidator;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/ManagerTest.php b/tests/ManagerTest.php
@@ -9,7 +9,7 @@ class ManagerTest extends TestCase
 {
     private $stub;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -8,7 +8,7 @@ class RedisTest extends TestCase
 {
     private $redis;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/TaggerTest.php b/tests/TaggerTest.php
@@ -13,7 +13,7 @@ class TaggerTest extends TestCase
 
     private $redis;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -20,7 +20,7 @@ public function __construct($name = null, array $data = [], $dataName = '')
         $this->useArtisan = version_compare('5.4', Application::VERSION, '>');
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -41,7 +41,7 @@ public function setUp()
         DB::beginTransaction();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         DB::rollback();
 
@@ -67,5 +67,7 @@ protected function getEnvironmentSetUp($app)
             'database' => ':memory:',
             'prefix'   => '',
         ]);
+        //If the database redis has a prefix, Lada fails to flush the cache
+        $app['config']->set('database.redis.options.prefix', false);
     }
 }