diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-07 18:01:28 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-07 18:01:28 +0200 |
| commit | e90e0779f3ccdc18c9143c0cf73adc53c5dc10dc (patch) | |
| tree | 9a0b2774be293eb02a90b35b3b4ffefdf93c15ab | |
| parent | 8ee79c729abe0f5121732f9cdcbc71ac7f864c16 (diff) | |
make it easier to run js tests
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | README.rst | 15 |
2 files changed, 18 insertions, 13 deletions
@@ -36,17 +36,21 @@ dist: clean git archive HEAD --format=zip --prefix=$(app_name)/ > $(package_name).zip -test: unit integration acceptance +# tests +test: javascript-tests unit-tests integration-tests acceptance-tests - -unit: +unit-tests: phpunit tests/unit -integration: +integration-tests: phpunit tests/integration -acceptance: - cd tests/acceptance; make +acceptance-tests: + cd tests/acceptance; make headless + + +javascript-tests: + cd js; make test diff --git a/README.rst b/README.rst index 96ec30694..bc513be57 100644 --- a/README.rst +++ b/README.rst @@ -149,23 +149,24 @@ JavaScript ~~~~~~~~~~ For JavaScript tests see :file:`js/README.md` - -PHP -~~~ All tests:: make test -Unit tests:: +PHP Unit tests:: - make unit + make unit-tests Integration tests:: - make integration + make integration-tests .. note:: For acceptance tests, a user with the name **test** and password **test** must exist! Acceptance tests:: - make acceptance + make acceptance-tests + +JavaScript tests:: + + make javascript-tests
\ No newline at end of file |