Update tests

onetreehill · May 31, 2014 · 9a35927 · 9a35927
1 parent fbba727
commit 9a35927
Show file tree

Hide file tree

Showing 115 changed files with 560 additions and 5,648 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -9,20 +9,12 @@ var lib = 'lib/**/*.js',
 var handleError = function(err){
   console.error(err.stack);
   this.emit('end');
-}
+};
 
-gulp.task('hexo', function(callback){
-  require('./lib/init')(path.join(__dirname, 'test', 'blog'), {
-    _: [],
-    silent: true,
-    debug: true
-  }, callback);
-});
-
-gulp.task('mocha', ['hexo'], function(){
-  return gulp.src(test)
+gulp.task('mocha', function(){
+  return gulp.src('test/scripts/index.js')
     .pipe(mocha({
-      reporter: 'dot',
+      reporter: 'spec',
       ignoreLeaks: true
     }).on('error', handleError));
 });

diff --git a/lib/init.js b/lib/init.js
@@ -3,8 +3,12 @@ var async = require('async'),
   Hexo = require('./core'),
   Logger = require('./logger');
 
+var defaultCallback = function(err){
+  process.exit(err ? 1 : 0);
+};
+
 module.exports = function(cwd, args, callback){
-  if (typeof callback !== 'function') callback = function(){};
+  if (typeof callback !== 'function') callback = defaultCallback;
 
   var hexo = global.hexo = new Hexo(),
     configfile = args.config || '_config.yml';
@@ -68,7 +72,7 @@ module.exports = function(cwd, args, callback){
 
       hexo.emit('exit');
 
-      if (!err) return process.exit(0);
+      if (!err) return callback();
 
       var logPath = path.join(hexo.base_dir, 'debug.log'),
         FileStream = Logger.stream.File;
@@ -81,9 +85,8 @@ module.exports = function(cwd, args, callback){
           FileStream.dump(logPath, hexo.log, next);
         }
       ], function(err){
-        if (err) return log.e(err);
-
-        process.exit(1);
+        if (err) log.e(err);
+        callback(err);
       });
     });
   });

diff --git a/test/blog/.gitignore b/test/blog/.gitignore
diff --git a/test/blog/_config.yml b/test/blog/_config.yml
diff --git a/test/blog/package.json b/test/blog/package.json
diff --git a/test/blog/scaffolds/draft.md b/test/blog/scaffolds/draft.md
diff --git a/test/blog/scaffolds/page.md b/test/blog/scaffolds/page.md
diff --git a/test/blog/scaffolds/photo.md b/test/blog/scaffolds/photo.md
diff --git a/test/blog/scaffolds/post.md b/test/blog/scaffolds/post.md
diff --git a/test/blog/source/_posts/hello-world.md b/test/blog/source/_posts/hello-world.md
diff --git a/test/blog/source/downloads/code/test.js b/test/blog/source/downloads/code/test.js
diff --git a/test/blog/themes/landscape/Gruntfile.js b/test/blog/themes/landscape/Gruntfile.js
diff --git a/test/blog/themes/landscape/LICENSE b/test/blog/themes/landscape/LICENSE
diff --git a/test/blog/themes/landscape/README.md b/test/blog/themes/landscape/README.md