Added "extends" key to the jshint config files, so there is less repetition.
Mocha now runs from grunt, just run "grunt" Copied es-php's README.md, will modify later More logging around sending a request, including stack traces for debug messages Connections now manage their own state, and emit a "status changed" event which the connection pool listens for Fixed the custom errors Stream loggers will dump their buffered output to stderr when the process exits so that log messages will be sort of saved, File logger overrides this and writes to the file syncronously Added _.handler(), _.scheduled(), and _.makeBoundMethods() to the utils
This commit is contained in:
37
Gruntfile.js
37
Gruntfile.js
@ -3,6 +3,8 @@
|
||||
|
||||
module.exports = function (grunt) {
|
||||
|
||||
var argv = require('optimist').argv;
|
||||
|
||||
var pre = [
|
||||
'src/pre.js',
|
||||
'src/shared.js',
|
||||
@ -34,15 +36,17 @@ module.exports = function (grunt) {
|
||||
dest: 'dist/elasticsearch-node.js'
|
||||
}
|
||||
},
|
||||
simplemocha: {
|
||||
mochaTest: {
|
||||
unit: [
|
||||
'test/unit/*.test.js'
|
||||
'test/unit/**/*.test.js'
|
||||
],
|
||||
integration: [
|
||||
'test/integration/*.test.js'
|
||||
'yaml-suite': [
|
||||
'test/integration/yaml-suite/index.js'
|
||||
],
|
||||
options: {
|
||||
reporter: 'spec'
|
||||
colors: true,
|
||||
require: 'should',
|
||||
reporter: 'dot'
|
||||
}
|
||||
},
|
||||
jshint: {
|
||||
@ -50,18 +54,11 @@ module.exports = function (grunt) {
|
||||
src: [
|
||||
'Gruntfile.js',
|
||||
'src/**/*.js',
|
||||
],
|
||||
options: {
|
||||
jshintrc: 'src/.jshintrc'
|
||||
}
|
||||
},
|
||||
tests: {
|
||||
src: [
|
||||
'test/**/*.js'
|
||||
],
|
||||
options: {
|
||||
jshintrc: 'test/.jshintrc'
|
||||
}
|
||||
]
|
||||
},
|
||||
options: {
|
||||
jshintrc: true
|
||||
}
|
||||
},
|
||||
yuidoc: {
|
||||
@ -84,13 +81,11 @@ module.exports = function (grunt) {
|
||||
});
|
||||
|
||||
// load plugins
|
||||
grunt.loadNpmTasks('grunt-simple-mocha');
|
||||
grunt.loadNpmTasks('grunt-mocha-test');
|
||||
grunt.loadNpmTasks('grunt-contrib-jshint');
|
||||
grunt.loadNpmTasks('grunt-contrib-yuidoc');
|
||||
|
||||
|
||||
// Default task.
|
||||
grunt.registerTask('default', ['jshint', 'simple-mocha']);
|
||||
grunt.registerTask('test', ['simplemocha:integration']);
|
||||
|
||||
};
|
||||
grunt.registerTask('default', ['jshint', 'mochaTest']);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user