From a3de375fef2f153ff33db9390ffe2e3846f7ad1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 8 Jul 2019 20:27:23 +0200 Subject: [PATCH] neodes `withDir` seems incompatible with cypress --- backend/src/bootstrap/neode.js | 3 ++- backend/src/models/{spec => }/User.spec.js | 4 ++-- backend/src/models/index.js | 13 +++++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) rename backend/src/models/{spec => }/User.spec.js (80%) create mode 100644 backend/src/models/index.js diff --git a/backend/src/bootstrap/neode.js b/backend/src/bootstrap/neode.js index 12ac3c299..65a2074be 100644 --- a/backend/src/bootstrap/neode.js +++ b/backend/src/bootstrap/neode.js @@ -1,8 +1,9 @@ import Neode from 'neode' +import models from '../models' export default function setupNeode(options) { const { uri, username, password } = options const neodeInstance = new Neode(uri, username, password) - neodeInstance.withDirectory(`${__dirname}/../models`) + neodeInstance.with(models) return neodeInstance } diff --git a/backend/src/models/spec/User.spec.js b/backend/src/models/User.spec.js similarity index 80% rename from backend/src/models/spec/User.spec.js rename to backend/src/models/User.spec.js index d1aa79b7d..e00136970 100644 --- a/backend/src/models/spec/User.spec.js +++ b/backend/src/models/User.spec.js @@ -1,5 +1,5 @@ -import Factory from '../../seed/factories' -import { neode } from '../../bootstrap/neo4j' +import Factory from '../seed/factories' +import { neode } from '../bootstrap/neo4j' const factory = Factory() const instance = neode() diff --git a/backend/src/models/index.js b/backend/src/models/index.js new file mode 100644 index 000000000..dbf654c68 --- /dev/null +++ b/backend/src/models/index.js @@ -0,0 +1,13 @@ +import fs from 'fs' +import path from 'path' + +const models = {} +fs.readdirSync(__dirname).forEach(file => { + file = path.join(__dirname, file).toString('utf-8') + const name = path.basename(file, '.js') + if (!/\.spec/.test(name) && path.extname(file) === '.js') { + // Is a gql file + models[name] = require(file) + } +}) +export default models