From a061894e4374763330e28379f011435294909a60 Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Thu, 29 Sep 2016 09:59:29 -0300
Subject: [PATCH] Fixed gulp test rule: chdir to build to test
Related: simcaq/SCRUM#68
---
gulpfile.babel.js | 43 ++++++++++++++++++++++---------------------
src/test/test.js | 4 +++-
2 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 986652cc..beb0e25f 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -29,25 +29,25 @@ function createLogDir() {
}
/**
- * Compile source files
- */
+* Compile source files
+*/
gulp.task('compile', () => {
createLogDir();
// run ESLint
gulp.src('src/**/*.js')
- .pipe(eslint())
- .pipe(eslint.format());
+ .pipe(eslint())
+ .pipe(eslint.format());
// compile source to ES5
gulp.src('src/**/*.js')
- .pipe(cache.filter()) // cache source files
- .pipe(babel()) // compile only modified files
- .pipe(cache.cache()) // cache compiled files
- .pipe(gulp.dest('build')); // move compiled files to build directory
+ .pipe(cache.filter()) // cache source files
+ .pipe(babel()) // compile only modified files
+ .pipe(cache.cache()) // cache compiled files
+ .pipe(gulp.dest('build')); // move compiled files to build directory
// copy configuration file to build directory
gulp.src('config.json')
- .pipe(gulp.dest('build'));
+ .pipe(gulp.dest('build'));
});
gulp.task('build', ['compile']);
@@ -55,17 +55,18 @@ gulp.task('build', ['compile']);
gulp.task('doc', (cb) => {
let config = require('./jsdoc.json');
gulp.src(['README.md', './src/**/*.js'], {read: false})
- .pipe(jsdoc(config, cb));
+ .pipe(jsdoc(config, cb));
});
gulp.task('test', ['build'], () => {
- gulp.src('test/test.js', {read: false})
+ process.chdir('build');
+ gulp.src('test/test.js', {read: false})
.pipe(mocha())
.once('error', () => {
- process.exit(1);
+ process.exit(1);
})
.once('end', () => {
- process.exit();
+ process.exit();
});
});
@@ -79,14 +80,14 @@ gulp.task('watch', ['compile'], () => {
});
gulp.task('run', () => {
- process.chdir('build');
- nodemon({
- script: 'server.js',
- tasks: ['watch'],
- ignore: ["test/test.js", "gulpfile.babel.js"],
- ext: 'js html json',
- env: { 'NODE_ENV': 'development' }
- });
+ process.chdir('build');
+ nodemon({
+ script: 'server.js',
+ tasks: ['watch'],
+ ignore: ["test/test.js", "gulpfile.babel.js"],
+ ext: 'js html json',
+ env: { 'NODE_ENV': 'development' }
+ });
});
gulp.task('default', ['run']);
diff --git a/src/test/test.js b/src/test/test.js
index e6bdd1fd..f06f837e 100644
--- a/src/test/test.js
+++ b/src/test/test.js
@@ -12,7 +12,9 @@ const expect = chai.expect;
const should = chai.should(); // actually call the function
-const server = require('../libs/app');
+const libs = `${process.cwd()}/libs`;
+
+const server = require(`${libs}/app`);
chai.use(chaiHttp);
--
GitLab