Merge pull request #1204 from naokiy/strict_assert_error

More strict error assertion

lib/models/category.js

@@ -67,7 +67,7 @@ module.exports = function(ctx){
  parent: parent || {$exists: false}
  });
 
- if (cat && cat._id === data._id){
+ if (cat){
  throw new Error('Category `' + name + '` has already existed!');
  }
  });

lib/models/tag.js

@@ -53,7 +53,7 @@ module.exports = function(ctx){
  var Tag = ctx.model('Tag');
  var tag = Tag.findOne({name: name});
 
- if (tag && tag._id === data._id){
+ if (tag){
  throw new Error('Tag `' + name + '` has already existed!');
  }
  });

test/scripts/box/box.js

@@ -6,6 +6,7 @@ var fs = require('hexo-fs');
 var Promise = require('bluebird');
 var crypto = require('crypto');
 var util = require('hexo-util');
+var sinon = require('sinon');
 var Pattern = util.Pattern;
 var testUtil = require('../../util');
 
@@ -82,12 +83,17 @@ describe('Box', function(){
 
  it('addProcessor() - no fn', function(){
  var box = newBox();
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'fn must be a function');
+ });
 
  try {
  box.addProcessor('test');
  } catch (err){
- err.should.have.property('message', 'fn must be a function');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 
  it('_loadFiles() - create', function(){
@@ -430,11 +436,16 @@ describe('Box', function(){
 
  it.skip('watch() - watcher has started', function(callback){
  var box = newBox();
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'Watcher has already started.');
+ });
 
  box.watch().then(function(){
  box.watch().catch(function(err){
- err.should.have.property('message', 'Watcher has already started.');
+ errorCallback(err);
  box.unwatch();
+ }).finally(function() {
+ errorCallback.calledOnce.should.be.false;
  callback();
  });
  });
@@ -482,12 +493,17 @@ describe('Box', function(){
 
  it('unwatch() - watcher not started', function(){
  var box = newBox();
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'Watcher hasn\'t started yet.');
+ });
 
  try {
  box.unwatch();
  } catch (err){
- err.should.have.property('message', 'Watcher hasn\'t started yet.');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 
  it.skip('isWatching()', function(){

test/scripts/extend/filter.js

@@ -75,22 +75,32 @@ describe('Filter', function(){
 
  it('unregister() - type is required', function(){
  var f = new Filter();
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'type is required');
+ });
 
  try {
  f.unregister();
  } catch (err){
- err.should.have.property('message', 'type is required');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 
  it('unregister() - fn must be a function', function(){
  var f = new Filter();
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'fn must be a function');
+ });
 
  try {
  f.unregister('test');
  } catch (err){
- err.should.have.property('message', 'fn must be a function');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 
  it('list()', function(){

test/scripts/extend/tag.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var should = require('chai').should();
+var sinon = require('sinon');
 var Promise = require('bluebird');
 
 describe('Tag', function(){
@@ -123,19 +124,31 @@ describe('Tag', function(){
  });
 
  it('register() - name is required', function(){
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'name is required');
+ });
+
  try {
  tag.register();
  } catch (err){
- err.should.have.property('message', 'name is required');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 
  it('register() - fn must be a function', function(){
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'fn must be a function');
+ });
+
  try {
  tag.register('test');
  } catch (err){
- err.should.have.property('message', 'fn must be a function');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 
  it('render() - context', function(){

test/scripts/filters/new_post_path.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var should = require('chai').should();
+var sinon = require('sinon');
 var pathFn = require('path');
 var moment = require('moment');
 var Promise = require('bluebird');
@@ -170,8 +171,12 @@ describe('new_post_path', function(){
  });
 
  it('data is required', function(){
- return newPostPath().catch(function(err){
+ var errorCallback = sinon.spy(function(err){
  err.should.have.property('message', 'Either data.path or data.slug is required!');
  });
+
+ return newPostPath().catch(errorCallback).finally(function() {
+ errorCallback.calledOnce.should.be.true;
+ });
  });
 });

test/scripts/helpers/partial.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var should = require('chai').should();
+var sinon = require('sinon');
 var pathFn = require('path');
 var fs = require('hexo-fs');
 var Promise = require('bluebird');
@@ -80,10 +81,16 @@ describe('partial', function(){
  });
 
  it('name must be a string', function(){
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'name must be a string!');
+ });
+
  try {
  partial();
  } catch (err){
- err.should.have.property('message', 'name must be a string!');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 });

test/scripts/hexo/hexo.js

@@ -89,9 +89,13 @@ describe('Hexo', function(){
  });
 
  it('call() - console not registered', function(){
- return hexo.call('nothing').catch(function(err){
+ var errorCallback = sinon.spy(function(err){
  err.should.have.property('message', 'Console `nothing` has not been registered yet!');
  });
+
+ return hexo.call('nothing').catch(errorCallback).finally(function(){
+ errorCallback.calledOnce.should.be.true;
+ });
  });
 
  it('init()', function(){

test/scripts/hexo/locals.js

@@ -1,17 +1,24 @@
 'use strict';
 
 var should = require('chai').should();
+var sinon = require('sinon');
 
 describe('Locals', function(){
  var Locals = require('../../../lib/hexo/locals');
  var locals = new Locals();
 
  it('get() - name must be a string', function(){
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'name must be a string!');
+ });
+
  try {
  locals.get();
  } catch (err){
- err.should.have.property('message', 'name must be a string!');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 
  it('set() - function', function(){
@@ -32,19 +39,31 @@ describe('Locals', function(){
  });
 
  it('set() - name must be a string', function(){
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'name must be a string!');
+ });
+
  try {
  locals.set();
  } catch (err){
- err.should.have.property('message', 'name must be a string!');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 
  it('set() - value is required', function(){
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'value is required!');
+ });
+
  try {
  locals.set('test');
  } catch (err){
- err.should.have.property('message', 'value is required!');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 
  it('remove()', function(){
@@ -57,11 +76,17 @@ describe('Locals', function(){
  });
 
  it('remove() - name must be a string', function(){
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'name must be a string!');
+ });
+
  try {
  locals.remove();
  } catch (err){
- err.should.have.property('message', 'name must be a string!');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 
  it('toObject()', function(){

test/scripts/hexo/render.js

@@ -99,8 +99,12 @@ describe('Render', function(){
  });
 
  it('render() - no path and text', function(){
- return hexo.render.render().catch(function(err){
+ var errorCallback = sinon.spy(function(err){
  err.should.have.property('message', 'No input file or string!');
+ })
+
+ return hexo.render.render().catch(errorCallback).finally(function() {
+ errorCallback.calledOnce.should.be.true;
  });
  });
 
@@ -220,11 +224,17 @@ describe('Render', function(){
  });
 
  it('renderSync() - no path and text', function(){
+ var errorCallback = sinon.spy(function(err) {
+ err.should.have.property('message', 'No input file or string!');
+ });
+
  try {
  hexo.render.renderSync();
  } catch (err){
- err.should.have.property('message', 'No input file or string!');
+ errorCallback(err);
  }
+
+ errorCallback.calledOnce.should.be.true;
  });
 
  it('renderSync() - options', function(){