Few more fixes.

AudithSoftworks · Apr 17, 2017 · 99d49db · 99d49db
1 parent 8e46e13
commit 99d49db
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 30 deletions.
diff --git a/storage/build/scripts/dev-env/build.sh b/storage/build/scripts/dev-env/build.sh
@@ -15,13 +15,11 @@ docker-compose build
 
 if [ -z ${PHP_VERSION+x} ]; then export PHP_VERSION='7'; fi; # 5|7
 
-if [[ $(docker-compose ps | grep Exit) || $(docker-compose ps | grep Up) ]]; then docker-compose down; fi;
-
+docker-compose down;
 docker-compose up -d php${PHP_VERSION}-cli;
 docker-compose ps;
-docker exec basis_php${PHP_VERSION}-cli_1 \
-    /bin/bash -c "echo $(docker inspect -f '{{ .NetworkSettings.Networks.basis_default.IPAddress }}' basis_nginxForPhp${PHP_VERSION}_1) basis.audith.org | sudo tee -a /etc/hosts";
-export NETWORK_GATEWAY=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' ${COMPOSE_PROJECT_NAME}php${PHP_VERSION}-cli_1);
+docker exec ${COMPOSE_PROJECT_NAME}php${PHP_VERSION}-cli_1 \
+    /bin/bash -c "echo $(docker inspect -f '{{ .NetworkSettings.Networks.basis_default.IPAddress }}' ${COMPOSE_PROJECT_NAME}nginxForPhp${PHP_VERSION}_1) basis.audith.org | sudo tee -a /etc/hosts";
 
 test -f .env || cat .env.example | tee .env > /dev/null 2>&1;
 
@@ -30,7 +28,7 @@ test -f .env || cat .env.example | tee .env > /dev/null 2>&1;
 # and SAUCE_ACCESS_KEY env variables to the environment for which the next 'docker exec' is being run.
 ###############################################################################################################
 
-docker exec basis_php${PHP_VERSION}-cli_1 bash -c "
+docker exec ${COMPOSE_PROJECT_NAME}php${PHP_VERSION}-cli_1 bash -c "
     if [ ! -f ~/.bash_profile ]; then touch ~/.bash_profile; fi;
     if [ ! \$(cat ~/.bash_profile | grep SAUCE_) ]; then
         echo 'export SAUCE_USERNAME=\"$SAUCE_USERNAME\"' | sudo tee -a ~/.bash_profile;

diff --git a/tests/WebUi/SauceWebDriver/AuthenticationTest.php b/tests/WebUi/SauceWebDriver/AuthenticationTest.php
@@ -13,30 +13,30 @@ class AuthenticationTest extends SauceWebDriverTestCase
 
     /** @var array */
     public static $browsers = [
-        [
-            'browserName' => 'firefox',
-            'desiredCapabilities' => [
-                'platform' => 'Linux'
-            ]
-        ],
-        [
-            'browserName' => 'chrome',
-            'desiredCapabilities' => [
-                'platform' => 'Linux'
-            ]
-        ],
-        [
-            'browserName' => 'firefox',
-            'desiredCapabilities' => [
-                'platform' => 'macOS 10.12'
-            ]
-        ],
-        [
-            'browserName' => 'chrome',
-            'desiredCapabilities' => [
-                'platform' => 'macOS 10.12'
-            ]
-        ],
+//        [
+//            'browserName' => 'firefox',
+//            'desiredCapabilities' => [
+//                'platform' => 'Linux'
+//            ]
+//        ],
+//        [
+//            'browserName' => 'chrome',
+//            'desiredCapabilities' => [
+//                'platform' => 'Linux'
+//            ]
+//        ],
+//        [
+//            'browserName' => 'firefox',
+//            'desiredCapabilities' => [
+//                'platform' => 'macOS 10.12'
+//            ]
+//        ],
+//        [
+//            'browserName' => 'chrome',
+//            'desiredCapabilities' => [
+//                'platform' => 'macOS 10.12'
+//            ]
+//        ],
         [
             'browserName' => 'firefox',
             'desiredCapabilities' => [