diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c2c438fb..b487405d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,11 +1,12 @@ ## Submitting Pull Requests -* run ```npm install``` to make sure your development dependencies are up-to-date -* Please ensure that the test suite passes before submitting a PR: - * ```npm test``` +* Please rebase your branch against the current master +* Run ```npm install``` to make sure your development dependencies are up-to-date +* [grunt-cli](https://github.com/gruntjs/grunt-cli) >= 0.4.0 is required to sanity check your contribution +* Please ensure that the test suite passes **and** that bootbox.js is lint free before submitting a PR: + * ```grunt``` * If you've added new functionality, **please** include tests which validate its behaviour -* Please ensure that bootbox.js is lint free: - * ```grunt jshint``` +* **Please follow these basic steps to make pull request reviews easier!** ## Submitting bug reports diff --git a/Gruntfile.js b/Gruntfile.js index ef9eae2a..cc059ed6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -16,9 +16,18 @@ module.exports = function(grunt) { jshintrc: ".jshintrc" }, all: ["bootbox.js"] + }, + + karma: { + unit: { + configFile: "karma.conf.js" + } } }); grunt.loadNpmTasks("grunt-contrib-uglify"); grunt.loadNpmTasks("grunt-contrib-jshint"); + grunt.loadNpmTasks("grunt-karma"); + + grunt.registerTask("default", ["jshint", "karma"]); }; diff --git a/package.json b/package.json index a292a6b7..272e1e1c 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "karma-junit-reporter": "~0.1.0", "sinon": "~1.7.3", "sinon-chai": "~2.4.0", - "karma-chai": "0.0.1" + "karma-chai": "0.0.1", + "grunt-karma": "~0.6.2" } }