From 8bedaa2846f1772152f19bf06981d5f1bd2a9839 Mon Sep 17 00:00:00 2001 From: Tit Petric Date: Fri, 15 Mar 2019 00:29:34 +0100 Subject: [PATCH] upd(makefile): remove rbac, comment mail mock gen --- Makefile | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index edb4d3a84..5977d898d 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ -.PHONY: help docker docker-push realize dep dep.update test test.rbac test.messaging test.crm qa critic vet codegen +.PHONY: help docker docker-push realize dep dep.update test test.messaging test.crm qa critic vet codegen PKG = "github.com/$(shell cat .project)" GO = go GOGET = $(GO) get -u -BASEPKGS = rbac system crm messaging +BASEPKGS = system crm messaging IMAGES = system crm messaging ######################################################################################################################## @@ -27,7 +27,6 @@ help: @echo - critic - run go critic on all code @echo - test.crm - individual package unit tests @echo - test.messaging - individual package unit tests - @echo - test.rbac - individual package unit tests @echo - test - run all available unit tests @echo - qa - run vet, critic and test on code @echo @@ -100,18 +99,13 @@ test.crm.db: $(GOTEST) $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" test.system: $(GOTEST) - $(GOTEST) -covermode count -coverprofile .cover.out -v ./system/repository/... ./system/service/... + $(GOTEST) -covermode count -coverprofile .cover.out -v ./system/internal/repository/... ./system/internal/service/... $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" test.system.db: $(GOTEST) $(GOTEST) -covermode count -coverprofile .cover.out -v ./system/db/... $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" - -test.rbac: $(GOTEST) - $(GOTEST) -covermode count -coverprofile .cover.out -v ./internal/rbac/... - $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" - test.rules: $(GOTEST) $(GOTEST) -covermode count -coverprofile .cover.out -v ./internal/rules/... $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" @@ -120,14 +114,6 @@ test.mail: $(GOTEST) $(GOTEST) -covermode count -coverprofile .cover.out -v ./internal/mail/... $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" -test.rbac.resources: $(GOTEST) - $(GOTEST) -run Resources -covermode count -coverprofile .cover.out -v ./internal/rbac/... - $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" - -test.rbac.sessions: $(GOTEST) - $(GOTEST) -run Sessions -covermode count -coverprofile .cover.out -v ./internal/rbac/... - $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" - test.store: $(GOTEST) $(GOTEST) -covermode count -coverprofile .cover.out -v ./internal/store/... $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" @@ -154,7 +140,7 @@ mocks: $(GOMOCK) $(MOCKGEN) -package service -source system/internal/service/role.go -destination system/internal/service/role_mock_test.go $(MOCKGEN) -package service -source system/internal/service/user.go -destination system/internal/service/user_mock_test.go - $(MOCKGEN) -package mail -source internal/mail/mail.go -destination internal/mail/mail_mock_test.go + # $(MOCKGEN) -package mail -source internal/mail/mail.go -destination internal/mail/mail_mock_test.go $(MOCKGEN) -package rules -source internal/rules/interfaces.go -destination internal/rules/resources_mock_test.go mkdir -p system/internal/repository/mocks