From 2551e11e4c890e0d5bb358094140c2e84a1e0b9c Mon Sep 17 00:00:00 2001
From: Akolzin Dmitry <akolzinvs@gmail.com>
Date: Tue, 18 Feb 2020 18:17:59 +0300
Subject: [PATCH] merge coverage

---
 .travis.yml      | 4 +++-
 Makefile         | 3 +++
 composer.json    | 7 ++++++-
 phpunit.xml.dist | 3 ---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 40f9efa..e381ed5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,9 @@ before_script: make before_script
 
 script: composer test
 
-after_success: bash <(curl -s https://codecov.io/bash)
+after_success:
+  - make covegare
+  - bash <(curl -s https://codecov.io/bash)
 
 jobs:
   include:
diff --git a/Makefile b/Makefile
index 345e542..c060a84 100644
--- a/Makefile
+++ b/Makefile
@@ -21,3 +21,6 @@ before_script:
 	bin/robo --load-from tests/RoboFile.php project:deploy
 	(php -S localhost:8000 -t www &) 2> /dev/null > /dev/null
 	sleep 2
+
+covegare:
+	wget https://phar.phpunit.de/phpcov.phar && php phpcov.phar merge coverage/cov --clover coverage.xml
diff --git a/composer.json b/composer.json
index 13a09e2..e457089 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,12 @@
       "opencart-dir" : "www"
     },
     "scripts" : {
-      "test": "bin/phpunit --testsuite tests --colors=always",
+      "test-admin": "bin/phpunit --coverage-php coverage/cov/admin.cov --testsuite tests --colors=always",
+      "test-catalog": "bin/phpunit --coverage-php coverage/cov/catalog.cov --testsuite catalog-tests --colors=always",
+      "test": [
+        "@test-admin",
+        "@test-catalog"
+      ],
       "setup" : "bin/robo --load-from tests/RoboFile.php opencart:setup"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4990776..8e8e34f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -30,7 +30,4 @@
             <directory suffix=".php">./www/system/library/retailcrm</directory>
         </whitelist>
     </filter>
-    <logging>
-        <log type="coverage-clover" target="coverage.xml"/>
-    </logging>
 </phpunit>
\ No newline at end of file