Uploader and Catalog tests working under same repo

package.json

@@ -4,9 +4,11 @@
   "description": "A catalog for Open Aerial Map Imagery",
   "main": "index.js",
   "scripts": {
-    "test": "npm run lint && ./node_modules/mocha/bin/mocha",
+    "test": "npm run lint && npm run catalog_tests && npm run uploader_tests",
     "lint": "eslint . --ext .js",
-    "docs": "apidoc -i routes/ -o docs/"
+    "docs": "apidoc -i routes/ -o docs/",
+    "uploader_tests": "lab -T test/uploader/babel.js test/uploader/test__*.js",
+    "catalog_tests": "mocha test/catalog"
   },
   "repository": {
     "type": "git",

routes/_apidoc.js

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 // -----------------------------------------------------------------------------
 // Meta success return values
 // -----------------------------------------------------------------------------
@@ -81,8 +80,7 @@
  *      ]
  *   }
  */
-||||||| merged common ancestors
-=======
+
 /**
  * @apiDefine Token API Token Authentication
  *  API token must be included either as an HTTP `Bearer: your-token` header or as a query
@@ -113,4 +111,3 @@
  * @apiSuccess {String} results.scenes.images.startedAt Date and time the processing started
  * @apiSuccess {String} results.scenes.images.stoppedAt Date and time the processing stopped
  */
->>>>>>> oam-uploader-api-repo/develop

routes/uploads.js

@@ -231,7 +231,10 @@ module.exports = [
         });
 
         q.awaitAll(function (err) {
-          if (err) { return reply(Boom.wrap(err)); }
+          if (err) {
+            console.log(err);
+            return reply(Boom.wrap(err));
+          }
           db.collection('uploads').insertOne(data)
           .then(function (result) {
             sendgrid.send({

services/db.js

@@ -31,7 +31,7 @@ Connection.prototype.deleteDb = function (cb) {
 };
 
 Connection.prototype.close = function () {
-  mongoose.disconnect();
+  mongoose.connection.close();
 };
 
 module.exports = Connection;

test/test_meta.js → test/catalog/test_meta.js

@@ -4,10 +4,9 @@
 var expect = require('chai').expect;
 // var should = require('chai').should();
 var request = require('request');
-var Conn = require('../services/db.js');
-var Server = require('../services/server.js');
+var Conn = require('../../services/db.js');
+var Server = require('../../services/server.js');
 var meta = require('./sample_meta.json');
-var testDb = 'oam_catalog_test';
 
 describe('Meta endpoint', function () {
   this.timeout(15000);

test/test_tms.js → test/catalog/test_tms.js

@@ -5,8 +5,8 @@ var expect = require('chai').expect;
 // var should = require('chai').should();
 var request = require('request');
 var async = require('async');
-var Conn = require('../services/db.js');
-var Server = require('../services/server.js');
+var Conn = require('../../services/db.js');
+var Server = require('../../services/server.js');
 var meta = require('./sample_meta.json');
 var testDb = 'oam_catalog_test';
 

test/test__token_management.js → test/uploader/test__token_management.js

@@ -1,18 +1,19 @@
 'use strict';
 
 var Lab = require('lab');
-var Server = require('../services/server');
-var Conn = require('../services/db.js');
-var config = require('../config');
+var Server = require('../../services/server');
+var Conn = require('../../services/db.js');
+var config = require('../../config');
 
-var createValidateToken = require('../services/validate-token');
+var createValidateToken = require('../../services/validate-token');
 var chai = require('chai');
 var ObjectId = require('mongodb').ObjectID;
 
 var lab = exports.lab = Lab.script();
 var suite = lab.experiment;
 var test = lab.test;
 var before = lab.before;
+var after = lab.after;
 var assert = chai.assert;
 
 var cookie = null;
@@ -21,6 +22,7 @@ var validateToken = null;
 
 suite('test tokens', function () {
   var server;
+  var dbWrapper;
 
   before(function (done) {
     assert.match(config.dbUri, /test$/, 'use the test database');
@@ -30,7 +32,7 @@ suite('test tokens', function () {
     var serverWrapper = new Server(4000);
     serverWrapper.start();
     server = serverWrapper.hapi;
-    var dbWrapper = new Conn();
+    dbWrapper = new Conn();
     dbWrapper.start();
     var db = dbWrapper.db;
     validateToken = createValidateToken(db);
@@ -78,6 +80,11 @@ suite('test tokens', function () {
     });
   });
 
+  after(function (done) {
+    dbWrapper.close();
+    done();
+  });
+
   test('should list tokens', function (done) {
     var options = {
       method: 'GET',

test/test__token_validation.js → test/uploader/test__token_validation.js

@@ -1,12 +1,13 @@
-var Conn = require('../services/db.js');
+var Conn = require('../../services/db.js');
 var Lab = require('lab');
-var createValidateToken = require('../services/validate-token');
+var createValidateToken = require('../../services/validate-token');
 var chai = require('chai');
 
 var lab = exports.lab = Lab.script();
 var suite = lab.experiment;
 var test = lab.test;
 var before = lab.before;
+var after = lab.after;
 var assert = chai.assert;
 
 var validateToken = null;
@@ -65,8 +66,10 @@ var tokens = [
 ];
 
 suite('test token validation', function () {
+  var dbWrapper;
+
   before(function (done) {
-    var dbWrapper = new Conn();
+    dbWrapper = new Conn();
     dbWrapper.start();
     var db = dbWrapper.db;
     validateToken = createValidateToken(db);
@@ -78,6 +81,11 @@ suite('test token validation', function () {
     });
   });
 
+  after(function (done) {
+    dbWrapper.close();
+    done();
+  });
+
   test('should validate active token', function (done) {
     validateToken(tokens[0].token, function (error, valid, creds) {
       assert(valid);

test/test__user_authentication.js → test/uploader/test__user_authentication.js

@@ -1,20 +1,20 @@
 'use strict';
 
-var Server = require('../services/server');
+var Server = require('../../services/server');
 var Lab = require('lab');
-var server = require('../');
 var chai = require('chai');
 
 var lab = exports.lab = Lab.script();
 var suite = lab.experiment;
 var test = lab.test;
 var before = lab.before;
-// var after = lab.after;
 var assert = chai.assert;
 
 var cookie = null;
 
 suite('test authentication', function () {
+  var server;
+
   before(function (done) {
     // Get a reference to the server.
     // Wait for everything to load.

test/test__worker.js → test/uploader/test__worker.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var Server = require('../services/server');
-var Conn = require('../services/db.js');
+var Server = require('../../services/server');
+var Conn = require('../../services/db.js');
 var Lab = require('lab');
 var chai = require('chai');
 var omit = require('omit-deep');
@@ -10,20 +10,26 @@ var lab = exports.lab = Lab.script();
 var suite = lab.experiment;
 var test = lab.test;
 var before = lab.before;
+var after = lab.after;
 var assert = chai.assert;
 
 suite('test worker', function () {
   var server;
+  var dbWrapper;
   var uploadId;
 
   before(function (done) {
     var serverWrapper = new Server(4000);
     serverWrapper.start();
     server = serverWrapper.hapi;
-    var dbWrapper = new Conn();
+    dbWrapper = new Conn();
     dbWrapper.start();
     var db = dbWrapper.db;
-    db.dropDatabase();
+    db.dropDatabase(done);
+  });
+
+  after(function (done) {
+    dbWrapper.close();
     done();
   });
 

worker.js

@@ -3,7 +3,6 @@
 require('envloader').load();
 
 var _ = require('lodash');
-var Conn = require('./services/db.js');
 var S3 = require('./services/s3.js');
 var LocalOAM = require('./services/localoam.js');
 var async = require('async');
@@ -18,8 +17,7 @@ var cron = require('node-cron');
 var registerURL = process.env.OIN_REGISTER_URL || 'https://raw.githubusercontent.com/openimagerynetwork/oin-register/master/master.json';
 var localRegisterURL = process.env.LOCAL_REGISTER_URL || '';
 
-var db = new Conn(process.env.DBNAME || 'oam-catalog', process.env.DBURI);
-db.start();
+var db = mongoose.connection;
 
 var consoleLog = function (err, msg) {
   if (err) {