From a2df8075dd44c0951bd057b462df3d234e76bdeb Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 9 Jun 2022 16:00:05 +0200
Subject: [PATCH] test: migrate guards scroll-behavior

---
 packages/router/e2e/runner.js                        | 12 ++++--------
 .../{old-e2e => e2e}/scroll-behavior/index.html      |  0
 .../router/{old-e2e => e2e}/scroll-behavior/index.ts |  0
 .../{old-e2e => e2e}/scroll-behavior/scrollWaiter.ts |  0
 .../router/{old-e2e => e2e}/specs/scroll-behavior.js |  0
 packages/router/nightwatch.conf.js                   |  4 ++--
 6 files changed, 6 insertions(+), 10 deletions(-)
 rename packages/router/{old-e2e => e2e}/scroll-behavior/index.html (100%)
 rename packages/router/{old-e2e => e2e}/scroll-behavior/index.ts (100%)
 rename packages/router/{old-e2e => e2e}/scroll-behavior/scrollWaiter.ts (100%)
 rename packages/router/{old-e2e => e2e}/specs/scroll-behavior.js (100%)

diff --git a/packages/router/e2e/runner.js b/packages/router/e2e/runner.js
index 1853832f..1d454ddd 100644
--- a/packages/router/e2e/runner.js
+++ b/packages/router/e2e/runner.js
@@ -12,11 +12,7 @@ const args = process.argv.slice(2)
 const isLocal = args.indexOf('--local') > -1
 
 const getServer =
-  args.indexOf('--dev') > -1
-    ? null
-    : // : process.env.CI || args.indexOf('--ci') > -1
-      // ? require('./staticServer')
-      require('./devServer')
+  args.indexOf('--dev') > -1 ? () => null : require('./devServer')
 
 ;(async () => {
   const server = await getServer()
@@ -52,19 +48,19 @@ BROWSERSTACK_ACCESS_KEY is not set. Did you create the .env file?
           await runNighwatchCli().finally(() => {
             // Code to stop browserstack local after end of single test
             bs_local.stop(() => {
-              server.close()
+              server?.close()
             })
           })
         }
       )
     } else {
       await runNighwatchCli()
-      server.close()
+      server?.close()
     }
   } catch (ex) {
     console.log('There was an error while starting the test runner:\n\n')
     process.stderr.write(ex.stack + '\n')
-    server.close()
+    server?.close()
     process.exit(2)
   }
 })()
diff --git a/packages/router/old-e2e/scroll-behavior/index.html b/packages/router/e2e/scroll-behavior/index.html
similarity index 100%
rename from packages/router/old-e2e/scroll-behavior/index.html
rename to packages/router/e2e/scroll-behavior/index.html
diff --git a/packages/router/old-e2e/scroll-behavior/index.ts b/packages/router/e2e/scroll-behavior/index.ts
similarity index 100%
rename from packages/router/old-e2e/scroll-behavior/index.ts
rename to packages/router/e2e/scroll-behavior/index.ts
diff --git a/packages/router/old-e2e/scroll-behavior/scrollWaiter.ts b/packages/router/e2e/scroll-behavior/scrollWaiter.ts
similarity index 100%
rename from packages/router/old-e2e/scroll-behavior/scrollWaiter.ts
rename to packages/router/e2e/scroll-behavior/scrollWaiter.ts
diff --git a/packages/router/old-e2e/specs/scroll-behavior.js b/packages/router/e2e/specs/scroll-behavior.js
similarity index 100%
rename from packages/router/old-e2e/specs/scroll-behavior.js
rename to packages/router/e2e/specs/scroll-behavior.js
diff --git a/packages/router/nightwatch.conf.js b/packages/router/nightwatch.conf.js
index 3114d978..63bd0fb6 100644
--- a/packages/router/nightwatch.conf.js
+++ b/packages/router/nightwatch.conf.js
@@ -22,10 +22,10 @@ module.exports = {
   page_objects_path: ['node_modules/nightwatch/examples/pages/'],
 
   // See https://nightwatchjs.org/guide/extending-nightwatch/custom-commands.html
-  custom_commands_path: ['node_modules/nightwatch/examples/custom-commands/'],
+  custom_commands_path: ['node_modules/nightwatch-helpers/commands'],
 
   // See https://nightwatchjs.org/guide/extending-nightwatch/custom-assertions.html
-  custom_assertions_path: '',
+  custom_assertions_path: ['node_modules/nightwatch-helpers/assertions'],
 
   // See https://nightwatchjs.org/guide/extending-nightwatch/plugin-api.html
   plugins: [],
-- 
2.47.2