diff --git a/scripts/test.js b/scripts/test.js index 89071ae15..7d070071e 100755 --- a/scripts/test.js +++ b/scripts/test.js @@ -7,8 +7,8 @@ var passingTests = [ 'node built/cli.js spec/basicConf.js', // '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', + 'node built/cli.js spec/altRootConf.js', + 'node built/cli.js spec/inferRootConf.js', // 'node built/cli.js spec/onCleanUpAsyncReturnValueConf.js', // 'node built/cli.js spec/onCleanUpNoReturnValueConf.js', // 'node built/cli.js spec/onCleanUpSyncReturnValueConf.js', diff --git a/spec/altRoot/findelements_spec.js b/spec/altRoot/findelements_spec.js index e6d3d7934..8af2697de 100644 --- a/spec/altRoot/findelements_spec.js +++ b/spec/altRoot/findelements_spec.js @@ -1,19 +1,19 @@ -describe('finding elements when ng-app is nested', function() { - beforeEach(function() { - browser.get('alt_root_index.html#/form'); +describe('finding elements when ng-app is nested', () => { + beforeEach(async() => { + await browser.get('alt_root_index.html#/form'); }); - it('should find an element by binding', function() { - var greeting = element(by.binding('{{greeting}}')); + it('should find an element by binding', async() => { + const greeting = element(by.binding('{{greeting}}')); - expect(greeting.getText()).toEqual('Hiya'); + expect(await greeting.getText()).toEqual('Hiya'); }); - it('should find elements outside of angular', function() { - var outside = element(by.id('outside-ng')); - var inside = element(by.id('inside-ng')); + it('should find elements outside of angular', async() => { + const outside = element(by.id('outside-ng')); + const inside = element(by.id('inside-ng')); - expect(outside.getText()).toEqual('{{1 + 2}}'); - expect(inside.getText()).toEqual('3'); + expect(await outside.getText()).toEqual('{{1 + 2}}'); + expect(await inside.getText()).toEqual('3'); }); }); diff --git a/spec/altRootConf.js b/spec/altRootConf.js index 080e4245d..bc7669030 100644 --- a/spec/altRootConf.js +++ b/spec/altRootConf.js @@ -3,6 +3,7 @@ var env = require('./environment.js'); // Tests for an Angular app where ng-app is not on the body. exports.config = { seleniumAddress: env.seleniumAddress, + SELENIUM_PROMISE_MANAGER: false, framework: 'jasmine', diff --git a/spec/inferRootConf.js b/spec/inferRootConf.js index 939d07871..a4332dfc3 100644 --- a/spec/inferRootConf.js +++ b/spec/inferRootConf.js @@ -3,6 +3,7 @@ var env = require('./environment.js'); // Tests for an Angular app where ng-app is not on the body. exports.config = { seleniumAddress: env.seleniumAddress, + SELENIUM_PROMISE_MANAGER: false, framework: 'jasmine',