Merge pull request #21 from clue-labs/phpunit

Add PHPUnit to require-dev
clue · Jun 29, 2017 · 6b1779d · 6b1779d
2 parents fba4e31 + a4ec330
commit 6b1779d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,4 +14,4 @@ install:
   - composer install --no-interaction
 
 script:
-  - phpunit --coverage-text
+  - vendor/bin/phpunit --coverage-text
diff --git a/README.md b/README.md
@@ -24,6 +24,7 @@ to execute individual functions depending on the arguments given.
   * [Route](#route)
   * [NoRouteFoundException](#noroutefoundexception)
 * [Install](#install)
+* [Tests](#tests)
 * [License](#license)
 * [More](#more)
 
@@ -554,6 +555,21 @@ $ composer require clue/commander:^1.2
 
 See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades.
 
+## Tests
+
+To run the test suite, you first need to clone this repo and then install all
+dependencies [through Composer](http://getcomposer.org):
+
+```bash
+$ composer install
+```
+
+To run the test suite, go to the project root and run:
+
+```bash
+$ php vendor/bin/phpunit
+```
+
 ## License
 
 MIT

diff --git a/composer.json b/composer.json
@@ -17,6 +17,7 @@
         "php": ">=5.3"
     },
     "require-dev": {
-        "clue/arguments": "^1.0"
+        "clue/arguments": "^1.0",
+        "phpunit/phpunit": "^5.0 || ^4.8"
     }
 }
diff --git a/tests/RouteTest.php b/tests/RouteTest.php
@@ -6,7 +6,7 @@ class RouteTest extends PHPUnit_Framework_TestCase
 {
     public function testToStringWillReturnStringFromToken()
     {
-        $token = $this->getMock('Clue\Commander\Tokens\TokenInterface');
+        $token = $this->getMockBuilder('Clue\Commander\Tokens\TokenInterface')->getMock();
         $token->expects($this->once())->method('__toString')->willReturn('test');
 
         $route = new Route($token, 'var_dump');

diff --git a/tests/Tokens/AlternativeTokenTest.php b/tests/Tokens/AlternativeTokenTest.php
@@ -9,8 +9,8 @@ class AlternativeTokenTest extends PHPUnit_Framework_TestCase
     public function testSupportsAnyTwoTokens()
     {
         new AlternativeToken(array(
-            $this->getMock('Clue\Commander\Tokens\TokenInterface'),
-            $this->getMock('Clue\Commander\Tokens\TokenInterface'),
+            $this->getMockBuilder('Clue\Commander\Tokens\TokenInterface')->getMock(),
+            $this->getMockBuilder('Clue\Commander\Tokens\TokenInterface')->getMock(),
         ));
     }
 
@@ -35,7 +35,7 @@ public function testRequiresValidTokens()
 
     public function testDoesNotSupportOptional()
     {
-        $token = $this->getMock('Clue\Commander\Tokens\TokenInterface');
+        $token = $this->getMockBuilder('Clue\Commander\Tokens\TokenInterface')->getMock();
         $tokens = array(
             $token,
             new OptionalToken($token)

diff --git a/tests/Tokens/SentenceTokenTest.php b/tests/Tokens/SentenceTokenTest.php
@@ -8,8 +8,8 @@ class SentenceTokenTest extends PHPUnit_Framework_TestCase
     public function testSupportsAnyTwoTokens()
     {
         new SentenceToken(array(
-            $this->getMock('Clue\Commander\Tokens\TokenInterface'),
-            $this->getMock('Clue\Commander\Tokens\TokenInterface'),
+            $this->getMockBuilder('Clue\Commander\Tokens\TokenInterface')->getMock(),
+            $this->getMockBuilder('Clue\Commander\Tokens\TokenInterface')->getMock(),
         ));
     }