Merge remote-tracking branch 'origin/master' into socket.io1.x

tests/groups.js

@@ -76,6 +76,7 @@ describe('Groups', function() {
 	describe('.search()', function() {
 		it('should return the "Test" group when searched for', function(done) {
 			Groups.search('test', {}, function(err, groups) {
+				if (err) return done(err);
 				assert.equal(1, groups.length);
 				assert.strictEqual('Test', groups[0].name);
 				done();
@@ -86,6 +87,7 @@ describe('Groups', function() {
 			Groups.search('hidden', {
 				showAllGroups: true
 			}, function(err, groups) {
+				if (err) return done(err);
 				assert.equal(1, groups.length);
 				assert.strictEqual('Hidden', groups[0].name);
 				done();