Merge 5f11323 into 7520113

hexojs · Jul 6, 2020 · 1159152 · 1159152
2 parents 7520113 + 5f11323
commit 1159152
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 90 deletions.
diff --git a/test/scripts/box/box.js b/test/scripts/box/box.js
@@ -4,7 +4,7 @@ const { join, sep } = require('path');
 const { appendFile, mkdir, mkdirs, rename, rmdir, stat, unlink, writeFile } = require('hexo-fs');
 const Promise = require('bluebird');
 const { hash, Pattern } = require('hexo-util');
-const { spy, match } = require('sinon');
+const { spy, match, assert: sinonAssert } = require('sinon');
 
 describe('Box', () => {
   const Hexo = require('../../../lib/hexo');
@@ -110,7 +110,7 @@ describe('Box', () => {
     await writeFile(path, 'a');
     await box.process();
 
-    processor.calledWithMatch({ type: 'create', path: name }).should.be.true;
+    sinonAssert.calledWithMatch(processor, { type: 'create', path: name });
 
     await rmdir(box.base);
   });
@@ -134,7 +134,7 @@ describe('Box', () => {
     ]);
     await box.process();
 
-    processor.calledWithMatch({ type: 'update', path: name }).should.be.true;
+    sinonAssert.calledWithMatch(processor, { type: 'update', path: name });
 
     await rmdir(box.base);
   });
@@ -157,7 +157,7 @@ describe('Box', () => {
     });
     await box.process();
 
-    processor.calledWithMatch({ type: 'skip', path: name }).should.be.true;
+    sinonAssert.calledWithMatch(processor, { type: 'skip', path: name });
 
     await rmdir(box.base);
   });
@@ -180,7 +180,7 @@ describe('Box', () => {
     });
     await box.process();
 
-    processor.calledWithMatch({ type: 'skip', path: name }).should.be.true;
+    sinonAssert.calledWithMatch(processor, { type: 'skip', path: name });
 
     await rmdir(box.base);
   });
@@ -203,7 +203,7 @@ describe('Box', () => {
     });
     await box.process();
 
-    processor.calledWithMatch({ type: 'skip', path: name }).should.be.true;
+    sinonAssert.calledWithMatch(processor, { type: 'skip', path: name });
 
     await rmdir(box.base);
   });
@@ -223,7 +223,7 @@ describe('Box', () => {
     ]);
     await box.process();
 
-    processor.calledWith(match.has('type', 'delete')).should.be.true;
+    sinonAssert.calledWith(processor, match.has('type', 'delete'));
     processor.calledOnce.should.be.true;
 
     await rmdir(box.base);
@@ -240,7 +240,7 @@ describe('Box', () => {
     await writeFile(path, 'a');
     await box.process();
 
-    processor.calledWith(match.has('params', match.has('id', '123456'))).should.be.true;
+    sinonAssert.calledWith(processor, match.has('params', match.has('id', '123456')));
     processor.calledOnce.should.be.true;
 
     await rmdir(box.base);
@@ -314,12 +314,12 @@ describe('Box', () => {
     box.isWatching().should.be.true;
     await Promise.delay(500);
 
-    processor.firstCall.calledWithMatch({
+    sinonAssert.calledWithMatch(processor.firstCall, {
       source: src,
       path: path,
       type: 'create',
       params: {}
-    }).should.be.true;
+    });
 
     box.unwatch();
     await rmdir(box.base);
@@ -343,12 +343,12 @@ describe('Box', () => {
     await appendFile(src, 'b');
     await Promise.delay(500);
 
-    processor.lastCall.calledWithMatch({
+    sinonAssert.calledWithMatch(processor.lastCall, {
       source: src,
       path: path,
       type: 'update',
       params: {}
-    }).should.be.true;
+    });
 
     box.unwatch();
     await rmdir(box.base);
@@ -372,12 +372,12 @@ describe('Box', () => {
     await unlink(src);
     await Promise.delay(500);
 
-    processor.lastCall.calledWithMatch({
+    sinonAssert.calledWithMatch(processor.lastCall, {
       source: src,
       path: path,
       type: 'delete',
       params: {}
-    }).should.be.true;
+    });
 
     box.unwatch();
     await rmdir(box.base);
@@ -632,8 +632,8 @@ describe('Box', () => {
     await writeFile(join(box.base, 'a.txt'), 'a');
     await box.process();
 
-    beforeSpy.calledWithMatch({ type: 'create', path: 'a.txt' }).should.be.true;
-    afterSpy.calledWithMatch({ type: 'create', path: 'a.txt' }).should.be.true;
+    sinonAssert.calledWithMatch(beforeSpy, { type: 'create', path: 'a.txt' });
+    sinonAssert.calledWithMatch(afterSpy, { type: 'create', path: 'a.txt' });
     beforeSpy.calledOnce.should.be.true;
     afterSpy.calledOnce.should.be.true;
 

diff --git a/test/scripts/console/config.js b/test/scripts/console/config.js
@@ -3,7 +3,7 @@
 const { mkdirs, readFile, rmdir, unlink, writeFile } = require('hexo-fs');
 const { join } = require('path');
 const { load } = require('js-yaml');
-const { stub } = require('sinon');
+const { stub, assert: sinonAssert } = require('sinon');
 
 describe('config', () => {
   const Hexo = require('../../../lib/hexo');
@@ -28,7 +28,7 @@ describe('config', () => {
       logStub.restore();
     }
 
-    logStub.calledWith(hexo.config).should.be.true;
+    sinonAssert.calledWith(logStub, hexo.config);
   });
 
   it('read config', async () => {
@@ -40,7 +40,7 @@ describe('config', () => {
       logStub.restore();
     }
 
-    logStub.calledWith(hexo.config.title).should.be.true;
+    sinonAssert.calledWith(logStub, hexo.config.title);
   });
 
   it('read nested config', async () => {
@@ -52,7 +52,7 @@ describe('config', () => {
       };
 
       await config({_: ['server.port']});
-      logStub.calledWith(hexo.config.server.port).should.be.true;
+      sinonAssert.calledWith(logStub, hexo.config.server.port);
     } finally {
       delete hexo.config.server;
       logStub.restore();

diff --git a/test/scripts/console/deploy.js b/test/scripts/console/deploy.js
@@ -2,7 +2,7 @@
 
 const { exists, mkdirs, readFile, rmdir, writeFile } = require('hexo-fs');
 const { join } = require('path');
-const { spy, stub } = require('sinon');
+const { spy, stub, assert: sinonAssert } = require('sinon');
 
 describe('deploy', () => {
   const Hexo = require('../../../lib/hexo');
@@ -32,9 +32,10 @@ describe('deploy', () => {
       logStub.restore();
     }
 
-    logStub.calledWithMatch(
+    sinonAssert.calledWithMatch(
+      logStub,
       'You should configure deployment settings in _config.yml first!'
-    ).should.be.true;
+    );
   });
 
   it('single deploy setting', async () => {
@@ -56,11 +57,11 @@ describe('deploy', () => {
     beforeListener.calledOnce.should.be.true;
     afterListener.calledOnce.should.be.true;
 
-    deployer.calledWith({
+    sinonAssert.calledWith(deployer, {
       type: 'foo',
       foo: 'foo',
       bar: 'bar'
-    }).should.be.true;
+    });
   });
 
   it('multiple deploy setting', async () => {
@@ -79,16 +80,16 @@ describe('deploy', () => {
     deployer1.calledOnce.should.be.true;
     deployer2.calledOnce.should.be.true;
 
-    deployer1.calledWith({
+    sinonAssert.calledWith(deployer1, {
       type: 'foo',
       foo: 'foo',
       test: true
-    }).should.be.true;
-    deployer2.calledWith({
+    });
+    sinonAssert.calledWith(deployer2, {
       type: 'bar',
       bar: 'bar',
       test: true
-    }).should.be.true;
+    });
   });
 
   // it('deployer not found'); missing-unit-test

diff --git a/test/scripts/console/list_categories.js b/test/scripts/console/list_categories.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Promise = require('bluebird');
-const { stub } = require('sinon');
+const { stub, assert: sinonAssert } = require('sinon');
 
 describe('Console list', () => {
   const Hexo = require('../../../lib/hexo');
@@ -20,9 +20,9 @@ describe('Console list', () => {
 
   it('no categories', () => {
     listCategories();
-    logStub.calledWithMatch('Name').should.be.true;
-    logStub.calledWithMatch('Posts').should.be.true;
-    logStub.calledWithMatch('No categories.').should.be.true;
+    sinonAssert.calledWithMatch(logStub, 'Name');
+    sinonAssert.calledWithMatch(logStub, 'Posts');
+    sinonAssert.calledWithMatch(logStub, 'No categories.');
   });
 
   it('categories', async () => {
@@ -41,9 +41,9 @@ describe('Console list', () => {
     ], (tags, i) => output[i].setCategories(tags));
     await hexo.locals.invalidate();
     listCategories();
-    logStub.calledWithMatch('Name').should.be.true;
-    logStub.calledWithMatch('Posts').should.be.true;
-    logStub.calledWithMatch('baz').should.be.true;
-    logStub.calledWithMatch('foo').should.be.true;
+    sinonAssert.calledWithMatch(logStub, 'Name');
+    sinonAssert.calledWithMatch(logStub, 'Posts');
+    sinonAssert.calledWithMatch(logStub, 'baz');
+    sinonAssert.calledWithMatch(logStub, 'foo');
   });
 });
diff --git a/test/scripts/console/list_page.js b/test/scripts/console/list_page.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { stub } = require('sinon');
+const { stub, assert: sinonAssert } = require('sinon');
 
 describe('Console list', () => {
   const Hexo = require('../../../lib/hexo');
@@ -20,10 +20,10 @@ describe('Console list', () => {
 
   it('no page', () => {
     listPages();
-    logStub.calledWithMatch('Date').should.be.true;
-    logStub.calledWithMatch('Title').should.be.true;
-    logStub.calledWithMatch('Path').should.be.true;
-    logStub.calledWithMatch('No pages.').should.be.true;
+    sinonAssert.calledWithMatch(logStub, 'Date');
+    sinonAssert.calledWithMatch(logStub, 'Title');
+    sinonAssert.calledWithMatch(logStub, 'Path');
+    sinonAssert.calledWithMatch(logStub, 'No pages.');
   });
 
   it('page', async () => {
@@ -33,10 +33,10 @@ describe('Console list', () => {
       path: 'bar'
     });
     listPages();
-    logStub.calledWithMatch('Date').should.be.true;
-    logStub.calledWithMatch('Title').should.be.true;
-    logStub.calledWithMatch('Path').should.be.true;
-    logStub.calledWithMatch('Hello World').should.be.true;
-    logStub.calledWithMatch('foo').should.be.true;
+    sinonAssert.calledWithMatch(logStub, 'Date');
+    sinonAssert.calledWithMatch(logStub, 'Title');
+    sinonAssert.calledWithMatch(logStub, 'Path');
+    sinonAssert.calledWithMatch(logStub, 'Hello World');
+    sinonAssert.calledWithMatch(logStub, 'foo');
   });
 });
diff --git a/test/scripts/console/list_post.js b/test/scripts/console/list_post.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { stub } = require('sinon');
+const { stub, assert: sinonAssert } = require('sinon');
 
 describe('Console list', () => {
   const Hexo = require('../../../lib/hexo');
@@ -19,12 +19,12 @@ describe('Console list', () => {
 
   it('no post', () => {
     listPosts();
-    logStub.calledWithMatch('Date').should.be.true;
-    logStub.calledWithMatch('Title').should.be.true;
-    logStub.calledWithMatch('Path').should.be.true;
-    logStub.calledWithMatch('Category').should.be.true;
-    logStub.calledWithMatch('Tags').should.be.true;
-    logStub.calledWithMatch('No posts.').should.be.true;
+    sinonAssert.calledWithMatch(logStub, 'Date');
+    sinonAssert.calledWithMatch(logStub, 'Title');
+    sinonAssert.calledWithMatch(logStub, 'Path');
+    sinonAssert.calledWithMatch(logStub, 'Category');
+    sinonAssert.calledWithMatch(logStub, 'Tags');
+    sinonAssert.calledWithMatch(logStub, 'No posts.');
   });
 
   it('post', async () => {
@@ -39,16 +39,15 @@ describe('Console list', () => {
     await hexo.locals.invalidate();
 
     listPosts();
-    logStub.calledWithMatch('Date').should.be.true;
-    logStub.calledWithMatch('Title').should.be.true;
-    logStub.calledWithMatch('Path').should.be.true;
-    logStub.calledWithMatch('Category').should.be.true;
-    logStub.calledWithMatch('Tags').should.be.true;
-    posts.forEach(post => {
-      logStub.calledWithMatch(post.source).should.be.true;
-      logStub.calledWithMatch(post.source).should.be.true;
-      logStub.calledWithMatch(post.slug).should.be.true;
-      logStub.calledWithMatch(post.title).should.be.true;
-    });
+    sinonAssert.calledWithMatch(logStub, 'Date');
+    sinonAssert.calledWithMatch(logStub, 'Title');
+    sinonAssert.calledWithMatch(logStub, 'Path');
+    sinonAssert.calledWithMatch(logStub, 'Category');
+    sinonAssert.calledWithMatch(logStub, 'Tags');
+    for (let i = 0; i < posts.length; i++) {
+      sinonAssert.calledWithMatch(logStub, posts[i].source);
+      sinonAssert.calledWithMatch(logStub, posts[i].slug);
+      sinonAssert.calledWithMatch(logStub, posts[i].title);
+    }
   });
 });
diff --git a/test/scripts/console/list_tags.js b/test/scripts/console/list_tags.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Promise = require('bluebird');
-const { stub } = require('sinon');
+const { stub, assert: sinonAssert } = require('sinon');
 
 describe('Console list', () => {
   const Hexo = require('../../../lib/hexo');
@@ -22,10 +22,10 @@ describe('Console list', () => {
 
   it('no tags', () => {
     listTags();
-    logStub.calledWithMatch('Name').should.be.true;
-    logStub.calledWithMatch('Posts').should.be.true;
-    logStub.calledWithMatch('Path').should.be.true;
-    logStub.calledWithMatch('No tags.').should.be.true;
+    sinonAssert.calledWithMatch(logStub, 'Name');
+    sinonAssert.calledWithMatch(logStub, 'Posts');
+    sinonAssert.calledWithMatch(logStub, 'Path');
+    sinonAssert.calledWithMatch(logStub, 'No tags.');
   });
 
   it('tags', async () => {
@@ -45,12 +45,12 @@ describe('Console list', () => {
     await hexo.locals.invalidate();
 
     listTags();
-    logStub.calledWithMatch('Name').should.be.true;
-    logStub.calledWithMatch('Posts').should.be.true;
-    logStub.calledWithMatch('Path').should.be.true;
-    logStub.calledWithMatch('baz').should.be.true;
-    logStub.calledWithMatch('foo').should.be.true;
-    logStub.calledWithMatch('tags/baz').should.be.true;
-    logStub.calledWithMatch('tags/foo').should.be.true;
+    sinonAssert.calledWithMatch(logStub, 'Name');
+    sinonAssert.calledWithMatch(logStub, 'Posts');
+    sinonAssert.calledWithMatch(logStub, 'Path');
+    sinonAssert.calledWithMatch(logStub, 'baz');
+    sinonAssert.calledWithMatch(logStub, 'foo');
+    sinonAssert.calledWithMatch(logStub, 'tags/baz');
+    sinonAssert.calledWithMatch(logStub, 'tags/foo');
   });
 });