test(api): Fix author creation helper

metabrainz · Jun 19, 2020 · 6f90f7a · 6f90f7a
1 parent e791a62
commit 6f90f7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/test/src/api/routes/test-author.js b/test/src/api/routes/test-author.js
@@ -178,7 +178,8 @@ describe('Browse Author', () => {
 			const authorBBID = getRandomUUID();
 			const authorAttribs = {
 				bbid: authorBBID,
-				typeId
+				// Make type id alternate between "person" (1) and "group" (2)
+				typeId: (typeId % 2) + 1
 			};
 			await createAuthor(authorBBID, authorAttribs);
 			authorBBIDs.push(authorBBID);
@@ -245,10 +246,10 @@ describe('Browse Author', () => {
 	});
 
 	it('should return list of authors associated with the work (with Type filter)', async () => {
-		const res = await chai.request(app).get(`/author?work=${work.get('bbid')}&type=Author+Type+1`);
+		const res = await chai.request(app).get(`/author?work=${work.get('bbid')}&type=Person`);
 		await browseAuthorBasicTests(res);
 		expect(res.body.authors.length).to.equal(1);
-		expect(_.toLower(res.body.authors[0].entity.authorType)).to.equal('author type 1');
+		expect(res.body.authors[0].entity.authorType).to.equal('Person');
 	});
 
 	it('should return 0 authors (with Incorrect Type filter)', async () => {
@@ -258,10 +259,10 @@ describe('Browse Author', () => {
 	});
 
 	it('should allow params to be case insensitive', async () => {
-		const res = await chai.request(app).get(`/aUThor?wOrk=${work.get('bbid')}&tYPe=AuTHor+TyPe+1`);
+		const res = await chai.request(app).get(`/aUThor?wOrk=${work.get('bbid')}&tYPe=pERsOn`);
 		await browseAuthorBasicTests(res);
 		expect(res.body.authors.length).to.equal(1);
-		expect(_.toLower(res.body.authors[0].entity.authorType)).to.equal('author type 1');
+		expect(res.body.authors[0].entity.authorType).to.equal('Person');
 	});
 
 	it('should NOT throw an error if there is no related entity', async () => {

diff --git a/test/test-helpers/create-entities.js b/test/test-helpers/create-entities.js
@@ -107,9 +107,6 @@ const entityAttribs = {
 	relationshipSetId: 1,
 	revisionId: 1
 };
-const authorTypeAttribs = {
-	id: random.number()
-};
 
 export function createEditor(editorId) {
 	return orm.bookshelf.knex.transaction(async (transacting) => {
@@ -332,21 +329,21 @@ export async function createAuthor(optionalBBID, optionalAuthorAttribs = {}) {
 		endYear: 2012,
 		ended: true,
 		genderId: editorAttribs.genderId,
-		typeId: authorTypeAttribs.id,
+		typeId: 1,
 		...optionalAuthorAttribs
 	};
 	await new Area({gid: uuidv4(), id: areaId, name: 'Rlyeh'})
 		.save(null, {method: 'insert'});
 	// Front-end requires 'Person' and 'Group' types
 	try {
-		await new AuthorType({id: authorTypeAttribs.id, label: 'Person'})
+		await new AuthorType({id: 1, label: 'Person'})
 			.save(null, {method: 'insert'});
 	}
 	catch (error) {
 		// Type already exists
 	}
 	try {
-		await new AuthorType({id: random.number(), label: 'Group'})
+		await new AuthorType({id: 2, label: 'Group'})
 			.save(null, {method: 'insert'});
 	}
 	catch (error) {