From 81e315e5996c2675f35f54ef51ab15423859903e Mon Sep 17 00:00:00 2001
From: Jure Triglav <juretriglav@gmail.com>
Date: Tue, 21 Nov 2017 10:49:43 +0100
Subject: [PATCH] Adjust mock to fit the widened use of requite-relative
---
src/startup/build.js | 4 ++--
test/cli/start.js | 17 ++++++++++++-----
test/integration.js | 2 +-
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/startup/build.js b/src/startup/build.js
index 75d5bfd1a..94323b43f 100644
--- a/src/startup/build.js
+++ b/src/startup/build.js
@@ -2,8 +2,8 @@ const requireRelative = require('require-relative')
const webpack = requireRelative('webpack')
const Promise = require('bluebird')
const path = require('path')
-const webpackDevMw = requireRelative('webpack-dev-middleware')
-const webpackHotMw = requireRelative('webpack-hot-middleware')
+const webpackDevMw = require('webpack-dev-middleware')
+const webpackHotMw = require('webpack-hot-middleware')
const logger = require('@pubsweet/logger')
const onError = require('../error-exit')
const config = require('config')
diff --git a/test/cli/start.js b/test/cli/start.js
index 9a6e109a6..867bea7ec 100644
--- a/test/cli/start.js
+++ b/test/cli/start.js
@@ -1,15 +1,22 @@
jest.mock('webpack', () => {
- const compiler = {
- run: cb => cb(null, {})
- }
- return () => compiler
})
jest.mock(require('path').resolve('webpack', `webpack.${require('config').util.getEnv('NODE_ENV')}.config.js`), () => {}, {virtual: true})
jest.mock(require('path').resolve('config', 'components.json'), () => [], {virtual: true})
jest.mock('forever-monitor', () => ({
start: jest.fn(() => ({ on: jest.fn() }))
}))
-jest.mock('require-relative', () => () => (app) => require('bluebird').resolve({ on: jest.fn(), app }))
+jest.mock('require-relative', () => {
+ return (required) => {
+ if (required === 'webpack') {
+ const compiler = {
+ run: cb => cb(null, {})
+ }
+ return () => compiler
+ } else {
+ return (app) => require('bluebird').resolve({ on: jest.fn(), app })
+ }
+ }
+})
const { getMockArgv } = require('../helpers/')
const Promise = require('bluebird')
diff --git a/test/integration.js b/test/integration.js
index a6d04fdc2..b0ca201d8 100644
--- a/test/integration.js
+++ b/test/integration.js
@@ -138,7 +138,7 @@ describe('CLI: integration test', () => {
app.stdout.on('data', async data => {
console.log('stdout:', data.toString())
if (data.toString().includes('App is listening')) {
- const result = await fetch('http://localhost:3000')
+ const result = await fetch('http://localhost:4000')
expect(result.status).toBe(200)
done()
}
--
GitLab