Merge pull request #3293 from segayuu/fix-ignore-lint-error

Test refactor

lib/plugins/processor/common.js

@@ -12,7 +12,7 @@ function isTmpFile(path) {
 }
 
 function isHiddenFile(path) {
-  return /(^|\/)[_\.]/.test(path); // eslint-disable-line no-useless-escape
+  return /(^|\/)[_.]/.test(path);
 }
 
 exports.ignoreTmpAndHiddenFile = new Pattern(path => {

lib/plugins/tag/img.js

@@ -4,7 +4,7 @@ const url = require('url');
 const util = require('hexo-util');
 const htmlTag = util.htmlTag;
 
-const rUrl = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[.\!\/\\w]*))?)/; // eslint-disable-line no-useless-escape
+const rUrl = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=+$,\w]+@)[A-Za-z0-9.-]+)((?:\/[+~%/.\w-_]*)?\??(?:[-+=&;%@.\w_]*)#?(?:[.!/\\w]*))?)/;
 const rMeta = /["']?([^"']+)?["']?\s*["']?([^"']+)?["']?/;
 
 /**

lib/plugins/tag/link.js

@@ -3,7 +3,7 @@
 const util = require('hexo-util');
 const htmlTag = util.htmlTag;
 
-const rUrl = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[.\!\/\\w]*))?)/; // eslint-disable-line no-useless-escape
+const rUrl = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=+$,\w]+@)[A-Za-z0-9.-]+)((?:\/[+~%/.\w-_]*)?\??(?:[-+=&;%@.\w_]*)#?(?:[.!/\\w]*))?)/;
 
 /**
 * Link tag

test/.eslintrc

@@ -2,5 +2,8 @@
   "extends": "hexo/test",
   "env": {
     "es6": true
+  },
+  "globals": {
+    "should": true
   }
 }

test/index.js

@@ -1,8 +1,6 @@
 'use strict';
 
-const chai = require('chai');
-
-chai.use(require('chai-as-promised'));
+require('chai').use(require('chai-as-promised'));
 
 describe('Hexo', () => {
   require('./scripts/box');

test/mocha.opts

@@ -1 +1,6 @@
---reporter spec
+--colors
+--reporter spec
+--ui bdd
+--full-trace
+--exit
+--require chai/register-should

test/scripts/box/box.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const pathFn = require('path');
 const fs = require('hexo-fs');
 const Promise = require('bluebird');

test/scripts/box/file.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const pathFn = require('path');
 const Promise = require('bluebird');
 const fs = require('hexo-fs');

test/scripts/console/clean.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const fs = require('hexo-fs');
 
 describe('clean', () => {

test/scripts/console/config.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const fs = require('hexo-fs');
 const pathFn = require('path');
 const yaml = require('js-yaml');

test/scripts/console/deploy.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const fs = require('hexo-fs');
 const pathFn = require('path');
 const sinon = require('sinon');

test/scripts/console/generate.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const pathFn = require('path');
 const fs = require('hexo-fs');
 const Promise = require('bluebird');

test/scripts/console/migrate.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const sinon = require('sinon');
 
 describe('migrate', () => {

test/scripts/console/new.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const fs = require('hexo-fs');
 const moment = require('moment');
 const pathFn = require('path');

test/scripts/console/publish.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const fs = require('hexo-fs');
 const moment = require('moment');
 const pathFn = require('path');

test/scripts/console/render.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const fs = require('hexo-fs');
 const pathFn = require('path');
 const Promise = require('bluebird');

test/scripts/extend/console.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('Console', () => {
   const Console = require('../../../lib/extend/console');

test/scripts/extend/deployer.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('Deployer', () => {
   const Deployer = require('../../../lib/extend/deployer');

test/scripts/extend/filter.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const sinon = require('sinon');
 
 describe('Filter', () => {

test/scripts/extend/generator.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('Generator', () => {
   const Generator = require('../../../lib/extend/generator');

test/scripts/extend/helper.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('Helper', () => {
   const Helper = require('../../../lib/extend/helper');

test/scripts/extend/migrator.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('Migrator', () => {
   const Migrator = require('../../../lib/extend/migrator');

test/scripts/extend/processor.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('Processor', () => {
   const Processor = require('../../../lib/extend/processor');

test/scripts/extend/renderer.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('Renderer', () => {
   const Renderer = require('../../../lib/extend/renderer');

test/scripts/extend/tag.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const sinon = require('sinon');
 const Promise = require('bluebird');
 

test/scripts/filters/backtick_code_block.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const util = require('hexo-util');
 const cloneDeep = require('lodash/cloneDeep');
 const defaultConfig = require('../../../lib/hexo/default_config');

test/scripts/filters/excerpt.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('Excerpt', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/filters/external_link.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('External link', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/filters/i18n_locals.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('i18n locals', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/filters/new_post_path.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const sinon = require('sinon');
 const pathFn = require('path');
 const moment = require('moment');

test/scripts/filters/post_permalink.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const moment = require('moment');
 
 const PERMALINK = ':year/:month/:day/:title/';

test/scripts/filters/render_post.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const fixture = require('../../fixtures/post_render');
 
 describe('Render post', () => {

test/scripts/filters/save_database.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const fs = require('hexo-fs');
 const Promise = require('bluebird');
 

test/scripts/filters/titlecase.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('Titlecase', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/generators/asset.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const Promise = require('bluebird');
 const pathFn = require('path');
 const fs = require('hexo-fs');

test/scripts/generators/page.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const Promise = require('bluebird');
 
 describe('page', () => {

test/scripts/generators/post.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const Promise = require('bluebird');
 
 describe('post', () => {

test/scripts/helpers/css.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('css', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/date.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const moment = require('moment-timezone');
-const should = require('chai').should(); // eslint-disable-line
 const sinon = require('sinon');
 
 describe('date', () => {

test/scripts/helpers/debug.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const rewire = require('rewire');
 const sinon = require('sinon');
 

test/scripts/helpers/favicon_tag.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('favicon_tag', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/feed_tag.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('feed_tag', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/fragment_cache.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('fragment_cache', () => {
   const fragment_cache = require('../../../lib/plugins/helper/fragment_cache')();

test/scripts/helpers/gravatar.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const crypto = require('crypto');
-const should = require('chai').should(); // eslint-disable-line
 
 describe('gravatar', () => {
   const gravatar = require('../../../lib/plugins/helper/gravatar');

test/scripts/helpers/image_tag.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('image_tag', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/is.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('is', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/js.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('js', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/link_to.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('link_to', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/list_archives.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('list_archives', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/list_categories.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const Promise = require('bluebird');
 
 describe('list_categories', () => {

test/scripts/helpers/list_posts.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('list_posts', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/list_tags.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const Promise = require('bluebird');
 
 describe('list_tags', () => {

test/scripts/helpers/mail_to.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const qs = require('querystring');
 
 describe('mail_to', () => {

test/scripts/helpers/markdown.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('markdown', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/number_format.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('number_format', () => {
   const numberFormat = require('../../../lib/plugins/helper/number_format');

test/scripts/helpers/open_graph.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const moment = require('moment');
-const should = require('chai').should(); // eslint-disable-line
 
 describe('open_graph', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/paginator.js

@@ -1,4 +1,4 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
 
 describe('paginator', () => {
   const Hexo = require('../../../lib/hexo');

test/scripts/helpers/partial.js

@@ -1,4 +1,5 @@
-const should = require('chai').should(); // eslint-disable-line
+'use strict';
+
 const sinon = require('sinon');
 const pathFn = require('path');
 const fs = require('hexo-fs');