From c5920513a166334691c5225e7efb0e0fad317c04 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 6 Dec 2016 04:08:01 +0100
Subject: [PATCH] chore: make tunnel filenames consistent (#2072)

* Currently the tunnel `setup/wait/stop` files always have different names like `sauce_connect_block` or just `waitfor_tunnel`.
---
 .../{start_tunnel.sh => start-tunnel.sh}             |  0
 .../{teardown_tunnel.sh => stop-tunnel.sh}           |  0
 .../{waitfor_tunnel.sh => wait-tunnel.sh}            |  0
 scripts/ci/sources/tunnel.sh                         | 12 ++++++------
 scripts/{sauce => saucelabs}/sauce_config.js         |  0
 .../start-tunnel.sh}                                 |  0
 .../stop-tunnel.sh}                                  |  0
 .../wait-tunnel.sh}                                  |  0
 test/protractor.conf.js                              |  2 +-
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename scripts/browserstack/{start_tunnel.sh => start-tunnel.sh} (100%)
 rename scripts/browserstack/{teardown_tunnel.sh => stop-tunnel.sh} (100%)
 rename scripts/browserstack/{waitfor_tunnel.sh => wait-tunnel.sh} (100%)
 rename scripts/{sauce => saucelabs}/sauce_config.js (100%)
 rename scripts/{sauce/sauce_connect_setup.sh => saucelabs/start-tunnel.sh} (100%)
 rename scripts/{sauce/sauce_connect_teardown.sh => saucelabs/stop-tunnel.sh} (100%)
 rename scripts/{sauce/sauce_connect_block.sh => saucelabs/wait-tunnel.sh} (100%)

diff --git a/scripts/browserstack/start_tunnel.sh b/scripts/browserstack/start-tunnel.sh
similarity index 100%
rename from scripts/browserstack/start_tunnel.sh
rename to scripts/browserstack/start-tunnel.sh
diff --git a/scripts/browserstack/teardown_tunnel.sh b/scripts/browserstack/stop-tunnel.sh
similarity index 100%
rename from scripts/browserstack/teardown_tunnel.sh
rename to scripts/browserstack/stop-tunnel.sh
diff --git a/scripts/browserstack/waitfor_tunnel.sh b/scripts/browserstack/wait-tunnel.sh
similarity index 100%
rename from scripts/browserstack/waitfor_tunnel.sh
rename to scripts/browserstack/wait-tunnel.sh
diff --git a/scripts/ci/sources/tunnel.sh b/scripts/ci/sources/tunnel.sh
index 62d29160ba8..d0296f82d8e 100644
--- a/scripts/ci/sources/tunnel.sh
+++ b/scripts/ci/sources/tunnel.sh
@@ -4,10 +4,10 @@
 start_tunnel() {
   case "$MODE" in
     e2e*|saucelabs*)
-      ./scripts/sauce/sauce_connect_setup.sh
+      ./scripts/saucelabs/start-tunnel.sh
       ;;
     browserstack*)
-      ./scripts/browserstack/start_tunnel.sh
+      ./scripts/browserstack/start-tunnel.sh
       ;;
     *)
       ;;
@@ -17,10 +17,10 @@ start_tunnel() {
 wait_for_tunnel() {
   case "$MODE" in
     e2e*|saucelabs*)
-      ./scripts/sauce/sauce_connect_block.sh
+      ./scripts/saucelabs/wait-tunnel.sh
       ;;
     browserstack*)
-      ./scripts/browserstack/waitfor_tunnel.sh
+      ./scripts/browserstack/wait-tunnel.sh
       ;;
     *)
       ;;
@@ -31,10 +31,10 @@ wait_for_tunnel() {
 teardown_tunnel() {
   case "$MODE" in
     e2e*|saucelabs*)
-      ./scripts/sauce/sauce_connect_teardown.sh
+      ./scripts/saucelabs/stop-tunnel.sh
       ;;
     browserstack*)
-      ./scripts/browserstack/teardown_tunnel.sh
+      ./scripts/browserstack/stop-tunnel.sh
       ;;
     *)
       ;;
diff --git a/scripts/sauce/sauce_config.js b/scripts/saucelabs/sauce_config.js
similarity index 100%
rename from scripts/sauce/sauce_config.js
rename to scripts/saucelabs/sauce_config.js
diff --git a/scripts/sauce/sauce_connect_setup.sh b/scripts/saucelabs/start-tunnel.sh
similarity index 100%
rename from scripts/sauce/sauce_connect_setup.sh
rename to scripts/saucelabs/start-tunnel.sh
diff --git a/scripts/sauce/sauce_connect_teardown.sh b/scripts/saucelabs/stop-tunnel.sh
similarity index 100%
rename from scripts/sauce/sauce_connect_teardown.sh
rename to scripts/saucelabs/stop-tunnel.sh
diff --git a/scripts/sauce/sauce_connect_block.sh b/scripts/saucelabs/wait-tunnel.sh
similarity index 100%
rename from scripts/sauce/sauce_connect_block.sh
rename to scripts/saucelabs/wait-tunnel.sh
diff --git a/test/protractor.conf.js b/test/protractor.conf.js
index c4dd08cb9d1..5a9c2c63100 100644
--- a/test/protractor.conf.js
+++ b/test/protractor.conf.js
@@ -21,7 +21,7 @@ const config = {
 };
 
 if (process.env['TRAVIS']) {
-  const key = require('../scripts/sauce/sauce_config');
+  const key = require('../scripts/saucelabs/sauce_config');
   config.sauceUser = process.env['SAUCE_USERNAME'];
   config.sauceKey = key;
   config.capabilities = {