diff --git a/Makefile b/Makefile index 4273d393..f740b9e4 100644 --- a/Makefile +++ b/Makefile @@ -11,17 +11,22 @@ ifndef DEP @curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh endif - @echo "==> installing CLI dependencies" + @echo "==> installing go dependencies" @dep ensure -.PHONY: install-cli +.PHONY: install-go install-js: ifndef NPM $(error npm is not installed) endif - @echo "==> installing web dependencies" - @(cd ${GOPATH}/src/github.com/dnote/dnote/web && npm install --unsafe-perm) + @echo "==> installing js dependencies" + +ifeq ($(CI), true) + @(cd ${GOPATH}/src/github.com/dnote/dnote/web && npm install --unsafe-perm=true) +else + @(cd ${GOPATH}/src/github.com/dnote/dnote/web && npm install) +endif .PHONY: install-js ## test diff --git a/pkg/server/testutils/main.go b/pkg/server/testutils/main.go index b049dd30..d40c22d6 100644 --- a/pkg/server/testutils/main.go +++ b/pkg/server/testutils/main.go @@ -228,7 +228,7 @@ func CreateMockStripeBackend(ts *httptest.Server) stripe.Backend { stripeMockBackend := stripe.GetBackendWithConfig( stripe.APIBackend, &stripe.BackendConfig{ - URL: ts.URL + "/v1", + URL: ts.URL, HTTPClient: ts.Client(), }, )