Merge pull request #282 from vtm9/master

Improve testing
hexlet-codebattle · Jan 29, 2018 · 8ef679e · 8ef679e
2 parents 3c64809 + 2f69d9c
commit 8ef679e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -1,21 +1,6 @@
 include make-compose.mk
 include make-ansible.mk
 
-compile:
-	mix compile
-
-install:
-	mix deps.get
-
-test:
-	mix test
-
-test-coverage-html:
-	mix coveralls.html
-
-lint:
-	mix credo
-
 clean:
 	rm -rf services/app/_build
 	rm -rf services/app/deps

diff --git a/make-compose.mk b/make-compose.mk
@@ -7,9 +7,12 @@ compose:
 compose-build:
 	docker-compose build
 
-compose-test:
+compose-test-all:
 	docker-compose run app mix test
 
+compose-test:
+	docker-compose run app mix test test/codebattle test/codebattle_web
+
 compose-kill:
 	docker-compose kill
 
@@ -36,9 +39,6 @@ compose-db-prepare:
 compose-upload-langs:
 	docker-compose run app mix upload_langs
 
-compose-test-coverage-html:
-	docker-compose run -e "MIX_ENV=test" app make test-coverage-html
-
 compose-credo:
 	docker-compose run app mix credo