Skip to content

Commit 6b5777e

Browse files
committed
Update Makefile and CI.
1 parent b2f0644 commit 6b5777e

12 files changed

+30
-150
lines changed

.travis.yml

+22-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,30 @@
11
language: "node_js"
22
node_js:
3-
- "0.4"
4-
- "0.6"
5-
- "0.8"
3+
- "11"
4+
- "10"
5+
- "9"
6+
- "8"
7+
- "7"
8+
- "6"
9+
- "5"
10+
- "4"
11+
- "3" # io.js
12+
- "2" # io.js
13+
- "1" # io.js
14+
- "0.12"
615
- "0.10"
16+
- "0.8"
717

18+
19+
# NOTE: `istanbul` and `coveralls` are pinned for compatibility with node 0.8.
820
before_install:
9-
- "npm install istanbul -g"
10-
- "npm install coveralls -g"
21+
- "npm install -g istanbul@0.2.2"
22+
- "npm install -g coveralls@2.11.4"
1123

12-
script: "make ci-travis"
24+
script:
25+
- "make check"
1326

1427
after_success:
15-
- "make submit-coverage-to-coveralls"
28+
- "make report-cov"
29+
30+
sudo: false

Makefile

+4-46
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,7 @@
1-
SOURCES = lib/*.js
2-
TESTS ?= test/*.test.js
1+
include node_modules/make-node/main.mk
32

4-
lint: lint-jshint
5-
test: test-mocha
6-
test-cov: test-istanbul-mocha
7-
view-cov: view-istanbul-report
3+
MOCHAFLAGS = --require ./test/bootstrap/node
84

95

10-
# ==============================================================================
11-
# Node.js
12-
# ==============================================================================
13-
include support/mk/node.mk
14-
include support/mk/mocha.mk
15-
16-
# ==============================================================================
17-
# Browserify
18-
# ==============================================================================
19-
BROWSERIFY_MAIN = ./lib/index.js
20-
21-
include support/mk/browserify.mk
22-
include support/mk/testling.mk
23-
24-
# ==============================================================================
25-
# Code Quality
26-
# ==============================================================================
27-
include support/mk/notes.mk
28-
include support/mk/jshint.mk
29-
include support/mk/istanbul.mk
30-
31-
# ==============================================================================
32-
# Continuous Integration
33-
# ==============================================================================
34-
include support/mk/coveralls.mk
35-
36-
ci-travis: test test-cov
37-
submit-coverage-to-coveralls: submit-istanbul-lcov-to-coveralls
38-
39-
# ==============================================================================
40-
# Clean
41-
# ==============================================================================
42-
clean:
43-
rm -rf build
44-
rm -rf reports
45-
46-
clobber: clean clobber-node
47-
48-
49-
.PHONY: lint test test-cov view-cov ci-travis clean clobber
6+
# Perform self-tests.
7+
check: test

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,14 @@
3636
"passport-oauth2": "1.x.x"
3737
},
3838
"devDependencies": {
39-
"mocha": "1.x.x",
40-
"chai": "1.x.x",
39+
"make-node": "0.4.6",
40+
"mocha": "2.x.x",
41+
"chai": "2.x.x",
4142
"chai-passport-strategy": "0.1.x"
4243
},
4344
"engines": { "node": ">= 0.4.0" },
4445
"scripts": {
45-
"test": "node_modules/.bin/mocha --reporter spec --require test/bootstrap/node test/*.test.js"
46+
"test": "make test"
4647
},
4748
"testling": {
4849
"browsers": [

support/mk/browserify.mk

-10
This file was deleted.

support/mk/coveralls.mk

-7
This file was deleted.

support/mk/istanbul.mk

-26
This file was deleted.

support/mk/jshint.mk

-7
This file was deleted.

support/mk/mocha.mk

-13
This file was deleted.

support/mk/node.mk

-8
This file was deleted.

support/mk/notes.mk

-7
This file was deleted.

support/mk/testling.mk

-7
This file was deleted.

support/mk/vows.mk

-9
This file was deleted.

0 commit comments

Comments
 (0)