From 003470c455968b93bdfea93af9dc138cbbac284a Mon Sep 17 00:00:00 2001 From: "mike.rode" Date: Sun, 24 Feb 2019 03:00:44 -0600 Subject: [PATCH] Use async/await for tests. --- config/config.json | 2 +- coverage/index.html | 28 ++++---- coverage/recommend/config/index.html | 2 +- coverage/recommend/config/index.js.html | 2 +- coverage/recommend/config/plex.js.html | 2 +- coverage/recommend/config/test.js.html | 2 +- coverage/recommend/index.html | 2 +- coverage/recommend/index.js.html | 2 +- .../recommend/server/controllers/index.html | 2 +- .../controllers/plex.controller.js.html | 2 +- coverage/recommend/server/index.html | 28 ++++---- coverage/recommend/server/index.js.html | 30 ++++---- coverage/recommend/server/models/index.html | 2 +- .../recommend/server/models/index.js.html | 2 +- .../server/models/plexLibrary.js.html | 2 +- .../server/models/plexSection.js.html | 2 +- coverage/recommend/server/models/user.js.html | 2 +- coverage/recommend/server/routes/index.html | 2 +- .../server/routes/plex.route.js.html | 2 +- .../server/services/plex/auth.js.html | 2 +- .../server/services/plex/helpers.js.html | 30 ++++---- .../server/services/plex/importData.js.html | 10 +-- .../recommend/server/services/plex/index.html | 2 +- .../server/services/plex/index.js.html | 6 +- .../server/services/plex/plexApi.js.html | 12 ++-- test/server/services/plex/importData.test.js | 71 ++++++------------- 26 files changed, 110 insertions(+), 141 deletions(-) diff --git a/config/config.json b/config/config.json index 2bdd2db..ba6e745 100644 --- a/config/config.json +++ b/config/config.json @@ -15,7 +15,7 @@ "host": "127.0.0.1", "dialect": "postgres", "operatorsAliases": false, - "logging": true + "logging": false }, "production": { "username": "postgres", diff --git a/coverage/index.html b/coverage/index.html index d608d5f..7490b1f 100644 --- a/coverage/index.html +++ b/coverage/index.html @@ -20,9 +20,9 @@
- 89.11% + 87.62% Statements - 180/202 + 177/202
68.97% @@ -30,14 +30,14 @@ 20/29
- 88.68% + 83.02% Functions - 47/53 + 44/53
- 89.05% + 87.56% Lines - 179/201 + 176/201

@@ -89,15 +89,15 @@ recommend/server -

- 100% - 18/18 +
+ 83.33% + 15/18 100% 0/0 - 100% - 6/6 - 100% - 18/18 + 50% + 3/6 + 83.33% + 15/18 @@ -158,7 +158,7 @@
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/config/index.html b/coverage/recommend/config/index.html index bd84b59..721914a 100644 --- a/coverage/recommend/config/index.html +++ b/coverage/recommend/config/index.html @@ -106,7 +106,7 @@
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/config/index.js.html b/coverage/recommend/config/index.js.html index c6ed383..8929010 100644 --- a/coverage/recommend/config/index.js.html +++ b/coverage/recommend/config/index.js.html @@ -94,7 +94,7 @@ export default {server: _.merge(defaultConfig, envConfig), plex: plexConfig};
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/config/plex.js.html b/coverage/recommend/config/plex.js.html index b69cdbf..26fa303 100644 --- a/coverage/recommend/config/plex.js.html +++ b/coverage/recommend/config/plex.js.html @@ -73,7 +73,7 @@ export default plexConfig;
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/config/test.js.html b/coverage/recommend/config/test.js.html index c67a080..a60830f 100644 --- a/coverage/recommend/config/test.js.html +++ b/coverage/recommend/config/test.js.html @@ -70,7 +70,7 @@ export default testConfig;
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/index.html b/coverage/recommend/index.html index 8549211..8a975df 100644 --- a/coverage/recommend/index.html +++ b/coverage/recommend/index.html @@ -80,7 +80,7 @@
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/index.js.html b/coverage/recommend/index.js.html index 048609e..42ae9eb 100644 --- a/coverage/recommend/index.js.html +++ b/coverage/recommend/index.js.html @@ -76,7 +76,7 @@ export default server.create(config);
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/controllers/index.html b/coverage/recommend/server/controllers/index.html index 363b484..b0c3068 100644 --- a/coverage/recommend/server/controllers/index.html +++ b/coverage/recommend/server/controllers/index.html @@ -80,7 +80,7 @@
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/controllers/plex.controller.js.html b/coverage/recommend/server/controllers/plex.controller.js.html index 6369138..b141a5d 100644 --- a/coverage/recommend/server/controllers/plex.controller.js.html +++ b/coverage/recommend/server/controllers/plex.controller.js.html @@ -109,7 +109,7 @@ export default router;
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/index.html b/coverage/recommend/server/index.html index 1aa024b..91b2509 100644 --- a/coverage/recommend/server/index.html +++ b/coverage/recommend/server/index.html @@ -20,9 +20,9 @@
- 100% + 83.33% Statements - 18/18 + 15/18
100% @@ -30,14 +30,14 @@ 0/0
- 100% + 50% Functions - 6/6 + 3/6
- 100% + 83.33% Lines - 18/18 + 15/18

@@ -63,15 +63,15 @@ index.js -

- 100% - 18/18 +
+ 83.33% + 15/18 100% 0/0 - 100% - 6/6 - 100% - 18/18 + 50% + 3/6 + 83.33% + 15/18 @@ -80,7 +80,7 @@
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/index.js.html b/coverage/recommend/server/index.js.html index 35a1b9f..342d405 100644 --- a/coverage/recommend/server/index.js.html +++ b/coverage/recommend/server/index.js.html @@ -20,9 +20,9 @@
- 100% + 83.33% Statements - 18/18 + 15/18
100% @@ -30,14 +30,14 @@ 0/0
- 100% + 50% Functions - 6/6 + 3/6
- 100% + 83.33% Lines - 18/18 + 15/18

@@ -118,14 +118,14 @@ 1x   1x -1x -1x +  +          1x -1x +      1x @@ -159,15 +159,15 @@ export default () => {   const port = server.get('port');   - sequelize.sync().then(() => { - server.listen(port, () => { - console.log(`Express server listening on - http://${hostname}:${port}`); + sequelize.sync().then(() => { + server.listen(port, () => { + console.log(`Express server listening on - http://${hostname}:${port}`); }); }); };   - process.on('unhandledRejection', (reason, p) => { - console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); + process.on('unhandledRejection', (reason, p) => { + console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); });   return {create, start}; @@ -178,7 +178,7 @@ export default () => {

Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/models/index.html b/coverage/recommend/server/models/index.html index 601cba5..520f96b 100644 --- a/coverage/recommend/server/models/index.html +++ b/coverage/recommend/server/models/index.html @@ -119,7 +119,7 @@
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/models/index.js.html b/coverage/recommend/server/models/index.js.html index 7fb8e61..469a851 100644 --- a/coverage/recommend/server/models/index.js.html +++ b/coverage/recommend/server/models/index.js.html @@ -178,7 +178,7 @@ module.exports = db;
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/models/plexLibrary.js.html b/coverage/recommend/server/models/plexLibrary.js.html index c53c122..098a1bd 100644 --- a/coverage/recommend/server/models/plexLibrary.js.html +++ b/coverage/recommend/server/models/plexLibrary.js.html @@ -118,7 +118,7 @@
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/models/plexSection.js.html b/coverage/recommend/server/models/plexSection.js.html index 4e5aab6..9efbf17 100644 --- a/coverage/recommend/server/models/plexSection.js.html +++ b/coverage/recommend/server/models/plexSection.js.html @@ -97,7 +97,7 @@
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/models/user.js.html b/coverage/recommend/server/models/user.js.html index 4a60058..20b1808 100644 --- a/coverage/recommend/server/models/user.js.html +++ b/coverage/recommend/server/models/user.js.html @@ -100,7 +100,7 @@
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/routes/index.html b/coverage/recommend/server/routes/index.html index ab87bb0..94a5d5e 100644 --- a/coverage/recommend/server/routes/index.html +++ b/coverage/recommend/server/routes/index.html @@ -80,7 +80,7 @@
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/routes/plex.route.js.html b/coverage/recommend/server/routes/plex.route.js.html index 441ef9e..135843d 100644 --- a/coverage/recommend/server/routes/plex.route.js.html +++ b/coverage/recommend/server/routes/plex.route.js.html @@ -79,7 +79,7 @@ export default router;
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/services/plex/auth.js.html b/coverage/recommend/server/services/plex/auth.js.html index 3f02342..b4dbc1c 100644 --- a/coverage/recommend/server/services/plex/auth.js.html +++ b/coverage/recommend/server/services/plex/auth.js.html @@ -130,7 +130,7 @@ export default fetchToken;
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/services/plex/helpers.js.html b/coverage/recommend/server/services/plex/helpers.js.html index fe06822..45b3e3d 100644 --- a/coverage/recommend/server/services/plex/helpers.js.html +++ b/coverage/recommend/server/services/plex/helpers.js.html @@ -103,21 +103,21 @@     1x -12x -12x +11x +11x 3x   -9x +8x     1x -13x -13x -13x -13x -13x +12x +12x +12x +12x +12x   -13x +12x       @@ -125,13 +125,13 @@     1x -12x -12x -12x -12x +11x +11x +11x +11x     -12x +11x       @@ -208,7 +208,7 @@ export default {formatResponse, buildUrl, request};
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/services/plex/importData.js.html b/coverage/recommend/server/services/plex/importData.js.html index c633e87..f343d8d 100644 --- a/coverage/recommend/server/services/plex/importData.js.html +++ b/coverage/recommend/server/services/plex/importData.js.html @@ -145,14 +145,14 @@     1x -2x -2x -2x +1x +1x +1x     1x +1x 2x -4x       @@ -337,7 +337,7 @@ export default {importSections, importLibraries, importMostWatched};
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/services/plex/index.html b/coverage/recommend/server/services/plex/index.html index 91fa729..49d9e8a 100644 --- a/coverage/recommend/server/services/plex/index.html +++ b/coverage/recommend/server/services/plex/index.html @@ -132,7 +132,7 @@
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/services/plex/index.js.html b/coverage/recommend/server/services/plex/index.js.html index e4d381c..06f5666 100644 --- a/coverage/recommend/server/services/plex/index.js.html +++ b/coverage/recommend/server/services/plex/index.js.html @@ -149,8 +149,8 @@     1x -2x -2x +1x +1x     1x @@ -244,7 +244,7 @@ export default {
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/coverage/recommend/server/services/plex/plexApi.js.html b/coverage/recommend/server/services/plex/plexApi.js.html index bfa0ddf..d861bc9 100644 --- a/coverage/recommend/server/services/plex/plexApi.js.html +++ b/coverage/recommend/server/services/plex/plexApi.js.html @@ -150,7 +150,7 @@     1x -4x +3x       @@ -200,10 +200,10 @@     1x -4x -4x -4x -4x +3x +3x +3x +3x     1x @@ -322,7 +322,7 @@ export default {
Code coverage - generated by istanbul at Sun Feb 24 2019 02:09:19 GMT-0600 (Central Standard Time) + generated by istanbul at Sun Feb 24 2019 03:00:29 GMT-0600 (Central Standard Time)
diff --git a/test/server/services/plex/importData.test.js b/test/server/services/plex/importData.test.js index 56f5cda..683cada 100644 --- a/test/server/services/plex/importData.test.js +++ b/test/server/services/plex/importData.test.js @@ -5,59 +5,35 @@ import responses from './mocks/plexResponses'; import { PlexSection, User, PlexLibrary } from '../../../../server/models'; import truncate from '../../../truncate'; -before(() => truncate('PlexSection')); +// before(() => truncate('PlexSection')); describe('ImportData', () => { - // beforeEach(() => { - // User.create({ - // firstName: 'Mike', - // lastName: 'Rode', - // email: 'michaelrode44@gmail.com', - // }); - // }); + before(() => { + User.upsert( + { + firstName: 'Mike', + lastName: 'Rode', + email: 'michaelrode44@gmail.com', + }, + { where: { email: 'micahelrode44@gmail.com' } }, + ); + }); describe('GET /plex/import/sections', async () => { - it('should find and store sections in the database first', (done) => { + it('should find and store sections in the database first', async () => { nock('https://plex.mjrflix.com') .get('/library/sections?X-Plex-Token=testPlexApiToken') .reply(200, responses.sectionsRaw, { 'Content-Type': 'text/json', }); - chai - .request(app) - .get('/plex/import/sections') - .then((err, res) => { - PlexSection.findAll().then((sections) => { - sections.should.be.a('array'); - sections.should.have.length(2); - }); - done(); - }) - .catch(done); - }); - - it('should find and store sections in the database second', (done) => { - nock('https://plex.mjrflix.com') - .get('/library/sections?X-Plex-Token=testPlexApiToken') - .reply(200, responses.sectionsRaw, { - 'Content-Type': 'text/json', - }); - - chai - .request(app) - .get('/plex/import/sections') - .then((err, res) => { - PlexSection.findAll().then((sections) => { - sections.should.be.a('array'); - sections.should.have.length(2); - }); - done(); - }) - .catch(done); + const response = await chai.request(app).get('/plex/import/sections'); + response.should.have.status(200); + const sections = await PlexSection.findAll(); + sections.should.be.length(2); }); }); describe('Get /plex/import/libraries', async () => { - it('should sections', (done) => { + it('should sections', async () => { nock('https://plex.mjrflix.com') .get(url => url.includes('/library/sections/3')) .reply(200, responses.getLibraryDataBySectionRaw, { @@ -73,16 +49,9 @@ describe('ImportData', () => { .reply(200, responses.sectionsRaw, { 'Content-Type': 'text/json', }); - chai - .request(app) - .get('/plex/import/libraries') - .then((err, res) => { - PlexLibrary.findAll().then((media) => { - media.should.be.a('array'); - // console.log('mikes-media', media); - done(); - }); - }); + const response = await chai.request(app).get('/plex/import/libraries'); + const media = await PlexLibrary.findAll(); + media.should.be.length(56); }); }); });