merged develop in and fixed lcov issue

Author: appinteractive

.travis.yml

@@ -23,7 +23,7 @@ jobs:
       - yarn install --frozen-lockfile --non-interactive
       - yarn add codacy-coverage
       - yarn global add nyc
-      - yarn test:coverage
+      - yarn test
       - cat ./coverage/lcov.info | codacy-coverage
 
 after_success:

README.md

@@ -72,7 +72,7 @@ Getting up and running is as easy as 1, 2, 3, 4 ... 5.
    > ##### IMPORTANT for WIN users: 
    > - make sure you have mongo bin directory added to your PATH
    > - if you picked another data directory during mongodb setup make sure 
-   > to change package.json scripts section for key "dev-win" so it points to
+   > to change package.json scripts section for key "dev:win" so it points to
    > the proper path. Otherwise you will get missing data path errors from mongodb.
    
    If you did it right it will seed some fake data for you and downloads some images and avatar for faster development.

package.json

@@ -3,7 +3,7 @@
   "description": "Human-Connection API",
   "version": "0.1.0",
   "homepage": "https://human-connection.org",
-  "license": "CC-BY-NC-SA-4.0",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/Human-Connection/API.git"
@@ -34,13 +34,10 @@
   },
   "scripts": {
     "clear": "rm -Rf tmp",
-    "nyc": "nyc --reporter=text-summary",
-    "test": "npm run eslint && cross-env NODE_ENV=test npm run nyc npm run mocha",
-    "test:mongo": "npm run eslint && cross-env NODE_ENV=test npm run nyc npm run mocha:mongo",
-    "test:coverage": "npm run eslint && cross-env NODE_ENV=test npm run nyc --reporter=lcovonly npm run mocha",
+    "test": "npm run eslint && cross-env NODE_ENV=test && nyc --reporter=lcovonly --reporter=text-summary npm run mocha",
+    "test:mongo": "npm run eslint && cross-env NODE_ENV=test && nyc --reporter=lcovonly --reporter=text-summary npm run mocha:mongo",
     "eslint": "eslint server/. test/. --config .eslintrc.json",
     "start": "concurrently 'mongod' 'wait-on tcp:27017 && cross-env NODE_ENV=production node server/'",
-    "start:win": "concurrently \"mongod\" \"wait-on tcp:27017 &&SET NODE_ENV=production&& node server/\"",
     "dev:debug": "npm run clear && concurrently '$npm_package_config_mongoDev &>/dev/null' 'wait-on tcp:27017 && cross-env DEBUG=feathers && cross-env NODE_ENV=development nodemon --inspect server/'",
     "dev": "npm run clear && concurrently '$npm_package_config_mongoDev &>/dev/null' 'wait-on tcp:27017 && cross-env DEBUG=feathers && cross-env NODE_ENV=development nodemon server/'",
     "dev:local": "sh scripts/run-local.sh",
@@ -110,7 +107,7 @@
   "devDependencies": {
     "babel-eslint": "~8.2.3",
     "concurrently": "~3.5.1",
-    "cross-env": "^5.1.5",
+    "cross-env": "^5.2.0",
     "eslint": "~4.19.1",
     "istanbul": "1.1.0-alpha.1",
     "mocha": "~5.2.0",

server/hooks/create-excerpt.js

@@ -37,15 +37,15 @@ module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
       const contentBefore = trunc(content, 9999999999);
       const contentTruncated = trunc(contentSanitized, options.length);
 
-      // save meta key hasMore to indecate if there is more text then in the excerpt
+      // save meta key hasMore to indicate if there is more text then in the excerpt
       const hasMore = contentBefore.text.length > (contentTruncated.text.length + 20);
       setByDot(hook.data, 'hasMore', hasMore);
 
       // set excerpt
       setByDot(hook.data, `${options.field}Excerpt`, hasMore ? contentTruncated.html : content.replace(/(\ ){2,}/ig, ' '))
     } catch (err) {
-      hook.app.error(err);
-      throw new Error(err);
+      // hook.app.error(err);
+      // throw new Error(err);
     }
     // trim content
     setByDot(hook.data, options.field, content.replace(/(\ ){2,}/ig, ' '));

server/mongoose.js

@@ -12,7 +12,7 @@ module.exports = function () {
     connectTimeoutMS: 10000,
     socketTimeoutMS: 10000
   }, function () {
-    if (process.NODE_ENV !== 'production' && app.get('seeder').dropDatabase === true) {
+    if (process.env.NODE_ENV !== 'production' && app.get('seeder').dropDatabase === true) {
       mongoose.connection.dropDatabase().then(() => {
         app.debug('>>>>>> DROPED DATABASE <<<<<<');
         let uploadDir = path.resolve('public/uploads');

server/seeder/development/users-admin.js

@@ -16,7 +16,7 @@ module.exports = (seederstore) => {
         coverImg: 'https://source.unsplash.com/random/1250x280',
         badgeIds: () => {
           let badges = [keys(seederstore.badges)[0]];
-          if (process.NODE_ENV !== 'production') {
+          if (process.env.NODE_ENV !== 'production') {
             badges.push(keys(seederstore.badges)[5]);
             badges.push(keys(seederstore.badges)[10]);
             badges.push(keys(seederstore.badges)[16]);

server/services/auth-management/notifier.js

@@ -111,7 +111,7 @@ module.exports = function (app) {
 
   function sendEmail (email) {
     // Save copy to /tmp/emails while in debug mode
-    if (app.get('debug')) {
+    if (process.env.NODE_ENV !== 'production') {
       const filename = String(Date.now()) + '.html';
       const filepath = path.join(__dirname, '../../../tmp/emails/', filename);
       fs.outputFileSync(filepath, email.html);
@@ -124,7 +124,10 @@ module.exports = function (app) {
         app.debug('Sent email', result);
       })
       .catch(err => {
-        app.error('Error sending email', err);
+        if (process.env.NODE_ENV !== 'test') {
+          app.error('Error sending email', err);
+          app.debug(err.message);
+        }
       });
   }
 

test/services/auth-management.test.js

@@ -57,9 +57,19 @@ describe('\'authManagement\' service', () => {
   });
 });
 
+const waitFor = (ms) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve();
+    }, ms);
+  });
+};
+
 const getTokenFromMail = async () => {
   // Get token from tmp email file
   const mailDir = path.join(__dirname, '../../tmp/emails');
+  // wait for the mail to be created first
+  await waitFor(50);
   const fileName = await fs.readdirSync(mailDir)[0];
   const mailFile = path.join(mailDir, fileName);
   const mailContent = await fs.readFileSync(mailFile, 'utf8');

test/services/contributions.test.js

@@ -67,12 +67,12 @@ describe('\'contributions\' service', () => {
 
     it('creates mention notification', async () => {
       const mentionedUser = await userService.create(userData);
-      const data = {...contributionData};
-      data.content = `<a href="" class="hc-editor-mention-blot" data-hc-mention="{&quot;_id&quot;:&quot;${mentionedUser._id.toString()}&quot;,&quot;slug&quot;:&quot;${mentionedUser.slug}&quot;}">${mentionedUser.name}</a>`;
+      const data = Object.assign({}, contributionData);
+      data.content += ` <a href="" class="hc-editor-mention-blot" data-hc-mention="{&quot;_id&quot;:&quot;${mentionedUser._id.toString()}&quot;,&quot;slug&quot;:&quot;${mentionedUser.slug}&quot;}">${mentionedUser.name}</a>`;
       const contribution = await service.create(data, params);
       const result = await notificationService.find({
         query: {
-          userId: mentionedUser._id
+          userId: mentionedUser._id.toString()
         }
       });
       const notification = result.data[0];
@@ -176,4 +176,4 @@ describe('\'contributions\' service', () => {
       assert.ok(result.data[0].associatedCanDos[0], 'finds result');
     });
   });
-});
+});