Merge branch 'hotfix/coveralls'

Close #1
zendframework · Dec 2, 2015 · deedad4 · deedad4
2 parents 8d94712 + d0593e3
commit deedad4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,9 +32,12 @@ install:
   - composer info -i
 
 script:
-  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer coverage ; fi
+  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer test-coverage ; fi
   - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then composer test ; fi
   - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer cs ; fi
 
+after_script:
+  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer coveralls ; fi
+
 notifications:
   email: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#1](https://github.com/zendframework/zend-expressive-router/pull/1) fixes the
+  coveralls support to trigger after scripts, so the status of the check does
+  not make the tests fail. Additionally, ensured that coveralls can receive
+  the coverage report!
 
 ## 1.0.0 - 2015-12-02
 

diff --git a/composer.json b/composer.json
@@ -44,12 +44,10 @@
             "@cs",
             "@test"
         ],
-        "coverage": [
-            "phpunit --coverage-clover clover.xml",
-            "coveralls"
-        ],
+        "coveralls": "coveralls",
         "cs": "phpcs",
         "cs-fix": "phpcbf",
-        "test": "phpunit"
+        "test": "phpunit",
+        "test-coverage": "phpunit --coverage-clover clover.xml"
     }
 }