From 0a8e6694f9f9b476266bb1e3c9962fbd338f08f7 Mon Sep 17 00:00:00 2001 From: CrispusDH Date: Thu, 8 Nov 2018 12:20:52 +0200 Subject: [PATCH 1/3] chore(test): move synchronize_spec off of the control flow --- spec/basic/synchronize_spec.js | 120 ++++++++++++++------------------- spec/basicConf.js | 3 +- spec/ciFullConf.js | 3 +- 3 files changed, 55 insertions(+), 71 deletions(-) diff --git a/spec/basic/synchronize_spec.js b/spec/basic/synchronize_spec.js index becd65e43..f8c56fd8a 100644 --- a/spec/basic/synchronize_spec.js +++ b/spec/basic/synchronize_spec.js @@ -1,95 +1,77 @@ -describe('synchronizing with slow pages', function() { - beforeEach(function() { - browser.get('index.html#/async'); +describe('synchronizing with slow pages', () => { + beforeEach(async () => { + await browser.get('index.html#/async'); }); - it('waits for http calls', function() { - var status = element(by.binding('slowHttpStatus')); - var button = element(by.css('[ng-click="slowHttp()"]')); + it('waits for http calls', async () => { + const status = element(by.binding('slowHttpStatus')); + const button = element(by.css('[ng-click="slowHttp()"]')); + expect(await status.getText()).toEqual('not started'); - expect(status.getText()).toEqual('not started'); - - button.click(); - - expect(status.getText()).toEqual('done'); + await button.click(); + expect(await status.getText()).toEqual('done'); }); - it('waits for long javascript execution', function() { - var status = element(by.binding('slowFunctionStatus')); - var button = element(by.css('[ng-click="slowFunction()"]')); - - expect(status.getText()).toEqual('not started'); - - button.click(); + it('waits for long javascript execution', async () => { + const status = element(by.binding('slowFunctionStatus')); + const button = element(by.css('[ng-click="slowFunction()"]')); + expect(await status.getText()).toEqual('not started'); - expect(status.getText()).toEqual('done'); + await button.click(); + expect(await status.getText()).toEqual('done'); }); - it('DOES NOT wait for timeout', function() { - var status = element(by.binding('slowTimeoutStatus')); - var button = element(by.css('[ng-click="slowTimeout()"]')); + it('DOES NOT wait for timeout', async () => { + const status = element(by.binding('slowTimeoutStatus')); + const button = element(by.css('[ng-click="slowTimeout()"]')); + expect(await status.getText()).toEqual('not started'); - expect(status.getText()).toEqual('not started'); - - button.click(); - - expect(status.getText()).toEqual('pending...'); + await button.click(); + expect(await status.getText()).toEqual('pending...'); }); - it('waits for $timeout', function() { - var status = element(by.binding('slowAngularTimeoutStatus')); - var button = element(by.css('[ng-click="slowAngularTimeout()"]')); - - expect(status.getText()).toEqual('not started'); - - button.click(); + it('waits for $timeout', async () => { + const status = element(by.binding('slowAngularTimeoutStatus')); + const button = element(by.css('[ng-click="slowAngularTimeout()"]')); + expect(await status.getText()).toEqual('not started'); - expect(status.getText()).toEqual('done'); + await button.click(); + expect(await status.getText()).toEqual('done'); }); - it('waits for $timeout then a promise', function() { - var status = element(by.binding( - 'slowAngularTimeoutPromiseStatus')); - var button = element(by.css( - '[ng-click="slowAngularTimeoutPromise()"]')); + it('waits for $timeout then a promise', async () => { + const status = element(by.binding('slowAngularTimeoutPromiseStatus')); + const button = element(by.css('[ng-click="slowAngularTimeoutPromise()"]')); + expect(await status.getText()).toEqual('not started'); - expect(status.getText()).toEqual('not started'); - - button.click(); - - expect(status.getText()).toEqual('done'); + await button.click(); + expect(await status.getText()).toEqual('done'); }); - it('waits for long http call then a promise', function() { - var status = element(by.binding('slowHttpPromiseStatus')); - var button = element(by.css('[ng-click="slowHttpPromise()"]')); - - expect(status.getText()).toEqual('not started'); - - button.click(); + it('waits for long http call then a promise', async () => { + const status = element(by.binding('slowHttpPromiseStatus')); + const button = element(by.css('[ng-click="slowHttpPromise()"]')); + expect(await status.getText()).toEqual('not started'); - expect(status.getText()).toEqual('done'); + await button.click(); + expect(await status.getText()).toEqual('done'); }); - it('waits for slow routing changes', function() { - var status = element(by.binding('routingChangeStatus')); - var button = element(by.css('[ng-click="routingChange()"]')); + it('waits for slow routing changes', async () => { + const status = element(by.binding('routingChangeStatus')); + const button = element(by.css('[ng-click="routingChange()"]')); + expect(await status.getText()).toEqual('not started'); - expect(status.getText()).toEqual('not started'); - - button.click(); - - expect(browser.getPageSource()).toMatch('polling mechanism'); + await button.click(); + expect(await browser.getPageSource()).toMatch('polling mechanism'); }); - it('waits for slow ng-include templates to load', function() { - var status = element(by.css('.included')); - var button = element(by.css('[ng-click="changeTemplateUrl()"]')); - - expect(status.getText()).toEqual('fast template contents'); - - button.click(); + it('waits for slow ng-include templates to load', async () => { + const status = element(by.css('.included')); + const button = element(by.css('[ng-click="changeTemplateUrl()"]')); + expect(await status.getText()).toEqual('fast template contents'); - expect(status.getText()).toEqual('slow template contents'); + await button.click(); + expect(await status.getText()).toEqual('slow template contents'); }); }); diff --git a/spec/basicConf.js b/spec/basicConf.js index dda89b6c2..a861388d8 100644 --- a/spec/basicConf.js +++ b/spec/basicConf.js @@ -11,7 +11,8 @@ exports.config = { specs: [ 'basic/elements_spec.js', 'basic/lib_spec.js', - 'basic/handling_spec.js' + 'basic/handling_spec.js', + 'basic/synchronize_spec.js' ], // Exclude patterns are relative to this directory. diff --git a/spec/ciFullConf.js b/spec/ciFullConf.js index d69381691..a75c037d4 100644 --- a/spec/ciFullConf.js +++ b/spec/ciFullConf.js @@ -12,7 +12,8 @@ exports.config = { specs: [ 'basic/elements_spec.js', 'basic/lib_spec.js', - 'basic/handling_spec.js' + 'basic/handling_spec.js', + 'basic/synchronize_spec.js' ], // Exclude patterns are relative to this directory. From 87bf6d0a9ffbec834d0c5fce5b8f87e85edd4f61 Mon Sep 17 00:00:00 2001 From: Craig Nishina Date: Thu, 8 Nov 2018 17:34:57 -0800 Subject: [PATCH 2/3] Update ciFullConf.js --- spec/ciFullConf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ciFullConf.js b/spec/ciFullConf.js index 5e4e39830..2132f579c 100644 --- a/spec/ciFullConf.js +++ b/spec/ciFullConf.js @@ -12,7 +12,7 @@ exports.config = { // TODO(selenium4): revert back to basic/*_spec.js specs: [ 'basic/lib_spec.js', - 'basic/synchronize_spec.js', + 'basic/locators_spec.js', // 'basic/elements_spec.js', // 'basic/handling_spec.js' // 'basic/mockmodule_spec.js', From 70e3cb8f266c1f9b3e5ce699c904584e984ce0ed Mon Sep 17 00:00:00 2001 From: Craig Nishina Date: Thu, 8 Nov 2018 17:35:12 -0800 Subject: [PATCH 3/3] Update ciFullConf.js --- spec/ciFullConf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ciFullConf.js b/spec/ciFullConf.js index 2132f579c..b95838bca 100644 --- a/spec/ciFullConf.js +++ b/spec/ciFullConf.js @@ -12,7 +12,7 @@ exports.config = { // TODO(selenium4): revert back to basic/*_spec.js specs: [ 'basic/lib_spec.js', - 'basic/locators_spec.js', + 'basic/locators_spec.js' // 'basic/elements_spec.js', // 'basic/handling_spec.js' // 'basic/mockmodule_spec.js',