Skip to content

Commit

Permalink
Merge pull request #85 from rchicoli/make-unittests
Browse files Browse the repository at this point in the history
make: change go tests to unit tests
  • Loading branch information
rchicoli authored Apr 24, 2018
2 parents b98cca2 + feddad5 commit 3577c2b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ stages:
# - name: cache
# if: branch = development
- name: build
if: branch != master
# if: branch = development
- name: release
if: branch = master

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ DOCKER_COMPOSE := $(shell which docker-compose)

all: clean docker_build plugin_create plugin_enable clean

local: clean build go_tests plugin_create plugin_enable clean
local: clean build unit_tests plugin_create plugin_enable clean

clean:
@echo ""
Expand Down Expand Up @@ -146,7 +146,7 @@ undeploy_nginx: docker_compose skip
# TESTS #
#####################

go_tests:
unit_tests:
go test -cover -race -v ./...

acceptance_tests:
Expand Down

0 comments on commit 3577c2b

Please sign in to comment.