Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

Commit 8ba3e15

Browse files
committed
chore(test): use native promises instead of q on onPrepare
1 parent 8af3be7 commit 8ba3e15

File tree

6 files changed

+23
-18
lines changed

6 files changed

+23
-18
lines changed

scripts/test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ var passingTests = [
1212
// 'node built/cli.js spec/onCleanUpAsyncReturnValueConf.js',
1313
// 'node built/cli.js spec/onCleanUpNoReturnValueConf.js',
1414
// 'node built/cli.js spec/onCleanUpSyncReturnValueConf.js',
15-
// 'node built/cli.js spec/onPrepareConf.js',
16-
// 'node built/cli.js spec/onPrepareFileConf.js',
17-
// 'node built/cli.js spec/onPreparePromiseConf.js',
18-
// 'node built/cli.js spec/onPreparePromiseFileConf.js',
15+
'node built/cli.js spec/onPrepareConf.js',
16+
'node built/cli.js spec/onPrepareFileConf.js',
17+
'node built/cli.js spec/onPreparePromiseConf.js',
18+
'node built/cli.js spec/onPreparePromiseFileConf.js',
1919
// 'node built/cli.js spec/mochaConf.js',
2020
// 'node built/cli.js spec/withLoginConf.js',
2121
// 'node built/cli.js spec/suitesConf.js --suite okmany',

spec/onPrepare/asyncstartup.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
var q = require('q');
2-
3-
module.exports = q.fcall(function() {
1+
module.exports = async() => {
42
browser.params.password = '12345';
5-
}).delay(1000);
3+
return await new Promise((resolve, _) => {
4+
setTimeout(resolve, 1000);
5+
});
6+
}

spec/onPrepare/onPrepare_spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
describe('onPrepare function in the config', function() {
2-
it('should have a special variable set in onPrepare', function() {
1+
describe('onPrepare function in the config', () => {
2+
it('should have a special variable set in onPrepare', () => {
33
expect(browser.params.password).toEqual('12345');
44
});
55
});

spec/onPrepareConf.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
// Configuration using a function in onPrepare to set a parameter before
22
// testing.
3-
var env = require('./environment.js');
3+
const env = require('./environment.js');
44

55
// The main suite of Protractor tests.
66
exports.config = {
77
mockSelenium: true,
8+
SELENIUM_PROMISE_MANAGER: false,
89

910
framework: 'jasmine',
1011

@@ -16,7 +17,7 @@ exports.config = {
1617

1718
baseUrl: env.baseUrl + '/ng1/',
1819

19-
onPrepare: function() {
20+
onPrepare: () => {
2021
browser.params.password = '12345';
2122
}
2223
};

spec/onPrepareFileConf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
var env = require('./environment.js');
1+
const env = require('./environment.js');
22

33
// Configuration using a string in onPrepare to load a file with code to
44
// execute once before tests.
55
exports.config = {
66
mockSelenium: true,
7+
SELENIUM_PROMISE_MANAGER: false,
78

89
framework: 'jasmine',
910

spec/onPreparePromiseConf.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
// Configuration using a function in onPrepare to set a parameter before
22
// testing.
3-
var env = require('./environment.js');
3+
const env = require('./environment.js');
44
var q = require('q');
55

66
// The main suite of Protractor tests.
77
exports.config = {
88
mockSelenium: true,
9+
SELENIUM_PROMISE_MANAGER: false,
910

1011
framework: 'jasmine',
1112

@@ -17,9 +18,10 @@ exports.config = {
1718

1819
baseUrl: env.baseUrl + '/ng1/',
1920

20-
onPrepare: function() {
21-
return q.fcall(function() {
22-
browser.params.password = '12345';
23-
}).delay(1000);
21+
onPrepare: async() => {
22+
browser.params.password = '12345';
23+
return await new Promise((resolve, _) => {
24+
setTimeout(resolve, 1000);
25+
});
2426
}
2527
};

0 commit comments

Comments
 (0)