Improve unit tests and start adding objects.

lib/js-Round1.js

@@ -8,51 +8,60 @@
 
 'use strict';
 
-exports.retrieve_token = function() {
-  throw new Error("Not Implemented.");
+var paymentValidator = {
+  validateCreatePaymentJson: function(create_payment_json, reply) {
+    process.nextTick( function() {
+      //error = Error("Validation failed.");
+      var error;
+      process.nextTick( function() { reply(error, "valid."); });
+    });
+  }
 };
 
-// TODO: fix the confusing reply true/false meaning
-exports.validateCreatePaymentJson = function(createPaymentJson, reply) {
-  process.nextTick( function() {
-    reply(false);
-  });
-
-};
+//exports.paymentValidator = paymentValidator;
 
-exports.createBraintreePaymentInner = function(create_payment_json, reply) {
-  var cc_type = create_payment_json.payer.funding_instruments[0].credit_card.type;
-  reply( cc_type + " payment succeeded with braintree.");
-};
+var braintreePayment = {
 
-// TODO: Enable 'create' from braintree api
-exports.createBraintreePayment = function(create_payment_json, reply) {
-  exports.validateCreatePaymentJson(create_payment_json,
-      function(error) {
-        if(error) {
-          process.nextTick( function() {
-            reply("Payment failed.");
-          });
-        }
-        else {
-          var cc_type = create_payment_json.payer.funding_instruments[0].credit_card.type;
-          if(cc_type === "visa" ) {
+  createBraintreePaymentInner: function(create_payment_json, reply) {
+    var cc_type = create_payment_json.payer.funding_instruments[0].credit_card.type;
+    var error;
+    process.nextTick( function() {
+      reply( error, cc_type + " payment succeeded with braintree.");
+    });
+  },
+
+  // TODO: Enable 'create' from braintree api
+  createBraintreePayment: function(create_payment_json, reply) {
+    paymentValidator.validateCreatePaymentJson(create_payment_json,
+        function(error, message) {
+          if(error) {
             process.nextTick( function() {
-              exports.createBraintreePaymentInner(create_payment_json, reply);
+              reply(error, message);
             });
           }
-          else if(cc_type === "amex" ) {
-            process.nextTick( function() {
-              exports.createBraintreePaymentInner(create_payment_json, reply);
-            });
+          else {
+            var cc_type = create_payment_json.payer.funding_instruments[0].credit_card.type;
+            if(cc_type === "visa" ) {
+              process.nextTick( function() {
+                braintreePayment.createBraintreePaymentInner(create_payment_json, reply);
+              });
+            }
+            else if(cc_type === "amex" ) {
+              process.nextTick( function() {
+                braintreePayment.createBraintreePaymentInner(create_payment_json, reply);
+              });
+            }
+    //response = paypal.payment.create(createPamentJson,
+    //  function(error, payment){}
+    //);
           }
-  //response = paypal.payment.create(createPamentJson,
-  //  function(error, payment){}
-  //);
-        }
-      });
+        });
+  }
 };
 
+exports.braintreePayment = braintreePayment;
+
+
 exports.createPaypalPaymentInner = function(create_payment_json, reply) {
   var paypal = require('paypal-rest-sdk');
   // TODO: remove this dummy reference to shut-up warning.
@@ -65,18 +74,19 @@ exports.createPaypalPaymentInner = function(create_payment_json, reply) {
   //    console.log("Create Payment Response");
   //    console.log(payment);
   var cc_type = create_payment_json.payer.funding_instruments[0].credit_card.type;
-  reply( cc_type + " payment succeeded with paypal.");
+  var error = null;
+  reply( error, cc_type + " payment succeeded with paypal.");
   //  }
   //});
 };
 
 // TODO: Enable 'create' from paypal api
 exports.createPaypalPayment = function(create_payment_json, reply) {
-  exports.validateCreatePaymentJson(create_payment_json,
-      function(error) {
+  paymentValidator.validateCreatePaymentJson(create_payment_json,
+      function(error, message) {
         if(error) {
           process.nextTick( function() {
-            reply("Payment failed.");
+            reply(error, message);
           });
         }
         else {
@@ -99,34 +109,31 @@ exports.createPaypalPayment = function(create_payment_json, reply) {
 };
 
 // TODO: Enable 'create' from paypal api
-exports.processPaymentRequest = function(createPaymentJson, reply) {
+exports.processPaymentRequest = function(create_payment_json, reply) {
   // TODO: handle malformed data
   // TODO: this logic is confusing and error prone, cleanup
-  var currency = createPaymentJson.transactions[0].amount.currency;
-  if(createPaymentJson.payer.funding_instruments[0].credit_card.type === "amex" ) {
+  var currency = create_payment_json.transactions[0].amount.currency;
+  if(create_payment_json.payer.funding_instruments[0].credit_card.type === "amex" ) {
     if( currency === "USD" ) {
-      exports.createPaypalPayment(createPaymentJson, reply);
+      exports.createPaypalPayment(create_payment_json, reply);
     }
     else {
       process.nextTick( function() {
-        reply("American Express must be used with US Dollars only.");
+        var error = new Error("American Express must be used with US Dollars only.");
+        reply(error,"American Express must be used with US Dollars only.");
       });
     }
   }
   else {
     if( currency === "USD" || currency === "EUR" || currency === "AUD" ) {
-      exports.createPaypalPayment(createPaymentJson, reply);
+      exports.createPaypalPayment(create_payment_json, reply);
     }
     else {
-      exports.createBraintreePayment(createPaymentJson, reply);
+      braintreePayment.createBraintreePayment(create_payment_json, reply);
     }
   }
 };
 
-exports.braintree = function() {
-  throw new Error("Not Implemented.");
-};
-
 exports.create_listener = function(basePath) {
   var Hapi = require('hapi');
 

test/js-Round1_test.js

@@ -91,7 +91,7 @@ var create_payment_json_amex_thb = {
   }]
 };
 
-var create_payment_json_amex = {
+var create_payment_json_amex_usd = {
   "intent": "sale",
   "payer": {
     "payment_method": "credit_card",
@@ -362,105 +362,118 @@ exports['processPaymentRequest'] = {
         function() {
           js_Round1.processPaymentRequest(
             create_payment_json_visa_usd,
-            function(){}
+            function(error){
+              test.ifError(error);
+            }
             );},
         Error,
         'Create payment should not fail.');
     test.done();
   },
   'visa pay usd': function(test) {
-    test.expect(1);
+    test.expect(2);
     // tests here
     js_Round1.processPaymentRequest(
         create_payment_json_visa_usd,
-        function(answer){
-          test.equal(answer,
-            'Visa payment succeeded with paypal.',
-            'createPaypalPayment should succeed.');
+        function(error, message){
+          test.ifError(error);
+          test.equal(message,
+            'visa payment succeeded with paypal.',
+            'createPaypalPayment usd should succeed.');
           test.done();
         });
   },
   'visa pay eur': function(test) {
-    test.expect(1);
+    test.expect(2);
     // tests here
     js_Round1.processPaymentRequest(
         create_payment_json_visa_eur,
-        function(answer){
-          test.equal(answer,
-            'Visa payment succeeded with paypal.',
-            'createPaypalPayment should succeed.');
+        function(error, message){
+          test.ifError(error);
+          test.equal(message,
+            'visa payment succeeded with paypal.',
+            'createPaypalPayment eur should succeed.');
           test.done();
         });
   },
   'visa pay aud': function(test) {
-    test.expect(1);
+    test.expect(2);
     // tests here
     js_Round1.processPaymentRequest(
         create_payment_json_visa_aud,
-        function(answer){
-          test.equal(answer,
-            'Visa payment succeeded with paypal.',
-            'createPaypalPayment should succeed.');
+        function(error, message){
+          test.ifError(error);
+          test.equal(message,
+            'visa payment succeeded with paypal.',
+            'createPaypalPayment aud should succeed.');
           test.done();
         });
   },
   'visa pay thb': function(test) {
-    test.expect(1);
+    test.expect(2);
     // tests here
     js_Round1.processPaymentRequest(
         create_payment_json_visa_thb,
-        function(answer){
-          test.equal(answer,
-            'Visa payment succeeded with braintree.',
-            'createPaypalPayment should succeed.');
+        function(error, message){
+          test.ifError(error);
+          test.equal(message,
+            'visa payment succeeded with braintree.',
+            'createPaypalPayment thb should succeed.');
           test.done();
         });
   },
   'visa pay hkd': function(test) {
-    test.expect(1);
+    test.expect(2);
     // tests here
     js_Round1.processPaymentRequest(
         create_payment_json_visa_hkd,
-        function(answer){
-          test.equal(answer,
-            'Visa payment succeeded with braintree.',
-            'createPaypalPayment should succeed.');
+        function(error,message){
+          test.ifError(error);
+          test.equal(message,
+            'visa payment succeeded with braintree.',
+            'createPaypalPayment hkd should succeed.');
           test.done();
         });
   },
   'visa pay sgd': function(test) {
-    test.expect(1);
+    test.expect(2);
     // tests here
     js_Round1.processPaymentRequest(
         create_payment_json_visa_sgd,
-        function(answer){
-          test.equal(answer,
-            'Visa payment succeeded with braintree.',
-            'createPaypalPayment should succeed.');
+        function(error, message){
+          test.ifError(error);
+          test.equal(message,
+            'visa payment succeeded with braintree.',
+            'createPaypalPayment sgd should succeed.');
           test.done();
         });
   },
-  'amex pay': function(test) {
-    test.expect(1);
+  'amex pay usd': function(test) {
+    test.expect(2);
     // tests here
     js_Round1.processPaymentRequest(
-        create_payment_json_amex,
-        function(answer){
-          test.equal(answer,
-            'American Express payment succeeded with paypal.',
-            'createPaypalPayment should succeed.');
+        create_payment_json_amex_usd,
+        function(error, message){
+          test.ifError(error);
+          test.equal(message,
+            'amex payment succeeded with paypal.',
+            'createPaypalPayment amex usd should succeed.');
           test.done();
         });
   },
   'amex pay thb': function(test) {
-    test.expect(1);
+    test.expect(2);
     // tests here
     js_Round1.processPaymentRequest(
         create_payment_json_amex_thb,
-        function(answer){
-          test.equal(answer,
+        function(error,message){
+          test.notEqual(error,
+            null,
+            //new Error('American Express must be used with US Dollars only.'),
+            'createPaypalPayment amex thb should fail.');
+          test.equal(message,
             'American Express must be used with US Dollars only.',
-            'createPaypalPayment should succeed.');
+            'createPaypalPayment amex thb should fail.');
           test.done();
         });
   },
@@ -476,7 +489,7 @@ exports['createBraintreePayment'] = {
     // tests here
     test.doesNotThrow(
         function() {
-          js_Round1.createBraintreePayment(
+          js_Round1.braintreePayment.createBraintreePayment(
             create_payment_json_visa_usd,
             function(){}
             );},
@@ -485,13 +498,14 @@ exports['createBraintreePayment'] = {
     test.done();
   },
   'valid args': function(test) {
-    test.expect(1);
+    test.expect(2);
     // tests here
-    js_Round1.createBraintreePayment(
+    js_Round1.braintreePayment.createBraintreePayment(
         create_payment_json_visa_usd,
-        function(answer){
-          test.equal(answer,
-            'Visa payment succeeded with braintree.',
+        function(error, message){
+          test.ifError(error);
+          test.equal(message,
+            'visa payment succeeded with braintree.',
             'createBraintreePayment should succeed.');
           test.done();
         });
@@ -517,14 +531,15 @@ exports['createPaypalPayment'] = {
     test.done();
   },
   'valid args': function(test) {
-    test.expect(1);
+    test.expect(2);
     // tests here
     js_Round1.createPaypalPayment(
         create_payment_json_visa_usd,
-        function(answer){
-          test.equal(answer,
-            'Visa payment succeeded with paypal.',
-            'createPaypalPayment should succeed.');
+        function(error, message){
+          test.ifError(error);
+          test.equal(message,
+            'visa payment succeeded with paypal.',
+            'createPaypalPayment visa usd should succeed.');
           test.done();
         });
   },