+add: initial rework of unit tests and adding unit test for Multilingual.label.create()

Author: Johnny Hausman

Makefile

@@ -1,9 +1,10 @@
 REPORTER = dot
 
 test:
-	@NODE_ENV=test ./node_modules/.bin/mocha \
+	@NODE_ENV=test PORT=9999 ./node_modules/.bin/mocha \
     --reporter $(REPORTER) \
-    test/*.js
+    test/bootstrap.test.js \
+    test/**/*.js
 
     @NODE_ENV=test mocha-phantomjs \
     -R $(REPORTER) \

api/models/SiteUser.js

@@ -8,7 +8,7 @@
 
 var crypto = require('crypto');
 var AD = require('ad-utils');
-
+var _  = require('lodash');
 
 module.exports = {
 
@@ -297,7 +297,7 @@ module.exports = {
 
     afterCreate: function(newlyInsertedRecord, next) {
 
-        var safeData = newlyInsertedRecord;
+        var safeData = _.clone(newlyInsertedRecord);
         delete safeData.password;
         delete safeData.salt;
         ADCore.queue.publish('siteuser.created', { user: safeData });
@@ -333,7 +333,7 @@ module.exports = {
 
     afterUpdate: function(updatedRecord, next) {
 
-        var safeData = updatedRecord;
+        var safeData = _.clone(updatedRecord);
         delete safeData.password;
         delete safeData.salt;
         ADCore.queue.publish('siteuser.updated', { user: safeData });
@@ -363,9 +363,13 @@ module.exports = {
 
     afterDestroy: function(destroyedRecords, next) {
 
-        var safeData = destroyedRecords;
-        // delete safeData.password;
-        // delete safeData.salt;
+        var safeData = [];
+        destroyedRecords.forEach(function(rec){
+            var r = _.clone(rec);
+            delete r.password;
+            delete r.salt;
+            safeData.push(r);
+        });
         ADCore.queue.publish('siteuser.destroyed', { user: safeData });
         next();
     }

api/services/Multilingual.js

@@ -24,6 +24,85 @@ module.exports = {
     },
 
 
+    label: {
+
+        /**
+         * Multilingual.label.create()
+         * 
+         * creates a new label definition in the multilingual label table.
+         *
+         * This routine will only create a new one if there is not already 
+         * an existing label_key + label_context + language_code entry 
+         * matching the provided definition.
+         *
+         * if there is already a match, then we resolve without returning 
+         * a new label definition.
+         *
+         * if a new label was created, the new definition will be returned.
+         * 
+         * @param {obj} labelDef    The label info to create
+         * @param {function} cb     (optional) node style callback
+         *                          cb(err, newLabel);
+         * @return {Deferred}
+         */
+        create: function(labelDef, cb) {
+            var dfd = AD.sal.Deferred();
+
+            if((_.isFunction(labelDef)) && (_.isUndefined(cb))) {
+                cb = labelDef;
+                labelDef = undefined;
+            }
+
+            if (_.isUndefined(labelDef)) {
+                var error = new Error('labelDef parameter is required');
+                error.code = "E_MISSINGPARAM";
+                if (cb) cb(error);
+                dfd.reject(error);
+                return dfd;
+            }
+
+
+            function onError(err) {
+                if (cb) cb(err);
+                dfd.reject(err);
+            }
+
+            // check to see if we already have this label
+            SiteMultilingualLabel.find({
+                label_key:labelDef.label_key,
+                label_context:labelDef.label_context,
+                language_code:labelDef.language_code
+            })
+            .exec(function(err, label){
+                if (err) {
+                    onError(err);
+                } else {
+
+                    if ((label) && (label.length > 0)) {
+                        if (cb) cb();
+                        dfd.resolve();
+                    } else {
+
+                        // create the label:
+                        SiteMultilingualLabel.create(labelDef)
+                        .exec(function(err, label){
+
+                            if (err) {
+                                onError(err);
+                            } else {
+                                if (cb) cb(null, label);
+                                dfd.resolve(label);
+                            }
+                        })
+                    }
+                }
+            })
+
+            return dfd;
+        }
+
+    },
+
     languages:{
 
 

api/services/adcore/queue.js

@@ -211,10 +211,11 @@ var newSandbox = function( options ) {
 
     		// remove subKey from our list
     		delete obj.allSubscriptions[subKey];
-    		
+// console.log('... ADCore.queue.unsubscribe() : subKey ['+subKey+'] removed!');	        
+
 	    } else {
 // @TODO How do we handle this error?
-	        
+// console.log('... ADCore.queue.unsubscribe() : subKey ['+subKey+'] not found!');	        
 	    }
 	}
 

package.json

@@ -38,8 +38,10 @@
     "steal-tools": "~0.13.3"
   },
   "devDependencies": {
-    "mocha": "^1.18.2",
-    "chai": "^1.9.1",
+    "barrels": "^1.5.0",
+    "chai": "^3.2.0",
+    "mocha": "^2.2.5",
+    "supertest": "^1.1.0",
     "phantomjs": "1.9.7-15",
     "mocha-phantomjs": "^3.4.0"
   }