deblan-mirror/dnote
1
0
Fork 0
mirror of https://github.com/dnote/dnote synced 2026-03-14 14:35:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix dependency installation (#209)

Browse source 
* Fix local js dependency installation

* Fix wording

* Fix test
This commit is contained in:
Sung Won Cho 2019-06-27 11:59:42 +10:00 • committed by GitHub
commit c7a9ceee3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -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

2
pkg/server/testutils/main.go
View file

@ -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(),
},
)