Skip to content

Commit 90b758e

Browse files
DavertMikDavertMik
committed
code fixes
1 parent 2ec62e6 commit 90b758e

File tree

15 files changed

+122
-117
lines changed

15 files changed

+122
-117
lines changed

‎lib/codecept.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@ class Codecept {
110110
}
111111
}
112112

113-
module.exports = Codecept;
113+
module.exports = Codecept;

‎lib/command/run-multiple.js‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ let getConfig = require('./utils').getConfig;
33
let getTestRoot = require('./utils').getTestRoot;
44
let deepMerge = require('./utils').deepMerge;
55
let Codecept = require('../codecept');
6-
var fork = require('child_process').fork
6+
var fork = require('child_process').fork;
77
let output = require('../output');
88

99
module.exports = function (suite, test, options) {
@@ -21,7 +21,7 @@ module.exports = function (suite, test, options) {
2121
}
2222

2323
let outputDir = config.output;
24-
let defaultWindowSize = searchValueInObj('windowSize', config.helpers)
24+
let defaultWindowSize = searchValueInObj('windowSize', config.helpers);
2525

2626
// run multiple codeceptjs with options
2727
if (options.multiple) {
@@ -35,66 +35,67 @@ module.exports = function (suite, test, options) {
3535
// if key in browser list, then seach suites for this browser
3636
if (browserList.indexOf(browserSuites[0]) > -1) {
3737
let browser = browserSuites[0];
38-
let suites = browserSuites[1].split(',')
38+
let suites = browserSuites[1].split(',');
3939
// iterate suites for browser
4040
suites.forEach(function (suite) {
41-
runnerHelper(browser, suite, config)
42-
})
41+
runnerHelper(browser, suite, config);
42+
});
4343
} else if (browserSuites[0] == 'all' && browserSuites.length == 1) {
4444
let browsersConfig = Object.keys(config.multiple);
4545
browsersConfig.forEach(function (browser) {
4646
let suites = Object.keys(config.multiple[browser]);
4747
suites.forEach(function (suite) {
48-
runnerHelper(browser, suite, config)
49-
})
48+
runnerHelper(browser, suite, config);
49+
});
5050
});
5151
} else if (browserSuites.length == 1 && browserSuites[0] != '') {
5252
//run suite in all browsers
5353
let suites = browserSuites[0].split(',');
5454
suites.forEach(function (suite) {
55-
let browserConfiguration = Object.keys(config.multiple)
55+
let browserConfiguration = Object.keys(config.multiple);
5656
browserConfiguration.forEach(function (browser) {
5757
let configuration = config.multiple[browser];
5858
if (configuration[suite]) {
59-
runnerHelper(browser, suite, config)
59+
runnerHelper(browser, suite, config);
6060
}
61-
})
62-
})
61+
});
62+
});
6363
} else throw new Error('Error while running codeceptjs multiply. Suites list:' + multipleOptions);
6464
});
6565
}
6666

6767

6868
function runnerHelper(browser, suite, config) {
6969
let suiteConf = config.multiple[browser][suite];
70-
let sizes = suiteConf.windowSizes || ['default']
70+
let sizes = suiteConf.windowSizes || ['default'];
7171
// override browser
7272
let overriddenConfig = replaceValue(new getConfig(testRoot, configFile), 'browser',
73-
(browser === 'ie') ? 'internet explorer' : browser)
73+
browser === 'ie' ? 'internet explorer' : browser);
7474

7575
sizes.forEach(function (size) {
7676
if (size != 'default') {
7777
//override windowSize
78-
overriddenConfig = replaceValue(overriddenConfig, 'windowSize', size)
78+
overriddenConfig = replaceValue(overriddenConfig, 'windowSize', size);
7979
overriddenConfig =
80-
replaceValue(overriddenConfig, 'output', outputDir + browser + '_' + suite + '_' + size + '/')
80+
replaceValue(overriddenConfig, 'output', outputDir + browser + '_' + suite + '_' + size + '/');
8181
overriddenConfig =
82-
replaceValue(overriddenConfig, 'reportDir', outputDir + browser + '_' + suite + '_' + size + '/')
82+
replaceValue(overriddenConfig, 'reportDir', outputDir + browser + '_' + suite + '_' + size + '/');
8383
} else {
84-
overriddenConfig = replaceValue(overriddenConfig, 'windowSize', defaultWindowSize)
85-
overriddenConfig = replaceValue(overriddenConfig, 'output', outputDir + browser + '_' + suite + '/')
86-
overriddenConfig = replaceValue(overriddenConfig, 'reportDir', outputDir + browser + '_' + suite + '/')
84+
overriddenConfig = replaceValue(overriddenConfig, 'windowSize', defaultWindowSize);
85+
overriddenConfig = replaceValue(overriddenConfig, 'output', outputDir + browser + '_' + suite + '/');
86+
overriddenConfig = replaceValue(overriddenConfig, 'reportDir', outputDir + browser + '_' + suite + '/');
8787
}
8888

8989
//override grep param and collect all params
9090
let params = ['run', '--child', browser + '_' + suite + '_' + size, '--grep', suiteConf.grep,
9191
'--override', JSON.stringify(overriddenConfig)];
9292

9393
for (let i = 3; i < process.argv.length; i++) {
94-
if (process.argv[i].indexOf('--multiple=') < 0)
94+
if (process.argv[i].indexOf('--multiple=') < 0) {
9595
if (process.argv[i].indexOf('--multiple') < 0) {
9696
params.push(process.argv[i]);
97-
} else i++
97+
} else i++;
98+
}
9899
}
99100
fork(__dirname.replace('/lib/command', '/bin/codecept'), params, {
100101
stdio: [0, 1, 2, 'ipc']
@@ -103,7 +104,7 @@ module.exports = function (suite, test, options) {
103104
}).on('error', (err) => {
104105
process.exitCode = 1;
105106
});
106-
})
107+
});
107108
}
108109

109110
function replaceValue(obj, key, value) {
@@ -115,7 +116,7 @@ module.exports = function (suite, test, options) {
115116
}
116117
}
117118
if (obj[key]) obj[key] = value;
118-
if ((typeof obj == "object") && (obj !== null)) {
119+
if (typeof obj === "object" && obj !== null) {
119120
var children = Object.keys(obj);
120121
if (children.length > 0) {
121122
for (i = 0; i < children.length; i++) {
@@ -124,7 +125,7 @@ module.exports = function (suite, test, options) {
124125
}
125126
}
126127
return obj;
127-
};
128+
}
128129

129130
function searchValueInObj(_for, _in) {
130131
var r;

‎lib/helper/Nightmare.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class Nightmare extends Helper {
7979
_init() {
8080
this.Nightmare = requireg('nightmare');
8181

82-
requireg('nightmare-upload')(this.Nightmare);
82+
require('nightmare-upload')(this.Nightmare);
8383

8484
this.Nightmare.action('findElements', function (locator, contextEl, done) {
8585

‎lib/helper/Protractor.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ let withinStore = {};
2222
* #### Selenium Installation
2323
*
2424
* 1. Download [Selenium Server](http://docs.seleniumhq.org/download/)
25-
* 2. Launch the daemon: `java -jar selenium-server-standalone-2.xx.xxx.jar`
25+
* 2.1. For Chrome browser install [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/getting-started)
26+
* 2.2. For Firefox browser install [GeckoDriver](https://github.com/mozilla/geckodriver) (optionally)
27+
* 3. Launch the daemon: `java -jar selenium-server-standalone-3.xx.xxx.jar`
2628
*
2729
* #### PhantomJS Installation
2830
*
@@ -64,7 +66,7 @@ class Protractor extends SeleniumWebdriver {
6466
constructor(config) {
6567
super(config);
6668
this.options = {
67-
browser: 'firefox',
69+
browser: 'chrome',
6870
url: 'http://localhost',
6971
seleniumAddress: 'http://localhost:4444/wd/hub',
7072
rootElement: 'body',
@@ -110,7 +112,7 @@ class Protractor extends SeleniumWebdriver {
110112
return [
111113
{ name: 'url', message: "Base url of site to be tested", default: 'http://localhost' },
112114
{ name: 'driver', message: "Protractor driver (local, direct, session, hosted, sauce, browserstack)", default: 'hosted' },
113-
{ name: 'browser', message: 'Browser in which testing will be performed', default: 'firefox' },
115+
{ name: 'browser', message: 'Browser in which testing will be performed', default: 'chrome' },
114116
{ name: 'rootElement', message: "Root element of AngularJS application", default: 'body' },
115117
];
116118
}

‎lib/helper/SeleniumWebdriver.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ let withinStore = {};
2323
* #### Selenium Installation
2424
*
2525
* 1. Download [Selenium Server](http://docs.seleniumhq.org/download/)
26-
* 2. Launch the daemon: `java -jar selenium-server-standalone-2.xx.xxx.jar`
26+
* 2.1. For Chrome browser install [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/getting-started)
27+
* 2.2. For Firefox browser install [GeckoDriver](https://github.com/mozilla/geckodriver) (optionally)
28+
* 3. Launch the daemon: `java -jar selenium-server-standalone-3.xx.xxx.jar`
2729
*
2830
*
2931
* #### PhantomJS Installation
@@ -110,7 +112,7 @@ class SeleniumWebdriver extends Helper {
110112
static _config() {
111113
return [
112114
{ name: 'url', message: "Base url of site to be tested", default: 'http://localhost' },
113-
{ name: 'browser', message: 'Browser in which testing will be performed', default: 'firefox' },
115+
{ name: 'browser', message: 'Browser in which testing will be performed', default: 'chrome' },
114116
];
115117
}
116118

0 commit comments

Comments
 (0)