Merge pull request #24 from pattern-lab/dev

Brian Muenzenmeyer · Brian Muenzenmeyer · commit 4a57c3f47469 · 2014-03-16T07:28:29.000-05:00
Travis Integration
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,11 @@
+language: node_js
+
+node_js:
+  - 0.11
+  - 0.10
+  - 0.9
+  - 0.8
+
+branches:
+	only:
+		- dev
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -64,6 +64,9 @@ module.exports = function(grunt) {
 					'./public/styleguide/css/styleguide.css': './public/styleguide/css/styleguide.scss'
 				}
 			}
+		},
+		qunit: {
+			files: ["./test/tests.js"]
 		}
 	});
 
@@ -75,4 +78,7 @@ module.exports = function(grunt) {
 
 	//if you choose to use scss, or any preprocessor, you can add it here
 	grunt.registerTask('default', ['clean', 'concat', 'patternlab', /*'sass',*/ 'copy']);
+
+	//travis CI task
+	grunt.registerTask('travis', ['clean', 'concat', 'patternlab', /*'sass',*/ 'copy', 'qunit'])
 };
diff --git a/package.json b/package.json
@@ -4,13 +4,13 @@
   "version": "0.1.0",
   "devDependencies": {
     "grunt": "~0.4.0",
-    "grunt-contrib-nodeunit": "~0.1.2",
     "grunt-contrib-watch": "~0.2.0",
     "grunt-contrib-sass": "~0.2.2",
     "grunt-contrib-copy": "~0.4.0",
     "grunt-contrib-jshint": "~0.4.0",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-qunit": "~0.4.0",
     "matchdep": "~0.3.0"
   },
   "keywords": [
@@ -21,5 +21,11 @@
     "Javascript"
   ],
   "author": "Brian Muenzenmeyer",
-  "license": "MIT"
+  "license": "MIT",
+  "scripts": {
+    "test" : "grunt travis --verbose"
+  },
+  "engines": {
+    "node": ">=0.8"
+  }
 }
diff --git a/test/tests.js b/test/tests.js
@@ -0,0 +1,3 @@
+test( "hello test", function() {
+  ok( 2 == "2", "Passed!" );
+});
diff --git a/test/text.html b/test/text.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Hello Tests</title>
+  <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.14.0.css">
+</head>
+<body>
+  <div id="qunit"></div>
+  <div id="qunit-fixture"></div>
+  <script src="http://code.jquery.com/qunit/qunit-1.14.0.js"></script>
+  <script src="tests.js"></script>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,9 @@ module.exports = function(grunt) {`
`64`	`64`	`'./public/styleguide/css/styleguide.css': './public/styleguide/css/styleguide.scss'`
`65`	`65`	`}`
`66`	`66`	`}`
	`67`	`+ },`
	`68`	`+ qunit: {`
	`69`	`+ files: ["./test/tests.js"]`
`67`	`70`	`}`
`68`	`71`	`});`
`69`	`72`
`@@ -75,4 +78,7 @@ module.exports = function(grunt) {`
`75`	`78`
`76`	`79`	`//if you choose to use scss, or any preprocessor, you can add it here`
`77`	`80`	`grunt.registerTask('default', ['clean', 'concat', 'patternlab', /'sass',/ 'copy']);`
	`81`	`+`
	`82`	`+ //travis CI task`
	`83`	`+ grunt.registerTask('travis', ['clean', 'concat', 'patternlab', /'sass',/ 'copy', 'qunit'])`
`78`	`84`	`};`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+test( "hello test", function() {`
	`2`	`+ ok( 2 == "2", "Passed!" );`
	`3`	`+});`