Prepare for travis ci testing

andreassolberg · Dec 5, 2014 · 2664cfe · 2664cfe
1 parent ae55deb
commit 2664cfe
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+"scripts": {
+  "test": "grunt travis --verbose"
+}
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -33,14 +33,29 @@ module.exports = function(grunt) {
 					preserveLicenseComments: false
 				}
 			}
+		},
+		jshint: {
+			// define the files to lint
+			files: ['gruntfile.js', 'src/**/*.js', 'test/**/*.js'],
+			// configure JSHint (documented at http://www.jshint.com/docs/)
+			options: {
+				// more options here if you want to override JSHint defaults
+				globals: {
+					jQuery: true,
+					console: true,
+					module: true
+				}
+			}
 		}
 	});
 
 
 	// grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-requirejs');
+	grunt.loadNpmTasks('grunt-contrib-jshint');
+
+	grunt.registerTask('travis', ['requirejs', 'jshint']);
+	grunt.registerTask('default', ['requirejs', 'jshint']);
 
-	// Default task(s).
-	grunt.registerTask('default', ['requirejs']);
 
 };
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "OAuth 2.0 implementation in Javascript",
   "main": "src/jso.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "grunt travis --verbose"
   },
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
   ],
   "devDependencies": {
     "grunt": "~0.4.5",
-    "grunt-contrib-jshint": "~0.10.0",
+    "grunt-contrib-jshint": "^0.10.0",
     "grunt-contrib-nodeunit": "~0.4.1",
     "grunt-requirejs": "*"
   },