Merge pull request #2 from mstuart/master

jeffharrell · jeffharrell · commit 50edb26d62c2 · 2012-11-16T09:26:15.000-08:00
Fix for QR code link
diff --git a/dist/paypal-button.min.js b/dist/paypal-button.min.js
diff --git a/src/paypal-button.js b/src/paypal-button.js
@@ -151,7 +151,7 @@ PAYPAL.apps = PAYPAL.apps || {};
 			key;
 
 		for (key in data) {
-			url += key + '=' + data[key] + '&';
+			url += key + '=' + encodeURIComponent(data[key]) + '&';
 		}
 
 		url = encodeURIComponent(url);
diff --git a/test/paypal-button.js b/test/paypal-button.js
@@ -1,22 +1,18 @@
 /*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());
 
-
-
 // Test the object's integrity
 describe('PAYPAL.apps.ButtonFactory', function () {
-	'use strict';
 
+	'use strict';
 
 	it('Should have a PAYPAL object', function () {
 		PAYPAL.should.be.a('object');
@@ -30,14 +26,12 @@ describe('PAYPAL.apps.ButtonFactory', function () {
 		PAYPAL.apps.ButtonFactory.should.be.a('object');
 	});
 
-
 });
 
-
 // Test the create method
 describe('PAYPAL.apps.ButtonFactory.create', function () {
-	'use strict';
 
+	'use strict';
 
 	it('Should be a function', function () {
 		PAYPAL.apps.ButtonFactory.create.should.be.a('function');
@@ -49,7 +43,7 @@ describe('PAYPAL.apps.ButtonFactory.create', function () {
 		result.should.equal(false);
 	});
 
-	it('Should return an element if no parameters', function () {
+	it('Should return an element', function () {
 		var result = PAYPAL.apps.ButtonFactory.create({
 			business: '6XF3MPZBZV6HU',
 			item: 'Buy now',
@@ -58,5 +52,22 @@ describe('PAYPAL.apps.ButtonFactory.create', function () {
 
 		result.should.be.a('object');
 	});
+});
 
+// Test the buttons counter object
+describe('PAYPAL.apps.ButtonFactory.buttons', function () {
+	
+	'use strict';
+	
+	it('Should have two cart buttons', function () {
+		var result = PAYPAL.apps.ButtonFactory.buttons.cart;
+		
+		result.should.equal(2);
+	});
+	
+	it('Should have one QR code', function () {
+		var result = PAYPAL.apps.ButtonFactory.buttons.qr;
+		
+		result.should.equal(1);
+	});
 });

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ PAYPAL.apps = PAYPAL.apps \|\| {};`
`151`	`151`	`key;`
`152`	`152`
`153`	`153`	`for (key in data) {`
`154`		`- url += key + '=' + data[key] + '&';`
	`154`	`+ url += key + '=' + encodeURIComponent(data[key]) + '&';`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`url = encodeURIComponent(url);`