Merge branch 'UnitTest'

Author: trevisg

coin_board/routes/assets/assets.js

@@ -166,3 +166,6 @@ router.post('/addasset', function (req, res, next) {
 });
 
 module.exports = router;
+if (process.env.TEST === 'ok') {
+    module.exports.func = setpagecontent;
+}

coin_board/routes/datajunk/datajunk.js

@@ -35,7 +35,6 @@ const Scrapper = require('../../schemas/scrapper');
  */
 router.get('/', function (req, res, next) {
     let chck = req.session;
-
     if (chck && chck.userId) {
         User.findById(chck.userId).exec(function (error, user) {
             if (error || !user) {
@@ -78,7 +77,7 @@ router.post('/newscrapper', function (req, res, next) {
         !(chck && chck.userId)) {
         let err = new Error('All fields required.');
         err.status = 400;
-        console.log('err...' + err);
+        console.log(err.message);
         return res.redirect('/datajunk');
     } else {
         User.findById(chck.userId).exec((error, user) => {
@@ -88,23 +87,20 @@ router.post('/newscrapper', function (req, res, next) {
                     apisid['scrapperid'] = scrapper._id;
                     User.findOneAndUpdate({_id: chck.userId}, apisid,
                         (error, success) => {
-                            if (error) {
-                                res.redirect('/datajunk');
-                            }
                             return res.redirect('/datajunk');
                         });
                 });
             }
         });
     }
 });
+
 /**
  * @param {string} path
  * @param {function} callback
  * @memberof Routes.page.datajunk
  */
 router.post('/scrapper/newsource', function (req, res, next) {
-    param.logco('post scrapper newsource', req.session.userId);
     if (!req.body.name || !req.body.name.length ||
         !req.body.sourcegenre || !req.body.sourcetype ||
         !req.body.sourcename || !req.body.sourcereqpath ||
@@ -114,6 +110,7 @@ router.post('/scrapper/newsource', function (req, res, next) {
         console.log(err);
         return res.redirect('/datajunk');
     } else {
+        param.logco('post scrapper newsource', req.session.userId);
         User.findById(req.session.userId).exec((error, user) => {
             if (user) {
                 let newsource = {

coin_board/routes/profile/profile.js

@@ -51,7 +51,7 @@ router.get('/', function (req, res, next) {
         });
     } else {
         param.lognoco('PROFILE', chck);
-        res.render('page', param.profile);
+        res.redirect('/login');
     }
 });