Merge pull request #7 from substack/master

jeffharrell · jeffharrell · commit 737d807393c6 · 2013-01-02T19:09:54.000-08:00
properly split up to run on testling-ci
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
 	"testling": {
 		"browsers": ["ie6", "ie7", "ie8", "ie9", "firefox/15", "chrome/22", "opera/12", "safari/5.1"],
 		"harness" : "mocha",
-		"files": "test/*.js"
+		"files": "test/browser.js"
 	},
 	"dependencies": {},
 	"devDependencies": {
@@ -19,6 +19,6 @@
 		"jsdom": "*"
 	},
 	"scripts": {
-		"test": "mocha"
+		"test": "mocha test/server.js"
 	}
-}
+}
diff --git a/src/paypal-button.js b/src/paypal-button.js
@@ -1,6 +1,9 @@
 if (typeof PAYPAL === 'undefined' || !PAYPAL) {
 	var PAYPAL = {};
 }
+if (typeof module === 'object' && typeof module.exports === 'object') {
+	module.exports = PAYPAL;
+}
 
 PAYPAL.apps = PAYPAL.apps || {};
 
@@ -230,6 +233,8 @@ PAYPAL.apps = PAYPAL.apps || {};
 
 		for (i = 0, len = nodes.length; i < len; i++) {
 			node = nodes[i];
+			if (!node || !node.src) continue;
+
 			data = node && getDataSet(node);
 			button = data && data.button;
 			business = data.business = node.src.split('?merchant=')[1];
@@ -244,4 +249,4 @@ PAYPAL.apps = PAYPAL.apps || {};
 	}
 
 
-}());
+}());
diff --git a/test/browser.js b/test/browser.js
@@ -0,0 +1,6 @@
+/*jshint node:true, evil:true */
+/*global describe:true, it:true, PAYPAL:true, document:true, window:true */
+
+document.body.innerHTML = require('./index.html.js');
+
+require('./test.js');
diff --git a/test/index.html.js b/test/index.html.js
diff --git a/test/server.js b/test/server.js
@@ -0,0 +1,10 @@
+/*jshint node:true, evil:true */
+/*global describe:true, it:true, PAYPAL:true, document:true, window:true */
+
+var fs = require('fs'),
+	jsdom = require('jsdom').jsdom;
+
+global.document = jsdom(fs.readFileSync(__dirname + '/index.html').toString());
+global.window = document.createWindow();
+
+require('./test.js');
diff --git a/test/test.js b/test/test.js
@@ -1,13 +1,5 @@
-/*jshint node:true, evil:true */
-/*global describe:true, it:true, PAYPAL:true, document:true, window:true */
-
-var fs = require('fs'),
-	should = require('should'),
-	jsdom = require('jsdom').jsdom,
-	document = jsdom(fs.readFileSync('./test/index.html').toString()),
-	window = document.createWindow();
-
-eval(fs.readFileSync('src/paypal-button.js').toString());
+var PAYPAL = require('../src/paypal-button.js');
+require('should');
 
 // Test the object's integrity
 describe('PAYPAL.apps.ButtonFactory', function () {
@@ -130,4 +122,4 @@ describe('Multiple button image sizes', function () {
 		
 		hostedSmallImg.should.include('SM');
 	});
-});
+});
