Fix Makefile, move two mocks to correct folder, refactor test helpers

vektra · Sep 13, 2021 · 45dc76a · 45dc76a
1 parent ead8b66
commit 45dc76a
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 462 deletions.
diff --git a/Makefile b/Makefile
@@ -1,25 +1,33 @@
 SHELL=bash
 
-all: clean fmt test fixture install docker integration
+.PHONY: all
+all: clean fmt mocks test install docker integration
 
+.PHONY: clean
 clean:
 	rm -rf mocks
 
+.PHONY: fmt
 fmt:
 	go fmt ./...
 
-test:
+.PHONY: test
+test: mocks
 	go test ./...
 
-fixture:
-	mockery --print --dir pkg/fixtures --name RequesterVariadic > pkg/fixtures/mocks/requester_variadic.go
-	mockery --print --dir pkg/fixtures --name RequesterVariadic --unroll-variadic=False > pkg/fixtures/mocks/requester_variadic_one_arg.go
+mocks: $(shell find . -type f -name '*.go' -not -name '*_test.go')
+	go run . --dir pkg/fixtures --output mocks/pkg/fixtures
+	go run . --all=false --print --dir pkg/fixtures --name RequesterVariadic --structname RequesterVariadicOneArgument --unroll-variadic=False > mocks/pkg/fixtures/RequesterVariadicOneArgument.go
+	@touch mocks
 
+.PHONY: install
 install:
-	go install ./...
+	go install .
 
+.PHONY: docker
 docker:
 	docker build -t vektra/mockery .
 
+.PHONY: integration
 integration: docker install
 	./hack/run-e2e.sh
diff --git a/mocks/cmd/stackTracer.go b/mocks/cmd/stackTracer.go
diff --git a/mocks/pkg/Cleanup.go b/mocks/pkg/Cleanup.go
diff --git a/mocks/pkg/OutputStreamProvider.go b/mocks/pkg/OutputStreamProvider.go
diff --git a/mocks/pkg/WalkerVisitor.go b/mocks/pkg/WalkerVisitor.go
diff --git a/mocks/pkg/namer.go b/mocks/pkg/namer.go
diff --git a/pkg/fixtures/mocks/requester_variadic.go b/pkg/fixtures/mocks/requester_variadic.go
diff --git a/pkg/fixtures/mocks/requester_variadic_one_arg.go b/pkg/fixtures/mocks/requester_variadic_one_arg.go
diff --git a/pkg/generator.go b/pkg/generator.go
@@ -201,7 +201,7 @@ func upperFirstOnly(s string) string {
 			return unicode.ToUpper(r)
 		}
 		return r
-	},s)
+	}, s)
 }
 
 func (g *Generator) mockName() string {