Skip to content

Commit e21c9a4

Browse files
committed
Style guide applied to all the code involving the tests
1 parent de67645 commit e21c9a4

12 files changed

+135
-128
lines changed

test/detect-child-process.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
1-
var RuleTester = require("eslint").RuleTester;
1+
'use strict';
22

3-
var rule = require("../rules/detect-child-process");
3+
const RuleTester = require('eslint').RuleTester;
4+
const tester = new RuleTester();
45

6+
const ruleName = 'detect-child-process';
7+
const Rule = require(`../rules/${ruleName}`);
58

6-
var eslintTester = new RuleTester(),
7-
valid = "child_process.exec('ls')",
8-
invalidRequire = "require('child_process')",
9-
invalidExec= "var child = require('child_process'); child.exec(com)";
9+
const valid = 'child_process.exec(\'ls\')';
10+
const invalidRequire = 'require(\'child_process\')';
11+
const invalidExec = 'var child = require(\'child_process\'); child.exec(com)';
1012

1113

12-
eslintTester.run("detect-child-process (require('child_process'))", rule, {
14+
tester.run(`${ruleName} (require("child_process"))`, Rule, {
1315
valid: [{ code: valid }],
1416
invalid: [
1517
{
1618
code: invalidRequire,
17-
errors: [{ message: "Found require(\"child_process\")\n\t1: " + invalidRequire }]
18-
},
19+
errors: [{ message: `Found require("child_process")\n\t1: ${invalidRequire}` }]
20+
}
1921
]
2022
});
2123

2224

23-
eslintTester.run("detect-child-process (child_process.exec() wih non literal 1st arg.)", rule, {
25+
tester.run(`${ruleName} (child_process.exec() wih non literal 1st arg.)`, Rule, {
2426
valid: [{ code: valid }],
2527
invalid: [
2628
{
2729
code: invalidExec,
2830
errors: [
29-
{ message: "Found require(\"child_process\")\n\t1: " + invalidExec },
30-
{ message: "Found child_process.exec() with non Literal first argument\n\t1: " + invalidExec }]
31-
},
31+
{ message: `Found require("child_process")\n\t1: ${invalidExec}` },
32+
{ message: `Found child_process.exec() with non Literal first argument\n\t1: ${invalidExec}` }]
33+
}
3234
]
3335
});
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
var RuleTester = require("eslint").RuleTester;
1+
'use strict';
22

3-
var rule = require("../rules/detect-disable-mustache-escape");
3+
const RuleTester = require('eslint').RuleTester;
4+
const tester = new RuleTester();
45

6+
const ruleName = 'detect-disable-mustache-escape';
57

6-
var eslintTester = new RuleTester();
78

8-
9-
eslintTester.run("detect-disable-mustache-escape", rule, {
10-
valid: [{ code: "escapeMarkup = false" }],
9+
tester.run(ruleName, require(`../rules/${ruleName}`), {
10+
valid: [{ code: 'escapeMarkup = false' }],
1111
invalid: [
1212
{
13-
code: "a.escapeMarkup = false",
14-
errors: [{ message: "Markup escaping disabled." }]
15-
},
13+
code: 'a.escapeMarkup = false',
14+
errors: [{ message: 'Markup escaping disabled.' }]
15+
}
1616
]
1717
});

test/detect-eval-with-expression.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
var RuleTester = require("eslint").RuleTester;
1+
'use strict';
22

3-
var rule = require("../rules/detect-eval-with-expression");
3+
const RuleTester = require('eslint').RuleTester;
4+
const tester = new RuleTester();
45

6+
const ruleName = 'detect-eval-with-expression';
57

6-
var eslintTester = new RuleTester();
78

8-
9-
eslintTester.run("detect-eval-with-expression", rule, {
10-
valid: [{ code: "eval('alert()')" }],
9+
tester.run(ruleName, require(`../rules/${ruleName}`), {
10+
valid: [{ code: 'eval(\'alert()\')' }],
1111
invalid: [
1212
{
13-
code: "eval(a);",
14-
errors: [{ message: "eval with argument of type Identifier" }]
15-
},
13+
code: 'eval(a);',
14+
errors: [{ message: 'eval with argument of type Identifier' }]
15+
}
1616
]
1717
});

test/detect-new-buffer.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
var RuleTester = require("eslint").RuleTester;
1+
'use strict';
22

3-
var rule = require("../rules/detect-new-buffer");
3+
const RuleTester = require('eslint').RuleTester;
4+
const tester = new RuleTester();
45

6+
const ruleName = 'detect-new-buffer';
7+
const invalid = 'var a = new Buffer(c)';
58

6-
var eslintTester = new RuleTester(),
7-
invalid = "var a = new Buffer(c)";
89

9-
10-
eslintTester.run("detect-new-buffer", rule, {
11-
valid: [{ code: "var a = new Buffer('test')" }],
10+
tester.run(ruleName, require(`../rules/${ruleName}`), {
11+
valid: [{ code: 'var a = new Buffer(\'test\')' }],
1212
invalid: [
1313
{
1414
code: invalid,
15-
errors: [{ message: "Found new Buffer\n\t1: " + invalid }]
16-
},
15+
errors: [{ message: `Found new Buffer\n\t1: ${invalid}` }]
16+
}
1717
]
1818
});
Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
var RuleTester = require("eslint").RuleTester;
1+
'use strict';
22

3-
var rule = require("../rules/detect-no-csrf-before-method-override");
3+
const RuleTester = require('eslint').RuleTester;
4+
const tester = new RuleTester();
45

6+
const ruleName = 'detect-no-csrf-before-method-override';
57

6-
var eslintTester = new RuleTester();
7-
8-
9-
eslintTester.run("detect-no-csrf-before-method-override", rule, {
10-
valid: [{ code: "express.methodOverride();express.csrf()" }],
8+
tester.run(ruleName, require(`../rules/${ruleName}`), {
9+
valid: [{ code: 'express.methodOverride();express.csrf()' }],
1110
invalid: [
1211
{
13-
code: "express.csrf();express.methodOverride()",
14-
errors: [{ message: "express.csrf() middleware found before express.methodOverride()" }]
15-
},
12+
code: 'express.csrf();express.methodOverride()',
13+
errors: [{ message: 'express.csrf() middleware found before express.methodOverride()' }]
14+
}
1615
]
1716
});
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
var RuleTester = require("eslint").RuleTester;
1+
'use strict';
22

3-
var rule = require("../rules/detect-non-literal-fs-filename");
3+
const RuleTester = require('eslint').RuleTester;
4+
const tester = new RuleTester();
45

6+
const invalid = 'var a = fs.open(c)';
57

6-
var eslintTester = new RuleTester(),
7-
invalid = "var a = fs.open(c)";
8+
const ruleName = 'detect-non-literal-fs-filename';
89

9-
10-
eslintTester.run("detect-non-literal-fs-filename", rule, {
11-
valid: [{ code: "var a = fs.open('test')" }],
10+
tester.run(ruleName, require(`../rules/${ruleName}`), {
11+
valid: [{ code: 'var a = fs.open(\'test\')' }],
1212
invalid: [
1313
{
1414
code: invalid,
15-
errors: [{ message: "Found fs.open with non literal argument at index 0\n\t1: " + invalid }]
16-
},
15+
errors: [{ message: `Found fs.open with non literal argument at index 0\n\t1: ${invalid}` }]
16+
}
1717
]
1818
});

test/detect-non-literal-regexp.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
var RuleTester = require("eslint").RuleTester;
1+
'use strict';
22

3-
var rule = require("../rules/detect-non-literal-regexp");
3+
const RuleTester = require('eslint').RuleTester;
4+
const tester = new RuleTester();
45

6+
const ruleName = 'detect-non-literal-regexp';
7+
const invalid = 'var a = new RegExp(c, \'i\')';
58

6-
var eslintTester = new RuleTester(),
7-
invalid = "var a = new RegExp(c, 'i')";
89

9-
10-
eslintTester.run("detect-non-literal-regexp", rule, {
11-
valid: [{ code: "var a = new RegExp('ab+c', 'i')" }],
10+
tester.run(ruleName, require(`../rules/${ruleName}`), {
11+
valid: [{ code: 'var a = new RegExp(\'ab+c\', \'i\')' }],
1212
invalid: [
1313
{
1414
code: invalid,
15-
errors: [{ message: "Found non-literal argument to RegExp Constructor\n\t1: " + invalid }]
16-
},
15+
errors: [{ message: `Found non-literal argument to RegExp Constructor\n\t1: ${invalid}` }]
16+
}
1717
]
1818
});

test/detect-non-literal-require.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
var RuleTester = require("eslint").RuleTester;
1+
'use strict';
22

3-
var rule = require("../rules/detect-non-literal-require");
3+
const RuleTester = require('eslint').RuleTester;
4+
const tester = new RuleTester();
45

6+
const ruleName = 'detect-non-literal-require';
7+
const invalid = 'var a = require(c)';
58

6-
var eslintTester = new RuleTester(),
7-
invalid = "var a = require(c)";
89

9-
10-
eslintTester.run("detect-non-literal-require", rule, {
11-
valid: [{ code: "var a = require('b')" }],
10+
tester.run(ruleName, require(`../rules/${ruleName}`), {
11+
valid: [{ code: 'var a = require(\'b\')' }],
1212
invalid: [
1313
{
1414
code: invalid,
15-
errors: [{ message: "Found non-literal argument in require\n\t1: " + invalid }]
16-
},
15+
errors: [{ message: `Found non-literal argument in require\n\t1: ${invalid}` }]
16+
}
1717
]
1818
});

test/detect-object-injection.js

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,47 @@
1-
var RuleTester = require("eslint").RuleTester;
1+
'use strict';
22

3-
var rule = require("../rules/detect-object-injection");
3+
const RuleTester = require('eslint').RuleTester;
4+
const tester = new RuleTester();
45

6+
const ruleName = 'detect-object-injection';
57

6-
var eslintTester = new RuleTester(),
7-
valid = "var a = {};",
8-
// invalidVariable = "TODO",
9-
// invalidFunction = "TODO",
10-
invalidGeneric = "var a = {}; a[b] = 4";
8+
const Rule = require(`../rules/${ruleName}`);
9+
10+
const valid = 'var a = {};';
11+
// const invalidVariable = "TODO";
12+
// const invalidFunction = "TODO";
13+
const invalidGeneric = 'var a = {}; a[b] = 4';
1114

1215

1316
// TODO
14-
// eslintTester.run("detect-object-injection (Variable Assigned to)", rule, {
17+
// tester.run(`${ruleName} (Variable Assigned to)`, Rule, {
1518
// valid: [{ code: valid }],
1619
// invalid: [
1720
// {
1821
// code: invalidVariable,
19-
// errors: [{ message: "Variable Assigned to Object Injection Sink: <input>: 1\n\t" + invalidVariable + "\n\n" }]
20-
// },
22+
// errors: [{ message: `Variable Assigned to Object Injection Sink: <input>: 1\n\t${invalidVariable}\n\n` }]
23+
// }
2124
// ]
2225
// });
2326
//
2427
//
25-
// eslintTester.run("detect-object-injection (Function)", rule, {
28+
// tester.run(`${ruleName} (Function)`, Rule, {
2629
// valid: [{ code: valid }],
2730
// invalid: [
2831
// {
2932
// code: invalidFunction,
30-
// errors: [{ message: "Variable Assigned to Object Injection Sink: <input>: 1\n\t" + invalidFunction + "\n\n" }]
31-
// },
33+
// errors: [{ message: `Variable Assigned to Object Injection Sink: <input>: 1\n\t${invalidFunction}\n\n` }]
34+
// }
3235
// ]
3336
// });
3437

3538

36-
eslintTester.run("detect-object-injection (Generic)", rule, {
39+
tester.run(`${ruleName} (Generic)`, Rule, {
3740
valid: [{ code: valid }],
3841
invalid: [
3942
{
4043
code: invalidGeneric,
41-
errors: [{ message: "Generic Object Injection Sink: <input>: 1\n\t" + invalidGeneric + "\n\n" }]
42-
},
44+
errors: [{ message: `Generic Object Injection Sink: <input>: 1\n\t${invalidGeneric}\n\n` }]
45+
}
4346
]
4447
});
Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
1-
var RuleTester = require("eslint").RuleTester;
1+
'use strict';
22

3-
var rule = require("../rules/detect-possible-timing-attacks");
3+
const RuleTester = require('eslint').RuleTester;
4+
const tester = new RuleTester();
45

6+
const ruleName = 'detect-possible-timing-attacks';
7+
const Rule = require(`../rules/${ruleName}`);
58

6-
var eslintTester = new RuleTester(),
7-
valid = "if (age === 5) {}",
8-
invalidLeft = "if (password === 'mypass') {}",
9-
invalidRigth = "if ('mypass' === password) {}";
9+
const valid = 'if (age === 5) {}';
10+
const invalidLeft = 'if (password === \'mypass\') {}';
11+
const invalidRigth = 'if (\'mypass\' === password) {}';
1012

1113

1214
// We only check with one string "password" and operator "==="
1315
// to KISS.
1416

15-
eslintTester.run("detect-detect-possible-timing-attacks (left side)", rule, {
17+
tester.run(`${ruleName} (left side)`, Rule, {
1618
valid: [{ code: valid }],
1719
invalid: [
1820
{
1921
code: invalidLeft,
20-
errors: [{ message: "Potential timing attack, left side: true\n\t1: " + invalidLeft }]
21-
},
22+
errors: [{ message: `Potential timing attack, left side: true\n\t1: ${invalidLeft}` }]
23+
}
2224
]
2325
});
2426

2527

26-
eslintTester.run("detect-detect-possible-timing-attacks (right side)", rule, {
28+
tester.run(`${ruleName} (right side)`, Rule, {
2729
valid: [{ code: valid }],
2830
invalid: [
2931
{
3032
code: invalidRigth,
31-
errors: [{ message: "Potential timing attack, right side: true\n\t1: " + invalidRigth }]
32-
},
33+
errors: [{ message: `Potential timing attack, right side: true\n\t1: ${invalidRigth}` }]
34+
}
3335
]
3436
});

0 commit comments

Comments
 (0)