From e2a4d8bc246e7bbcf39cdfbf04c46df2dd286a88 Mon Sep 17 00:00:00 2001 From: Sander Vocke Date: Thu, 16 Jul 2020 22:49:20 +0200 Subject: [PATCH] Fix unit tests. --- server/endpoints/QuerySongsEndpointHandler.ts | 2 -- .../test/integration/flows/CreateArtistFlow.js | 6 ++---- server/test/integration/flows/CreateSongFlow.js | 17 +++++++---------- .../test/integration/flows/ModifyArtistFlow.js | 4 ++-- server/test/integration/flows/QuerySongsFlow.js | 5 ++--- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/server/endpoints/QuerySongsEndpointHandler.ts b/server/endpoints/QuerySongsEndpointHandler.ts index fd8397c..03e978f 100644 --- a/server/endpoints/QuerySongsEndpointHandler.ts +++ b/server/endpoints/QuerySongsEndpointHandler.ts @@ -54,8 +54,6 @@ export const QuerySongsEndpointHandler: EndpointHandler = async (req: any, res: } const reqObject: api.QuerySongsRequest = req.body; - console.log("Query with where: ", getSequelizeWhere(reqObject.query)); - await models.Song.findAll({ where: getSequelizeWhere(reqObject.query), include: [models.Artist, models.Album] diff --git a/server/test/integration/flows/CreateArtistFlow.js b/server/test/integration/flows/CreateArtistFlow.js index 7d75239..1813cf7 100644 --- a/server/test/integration/flows/CreateArtistFlow.js +++ b/server/test/integration/flows/CreateArtistFlow.js @@ -21,8 +21,7 @@ describe('POST /artist with no name', () => { .request(app) .post('/artist') .send({}) - .end((err, res) => { - expect(err).to.be.null; + .then((res) => { expect(res).to.have.status(400); done(); }); @@ -39,8 +38,7 @@ describe('POST /artist with a correct request', () => { .send({ name: "MyArtist" }) - .end((err, res) => { - expect(err).to.be.null; + .then((res) => { expect(res).to.have.status(200); expect(res.body).to.deep.equal({ id: 1 diff --git a/server/test/integration/flows/CreateSongFlow.js b/server/test/integration/flows/CreateSongFlow.js index 277442a..0e332b0 100644 --- a/server/test/integration/flows/CreateSongFlow.js +++ b/server/test/integration/flows/CreateSongFlow.js @@ -21,8 +21,7 @@ describe('POST /song with no title', () => { .request(app) .post('/song') .send({}) - .end((err, res) => { - expect(err).to.be.null; + .then((res) => { expect(res).to.have.status(400); done(); }); @@ -39,8 +38,7 @@ describe('POST /song with only a title', () => { .send({ title: "MySong" }) - .end((err, res) => { - expect(err).to.be.null; + .then((res) => { expect(res).to.have.status(200); expect(res.body).to.deep.equal({ id: 1 @@ -61,8 +59,7 @@ describe('POST /song with a nonexistent artist Id', () => { title: "MySong", artistIds: [1] }) - .end((err, res) => { - expect(err).to.be.null; + .then((res) => { expect(res).to.have.status(400); done(); }); @@ -75,7 +72,7 @@ describe('POST /song with an existing artist Id', () => { init().then((app) => { var req = chai.request(app).keepOpen(); helpers.createArtist(req, { name: "MyArtist" }, 200, { id: 1 }) - .then(() => { helpers.createSong(req, { name: "MySong" }, 200, { id: 1 }) }) + .then(() => helpers.createSong(req, { title: "MySong", artistIds: [ 1 ] }, 200, { id: 1 }) ) .then(req.close) .then(done); }); @@ -87,8 +84,8 @@ describe('POST /song with two existing artist Ids', () => { init().then((app) => { var req = chai.request(app).keepOpen(); helpers.createArtist(req, { name: "Artist1" }, 200, { id: 1 }) - .then(() => { helpers.createArtist(req, { name: "Artist2" }, 200, { id: 2 }) }) - .then(() => { helpers.createSong(req, { name: "MySong", artistIds: [1, 2] }, 200, { id: 1 }) }) + .then(() => helpers.createArtist(req, { name: "Artist2" }, 200, { id: 2 }) ) + .then(() => helpers.createSong(req, { title: "MySong", artistIds: [1, 2] }, 200, { id: 1 }) ) .then(req.close) .then(done); }); @@ -100,7 +97,7 @@ describe('POST /song with an existent and a nonexistent artist Id', () => { init().then((app) => { var req = chai.request(app).keepOpen(); helpers.createArtist(req, { name: "Artist1" }, 200, { id: 1 }) - .then(() => { helpers.createSong(req, { name: "MySong", artistIds: [1, 2] }, 400) }) + .then(() => helpers.createSong(req, { title: "MySong", artistIds: [1, 2] }, 400) ) .then(req.close) .then(done); }); diff --git a/server/test/integration/flows/ModifyArtistFlow.js b/server/test/integration/flows/ModifyArtistFlow.js index 485a960..d866e3e 100644 --- a/server/test/integration/flows/ModifyArtistFlow.js +++ b/server/test/integration/flows/ModifyArtistFlow.js @@ -37,8 +37,8 @@ describe('PUT /artist with an existing artist', () => { init().then((app) => { var req = chai.request(app).keepOpen(); helpers.createArtist(req, { name: "MyArtist" }, 200, { id: 1 }) - .then(() => { helpers.modifyArtist(req, 1, { name: "MyNewArtist" }, 200) }) - .then(() => { helpers.checkArtist(req, 1, 200, { name: "MyNewArtist" } )}) + .then(() => helpers.modifyArtist(req, 1, { name: "MyNewArtist" }, 200) ) + .then(() => helpers.checkArtist(req, 1, 200, { name: "MyNewArtist" } ) ) .then(req.close) .then(done); }); diff --git a/server/test/integration/flows/QuerySongsFlow.js b/server/test/integration/flows/QuerySongsFlow.js index b819ebd..b6cd3f8 100644 --- a/server/test/integration/flows/QuerySongsFlow.js +++ b/server/test/integration/flows/QuerySongsFlow.js @@ -23,15 +23,14 @@ describe('POST /song/query with no songs', () => { .send({ 'query': {} }) - .end((err, res) => { - expect(err).to.be.null; + .then((res) => { expect(res).to.have.status(200); expect(res.body).to.deep.equal({ ids: [] }); + done(); }); }) - .then(done); }); });