Skip to content

Commit

Permalink
Heil refactor #113
Browse files Browse the repository at this point in the history
  • Loading branch information
@aibarbetta
aibarbetta committed May 25, 2017
1 parent 7253d86 commit c7e1d5f
Show file tree
Hide file tree
Showing 21 changed files with 80 additions and 67 deletions.
0 src/test/routes/admin.constants.json → src/test/routes/admin/admin.constants.json
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions src/test/routes/admin.spec.js → src/test/routes/admin/admin.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
process.env.NODE_ENV = 'test';

const app = require('../../app');
const db = require('../../database');
const tables = require('../../database/tableNames');
const dbHandler = require('../../handlers/db/generalHandler');
const app = require('../../../app');
const db = require('../../../database/index');
const tables = require('../../../database/tableNames');
const dbHandler = require('../../../handlers/db/generalHandler');
const jwt = require('jsonwebtoken');
const request = require('supertest');
const chai = require('chai');
Expand All @@ -12,7 +12,7 @@ const chaiHttp = require('chai-http');
chai.should();
chai.use(chaiHttp);

const config = require('./../../config');
const config = require('./../../../config');
const constants = require('./admin.constants.json');

const testToken = jwt.sign({ admin: true }, config.secret);
Expand Down
0 src/test/routes/album.constants.json → src/test/routes/album/album.constants.json
View file
File renamed without changes.
0 src/test/routes/album.extra.constants.json → ...t/routes/album/album.extra.constants.json
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions src/test/routes/album.extra.spec.js → src/test/routes/album/album.extra.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
process.env.NODE_ENV = 'test';

const app = require('../../app');
const db = require('../../database');
const tables = require('../../database/tableNames');
const dbHandler = require('../../handlers/db');
const app = require('../../../app');
const db = require('../../../database/index');
const tables = require('../../../database/tableNames');
const dbHandler = require('../../../handlers/db/index');
const jwt = require('jsonwebtoken');
const request = require('supertest');
const chai = require('chai');
const chaiHttp = require('chai-http');
const logger = require('../../utils/logger');
const logger = require('../../../utils/logger');

chai.should();
chai.use(chaiHttp);

const config = require('./../../config');
const config = require('./../../../config');
const constants = require('./album.extra.constants.json');

const testToken = jwt.sign(constants.jwtTestUser, config.secret);
Expand Down
12 changes: 6 additions & 6 deletions src/test/routes/album.spec.js → src/test/routes/album/album.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
process.env.NODE_ENV = 'test';

const app = require('../../app');
const db = require('../../database');
const tables = require('../../database/tableNames');
const dbHandler = require('../../handlers/db');
const app = require('../../../app');
const db = require('../../../database/index');
const tables = require('../../../database/tableNames');
const dbHandler = require('../../../handlers/db/index');
const jwt = require('jsonwebtoken');
const request = require('supertest');
const chai = require('chai');
const chaiHttp = require('chai-http');
const logger = require('../../utils/logger');
const logger = require('../../../utils/logger');

chai.should();
chai.use(chaiHttp);

const config = require('./../../config');
const config = require('./../../../config');
const constants = require('./album.constants.json');

const testToken = jwt.sign(constants.jwtTestUser, config.secret);
Expand Down
0 src/test/routes/artist.constants.json → src/test/routes/artist/artist.constants.json
View file
File renamed without changes.
0 src/test/routes/artist.me.constants.json → ...st/routes/artist/artist.me.constants.json
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions src/test/routes/artist.me.spec.js → src/test/routes/artist/artist.me.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
process.env.NODE_ENV = 'test';

const app = require('../../app');
const db = require('../../database');
const dbHandler = require('../../handlers/db');
const app = require('../../../app');
const db = require('../../../database/index');
const dbHandler = require('../../../handlers/db/index');
const jwt = require('jsonwebtoken');
const request = require('supertest');
const chai = require('chai');
const chaiHttp = require('chai-http');
const logger = require('../../utils/logger');
const logger = require('../../../utils/logger');

chai.should();
chai.use(chaiHttp);

const config = require('./../../config');
const config = require('./../../../config');
const constants = require('./artist.me.constants.json');

const testToken = jwt.sign(constants.jwtTestUser, config.secret);
Expand Down
10 changes: 5 additions & 5 deletions src/test/routes/artist.spec.js → src/test/routes/artist/artist.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
process.env.NODE_ENV = 'test';

const app = require('../../app');
const db = require('../../database');
const dbHandler = require('../../handlers/db');
const app = require('../../../app');
const db = require('../../../database/index');
const dbHandler = require('../../../handlers/db/index');
const jwt = require('jsonwebtoken');
const request = require('supertest');
const chai = require('chai');
const chaiHttp = require('chai-http');
const logger = require('../../utils/logger');
const logger = require('../../../utils/logger');

chai.should();
chai.use(chaiHttp);

const config = require('./../../config');
const config = require('./../../../config');
const constants = require('./artist.constants.json');

const testToken = jwt.sign(constants.jwtTestUser, config.secret);
Expand Down
0 src/test/routes/token.constants.json → src/test/routes/token/token.constants.json
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions src/test/routes/token.spec.js → src/test/routes/token/token.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
process.env.NODE_ENV = 'test';

const app = require('../../app');
const db = require('../../database');
const tables = require('../../database/tableNames');
const dbHandler = require('../../handlers/db/generalHandler');
const app = require('../../../app');
const db = require('../../../database/index');
const tables = require('../../../database/tableNames');
const dbHandler = require('../../../handlers/db/generalHandler');
const request = require('supertest');
const chai = require('chai');
const chaiHttp = require('chai-http');
Expand Down
11 changes: 0 additions & 11 deletions src/test/routes/track.me.constants.json
View file

This file was deleted.

0 src/test/routes/track.constants.json → src/test/routes/track/track.constants.json
View file
File renamed without changes.
25 changes: 25 additions & 0 deletions src/test/routes/track/track.me.constants.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"jwtTestUser": {
"id": 24
},
"initialTrack": {
"name": "Despacito",
"albumId": 240,
"artists": [2, 1]
},
"validTrackId": 1,
"initialArtist1": {
"id": 1,
"name": "Papa Baute",
"description": "Tiene un implante coclear?",
"genres": ["Bachata"],
"images": ["una con guido", "otra con sergio"]
},
"initialArtist2": {
"id": 2,
"name": "Luis Fonsi",
"description": "El que canta despacito",
"genres": ["pero que no es justin"],
"images": ["ni daddy yankee"]
}
}
17 changes: 8 additions & 9 deletions src/test/routes/track.me.spec.js → src/test/routes/track/track.me.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
process.env.NODE_ENV = 'test';

const logger = require('../../utils/logger');
const app = require('../../app');
const db = require('../../database');
const tables = require('../../database/tableNames');
const dbHandler = require('../../handlers/db');
const logger = require('../../../utils/logger');
const app = require('../../../app');
const db = require('../../../database/index');
const tables = require('../../../database/tableNames');
const dbHandler = require('../../../handlers/db/index');
const jwt = require('jsonwebtoken');
const request = require('supertest');
const chai = require('chai');
Expand All @@ -13,9 +13,8 @@ const chaiHttp = require('chai-http');
chai.should();
chai.use(chaiHttp);

const config = require('./../../config');
const config = require('./../../../config');
const constants = require('./track.me.constants.json');
const artistsConstants = require('./artist.constants.json');

const testToken = jwt.sign(constants.jwtTestUser, config.secret);

Expand All @@ -27,8 +26,8 @@ describe('Track me', () => {
db.migrate.latest().then(() => {
dbHandler.general.createNewEntry(tables.artists,
[
artistsConstants.initialArtist,
artistsConstants.testArtist,
constants.initialArtist1,
constants.initialArtist2,
]).then(artists => {
logger.info(`Tests artists created: ${JSON.stringify(artists, null, 4)}`);
dbHandler.track.createNewTrackEntry(constants.initialTrack)
Expand Down
12 changes: 6 additions & 6 deletions src/test/routes/track.spec.js → src/test/routes/track/track.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
process.env.NODE_ENV = 'test';

const app = require('../../app');
const db = require('../../database');
const tables = require('../../database/tableNames');
const dbHandler = require('../../handlers/db');
const app = require('../../../app');
const db = require('../../../database/index');
const tables = require('../../../database/tableNames');
const dbHandler = require('../../../handlers/db/index');
const jwt = require('jsonwebtoken');
const request = require('supertest');
const chai = require('chai');
const chaiHttp = require('chai-http');
const logger = require('../../utils/logger');
const logger = require('../../../utils/logger');

chai.should();
chai.use(chaiHttp);

const config = require('./../../config');
const config = require('./../../../config');
const constants = require('./track.constants.json');

const testToken = jwt.sign(constants.jwtTestUser, config.secret);
Expand Down
0 src/test/routes/user.constants.json → src/test/routes/user/user.constants.json
View file
File renamed without changes.
0 src/test/routes/user.me.constants.json → src/test/routes/user/user.me.constants.json
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions src/test/routes/user.me.spec.js → src/test/routes/user/user.me.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
process.env.NODE_ENV = 'test';

const app = require('../../app');
const db = require('../../database');
const tables = require('../../database/tableNames');
const dbHandler = require('../../handlers/db/generalHandler');
const app = require('../../../app');
const db = require('../../../database/index');
const tables = require('../../../database/tableNames');
const dbHandler = require('../../../handlers/db/generalHandler');
const jwt = require('jsonwebtoken');
const request = require('supertest');
const chai = require('chai');
Expand All @@ -12,7 +12,7 @@ const chaiHttp = require('chai-http');
chai.should();
chai.use(chaiHttp);

const config = require('./../../config');
const config = require('./../../../config');
const constants = require('./user.me.constants.json');

const initialUserToken = jwt.sign(constants.initialUser, config.secret);
Expand Down
10 changes: 5 additions & 5 deletions src/test/routes/user.spec.js → src/test/routes/user/user.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
process.env.NODE_ENV = 'test';

const app = require('../../app');
const db = require('../../database');
const tables = require('../../database/tableNames');
const dbHandler = require('../../handlers/db/generalHandler');
const app = require('../../../app');
const db = require('../../../database/index');
const tables = require('../../../database/tableNames');
const dbHandler = require('../../../handlers/db/generalHandler');
const jwt = require('jsonwebtoken');
const request = require('supertest');
const chai = require('chai');
Expand All @@ -12,7 +12,7 @@ const chaiHttp = require('chai-http');
chai.should();
chai.use(chaiHttp);

const config = require('./../../config');
const config = require('./../../../config');
const constants = require('./user.constants.json');

const testToken = jwt.sign({ admin: true }, config.secret);
Expand Down

0 comments on commit c7e1d5f

Please sign in to comment.