add generateIndex for each test

metabrainz · Aug 13, 2020 · d0d59a9 · d0d59a9
1 parent 4c3a167
commit d0d59a9
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/test/src/server/routes/collection.js b/test/src/server/routes/collection.js
@@ -45,8 +45,9 @@ describe('POST /collection/collectionID/delete', () => {
 			public: true
 		};
 		const collection = await new UserCollection(collectionData).save(null, {method: 'insert'});
+		await generateIndex(orm);
 		const res = await agent.post(`/collection/${collection.get('id')}/delete/handler`).send();
-		const collections = await new UserCollection({id: collection.get('id')}).fetchAll({require: false});
+		const collections = await new UserCollection().where('id', collection.get('id')).fetchAll({require: false});
 		const collectionsJSON = collections.toJSON();
 
 		expect(res.status).to.equal(200);
@@ -62,6 +63,7 @@ describe('POST /collection/collectionID/delete', () => {
 			public: true
 		};
 		const collection = await new UserCollection(collectionData).save(null, {method: 'insert'});
+		await generateIndex(orm);
 		const author1 = await createAuthor();
 		const author2 = await createAuthor();
 		await new UserCollectionItem({
@@ -74,8 +76,8 @@ describe('POST /collection/collectionID/delete', () => {
 		});
 		const res = await agent.post(`/collection/${collection.get('id')}/delete/handler`).send();
 
-		const collections = await new UserCollection({id: collection.get('id')}).fetchAll({require: false});
-		const items = await new UserCollectionItem({collectionId: collection.get('id')}).fetchAll({require: false});
+		const collections = await new UserCollection().where('id', collection.get('id')).fetchAll({require: false});
+		const items = await new UserCollectionItem().where('collection_id', collection.get('id')).fetchAll({require: false});
 		const collectionsJSON = collections.toJSON();
 		const itemsJSON = items.toJSON();
 
@@ -95,6 +97,7 @@ describe('POST /collection/collectionID/delete', () => {
 		const collaborator1 = await createEditor();
 		const collaborator2 = await createEditor();
 		const collection = await new UserCollection(collectionData).save(null, {method: 'insert'});
+		await generateIndex(orm);
 		await new UserCollectionCollaborator({
 			collaboratorId: collaborator1.get('id'),
 			collectionId: collection.get('id')
@@ -105,8 +108,8 @@ describe('POST /collection/collectionID/delete', () => {
 		});
 
 		const res = await agent.post(`/collection/${collection.get('id')}/delete/handler`).send();
-		const collections = await new UserCollection({id: collection.get('id')}).fetchAll({require: false});
-		const collaborators = await new UserCollectionCollaborator({collectionId: collection.get('id')}).fetchAll({require: false});
+		const collections = await new UserCollection().where('id', res.body.id).fetchAll({require: false});
+		const collaborators = await new UserCollectionCollaborator().where('collection_id', collection.get('id')).fetchAll({require: false});
 		const collaboratorsJSON = collaborators.toJSON();
 		const collectionsJSON = collections.toJSON();
 
@@ -126,6 +129,7 @@ describe('POST /collection/collectionID/delete', () => {
 		};
 
 		const collection = await new UserCollection(collectionData).save(null, {method: 'insert'});
+		await generateIndex(orm);
 		// here loggedInUser is neither owner nor collaborator
 		const response = await agent.post(`/collection/${collection.get('id')}/delete/handler`).send();
 		const collections = await new UserCollection().where('id', collection.get('id')).fetchAll({require: false});
@@ -146,6 +150,7 @@ describe('POST /collection/collectionID/delete', () => {
 			public: true
 		};
 		const collection = await new UserCollection(collectionData).save(null, {method: 'insert'});
+		await generateIndex(orm);
 		await new UserCollectionCollaborator({
 			collaboratorId: loggedInUser.get('id'),
 			collectionId: collection.get('id')
@@ -174,7 +179,7 @@ describe('POST /collection/collectionID/delete', () => {
 		const res = await agent.post(`/collection/${collection.get('id')}/delete/handler`).send();
 		await refreshIndex();
 		const newResult = await searchByName(orm, collectionData.name, 'Collection', 10, 0);
-		const collections = await new UserCollection({id: collection.get('id')}).fetchAll({require: false});
+		const collections = await new UserCollection().where('id', collection.get('id')).fetchAll({require: false});
 		const collectionsJSON = collections.toJSON();
 
 		expect(res.status).to.equal(200);