Skip to content

Commit 464cd1e

Browse files
Merge pull request #121 from bd82/master
Some improvements to development workflow:
2 parents d9a2c07 + 5eaa50f commit 464cd1e

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
/examples/plottable/src/
1414
/examples/doppio/src/
1515
/node_modules/
16-
/typescript/
16+
/typescript/
17+
/coverage/

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
language: node_js
22
node_js:
33
- "0.10"
4-
5-
before_install:
6-
- npm install -g mocha

gruntfile.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ module.exports = function(grunt)
5656
files: ['src/**/*.ts'],
5757
tasks: ['ts:typedoc', 'string-replace:version']
5858
}
59+
},
60+
mocha_istanbul: {
61+
coverage: {
62+
src: 'test',
63+
options: {
64+
mask: '*.js'
65+
}
66+
}
5967
}
6068
});
6169

@@ -64,8 +72,10 @@ module.exports = function(grunt)
6472
grunt.loadNpmTasks('grunt-string-replace');
6573
grunt.loadNpmTasks('grunt-contrib-clean');
6674
grunt.loadNpmTasks('grunt-ts');
75+
grunt.loadNpmTasks('grunt-mocha-istanbul');
6776

6877
grunt.registerTask('default', ['ts:typedoc', 'string-replace:version']);
78+
grunt.registerTask('build_and_test', ['default', 'specs', 'mocha_istanbul:coverage']);
6979
grunt.registerTask('specs', ['clean:specsBefore', 'build-specs', 'clean:specsAfter']);
7080

7181
grunt.registerTask('build-specs', function() {

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@
4343
"grunt-contrib-clean": "^0.6.0",
4444
"grunt-contrib-watch": "~0.6.1",
4545
"grunt-string-replace": "^1.2.0",
46-
"grunt-ts": "^4.2.0-beta"
46+
"grunt-ts": "^4.2.0-beta",
47+
"grunt-mocha-istanbul": "^2.4.0",
48+
"istanbul": "^0.3.17",
49+
"mocha": "^2.2.5"
4750
},
4851
"files": [
4952
"bin",

0 commit comments

Comments
 (0)