diff --git a/scripts/test.js b/scripts/test.js index bf37c5557..83dcb1a09 100755 --- a/scripts/test.js +++ b/scripts/test.js @@ -30,7 +30,7 @@ var passingTests = [ // 'node built/cli.js spec/plugins/waitForAngularConf.js', // 'node built/cli.js spec/interactionConf.js', // 'node built/cli.js spec/directConnectConf.js', - // 'node built/cli.js spec/restartBrowserBetweenTestsConf.js', + 'node built/cli.js spec/restartBrowserBetweenTestsConf.js', // 'node built/cli.js spec/driverProviderLocalConf.js', // 'node built/cli.js spec/driverProviderLocalConf.js --useBlockingProxy', // 'node built/cli.js spec/getCapabilitiesConf.js', diff --git a/spec/restartBrowserBetweenTests/setCookies_spec.js b/spec/restartBrowserBetweenTests/setCookies_spec.js index c461db8f4..6d21c5fa4 100644 --- a/spec/restartBrowserBetweenTests/setCookies_spec.js +++ b/spec/restartBrowserBetweenTests/setCookies_spec.js @@ -1,23 +1,21 @@ -var env = require('../environment.js'); +const env = require('../environment.js'); -describe('pages with login', function() { - it('should set a cookie', function() { - browser.get(env.baseUrl + '/ng1/index.html'); +describe('pages with login', () => { + it('should set a cookie', async() => { + await browser.get(env.baseUrl + '/ng1/index.html'); - browser.manage().addCookie({name:'testcookie', value: 'Jane-1234'}); + await browser.manage().addCookie({name:'testcookie', value: 'Jane-1234'}); // Make sure the cookie is set. - browser.manage().getCookie('testcookie').then(function(cookie) { - expect(cookie.value).toEqual('Jane-1234'); - }); + const cookie = await browser.manage().getCookie('testcookie'); + expect(cookie.value).toEqual('Jane-1234'); }); - it('should check the cookie is gone', function() { - browser.get(env.baseUrl + '/ng1/index.html'); + it('should check the cookie is gone', async() => { + await browser.get(env.baseUrl + '/ng1/index.html'); // Make sure the cookie is gone. - browser.manage().getCookie('testcookie').then(function(cookie) { - expect(cookie).toEqual(null); - }); + const cookie = await browser.manage().getCookie('testcookie'); + expect(cookie).toEqual(null); }); }); diff --git a/spec/restartBrowserBetweenTestsConf.js b/spec/restartBrowserBetweenTestsConf.js index d74cf0bef..86277d8ab 100644 --- a/spec/restartBrowserBetweenTestsConf.js +++ b/spec/restartBrowserBetweenTestsConf.js @@ -1,8 +1,9 @@ -var env = require('./environment.js'); +const env = require('./environment.js'); // The main suite of Protractor tests. exports.config = { seleniumAddress: env.seleniumAddress, + SELENIUM_PROMISE_MANAGER: false, framework: 'jasmine',