Skip to content

Commit 0085752

Browse files
elukoyanovDavertMik
elukoyanov
authored and
DavertMik
committed
Refactor: update eslint and it's packages (#2112)
* chore: update eslint and it's packages * refactor: fix eslint import/order rule errors * refactor: fix eslint import/order rule errors in tests * refactor: fix eslint errors * refactor: fix eslint errors * refactor: dsiable eslint arrow-parens rule * refactor: skip max-classes-per-file eslint rule for step.js * refactor: fix update errors * refactor: update docs and typings
1 parent bdb9042 commit 0085752

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+353
-263
lines changed

Diff for: ‎.eslintrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"import/no-unresolved": 0,
3838
"no-await-in-loop": 0,
3939
"arrow-body-style": 0,
40-
"no-loop-func": 0
40+
"no-loop-func": 0,
41+
"arrow-parens": 0
4142
}
4243
}

Diff for: ‎examples/user_helper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const Helper = require('../lib/helper');
21
const assert = require('assert');
2+
const Helper = require('../lib/helper');
33

44
class User extends Helper {
55
// before/after hooks

Diff for: ‎lib/assert/error.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ function AssertionFailedError(params, template) {
1111
// this.message = "AssertionFailedError";
1212
let stack = new Error().stack;
1313
// this.showDiff = true;
14-
stack = stack ? stack.split('\n').filter(line =>
15-
// @todo cut assert things nicer
16-
line.indexOf('lib/assert') < 0).join('\n') : '';
14+
15+
// @todo cut assert things nicer
16+
stack = stack ? stack.split('\n').filter(line => line.indexOf('lib/assert') < 0).join('\n') : '';
1717
this.showDiff = true;
1818

1919
this.actual = this.params.actual;

Diff for: ‎lib/codecept.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
const fsPath = require('path');
1+
const existsSync = require('fs').existsSync;
22
const readFileSync = require('fs').readFileSync;
3+
const glob = require('glob');
4+
const fsPath = require('path');
5+
const resolve = require('path').resolve;
6+
37
const container = require('./container');
48
const Config = require('./config');
59
const event = require('../lib/event');
6-
const glob = require('glob');
710
const runHook = require('./hooks');
8-
const existsSync = require('fs').existsSync;
9-
const resolve = require('path').resolve;
1011
const output = require('./output');
12+
1113
/**
1214
* CodeceptJS runner
1315
*/

Diff for: ‎lib/command/configMigrate.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
const print = require('../output').print;
2-
const success = require('../output').success;
3-
const error = require('../output').error;
41
const colors = require('chalk');
52
const fs = require('fs');
6-
const path = require('path');
7-
const fileExists = require('../utils').fileExists;
83
const inquirer = require('inquirer');
9-
const getTestRoot = require('./utils').getTestRoot;
104
const mkdirp = require('mkdirp');
5+
const path = require('path');
116
const util = require('util');
127

8+
const print = require('../output').print;
9+
const success = require('../output').success;
10+
const error = require('../output').error;
11+
const fileExists = require('../utils').fileExists;
12+
const getTestRoot = require('./utils').getTestRoot;
13+
1314
module.exports = function (initPath) {
1415
const testsPath = getTestRoot(initPath);
1516

Diff for: ‎lib/command/definitions.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
const fs = require('fs');
2+
const path = require('path');
3+
14
const getConfig = require('./utils').getConfig;
25
const getTestRoot = require('./utils').getTestRoot;
36
const Codecept = require('../codecept');
47
const container = require('../container');
58
const output = require('../output');
6-
const fs = require('fs');
7-
const path = require('path');
89

910
const template = ({
1011
helperNames, supportObject, importPaths, translations, hasCustomStepsFile,

Diff for: ‎lib/command/generate.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
const output = require('../output');
2-
const inquirer = require('inquirer');
1+
const colors = require('chalk');
32
const fs = require('fs');
3+
const inquirer = require('inquirer');
4+
const mkdirp = require('mkdirp');
45
const path = require('path');
5-
const colors = require('chalk');
6+
67
const { fileExists, ucfirst, lcfirst } = require('../utils');
7-
const mkdirp = require('mkdirp');
8+
const output = require('../output');
89
const {
910
getConfig, getTestRoot, safeFileWrite,
1011
} = require('./utils');

Diff for: ‎lib/command/gherkin/init.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
const output = require('../../output');
21
const inquirer = require('inquirer');
32
const fs = require('fs');
43
const path = require('path');
54
const mkdirp = require('mkdirp');
5+
6+
const output = require('../../output');
67
const { fileExists, ucfirst, lcfirst } = require('../../utils');
78
const {
89
getConfig, getTestRoot, updateConfig, safeFileWrite,

Diff for: ‎lib/command/gherkin/snippets.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
const escapeStringRegexp = require('escape-string-regexp');
2+
const fs = require('fs');
3+
const { Parser } = require('gherkin');
4+
const glob = require('glob');
5+
const fsPath = require('path');
6+
17
const getConfig = require('../utils').getConfig;
28
const getTestRoot = require('../utils').getTestRoot;
39
const Codecept = require('../../codecept');
4-
const container = require('../../container');
510
const output = require('../../output');
611
const { matchStep } = require('../../interfaces/bdd');
7-
const { Parser } = require('gherkin');
8-
const glob = require('glob');
9-
const fsPath = require('path');
10-
const fs = require('fs');
11-
const escapeStringRegexp = require('escape-string-regexp');
1212

1313
const parser = new Parser();
1414
parser.stopAtFirstError = false;

Diff for: ‎lib/command/gherkin/steps.js

-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,3 @@ module.exports = function (genPath, options) {
2525
output.error('No Gherkin steps defined');
2626
}
2727
};
28-

Diff for: ‎lib/command/info.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
const envinfo = require('envinfo');
2+
13
const getConfig = require('./utils').getConfig;
24
const getTestRoot = require('./utils').getTestRoot;
35
const Codecept = require('../codecept');
46
const output = require('../output');
5-
const envinfo = require('envinfo');
67

78
module.exports = async function (path) {
89
const testsPath = getTestRoot(path);

Diff for: ‎lib/command/init.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
const { print, success, error } = require('../output');
21
const colors = require('chalk');
32
const fs = require('fs');
3+
const inquirer = require('inquirer');
4+
const mkdirp = require('mkdirp');
45
const path = require('path');
6+
const { inspect } = require('util');
7+
8+
const { print, success, error } = require('../output');
59
const { fileExists, beautify } = require('../utils');
6-
const inquirer = require('inquirer');
710
const { getTestRoot } = require('./utils');
811
const generateDefinitions = require('./definitions');
912
const { test: generateTest } = require('./generate');
1013
const isLocal = require('../utils').installedLocally();
11-
const mkdirp = require('mkdirp');
12-
const { inspect } = require('util');
1314

1415
const defaultConfig = {
1516
tests: './*_test.js',

Diff for: ‎lib/command/run-multiple.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
const {
2-
getConfig, getTestRoot, fail,
3-
} = require('./utils');
41
const fork = require('child_process').fork;
52
const path = require('path');
63
const crypto = require('crypto');
4+
75
const runHook = require('../hooks');
86
const event = require('../event');
97
const collection = require('./run-multiple/collection');
108
const clearString = require('../utils').clearString;
119
const replaceValueDeep = require('../utils').replaceValueDeep;
10+
const {
11+
getConfig, getTestRoot, fail,
12+
} = require('./utils');
1213

1314
const runner = path.join(__dirname, '/../../bin/codecept');
1415
let config;
@@ -113,7 +114,7 @@ module.exports = function (selectedRuns, options) {
113114

114115
function executeRun(runName, runConfig) {
115116
// clone config
116-
let overriddenConfig = Object.assign({}, config);
117+
let overriddenConfig = { ...config };
117118

118119
// get configuration
119120
const browserConfig = runConfig.browser;

Diff for: ‎lib/command/run-workers.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
const { satisfyNodeVersion, getConfig, getTestRoot } = require('./utils');
21
// For Node version >=10.5.0, have to use experimental flag
32

4-
const ms = require('ms');
3+
const { Suite, Test, reporters: { Base } } = require('mocha');
54
const path = require('path');
5+
6+
const { satisfyNodeVersion, getConfig, getTestRoot } = require('./utils');
67
const Codecept = require('../codecept');
78
const Container = require('../container');
89
const { tryOrDefault } = require('../utils');
910
const output = require('../output');
1011
const event = require('../event');
1112
const runHook = require('../hooks');
12-
const { Suite, Test, reporters: { Base } } = require('mocha');
1313

1414
const stats = {
1515
suites: 0,

Diff for: ‎lib/command/run.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
const mkdirp = require('mkdirp');
2+
const path = require('path');
3+
14
const getConfig = require('./utils').getConfig;
25
const getTestRoot = require('./utils').getTestRoot;
36
const fileExists = require('../utils').fileExists;
4-
const path = require('path');
5-
const mkdirp = require('mkdirp');
67
const Config = require('../config');
78
const Codecept = require('../codecept');
89
const output = require('../output');

Diff for: ‎lib/command/utils.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
const fs = require('fs');
22
const path = require('path');
3+
const semver = require('semver');
4+
const util = require('util');
5+
36
const output = require('../output');
47
const { fileExists, beautify } = require('../utils');
5-
const util = require('util');
6-
const semver = require('semver');
78

89
// alias to deep merge
910
module.exports.deepMerge = require('../utils').deepMerge;

Diff for: ‎lib/config.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class Config {
114114
*/
115115
static reset() {
116116
hooks = [];
117-
return config = Object.assign({}, defaultConfig);
117+
return config = { ...defaultConfig };
118118
}
119119
}
120120

@@ -132,4 +132,3 @@ function loadConfigFile(configFile) {
132132
}
133133
throw new Error(`Config file ${configFile} can't be loaded`);
134134
}
135-

Diff for: ‎lib/container.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
const glob = require('glob');
12
const path = require('path');
3+
24
const fileExists = require('./utils').fileExists;
35
const Translation = require('./translation');
46
const MochaFactory = require('./mochaFactory');
57
const recorder = require('./recorder');
68
const event = require('./event');
7-
const glob = require('glob');
89

910
let container = {
1011
helpers: {},
@@ -357,7 +358,7 @@ function loadTranslation(translation) {
357358
if (require('../translations')[translation]) {
358359
vocabulary = require('../translations')[translation];
359360
return new Translation(vocabulary);
360-
} else if (fileExists(path.join(global.codecept_dir, translation))) {
361+
} if (fileExists(path.join(global.codecept_dir, translation))) {
361362
// get from a provided file instead
362363
vocabulary = require(path.join(global.codecept_dir, translation));
363364
} else {

Diff for: ‎lib/helper/Appium.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
let webdriverio;
22
let wdioV4;
33
let SCREEN_SIZE;
4+
5+
const fs = require('fs');
6+
const requireg = require('requireg');
7+
48
const Webdriver = require('./WebDriver');
59
const AssertionFailedError = require('../assert/error');
610
const truth = require('../assert/truth').truth;
7-
const requireg = require('requireg');
8-
const fs = require('fs');
911
const recorder = require('../recorder');
1012
const Locator = require('../locator');
1113
const ConnectionRefused = require('./errors/ConnectionRefused');
@@ -249,7 +251,8 @@ class Appium extends Webdriver {
249251
width: res.value[0],
250252
height: res.value[1],
251253
});
252-
} else if (this.options.windowSize && this.options.windowSize.indexOf('x') > 0 && !this.platform) {
254+
}
255+
if (this.options.windowSize && this.options.windowSize.indexOf('x') > 0 && !this.platform) {
253256
const dimensions = this.options.windowSize.split('x');
254257
await this.browser.windowHandleSize({
255258
width: dimensions[0],

Diff for: ‎lib/helper/FileSystem.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
const assert = require('assert');
2+
const path = require('path');
3+
const fs = require('fs');
4+
15
const Helper = require('../helper');
26
const fileExists = require('../utils').fileExists;
37
const fileIncludes = require('../assert/include').fileIncludes;
48
const fileEquals = require('../assert/equal').fileEquals;
5-
const assert = require('assert');
6-
const path = require('path');
7-
const fs = require('fs');
89

910
/**
1011
* Helper for testing filesystem.

Diff for: ‎lib/helper/GraphQL.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
const Helper = require('../helper');
21
const requireg = require('requireg');
32

3+
const Helper = require('../helper');
4+
45
let axios = requireg('axios');
56
let headers = {};
67

@@ -49,7 +50,7 @@ class GraphQL extends Helper {
4950
endpoint: '',
5051
};
5152
this.options = Object.assign(this.options, config);
52-
headers = Object.assign({}, this.options.defaultHeaders);
53+
headers = { ...this.options.defaultHeaders };
5354
axios.defaults.headers = this.options.defaultHeaders;
5455
}
5556

Diff for: ‎lib/helper/GraphQLDataFactory.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const path = require('path');
22
const requireg = require('requireg');
3+
34
const Helper = require('../helper');
45
const GraphQL = require('./GraphQL');
56

Diff for: ‎lib/helper/Mochawesome.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
let addMochawesomeContext;
22
let currentTest;
33
let currentSuite;
4+
5+
const requireg = require('requireg');
6+
47
const Helper = require('../helper');
58
const clearString = require('../utils').clearString;
6-
const requireg = require('requireg');
7-
const path = require('path');
89

910

1011
class Mochawesome extends Helper {

Diff for: ‎lib/helper/MockRequest.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
const Helper = require('../helper');
21
const requireg = require('requireg');
2+
3+
const Helper = require('../helper');
34
const { appendBaseUrl } = require('../utils');
45
const pollyWebDriver = require('./clientscripts/PollyWebDriverExt');
56

Diff for: ‎lib/helper/Nightmare.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1+
const path = require('path');
12
const requireg = require('requireg');
3+
const urlResolve = require('url').resolve;
4+
25
const Helper = require('../helper');
36
const stringIncludes = require('../assert/include').includes;
47
const urlEquals = require('../assert/equal').urlEquals;
58
const equals = require('../assert/equal').equals;
69
const empty = require('../assert/empty').empty;
710
const truth = require('../assert/truth').truth;
811
const Locator = require('../locator');
9-
const path = require('path');
1012
const ElementNotFound = require('./errors/ElementNotFound');
11-
const urlResolve = require('url').resolve;
1213
const {
1314
xpathLocator,
1415
fileExists,

0 commit comments

Comments
 (0)