test: fix naming

diff --git a/.gitignore b/.gitignore
index 478ad2dc4eaf515dc85785fb4a1b2cf3f9a06d2a..912122865f864532387ce61382c56ba0216bd252 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,7 @@ coverage
 .nyc_output
 .rpt2_cache
 .env
+local.log
+.DS_Store
+e2e/reports
+e2e/screenshots

diff --git a/e2e/nightwatch.browserstack.js b/e2e/nightwatch.browserstack.js
index 7289146e314d7c593990519a345b8b6ac955d537..9a08014c3d1d440c434c6d25d7a75d5ac4791d0b 100644 (file)
--- a/e2e/nightwatch.browserstack.js
+++ b/e2e/nightwatch.browserstack.js
@@ -6,8 +6,8 @@ const BS_USER = process.env.BS_USER
 const BS_KEY = process.env.BS_KEY
 
 const nwConf = {
-  src_folders: ['test/e2e/specs'],
-  output_folder: 'test/e2e/reports',
+  src_folders: ['e2e/specs'],
+  output_folder: 'e2e/reports',
   custom_commands_path: ['node_modules/nightwatch-helpers/commands'],
   custom_assertions_path: ['node_modules/nightwatch-helpers/assertions'],
   // set to true when testing on multiple browsers (-e chrome,firefox) to display tests as they pass instead of waiting for everything to be finished
@@ -19,7 +19,7 @@ const nwConf = {
   selenium: {
     start_process: false,
     host: 'hub-cloud.browserstack.com',
-    port: 80
+    port: 80,
   },
 
   common_capabilities: {
@@ -29,7 +29,7 @@ const nwConf = {
     'browserstack.local': true,
     'browserstack.video': false,
     acceptSslCerts: true,
-    resolution: '1024x768'
+    resolution: '1024x768',
   },
 
   test_settings: {
@@ -37,21 +37,21 @@ const nwConf = {
 
     chrome: {
       desiredCapabilities: {
-        browser: 'chrome'
-      }
+        browser: 'chrome',
+      },
     },
 
     chromeQt: {
       desiredCapabilities: {
         browser: 'chrome',
-        browser_version: '49.0'
-      }
+        browser_version: '49.0',
+      },
     },
 
     firefox: {
       desiredCapabilities: {
-        browser: 'firefox'
-      }
+        browser: 'firefox',
+      },
     },
 
     safari: {
@@ -59,8 +59,8 @@ const nwConf = {
         os: 'OS X',
         os_version: 'Mojave',
         browser: 'Safari',
-        browser_version: '12.0'
-      }
+        browser_version: '12.0',
+      },
     },
 
     safari6: {
@@ -68,44 +68,35 @@ const nwConf = {
         os: 'OS X',
         os_version: 'Lion',
         browser: 'Safari',
-        browser_version: '6.0'
-      }
-    },
-
-    ie9: {
-      desiredCapabilities: {
-        browser: 'internet explorer',
-        browser_version: '9'
-        // name: 'Bstack-[Nightwatch] Vue Router',
-        // 'browserstack.video': true
-      }
+        browser_version: '6.0',
+      },
     },
 
     ie: {
       desiredCapabilities: {
         browser: 'internet explorer',
-        browser_version: '11'
+        browser_version: '11',
         // name: 'Bstack-[Nightwatch] Vue Router',
         // 'browserstack.video': true
-      }
+      },
     },
 
     android44: {
       desiredCapabilities: {
         device: 'Google Nexus 5',
         realMobile: 'true',
-        os_version: '4.4'
-      }
+        os_version: '4.4',
+      },
     },
 
     ios7: {
       desiredCapabilities: {
         device: 'iPhone 7',
         realMobile: 'true',
-        os_version: '10'
-      }
-    }
-  }
+        os_version: '10',
+      },
+    },
+  },
 }
 
 // Code to copy seleniumhost/port into test settings

diff --git a/e2e/runner.js b/e2e/runner.js
index 28cfafcceda33802a326e65fc168176f16e9ffd5..dda6e5c1a0988ca0992fb2aeb746952f896c32e5 100644 (file)
--- a/e2e/runner.js
+++ b/e2e/runner.js
@@ -2,22 +2,22 @@
  * Running tests
  *
  * By default tests are run locally on chrome headless
- * $ node test/e2e/runner.js
+ * $ node e2e/runner.js
  *
  * You can run a specific test by passing it, or pass various tests
- * $ node test/e2e/runner.js test/e2e/specs/basic.js test/e2e/specs/redirect.js
+ * $ node e2e/runner.js e2e/specs/basic.js e2e/specs/redirect.js
  *
  * You can specify a list of browsers to run from nightwatch.config.js with -e separated by a comma
- * $ node test/e2e/runner.js -e safari,firefox
+ * $ node e2e/runner.js -e safari,firefox
  *
  * If you are already running the dev server with `yarn run serve`, you can pass the --dev option to avoid launching the server
- * $ node test/e2e/runner.js --dev
+ * $ node e2e/runner.js --dev
  * **Make sure to pass the option at the end**
  *
  * __For maintainers only__
  * You can trigger tests on Browserstack on other browsers by passing the --local option
  * It's also required to pass the list of browsers to test on to avoid launching too many tests. Available options are located inside nightwatch.browserstack.js
- * $ node test/e2e/runner.js --local -e ie,chrome50
+ * $ node e2e/runner.js --local -e ie,chrome50
  */
 
 require('dotenv').config()
@@ -60,7 +60,7 @@ if (args.indexOf('-c') < 0) {
 
 function adaptArgv(argv) {
   // take every remaining argument and treat it as a test file
-  // this allows to run `node test/e2e/runner.js test/e2e/basic.js`
+  // this allows to run `node e2e/runner.js test/e2e/basic.js`
   argv.retries = 1
   argv.test = argv['_'].slice(0)