test mongodb again

.travis.yml

@@ -6,6 +6,7 @@ before_install:
   - cp install/package.json package.json
 before_script:
   - sleep 15 # wait for mongodb to be ready
+  - mongo mydb_test --eval 'db.addUser("travis", "test");'
   - sh -c "if [ '$DB' = 'mongodb' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"mongo\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":27017,\\\"database\\\":0}\"; fi"
   - sh -c "if [ '$DB' = 'redis' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"redis\\\",\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":6379,\\\"database\\\":0}\"; fi"
   - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database nodebb;' -U postgres; psql -c 'create database travis_ci_test;' -U postgres; node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"postgres\\\",\\\"postgres:host\\\":\\\"127.0.0.1\\\",\\\"postgres:port\\\":5432,\\\"postgres:password\\\":\\\"\\\",\\\"postgres:database\\\":\\\"nodebb\\\",\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":5432,\\\"username\\\":\\\"postgres\\\",\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"

src/database/mongo/pubsub.js

@@ -1,8 +1,10 @@
 'use strict';
 
 var mubsub = require('mubsub-nbb');
-
 var db = require('../mongo');
-var client = mubsub(db.getConnectionString(), db.getConnectionOptions());
 
+var client = mubsub(db.getConnectionString(), db.getConnectionOptions());
+client.on('error', function (err) {
+	console.error('mongo pubsub error', err);
+});
 module.exports = client.channel('pubsub');

test/mocks/databasemock.js

@@ -35,7 +35,7 @@ nconf.defaults({
 
 if (!nconf.get('isCluster')) {
 	nconf.set('isPrimary', 'true');
-	nconf.set('isCluster', 'false');
+	nconf.set('isCluster', 'true');
 }
 
 var dbType = nconf.get('database');

test/pubsub.js

@@ -10,11 +10,9 @@ describe('pubsub', function () {
 	it('should use singleHostCluster', function (done) {
 		var oldValue = nconf.get('singleHostCluster');
 		nconf.set('singleHostCluster', true);
-		nconf.set('isCluster', true);
 		pubsub.on('testEvent', function (message) {
 			assert.equal(message.foo, 1);
 			nconf.set('singleHostCluster', oldValue);
-			nconf.set('isCluster', 'false');
 			pubsub.removeAllListeners('testEvent');
 			done();
 		});
@@ -24,11 +22,9 @@ describe('pubsub', function () {
 	it('should use the current database\'s pubsub', function (done) {
 		var oldValue = nconf.get('singleHostCluster');
 		nconf.set('singleHostCluster', false);
-		nconf.set('isCluster', true);
 		pubsub.on('testEvent', function (message) {
 			assert.equal(message.foo, 1);
 			nconf.set('singleHostCluster', oldValue);
-			nconf.set('isCluster', 'false');
 			pubsub.removeAllListeners('testEvent');
 			done();
 		});