Skip to content

Commit a97b120

Browse files
sokrasokra
authored
Merge pull request webpack#5963 from webpack/lint/add-missing-files
 add linting for test/*.js too
2 parents 40871b8 + 96df6ae commit a97b120

37 files changed

+118
-116
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module.exports = {
55
"env": {
66
"node": true,
77
"es6": true,
8+
"mocha": true,
89
},
910
"parserOptions": { "ecmaVersion": 2017 },
1011
"rules": {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"build:examples": "cd examples && node buildAll.js",
104104
"pretest": "npm run lint-files",
105105
"lint-files": "npm run lint && npm run beautify-lint",
106-
"lint": "eslint lib bin hot buildin \"test/**/webpack.config.js\" \"test/binCases/**/test.js\" \"examples/**/webpack.config.js\"",
106+
"lint": "eslint lib bin hot buildin \"test/*.js\" \"test/**/webpack.config.js\" \"test/binCases/**/test.js\" \"examples/**/webpack.config.js\"",
107107
"fix": "npm run lint -- --fix",
108108
"beautify-lint": "beautify-lint \"lib/**/*.js\" \"hot/**/*.js\" \"bin/**/*.js\" \"benchmark/*.js\" \"test/*.js\"",
109109
"nsp": "nsp check --output summary",

‎test/AmdMainTemplatePlugin.unittest.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* global describe, beforeEach, it */
22
"use strict";
33

4-
const should = require("should");
4+
require("should");
55
const sinon = require("sinon");
66
const TemplatePluginEnvironment = require("./helpers/TemplatePluginEnvironment");
77
const ConcatSource = require("webpack-sources").ConcatSource;
@@ -99,9 +99,9 @@ describe("AmdMainTemplatePlugin", () => {
9999
const externalFlag = {
100100
external: false
101101
};
102-
const noExternals = env.modulesListWithExternals.map((module) => Object.assign(module, externalFlag));
102+
const noExternals = env.modulesListWithExternals.map((module) => Object.assign({}, module, externalFlag));
103103
env.chunk = {
104-
getModules: () => env.modulesListWithExternals
104+
getModules: () => noExternals
105105
};
106106
env.eventBinding = setupPluginAndGetEventBinding();
107107
});

‎test/BenchmarkTestCases.benchmark.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
"use strict";
22

3-
const should = require("should");
3+
require("should");
44
const path = require("path");
55
const fs = require("fs");
66
const asyncLib = require("async");
77
var Test = require("mocha/lib/test");
88

9-
const webpack = require("../lib/webpack");
109
const Benchmark = require("benchmark");
1110

1211
describe("BenchmarkTestCases", function() {
@@ -35,7 +34,7 @@ describe("BenchmarkTestCases", function() {
3534
const baselineRevision = baselineInfo.rev;
3635
const baselinePath = path.resolve(baselinesPath, baselineRevision);
3736
if(fs.existsSync(path.resolve(baselinePath, ".git"))) {
38-
doLoadWebpack()
37+
doLoadWebpack();
3938
} else {
4039
try {
4140
fs.mkdirSync(baselinePath);
@@ -64,7 +63,7 @@ describe("BenchmarkTestCases", function() {
6463
});
6564
callback();
6665
}
67-
}, done)
66+
}, done);
6867
});
6968
});
7069

@@ -80,7 +79,7 @@ describe("BenchmarkTestCases", function() {
8079
if(err) return callback(err);
8180
const match = /^([a-f0-9]+)\s*([a-f0-9]+)\s*([a-f0-9]+)?\s*$/.exec(resultParents);
8281
if(!match) return callback(new Error("Invalid result from git rev-list"));
83-
const head = match[1]
82+
const head = match[1];
8483
const parent1 = match[2];
8584
const parent2 = match[3];
8685
if(parent2 && parent1) {

‎test/CachePlugin.unittest.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
"use strict";
22

3-
const should = require("should");
4-
const sinon = require("sinon");
3+
require("should");
54
const CachePlugin = require("../lib/CachePlugin");
6-
const applyPluginWithOptions = require("./helpers/applyPluginWithOptions");
75

86
describe("CachePlugin", () => {
97
let env;

‎test/CaseSensitiveModulesWarning.unittest.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
const should = require("should");
3+
require("should");
44
const CaseSensitiveModulesWarning = require("../lib/CaseSensitiveModulesWarning");
55

66
const createModule = function(identifier, numberOfReasons) {
@@ -49,6 +49,6 @@ Use equal casing. Compare these module identifiers:
4949
it("has the an origin", () =>
5050
myCaseSensitiveModulesWarning.origin.should.be.exactly(modules[0]));
5151

52-
it('has the a module', () =>
52+
it("has the a module", () =>
5353
myCaseSensitiveModulesWarning.module.should.be.exactly(modules[0]));
5454
});

‎test/ConfigTestCases.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22

33
/* globals describe it */
4-
const should = require("should");
4+
require("should");
55
const path = require("path");
66
const fs = require("fs");
77
const vm = require("vm");

‎test/ContextDependencyTemplateAsId.unittest.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22

33
const _ = require("lodash");
4-
const should = require("should");
4+
require("should");
55
const sinon = require("sinon");
66
const ContextDependencyTemplateAsId = require("../lib/dependencies/ContextDependencyTemplateAsId");
77

@@ -51,7 +51,7 @@ describe("ContextDependencyTemplateAsId", () => {
5151

5252
it("replaces source with missing module error", () => {
5353
env.source.replace.callCount.should.be.exactly(1);
54-
sinon.assert.calledWith(env.source.replace, 1, 24, '!(function webpackMissingModule() { var e = new Error("Cannot find module \\"myModule\\""); e.code = \'MODULE_NOT_FOUND\'; throw e; }())');
54+
sinon.assert.calledWith(env.source.replace, 1, 24, "!(function webpackMissingModule() { var e = new Error(\"Cannot find module \\\"myModule\\\"\"); e.code = 'MODULE_NOT_FOUND'; throw e; }())");
5555
});
5656
});
5757

@@ -71,7 +71,7 @@ describe("ContextDependencyTemplateAsId", () => {
7171

7272
it("replaces source with webpack require with comment", () => {
7373
env.source.replace.callCount.should.be.exactly(1);
74-
sinon.assert.calledWith(env.source.replace, 1, 24, '__webpack_require__(/*! shortened myModule */ "123").resolve');
74+
sinon.assert.calledWith(env.source.replace, 1, 24, "__webpack_require__(/*! shortened myModule */ \"123\").resolve");
7575
});
7676
});
7777

@@ -83,7 +83,7 @@ describe("ContextDependencyTemplateAsId", () => {
8383

8484
it("replaces source with webpack require without comment", () => {
8585
env.source.replace.callCount.should.be.exactly(1);
86-
sinon.assert.calledWith(env.source.replace, 1, 24, '__webpack_require__("123").resolve');
86+
sinon.assert.calledWith(env.source.replace, 1, 24, "__webpack_require__(\"123\").resolve");
8787
});
8888
});
8989
});
@@ -103,7 +103,7 @@ describe("ContextDependencyTemplateAsId", () => {
103103
it("replaces source with webpack require and wraps value", () => {
104104
env.source.replace.callCount.should.be.exactly(2);
105105
sinon.assert.calledWith(env.source.replace, 18, 24, ")");
106-
sinon.assert.calledWith(env.source.replace, 1, 7, '__webpack_require__(/*! shortened myModule */ "123").resolve("prepend value"');
106+
sinon.assert.calledWith(env.source.replace, 1, 7, "__webpack_require__(/*! shortened myModule */ \"123\").resolve(\"prepend value\"");
107107
});
108108
});
109109

@@ -132,7 +132,7 @@ describe("ContextDependencyTemplateAsId", () => {
132132
sinon.assert.calledWith(env.source.replace, 9, 10, "foo");
133133
sinon.assert.calledWith(env.source.replace, 13, 14, "bar");
134134
sinon.assert.calledWith(env.source.replace, 18, 24, ")");
135-
sinon.assert.calledWith(env.source.replace, 1, 7, '__webpack_require__(/*! shortened myModule */ "123").resolve("prepend value"');
135+
sinon.assert.calledWith(env.source.replace, 1, 7, "__webpack_require__(/*! shortened myModule */ \"123\").resolve(\"prepend value\"");
136136
});
137137
});
138138
});

‎test/ContextReplacementPlugin.unittest.js‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
const should = require("should");
44
const sinon = require("sinon");
55
const ContextReplacementPlugin = require("../lib/ContextReplacementPlugin");
6-
const applyPluginWithOptions = require("./helpers/applyPluginWithOptions");
76
const PluginEnvironment = require("./helpers/PluginEnvironment");
87

98
describe("ContextReplacementPlugin", () => {
@@ -40,14 +39,14 @@ describe("ContextReplacementPlugin", () => {
4039
should(instance.newContentCreateContextMap).be.a.Function();
4140

4241
let x = (nothing, obj) => {
43-
should(obj.test).be.exactly("obj")
42+
should(obj.test).be.exactly("obj");
4443
};
4544

4645
let spy = sinon.spy(x);
4746

4847
instance.newContentCreateContextMap(undefined, spy);
4948

50-
should(spy.called).be.exactly(true)
49+
should(spy.called).be.exactly(true);
5150

5251
});
5352

@@ -68,10 +67,10 @@ describe("ContextReplacementPlugin", () => {
6867
let obj = buildPluginWithParams(/selector/, "./folder", true, /filter/);
6968

7069
let x = (nothing, result) => {
71-
should(result.request).be.exactly('./folder')
72-
should(result.dependencies[0].critical).be.exactly(false)
73-
should(result.recursive).be.exactly(true)
74-
should(result.regExp instanceof RegExp).be.exactly(true)
70+
should(result.request).be.exactly("./folder");
71+
should(result.dependencies[0].critical).be.exactly(false);
72+
should(result.recursive).be.exactly(true);
73+
should(result.regExp instanceof RegExp).be.exactly(true);
7574
};
7675

7776
let spy = sinon.spy(x);
@@ -81,24 +80,24 @@ describe("ContextReplacementPlugin", () => {
8180
dependencies: [{
8281
critical: true
8382
}]
84-
}, spy)
83+
}, spy);
8584

86-
should(spy.called).be.exactly(true)
85+
should(spy.called).be.exactly(true);
8786
});
8887

8988
it("default call with newContentCallback as a function", () => {
9089
let obj = buildPluginWithParams(/selector/, (result) => {
91-
should(result.request).be.exactly('selector')
92-
should(result.dependencies[0].critical).be.exactly(false)
93-
should(result.recursive).be.exactly(undefined)
94-
should(result.regExp).be.exactly(undefined)
90+
should(result.request).be.exactly("selector");
91+
should(result.dependencies[0].critical).be.exactly(false);
92+
should(result.recursive).be.exactly(undefined);
93+
should(result.regExp).be.exactly(undefined);
9594
}, true, /filter/);
9695

9796
let x = (nothing, result) => {
98-
should(result.request).be.exactly('selector')
99-
should(result.dependencies[0].critical).be.exactly(false)
100-
should(result.recursive).be.exactly(undefined)
101-
should(result.regExp).be.exactly(undefined)
97+
should(result.request).be.exactly("selector");
98+
should(result.dependencies[0].critical).be.exactly(false);
99+
should(result.recursive).be.exactly(undefined);
100+
should(result.regExp).be.exactly(undefined);
102101
};
103102

104103
let spy = sinon.spy(x);
@@ -108,9 +107,9 @@ describe("ContextReplacementPlugin", () => {
108107
dependencies: [{
109108
critical: false
110109
}]
111-
}, spy)
110+
}, spy);
112111

113-
should(spy.called).be.exactly(true)
112+
should(spy.called).be.exactly(true);
114113
});
115114

116115
it("call when result is false", () => {
@@ -124,7 +123,7 @@ describe("ContextReplacementPlugin", () => {
124123

125124
obj.beforeResolve.handler(false, spy);
126125

127-
should(spy.called).be.exactly(true)
126+
should(spy.called).be.exactly(true);
128127
});
129128
});
130129

@@ -133,8 +132,8 @@ describe("ContextReplacementPlugin", () => {
133132
let obj = buildPluginWithParams(/selector/, "./folder", true, /filter/);
134133

135134
let x = (nothing, result) => {
136-
result.resource.should.containEql('selector')
137-
result.resource.should.containEql('folder')
135+
result.resource.should.containEql("selector");
136+
result.resource.should.containEql("folder");
138137
};
139138

140139
let spy = sinon.spy(x);
@@ -146,14 +145,14 @@ describe("ContextReplacementPlugin", () => {
146145
}]
147146
}, spy);
148147

149-
should(spy.called).be.exactly(true)
148+
should(spy.called).be.exactly(true);
150149
});
151150

152151
it("default call where regex is incorrect", () => {
153152
let obj = buildPluginWithParams(/selector/, "./folder", true, /filter/);
154153

155154
let x = (nothing, result) => {
156-
result.resource.should.containEql('importwontwork')
155+
result.resource.should.containEql("importwontwork");
157156
};
158157

159158
let spy = sinon.spy(x);
@@ -165,7 +164,7 @@ describe("ContextReplacementPlugin", () => {
165164
}]
166165
}, spy);
167166

168-
should(spy.called).be.exactly(true)
167+
should(spy.called).be.exactly(true);
169168
});
170169

171170
it("default call where regex is correct", () => {
@@ -174,7 +173,7 @@ describe("ContextReplacementPlugin", () => {
174173
}, true, /filter/);
175174

176175
let x = (nothing, result) => {
177-
result.resource.should.equal('selector')
176+
result.resource.should.equal("selector");
178177
};
179178

180179
let spy = sinon.spy(x);
@@ -186,17 +185,17 @@ describe("ContextReplacementPlugin", () => {
186185
}]
187186
}, spy);
188187

189-
should(spy.called).be.exactly(true)
188+
should(spy.called).be.exactly(true);
190189
});
191190

192191
it("default call where regex is correct and using function as newContent Resource", () => {
193192
let obj = buildPluginWithParams(/selector/, (result) => {
194-
result.resource = "imadifferentselector"
193+
result.resource = "imadifferentselector";
195194
}, true, /filter/);
196195

197196
let x = (nothing, result) => {
198-
result.resource.should.containEql('selector')
199-
result.resource.should.containEql('imadifferentselector')
197+
result.resource.should.containEql("selector");
198+
result.resource.should.containEql("imadifferentselector");
200199
};
201200

202201
let spy = sinon.spy(x);
@@ -208,10 +207,10 @@ describe("ContextReplacementPlugin", () => {
208207
}]
209208
}, spy);
210209

211-
should(spy.called).be.exactly(true)
210+
should(spy.called).be.exactly(true);
212211
});
213212

214-
})
213+
});
215214

216215
});
217216
});
@@ -223,7 +222,7 @@ let buildPluginWithParams = (resourceRegExp, newContentResource, newContentRecur
223222
instance.apply(pluginEnvironment.getEnvironmentStub());
224223

225224
let contextModuleFactory = pluginEnvironment.getEventBindings()[0];
226-
pluginEnvironment.getEventBindings().length.should.be.exactly(1)
225+
pluginEnvironment.getEventBindings().length.should.be.exactly(1);
227226

228227
let contextModuleFactoryPluginEnv = new PluginEnvironment();
229228

@@ -239,5 +238,5 @@ let buildPluginWithParams = (resourceRegExp, newContentResource, newContentRecur
239238
contextModuleFactory,
240239
beforeResolve,
241240
afterResolve
242-
}
241+
};
243242
};

‎test/ExternalModule.unittest.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ describe("ExternalModule", function() {
163163
// set up
164164
const variableToCheck = "foo";
165165
const request = "bar";
166-
const expected = `if(typeof foo === 'undefined') {var e = new Error(\"Cannot find module \\\"bar\\\"\"); e.code = 'MODULE_NOT_FOUND'; throw e;}
166+
const expected = `if(typeof foo === 'undefined') {var e = new Error("Cannot find module \\"bar\\""); e.code = 'MODULE_NOT_FOUND'; throw e;}
167167
`;
168168

169169
// invoke

0 commit comments

Comments
 (0)