X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=blobdiff_plain;f=Makefile;h=0f4cbbe80ebaf8df588c4144309c1f856fa7cae6;hp=1df4d6327333a06ef399778f16810f413c6e2f24;hb=0452e869ec0e3d336337f815da346346c860d914;hpb=f48a6f3a542613d68d7f8d12dfe9abe397c48db2

diff --git a/Makefile b/Makefile
index 1df4d632..0f4cbbe8 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)
@@ -21,14 +19,24 @@ dev: ## Install the latest dev version
 	@sh scripts/dev.sh
 
 run: ## Run the wallabag built-in server
-	@php bin/console server:run --env=$(ENV)
+	@php bin/console server:run --env=dev
+
+build: ## Run webpack
+	@npm run build:$(ENV)
 
-build: ## Run grunt
-	@grunt
+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
 
-test: ## Launch wallabag testsuite
-	@if [ ! -d "vendor/phpunit" ]; then composer install; fi
-	@ant prepare && vendor/phpunit/phpunit/phpunit -v
+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
@@ -36,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
+.PHONY: help clean prepare install fixtures update build test release deploy run dev
 
 .DEFAULT_GOAL := install