1 files changed, 16 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index ffbe102a..0686454f 100755
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,13 @@
 TMP_FOLDER=/tmp
 RELEASE_FOLDER=wllbg-release
 
-ifndef ENV
-        ENV=prod
-endif
+ENV ?= prod
 
 help: ## Display this help menu
         @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 clean: ## Clear the application cache
-        @rm -rf var/cache/*
+        rm -rf var/cache/*
 
 install: ## Install wallabag with the latest version
         @sh scripts/install.sh $(ENV)
@@ -26,8 +24,19 @@ run: ## Run the wallabag built-in server
 build: ## Run webpack
         @npm run build:$(ENV)
 
-test: ## Launch wallabag testsuite
-        @ant prepare && bin/simple-phpunit -v
+prepare: clean ## Prepare database for testsuite
+ifdef DB
+        cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
+endif
+        -php bin/console doctrine:database:drop --force --env=test
+        php bin/console doctrine:database:create --env=test
+        php bin/console doctrine:migrations:migrate --no-interaction --env=test
+
+fixtures: ## Load fixtures into database
+        php bin/console doctrine:fixtures:load --no-interaction --env=test
+
+test: prepare fixtures ## Launch wallabag testsuite
+        bin/simple-phpunit -v
 
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION
@@ -35,11 +44,9 @@ ifndef VERSION
 endif
         @sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
 
-travis: ## Make some stuff for Travis-CI
-
 deploy: ## Deploy wallabag
         @bundle exec cap staging deploy
 
-.PHONY: help clean install update build test release travis deploy run dev
+.PHONY: help clean prepare install fixtures update build test release deploy run dev
 
 .DEFAULT_GOAL := install