Merge branch 'master' of https://github.com/SpringRoll/SpringRollConnect into bugfix/162931909_group_twice

Author: DylanOrsh

.babelrc

@@ -0,0 +1,17 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "useBuiltIns": "entry",
+        "targets": {
+          "node": true
+        }
+      }
+    ]
+  ],
+  "plugins": [
+    "@babel/plugin-transform-runtime",
+    "@babel/plugin-transform-modules-commonjs"
+  ]
+}

.eslintrc.json

@@ -8,20 +8,20 @@
     "node": true,
     "done": true,
     "render": true,
-    "CONFIGURATION": true
+    "CONFIGURATION": true,
+    "before": true,
+    "afterEach": true,
+    "after": true,
+    "describe": true,
+    "it": true,
+    "beforeEach": true
   },
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module"
   },
   "rules": {
-    "no-console": "error",
-    "no-undef": [
-      "error"
-    ],
-    "semi": [
-      "error",
-      "always"
-    ]
+    "no-undef": ["error"],
+    "semi": ["error", "always"]
   }
 }

.gitignore

@@ -4,3 +4,4 @@ node_modules
 springroll.log
 log.txt
 app/output.log
+.nyc_output

.travis.yml

@@ -1,5 +1,12 @@
 language: node_js
 node_js:
   - "10.9.0"
+sudo: required
+addons:
+  chrome: stable
+services:
+  - mongodb
 before_install:
   - npm install -g grunt-cli
+  - sleep 5 # give time for mongo to wake up: https://docs.travis-ci.com/user/database-setup/#mongodb
+  - cp sample.env .env

Gruntfile.js

@@ -6,6 +6,7 @@ module.exports = function(grunt)
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-less');
   grunt.loadNpmTasks('grunt-eslint');
+  grunt.loadNpmTasks('grunt-prettier');
 
   // load the configuration
   grunt.initConfig({
@@ -58,8 +59,31 @@ module.exports = function(grunt)
           }
         ]
       }
+    },
+    prettier: {
+      options: {
+        progress: true,
+        singleQuote: true
+      },
+      tests: {
+        src: [
+          'test/**/*.js'
+        ]
+      },
+      // src: {
+      //   src: [
+      //     'src/**/*.js',
+      //     '!src/libs/*.js'
+      //   ]
+      // },
+      // app: {
+      //   src: [
+      //     'app/**/*.js',
+      //     '!app/public/**'
+      //   ]
+      // }
     }
   });
 
-  grunt.registerTask('default', ['copy', 'concat', 'less', 'eslint']);
+  grunt.registerTask('default', ['copy', 'concat', 'less', 'eslint', 'prettier:tests']);
 };

app/helpers/database.js

@@ -23,6 +23,11 @@ module.exports = function(app)
 {
 	log.info('Springroll API is now operational');
 
+	// if we're spawned in a child process, notify any listeners
+	if (process.send) {
+		process.send({ message: 'Springroll API is now operational' });
+	}
+
 	// Attempt to connect to database
 	mongoose.connect(process.env.MONGO_DATABASE, function()
 	{