Merge branch 'master' of github.com:paypal/JavaScriptButtons

jeffharrell · jeffharrell · commit 06ef5205b491 · 2012-11-26T22:55:44.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+ language: node_js
+ node_js:
+   - "0.8"
+   - "0.6"
diff --git a/README.md b/README.md
@@ -86,11 +86,13 @@ The JavaScript buttons have been tested and work in all modern browsers includin
 * Internet Explorer 7+.
 
 
-## Contributing
+## Contributing [![Build Status](https://travis-ci.org/paypal/JavaScriptButtons.png)](https://travis-ci.org/paypal/JavaScriptButtons)
+
 We love contributions! If you'd like to contribute please submit a pull request via Github. 
 
 [Mocha](https://github.com/visionmedia/mocha) is used to run our test cases. Please be sure to run these prior to your pull request and ensure nothing is broken.
 
+
 ## Authors
 **Jeff Harrell**  
 [https://github.com/jeffharrell](https://github.com/jeffharrell)
diff --git a/package.json b/package.json
@@ -9,7 +9,11 @@
 	"dependencies": {},
 	"devDependencies": {
 		"grunt": "*",
+		"mocha": "*",
 		"should": "*",
 		"jsdom": "*"
+	},
+	"scripts": {
+		"test": "mocha"
 	}
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 + language: node_js
 + node_js:
 +   - "0.8"
 +   - "0.6"