Skip to content

Commit ef45b24

Browse files
refactor: deprecation warning on model.remove() (console flood) (#576)
Co-authored-by: Valentin Lamatte <[email protected]>
1 parent 54cf7c3 commit ef45b24

8 files changed

+15
-11
lines changed

src/services/resource-remover.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const P = require('bluebird');
33
function ResourceRemover(Model, params) {
44
this.perform = () =>
55
new P((resolve, reject) => {
6-
Model.remove({ _id: params.recordId }, (err) => {
6+
Model.deleteOne({ _id: params.recordId }, (err) => {
77
if (err) { return reject(err); }
88
return resolve();
99
});

test/tests/services/filters-parser.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('service > filters-parser', () => {
5151
IslandModel = mongoose.model('Island', IslandSchema);
5252

5353
defaultParser = new FiltersParser(IslandModel, timezone, options);
54-
return IslandModel.remove({});
54+
return IslandModel.deleteMany({});
5555
})
5656
.then(() =>
5757
loadFixture(IslandModel, [

test/tests/services/has-many-dissociator.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ describe('service > has-many-dissociator', () => {
6868
afterAll(() => mongoose.connection.close());
6969

7070
beforeEach(() => Promise.all([
71-
LumberJackModel.remove({}),
72-
TreeModel.remove({}),
71+
LumberJackModel.deleteMany({}),
72+
TreeModel.deleteMany({}),
7373
loadFixture(LumberJackModel, [
7474
{
7575
_id: '41224d776a326fb40f000001',

test/tests/services/has-many-getter.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ describe('service > has-many-getter', () => {
8484

8585
LumberJackModel = mongoose.model('LumberJack', LumberJackSchema);
8686
TreeModel = mongoose.model('Tree', TreeSchema);
87-
return Promise.all([LumberJackModel.remove({}), TreeModel.remove({})]);
87+
return Promise.all([LumberJackModel.deleteMany({}), TreeModel.deleteMany({})]);
8888
})
8989
.then(() => Promise.all([
9090
loadFixture(LumberJackModel, [

test/tests/services/query-builder.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe('service > query-builder', () => {
6060
LumberJackModel = mongoose.model('LumberJack', LumberJackSchema);
6161
TreeModel = mongoose.model('Tree', TreeSchema);
6262

63-
return Promise.all([LumberJackModel.remove({}), TreeModel.remove({})]);
63+
return Promise.all([LumberJackModel.deleteMany({}), TreeModel.deleteMany({})]);
6464
})
6565
.then(() =>
6666
Promise.all([

test/tests/services/resource-remover.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ describe('service > resource-remover', () => {
2929
});
3030

3131
IslandModel = mongoose.model('Island', IslandSchema);
32-
return IslandModel.remove({});
32+
return IslandModel.deleteMany({});
3333
});
3434
});
3535

3636
afterAll(() => mongoose.connection.close());
3737

3838
beforeEach(async () => {
39-
await IslandModel.remove({});
39+
await IslandModel.deleteMany({});
4040
await loadFixture(IslandModel, [
4141
{ name: 'Kauai', _id: '56cb91bdc3464f14678934ca' },
4242
{ name: 'Oahu', _id: '56cb91bdc3464f14678934cb' },

test/tests/services/resources-getter.test.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,11 @@ describe('service > resources-getter', () => {
8686
UserModel = mongoose.model('User', UserSchema);
8787
FilmModel = mongoose.model('Film', FilmSchema);
8888

89-
return Promise.all([OrderModel.remove({}), UserModel.remove({}), FilmModel.remove({})]);
89+
return Promise.all([
90+
OrderModel.deleteMany({}),
91+
UserModel.deleteMany({}),
92+
FilmModel.deleteMany({}),
93+
]);
9094
})
9195
.then(() =>
9296
Promise.all([

test/tests/services/resources-remover.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ describe('service > resources-remover', () => {
3030
});
3131

3232
IslandModel = mongoose.model('Island', IslandSchema);
33-
return IslandModel.remove({});
33+
return IslandModel.deleteMany({});
3434
});
3535
});
3636

3737
afterAll(() => mongoose.connection.close());
3838

3939
beforeEach(async () => {
40-
await IslandModel.remove({});
40+
await IslandModel.deleteMany({});
4141
await loadFixture(IslandModel, [
4242
{ name: 'Kauai', _id: '56cb91bdc3464f14678934ca' },
4343
{ name: 'Oahu', _id: '56cb91bdc3464f14678934cb' },

0 commit comments

Comments
 (0)