Merge pull request #3412 from aaa2000/fix-tests

[github/wallabag/wallabag.git] / Makefile

diff --git a/Makefile b/Makefile
index 83c5f37ad78610d12e49211d3f6c0fc1b8bb752f..ffbe102a045c05f09ca3201322592e3ff153a111 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -23,12 +23,11 @@ dev: ## Install the latest dev version
 run: ## Run the wallabag built-in server
        @php bin/console server:run --env=$(ENV)
 
-build: ## Run grunt
-       @grunt
+build: ## Run webpack
+       @npm run build:$(ENV)
 
 test: ## Launch wallabag testsuite
-       @if [ ! -d "vendor/phpunit" ]; then composer install; fi
-       @ant prepare && vendor/phpunit/phpunit/phpunit -v
+       @ant prepare && bin/simple-phpunit -v
 
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION