From b1c59083d34a570766615ac17f5503374dbd92ca Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Tue, 23 Jul 2019 17:02:42 +0300
Subject: [PATCH] fixed tests

---
 composer.json                            | 55 +++++++++++++-----------
 phpunit.xml                              |  8 ++--
 tests/MenuBuilderTest.php                |  2 +-
 tests/MenuItemTest.php                   |  4 +-
 tests/MenuTest.php                       |  4 +-
 tests/{BaseTestCase.php => TestCase.php} |  8 ++--
 6 files changed, 43 insertions(+), 38 deletions(-)
 rename tests/{BaseTestCase.php => TestCase.php} (86%)

diff --git a/composer.json b/composer.json
index 3e70291..ca181e9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,40 +1,45 @@
 {
-   "name":"akaunting/menu",
-   "description":"Menu and sidebar management package for Laravel.",
-   "keywords":["laravel", "menu", "navigation", "sidebar", "bootstrap"],
-   "license":"MIT",
-   "authors":[
+   "name": "akaunting/menu",
+   "description": "Menu and sidebar management package for Laravel.",
+   "keywords": ["laravel", "menu", "navigation", "sidebar", "bootstrap"],
+   "license": "MIT",
+   "authors": [
         {  
-            "name":"Denis Duliçi",
-            "email":"info@akaunting.com",
-            "homepage":"https://akaunting.com",
-            "role":"Developer"
+            "name": "Denis Duliçi",
+            "email": "info@akaunting.com",
+            "homepage": "https://akaunting.com",
+            "role": "Developer"
         }
    ],
-   "require":{  
+   "require": {  
         "php": ">=7.1",
-        "illuminate/config":">=5.5 <6.0",
-        "illuminate/support":">=5.5 <6.0",
-        "illuminate/view":">=5.5 <6.0",
-        "laravelcollective/html":">=5.5 <6.0"
+        "illuminate/config": ">=5.5 <6.0",
+        "illuminate/support": ">=5.5 <6.0",
+        "illuminate/view": ">=5.5 <6.0",
+        "laravelcollective/html": ">=5.5 <6.0"
    },
-   "require-dev":{  
+   "require-dev": {  
         "friendsofphp/php-cs-fixer": "^2.10",
-        "mockery/mockery":"~1.0",
-        "orchestra/testbench": "3.7.*",
-        "phpunit/phpunit":"~7.0"
+        "mockery/mockery": "~1.0",
+        "orchestra/testbench": "3.8.*",
+        "phpunit/phpunit": "~7.0"
    },
-   "autoload":{  
-        "psr-4":{  
-            "Akaunting\\Menu\\":"./src"
+   "autoload": {  
+        "psr-4": {  
+            "Akaunting\\Menu\\": "src"
         },
-        "files":[  
+        "files": [  
             "src/helpers.php"
         ]
    },
-   "extra":{  
-        "laravel":{  
-            "providers":[  
+    "autoload-dev": {
+        "psr-4": {
+            "Akaunting\\Menu\\Tests\\": "tests"
+        }
+    },
+   "extra": {  
+        "laravel": {  
+            "providers": [  
                 "Akaunting\\Menu\\Provider"
             ],
             "aliases": {
diff --git a/phpunit.xml b/phpunit.xml
index 548b0f5..5460e31 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -10,13 +10,13 @@
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
-        <testsuite name="Akaunting Menu Test Suite">
-            <directory>Tests</directory>
+        <testsuite name="Package Test Suite">
+            <directory suffix="Test.php">tests</directory>
         </testsuite>
     </testsuites>
     <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
     <logging>
diff --git a/tests/MenuBuilderTest.php b/tests/MenuBuilderTest.php
index bc2fd10..dd774ee 100644
--- a/tests/MenuBuilderTest.php
+++ b/tests/MenuBuilderTest.php
@@ -6,7 +6,7 @@
 use Akaunting\Menu\MenuItem;
 use Illuminate\Config\Repository;
 
-class MenuBuilderTest extends BaseTestCase
+class MenuBuilderTest extends TestCase
 {
     /** @test */
     public function it_makes_a_menu_item()
diff --git a/tests/MenuItemTest.php b/tests/MenuItemTest.php
index 8982581..f814c54 100644
--- a/tests/MenuItemTest.php
+++ b/tests/MenuItemTest.php
@@ -5,14 +5,14 @@
 use Akaunting\Menu\Menu;
 use Akaunting\Menu\MenuItem;
 
-class MenuItemTest extends BaseTestCase
+class MenuItemTest extends TestCase
 {
     /**
      * @var Menu
      */
     private $menu;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         
diff --git a/tests/MenuTest.php b/tests/MenuTest.php
index 968503c..701a323 100644
--- a/tests/MenuTest.php
+++ b/tests/MenuTest.php
@@ -5,14 +5,14 @@
 use Akaunting\Menu\Menu;
 use Akaunting\Menu\MenuBuilder;
 
-class MenuTest extends BaseTestCase
+class MenuTest extends TestCase
 {
     /**
      * @var Menu
      */
     private $menu;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         
diff --git a/tests/BaseTestCase.php b/tests/TestCase.php
similarity index 86%
rename from tests/BaseTestCase.php
rename to tests/TestCase.php
index 4f2bc88..bfcdf65 100644
--- a/tests/BaseTestCase.php
+++ b/tests/TestCase.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Akaunting\Menus\Tests;
+namespace Akaunting\Menu\Tests;
 
+use Akaunting\Menu\Provider;
 use Collective\Html\HtmlServiceProvider;
-use Akaunting\Menus\MenusServiceProvider;
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
 
-abstract class BaseTestCase extends OrchestraTestCase
+abstract class TestCase extends OrchestraTestCase
 {
     public function setUp(): void
     {
@@ -17,7 +17,7 @@ protected function getPackageProviders($app)
     {
         return [
             HtmlServiceProvider::class,
-            MenusServiceProvider::class,
+            Provider::class,
         ];
     }