Skip to content

Commit 7d3bfee

Browse files
sadiqkhojaspwoodcock
authored andcommitted
Add development.json to the ignore list (getodk#1421)
1 parent b821c18 commit 7d3bfee

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ node_modules/
1212
/.repl-history
1313
.vscode
1414
/junit-reports/
15+
/config/development.json

Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
default: base
22

3+
NODE_CONFIG_ENV ?= test
4+
35
node_modules: package.json
46
npm install
57
touch node_modules
@@ -115,19 +117,19 @@ test-db-migrations:
115117

116118
.PHONY: test-fast
117119
test-fast: node_version
118-
BCRYPT=insecure npx mocha --recursive --fgrep @slow --invert
120+
NODE_CONFIG_ENV=test BCRYPT=insecure npx mocha --recursive --fgrep @slow --invert
119121

120122
.PHONY: test-integration
121123
test-integration: node_version
122-
BCRYPT=insecure npx mocha --recursive test/integration
124+
NODE_CONFIG_ENV=$(NODE_CONFIG_ENV) BCRYPT=insecure npx mocha --recursive test/integration
123125

124126
.PHONY: test-unit
125127
test-unit: node_version
126-
BCRYPT=insecure npx mocha --recursive test/unit
128+
NODE_CONFIG_ENV=test BCRYPT=insecure npx mocha --recursive test/unit
127129

128130
.PHONY: test-coverage
129131
test-coverage: node_version
130-
npx nyc -x "**/migrations/**" --reporter=lcov node_modules/.bin/_mocha --recursive test
132+
NODE_CONFIG_ENV=test npx nyc -x "**/migrations/**" --reporter=lcov node_modules/.bin/_mocha --recursive test
131133

132134
.PHONY: lint
133135
lint: node_version

0 commit comments

Comments
 (0)