Better helper config

Luciano Nooijen · Luciano Nooijen · commit dabe954b5a82 · 2018-11-18T18:38:53.000+01:00
diff --git a/controllers/authors.js b/controllers/authors.js
@@ -1,4 +1,4 @@
-const knex = require('../helpers/database');
+const { knex } = require('../helpers');
 
 const listAuthors = async () => {
     const authors = await knex.select('*').from('authors');
diff --git a/controllers/users.js b/controllers/users.js
@@ -1,4 +1,4 @@
-const knex = require('../helpers/database');
+const { knex } = require('../helpers');
 
 const listUsers = async () => {
     const Users = await knex.select('*').from('users');
diff --git a/helpers/helpers.js b/helpers/helpers.js
@@ -1,7 +1,7 @@
 /* eslint-disable global-require */
 
 module.exports = {
-    knex: require('./database'),
+    knex: require('./knex'),
     logger: require('./logger'),
     generateKnexConfig: require('./generate-knex-config'),
 };
diff --git a/helpers/knex.js b/helpers/knex.js
diff --git a/server/server.js b/server/server.js
@@ -5,7 +5,7 @@ if (ENABLE_SQREEN === 'true' && NODE_ENV !== 'TEST') require('sqreen');
 /* eslint-enable */
 
 const app = require('./app');
-const logger = require('../helpers/logger');
+const { logger } = require('../helpers');
 
 app.listen(PORT, () => {
     logger.info(`Server listening on port ${PORT}`); // eslint-disable-line
diff --git a/tests/app.test.js b/tests/app.test.js
@@ -1,4 +1,4 @@
-const knex = require('../helpers/database');
+const { knex } = require('../helpers');
 const { useTestDatabase } = require('./config');
 
 useTestDatabase();
diff --git a/tests/config/database-config.js b/tests/config/database-config.js
@@ -1,4 +1,4 @@
-const knex = require('../../helpers/database');
+const { knex } = require('../../helpers');
 
 const rollbackMigrateAndFill = async () =>
     knex.migrate

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const knex = require('../helpers/database');`
	`1`	`+const { knex } = require('../helpers');`
`2`	`2`
`3`	`3`	`const listAuthors = async () => {`
`4`	`4`	`const authors = await knex.select('*').from('authors');`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const knex = require('../../helpers/database');`
	`1`	`+const { knex } = require('../../helpers');`
`2`	`2`
`3`	`3`	`const rollbackMigrateAndFill = async () =>`
`4`	`4`	`knex.migrate`