Skip to content

Commit

Permalink
Merge pull request #1 from johnpbloch/master
Browse files Browse the repository at this point in the history
Port over changes to the 0.1 branch
  • Loading branch information
johnpbloch committed Nov 24, 2013
2 parents b5d4e56 + 03a1fd2 commit 5999ef4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ I like to add `./vendor/bin` to the front of my environment `$PATH` so that I ca
phpunit
```

If you're using Windows you might have to run the tests with this command:
If you're using Windows your command will be:

```
php vendor/bin/phpunit
vendor\bin\phpunit
```

### Next Steps
Expand Down Expand Up @@ -62,4 +62,4 @@ class MyNewTest extends TestCase {

* [PHPUnit Documentation](http://phpunit.de/manual/current/en/)
* [WP Mock Documentation](https://github.com/10up/wp_mock#use)
* [Mockery Documentation](https://github.com/padraic/mockery#simple-example)
* [Mockery Documentation](https://github.com/padraic/mockery#simple-example)
6 changes: 0 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
"description": "A starter project for your WordPress plugin or theme unit tests",
"type": "project",
"license": "GPL-2.0+",
"repositories": [
{
"type": "vcs",
"url": "https://github.com/10up/wp_mock"
}
],
"require": {
"10up/wp_mock": "dev-master",
"phpunit/phpunit": "~3.7@stable"
Expand Down

0 comments on commit 5999ef4

Please sign in to comment.