Skip to content

Commit

Permalink
fix: no more deprecation warnings in tests re: #6880
Browse files Browse the repository at this point in the history
  • Loading branch information
@vkarpov15
vkarpov15 committed Aug 24, 2018
1 parent 3b7464c commit 3f4a885
Show file tree
Hide file tree
Showing 11 changed files with 58 additions and 65 deletions.
6 changes: 5 additions & 1 deletion lib/connection.js
View file
Expand Up @@ -476,7 +476,11 @@ Connection.prototype.openUri = function(uri, options, callback) {
options.promiseLibrary = PromiseProvider.get();
}
if (!('useNewUrlParser' in options)) {
options.useNewUrlParser = false;
if ('useNewUrlParser' in this.base.options) {
options.useNewUrlParser = this.base.options.useNewUrlParser;
} else {
options.useNewUrlParser = false;
}
}

const parsePromise = new Promise((resolve, reject) => {
Expand Down
1 change: 1 addition & 0 deletions lib/index.js
View file
Expand Up @@ -88,6 +88,7 @@ Mongoose.prototype.STATES = STATES;
* - 'bufferCommands': enable/disable mongoose's buffering mechanism for all connections and models
* - 'useCreateIndex': false by default. Set to `true` to make Mongoose's default index build use `createIndex()` instead of `ensureIndex()` to avoid deprecation warnings from the MongoDB driver.
* - 'useFindAndModify': true by default. Set to `false` to make `findOneAndUpdate()` and `findOneAndRemove()` use native `findOneAndUpdate()` rather than `findAndModify()`.
* - 'useNewUrlParser': false by default. Set to `true` to make all connections set the `useNewUrlParser` option by default
* - 'cloneSchemas': false by default. Set to `true` to `clone()` all schemas before compiling into a model.
* - 'applyPluginsToDiscriminators': false by default. Set to true to apply global plugins to discriminator schemas. This typically isn't necessary because plugins are applied to the base schema and discriminators copy all middleware, methods, statics, and properties from the base schema.
* - 'objectIdGetter': true by default. Mongoose adds a getter to MongoDB ObjectId's called `_id` that returns `this` for convenience with populate. Set this to false to remove the getter.
Expand Down
2 changes: 1 addition & 1 deletion test/collection.test.js
View file
Expand Up @@ -31,7 +31,7 @@ describe('collections:', function() {
});

const uri = 'mongodb://localhost:27017/mongoose_test';
db.openUri(process.env.MONGOOSE_TEST_URI || uri, function(err) {
db.openUri(process.env.MONGOOSE_TEST_URI || uri, { useNewUrlParser: true }, function(err) {
connected = !err;
finish();
});
Expand Down
1 change: 1 addition & 0 deletions test/common.js
View file
Expand Up @@ -18,6 +18,7 @@ if (process.env.D === '1') {
// For 3.1.3 deprecations
mongoose.set('useFindAndModify', false);
mongoose.set('useCreateIndex', true);
mongoose.set('useNewUrlParser', true);

/**
* Override all Collection related queries to keep count
Expand Down
40 changes: 18 additions & 22 deletions test/connection.test.js
View file
Expand Up @@ -49,7 +49,8 @@ describe('connections:', function() {

it('with autoIndex (gh-5423)', function(done) {
var promise = mongoose.createConnection('mongodb://localhost:27017/mongoosetest', {
autoIndex: false
autoIndex: false,
useNewUrlParser: true
});

promise.then(function(conn) {
Expand All @@ -67,15 +68,16 @@ describe('connections:', function() {

it('throws helpful error with undefined uri (gh-6763)', function(done) {
assert.throws(function() {
mongoose.createConnection(void 0);
mongoose.createConnection(void 0, { useNewUrlParser: true });
}, /string.*createConnection/);
done();
});

it('resolving with q (gh-5714)', function(done) {
var bootMongo = Q.defer();

var conn = mongoose.createConnection('mongodb://localhost:27017/mongoosetest');
var conn = mongoose.createConnection('mongodb://localhost:27017/mongoosetest',
{ useNewUrlParser: true });

conn.on('connected', function() {
bootMongo.resolve(this);
Expand Down Expand Up @@ -110,7 +112,9 @@ describe('connections:', function() {
var numReconnected = 0;
var numReconnect = 0;
var numClose = 0;
conn = mongoose.createConnection('mongodb://localhost:27000/mongoosetest');
conn = mongoose.createConnection('mongodb://localhost:27000/mongoosetest', {
useNewUrlParser: true
});

conn.on('connected', function() {
++numConnected;
Expand Down Expand Up @@ -177,7 +181,8 @@ describe('connections:', function() {
var numReconnected = 0;
conn = mongoose.createConnection('mongodb://localhost:27000/mongoosetest', {
reconnectTries: 3,
reconnectInterval: 100
reconnectInterval: 100,
useNewUrlParser: true
});

conn.on('connected', function() {
Expand Down Expand Up @@ -245,7 +250,8 @@ describe('connections:', function() {
var numDisconnected = 0;
conn = mongoose.createConnection('mongodb://localhost:27000/mongoosetest', {
socketTimeoutMS: 100,
poolSize: 1
poolSize: 1,
useNewUrlParser: true
});

conn.on('timeout', function() {
Expand Down Expand Up @@ -351,18 +357,8 @@ describe('connections:', function() {
db.close(done);
});

it('should accept mongodb://localhost/fake', function(done) {
const db = mongoose.createConnection('mongodb://localhost/fake', () => {
db.close(done);
});
assert.ok(db instanceof mongoose.Connection);
assert.equal(db.name, 'fake');
assert.equal(db.host, 'localhost');
assert.equal(db.port, 27017);
});

it('should accept mongodb://aaron:psw@localhost:27000/fake', function(done) {
var db = mongoose.createConnection('mongodb://aaron:psw@localhost:27000/fake', () => {
var db = mongoose.createConnection('mongodb://aaron:psw@localhost:27000/fake', { useNewUrlParser: true }, () => {
db.close(done);
});
assert.equal(db.pass, 'psw');
Expand All @@ -374,7 +370,7 @@ describe('connections:', function() {

it('should accept unix domain sockets', function(done) {
const host = encodeURIComponent('/tmp/mongodb-27017.sock');
var db = mongoose.createConnection(`mongodb://aaron:psw@${host}/fake`);
var db = mongoose.createConnection(`mongodb://aaron:psw@${host}/fake`, { useNewUrlParser: true });
db.catch(() => {});
assert.equal(db.name, 'fake');
assert.equal(db.host, '/tmp/mongodb-27017.sock');
Expand Down Expand Up @@ -414,7 +410,7 @@ describe('connections:', function() {

describe('connect callbacks', function() {
it('execute with user:pwd connection strings', function(done) {
var db = mongoose.createConnection('mongodb://aaron:psw@localhost:27000/fake', function() {
var db = mongoose.createConnection('mongodb://aaron:psw@localhost:27000/fake', { useNewUrlParser: true }, function() {
done();
});
db.catch(() => {});
Expand All @@ -424,7 +420,7 @@ describe('connections:', function() {
db.close();
});
it('execute without user:pwd connection strings', function(done) {
var db = mongoose.createConnection('mongodb://localhost/fake', function() {
var db = mongoose.createConnection('mongodb://localhost/fake', { useNewUrlParser: true }, function() {
});
db.on('error', function(err) {
assert.ok(err);
Expand All @@ -439,15 +435,15 @@ describe('connections:', function() {
});

it('should return an error if malformed uri passed', function(done) {
var db = mongoose.createConnection('mongodb:///fake', function(err) {
var db = mongoose.createConnection('mongodb:///fake', { useNewUrlParser: true }, function(err) {
assert.ok(/hostname/.test(err.message));
done();
});
db.close();
assert.ok(!db.options);
});
it('should use admin db if not specified and user/pass specified', function(done) {
var db = mongoose.createConnection('mongodb://u:p@localhost/admin', function() {
var db = mongoose.createConnection('mongodb://u:p@localhost/admin', { useNewUrlParser: true }, function() {
done();
});
assert.equal(typeof db.options, 'object');
Expand Down
2 changes: 1 addition & 1 deletion test/docs/discriminators.test.js
View file
Expand Up @@ -95,7 +95,7 @@ describe('discriminator docs', function () {
assert.ifError(error);
// acquit:ignore:end

Event.count({}, function (error, count) {
Event.countDocuments({}, function (error, count) {
// acquit:ignore:start
assert.ifError(error);
// acquit:ignore:end
Expand Down
41 changes: 16 additions & 25 deletions test/index.test.js
View file
Expand Up @@ -10,26 +10,17 @@ var collection = 'blogposts_' + random();

const uri = 'mongodb://localhost:27017/mongoose_test';

const options = {
useNewUrlParser: true
};

describe('mongoose module:', function() {
describe('default connection works', function() {
it('without options', function(done) {
var goose = new Mongoose;
var db = goose.connection;

goose.connect(process.env.MONGOOSE_TEST_URI || uri);

db.on('open', function() {
db.close(function() {
done();
});
});
});

it('with options', function(done) {
var goose = new Mongoose;
var db = goose.connection;

goose.connect(process.env.MONGOOSE_TEST_URI || uri, {});
goose.connect(process.env.MONGOOSE_TEST_URI || uri, options);

db.on('open', function() {
db.close(function() {
Expand All @@ -42,7 +33,7 @@ describe('mongoose module:', function() {
var goose = new Mongoose;
var db = goose.connection;

goose.connect(process.env.MONGOOSE_TEST_URI || uri).then(function() {
goose.connect(process.env.MONGOOSE_TEST_URI || uri, options).then(function() {
db.close(done);
});
});
Expand Down Expand Up @@ -152,7 +143,7 @@ describe('mongoose module:', function() {
name: { type: String, required: true }
}));

return mongoose.connect(uri).
return mongoose.connect(uri, options).
then(() => M.updateOne({}, { name: null })).
then(
() => assert.ok(false),
Expand All @@ -166,7 +157,7 @@ describe('mongoose module:', function() {

mongoose.set('useCreateIndex', true);

return mongoose.connect(uri).
return mongoose.connect(uri, options).
then(() => {
const M = mongoose.model('Test', new Schema({
name: { type: String, index: true }
Expand Down Expand Up @@ -219,7 +210,7 @@ describe('mongoose module:', function() {
assert.deepEqual(calls[1].obj, subSchema.obj);

assert.equal(preSaveCalls, 0);
mong.connect(start.uri);
mong.connect(start.uri, options);
M.create({ test: [{ name: 'Val' }] }, function(error, doc) {
assert.ifError(error);
assert.equal(preSaveCalls, 2);
Expand All @@ -240,7 +231,7 @@ describe('mongoose module:', function() {
var disconnections = 0;
var pending = 4;

mong.connect(process.env.MONGOOSE_TEST_URI || uri);
mong.connect(process.env.MONGOOSE_TEST_URI || uri, options);
var db = mong.connection;

function cb() {
Expand All @@ -260,7 +251,7 @@ describe('mongoose module:', function() {
cb();
});

var db2 = mong.createConnection(process.env.MONGOOSE_TEST_URI || uri);
var db2 = mong.createConnection(process.env.MONGOOSE_TEST_URI || uri, options);

db2.on('open', function() {
connections++;
Expand All @@ -279,7 +270,7 @@ describe('mongoose module:', function() {
it('with callback', function(done) {
var mong = new Mongoose();

mong.connect(process.env.MONGOOSE_TEST_URI || uri);
mong.connect(process.env.MONGOOSE_TEST_URI || uri, options);

mong.connection.on('open', function() {
mong.disconnect(function() {
Expand All @@ -291,7 +282,7 @@ describe('mongoose module:', function() {
it('with promise (gh-3790)', function(done) {
var mong = new Mongoose();

mong.connect(process.env.MONGOOSE_TEST_URI || uri);
mong.connect(process.env.MONGOOSE_TEST_URI || uri, options);

mong.connection.on('open', function() {
mong.disconnect().then(function() { done(); });
Expand Down Expand Up @@ -393,7 +384,7 @@ describe('mongoose module:', function() {
it('with single mongod', function(done) {
var mong = new Mongoose();

mong.connect(uri, {}, function(err) {
mong.connect(uri, options, function(err) {
assert.ifError(err);
mong.connection.close();
done();
Expand All @@ -406,7 +397,7 @@ describe('mongoose module:', function() {

if (!uri) return done();

mong.connect(uri, {}, function(err) {
mong.connect(uri, options, function(err) {
assert.ifError(err);
mong.connection.close();
done();
Expand Down Expand Up @@ -446,7 +437,7 @@ describe('mongoose module:', function() {

it('of result from .connect() (gh-3940)', function(done) {
var m = new mongoose.Mongoose;
m.connect('mongodb://localhost:27017/test').then(function(m) {
m.connect('mongodb://localhost:27017/test', options).then(function(m) {
test(m);
m.disconnect();
done();
Expand Down
10 changes: 5 additions & 5 deletions test/model.findOneAndUpdate.test.js
View file
Expand Up @@ -1117,7 +1117,7 @@ describe('model: findOneAndUpdate:', function() {
assert.ifError(error);
assert.equal(breakfast.base, 'eggs');
assert.equal(breakfast.topping, 'bacon');
Breakfast.count({topping: 'bacon'}, function(error, count) {
Breakfast.countDocuments({topping: 'bacon'}, function(error, count) {
assert.ifError(error);
assert.equal(1, count);
done();
Expand Down Expand Up @@ -1163,7 +1163,7 @@ describe('model: findOneAndUpdate:', function() {
assert.ifError(error);
assert.equal(breakfast.base, 'eggs');
assert.equal(breakfast.topping, 'bacon');
Breakfast.count({topping: 'bacon'}, function(error, count) {
Breakfast.countDocuments({topping: 'bacon'}, function(error, count) {
assert.ifError(error);
assert.equal(1, count);
done();
Expand Down Expand Up @@ -1880,7 +1880,7 @@ describe('model: findOneAndUpdate:', function() {
it('useFindAndModify in opts (gh-5616)', function(done) {
var m = new mongoose.constructor();

m.connect(start.uri);
m.connect(start.uri, { useNewUrlParser: true });

var calls = [];
m.set('debug', function(collection, fnName) {
Expand All @@ -1907,7 +1907,7 @@ describe('model: findOneAndUpdate:', function() {
it('useFindAndModify in set (gh-5616)', function(done) {
var m = new mongoose.constructor();

m.connect(start.uri);
m.connect(start.uri, { useNewUrlParser: true });

var calls = [];
m.set('debug', function(collection, fnName) {
Expand Down Expand Up @@ -1935,7 +1935,7 @@ describe('model: findOneAndUpdate:', function() {
it('useFindAndModify with overwrite (gh-6887)', function() {
return co(function*() {
const m = new mongoose.constructor();
yield m.connect(start.uri);
yield m.connect(start.uri, { useNewUrlParser: true });

const calls = [];
m.set('debug', function(collection, fnName) {
Expand Down
2 changes: 1 addition & 1 deletion test/model.querying.test.js
View file
Expand Up @@ -197,7 +197,7 @@ describe('model: querying:', function() {
assert.ok(BlogPostB.findOne(q, null, {}, fn) instanceof Query);
});

describe('count', function() {
describe.skip('count', function() {
it('returns a Query', function(done) {
var BlogPostB = db.model('BlogPostB', collection);
assert.ok(BlogPostB.count({}) instanceof Query);
Expand Down

0 comments on commit 3f4a885

Please sign in to comment.