From 3df7353448b6e5244e359c7381d927ff6ea160ce Mon Sep 17 00:00:00 2001 From: CrispusDH Date: Thu, 8 Nov 2018 12:00:43 +0200 Subject: [PATCH 1/3] chore(test): move restart_spec off of the control flow --- spec/basic/restart_spec.js | 12 ++++++------ spec/basicConf.js | 3 ++- spec/ciFullConf.js | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/spec/basic/restart_spec.js b/spec/basic/restart_spec.js index e8aefde62..005089050 100644 --- a/spec/basic/restart_spec.js +++ b/spec/basic/restart_spec.js @@ -1,14 +1,14 @@ -describe('browser.restart', function() { - it('doesn\'t break ignoreSynchronization', function() { - browser.get('index.html#/polling'); - browser.restart(); +describe('browser.restart', () => { + it('doesn\'t break ignoreSynchronization', async () => { + await browser.get('index.html#/polling'); + await browser.restart(); browser.ignoreSynchronization = true; // Get a non-angular page. It shouldn't fail if ignoreSynchronization is on. - browser.get('https://google.com/'); + await browser.get('https://google.com/'); }); - afterAll(function() { + afterAll(() => { browser.ignoreSynchronization = false; }); }); diff --git a/spec/basicConf.js b/spec/basicConf.js index dda89b6c2..cee216252 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/restart_spec.js' ], // Exclude patterns are relative to this directory. diff --git a/spec/ciFullConf.js b/spec/ciFullConf.js index d69381691..f19a54f10 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/restart_spec.js' ], // Exclude patterns are relative to this directory. From f8a6d12a03307516ec303aed2489d67faeef021b Mon Sep 17 00:00:00 2001 From: Oleksii Date: Thu, 8 Nov 2018 23:52:18 +0200 Subject: [PATCH 2/3] remove duplicate --- spec/ciFullConf.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/ciFullConf.js b/spec/ciFullConf.js index 0f15d3278..0784c6ad0 100644 --- a/spec/ciFullConf.js +++ b/spec/ciFullConf.js @@ -14,8 +14,7 @@ exports.config = { 'basic/lib_spec.js', 'basic/handling_spec.js', 'basic/restart_spec.js', - 'basic/navigation_spec.js', - 'basic/handling_spec.js' + 'basic/navigation_spec.js' ], // Exclude patterns are relative to this directory. From 0e3ede04bc2a3f407395183e149279b5f80ab23e Mon Sep 17 00:00:00 2001 From: Oleksii Date: Thu, 8 Nov 2018 23:52:51 +0200 Subject: [PATCH 3/3] remove duplicate spec in basicCond --- spec/basicConf.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/basicConf.js b/spec/basicConf.js index 8936cd87e..ecbb75f96 100644 --- a/spec/basicConf.js +++ b/spec/basicConf.js @@ -13,8 +13,7 @@ exports.config = { 'basic/lib_spec.js', 'basic/handling_spec.js', 'basic/restart_spec.js', - 'basic/navigation_spec.js', - 'basic/handling_spec.js' + 'basic/navigation_spec.js' ], // Exclude patterns are relative to this directory.