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

chore(tests): update restart spec specs and plugin specs #5058

Merged
merged 1 commit into from
Nov 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scripts/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const Executor = require('./test/test_util').Executor;

const passingTests = [
'node built/cli.js spec/basicConf.js',
// 'node built/cli.js spec/basicConf.js --useBlockingProxy',
'node built/cli.js spec/basicConf.js --useBlockingProxy',
'node built/cli.js spec/multiConf.js',
'node built/cli.js spec/altRootConf.js',
'node built/cli.js spec/inferRootConf.js',
Expand All @@ -21,7 +21,7 @@ const passingTests = [
'node built/cli.js spec/suitesConf.js --suite okmany',
'node built/cli.js spec/suitesConf.js --suite okspec',
'node built/cli.js spec/suitesConf.js --suite okmany,okspec',
// 'node built/cli.js spec/plugins/smokeConf.js',
'node built/cli.js spec/plugins/smokeConf.js',
'node built/cli.js spec/plugins/multiPluginConf.js',
'node built/cli.js spec/plugins/jasminePostTestConf.js',
'node built/cli.js spec/plugins/mochaPostTestConf.js',
Expand All @@ -37,7 +37,7 @@ const passingTests = [
'node built/cli.js spec/controlLockConf.js',
'node built/cli.js spec/customFramework.js',
'node built/cli.js spec/noGlobalsConf.js',
// 'node built/cli.js spec/angular2Conf.js',
'node built/cli.js spec/angular2Conf.js',
'node built/cli.js spec/hybridConf.js',
'node built/cli.js spec/built/noCFBasicConf.js',
'node built/cli.js spec/built/noCFBasicConf.js --useBlockingProxy',
Expand Down
2 changes: 1 addition & 1 deletion spec/basic/expected_conditions_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ describe('expected conditions', () => {
describe('for forked browsers', () => {
// ensure that we can run EC on forked browser instances
it('should have alertIsPresent', async () => {
const browser2 = browser.forkNewDriverInstance();
const browser2 = await browser.forkNewDriverInstance().ready;
await browser2.get('index.html#/form');
const EC2 = browser2.ExpectedConditions;
const alertIsPresent = EC2.alertIsPresent();
Expand Down
1 change: 1 addition & 0 deletions spec/plugins/skipStabilityConf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var env = require('../environment.js');
// Verifies that plugins can change skipAngularStability on the fly.
exports.config = {
seleniumAddress: env.seleniumAddress,
SELENIUM_PROMISE_MANAGER: false,

framework: 'jasmine',

Expand Down
1 change: 1 addition & 0 deletions spec/plugins/smokeConf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ var env = require('../environment.js');
// Tests the (potential) edge case of exactly one plugin being used
exports.config = {
mockSelenium: true,
SELENIUM_PROMISE_MANAGER: false,

framework: 'jasmine',

Expand Down
4 changes: 2 additions & 2 deletions spec/plugins/specs/smoke_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
describe('check if plugin setup ran', function() {
it('should have set protractor.__BASIC_PLUGIN_RAN_*', function() {
describe('check if plugin setup ran', () => {
it('should have set protractor.__BASIC_PLUGIN_RAN_*', () => {
expect(protractor.__BASIC_PLUGIN_RAN_SETUP).toBe(true);
expect(protractor.__BASIC_PLUGIN_RAN_ON_PREPARE).toBe(true);
});
Expand Down