From 3d63ad48a3d3c2138a1ce503fbc70e02d6ecc07f Mon Sep 17 00:00:00 2001
From: Ron Rennick <ron@ronandandrea.com>
Date: Tue, 7 Apr 2020 19:33:30 -0300
Subject: [PATCH] Tweak configuration - set executable on initialize.sh - use
 pagename query string for ready page - use environment vars for docker config

---
 assets/components/e2e-env/docker-compose.yaml | 20 +++++++++----------
 tests/bin/run-e2e-CI.sh                       |  2 +-
 tests/e2e-tests/docker/initialize.sh          |  0
 3 files changed, 11 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 tests/e2e-tests/docker/initialize.sh

diff --git a/assets/components/e2e-env/docker-compose.yaml b/assets/components/e2e-env/docker-compose.yaml
index ae6057ff94596..a6756c2823a52 100644
--- a/assets/components/e2e-env/docker-compose.yaml
+++ b/assets/components/e2e-env/docker-compose.yaml
@@ -24,11 +24,11 @@ services:
       - ${WORDPRESS_PORT}:80
     restart: on-failure
     environment:
-      WORDPRESS_DB_HOST: db
-      WORDPRESS_DB_NAME: testdb
-      WORDPRESS_DB_USER: wordpress
-      WORDPRESS_DB_PASSWORD: wordpress
-      WORDPRESS_TABLE_PREFIX: "wp_"
+      WORDPRESS_DB_HOST: ${WORDPRESS_DB_HOST}
+      WORDPRESS_DB_NAME: ${WORDPRESS_DB_NAME}
+      WORDPRESS_DB_USER: ${WORDPRESS_DB_USER}
+      WORDPRESS_DB_PASSWORD: ${WORDPRESS_DB_PASSWORD}
+      WORDPRESS_TABLE_PREFIX: "${WORDPRESS_TABLE_PREFIX}"
       WORDPRESS_DEBUG: 1
     volumes:
       - wordpress:/var/www/html
@@ -42,12 +42,12 @@ services:
         context: ./docker/wp-cli
     restart: on-failure
     environment:
-        WORDPRESS_PORT: 8084
+        WORDPRESS_PORT: ${WORDPRESS_PORT}
         WORDPRESS_HOST: wordpress-www:80
-        WORDPRESS_TITLE: "WooCommerce Core E2E Test Suite"
-        WORDPRESS_LOGIN: admin
-        WORDPRESS_PASSWORD: password
-        WORDPRESS_EMAIL: "admin@woocommercecoree2etestsuite.com"
+        WORDPRESS_TITLE: ${WORDPRESS_TITLE}
+        WORDPRESS_LOGIN: ${WORDPRESS_LOGIN}
+        WORDPRESS_PASSWORD: ${WORDPRESS_PASSWORD}
+        WORDPRESS_EMAIL: "${WORDPRESS_EMAIL}"
         DOMAIN_NAME:
 
     volumes:
diff --git a/tests/bin/run-e2e-CI.sh b/tests/bin/run-e2e-CI.sh
index e2ae6ec9cf2b2..95d89739cfa27 100755
--- a/tests/bin/run-e2e-CI.sh
+++ b/tests/bin/run-e2e-CI.sh
@@ -9,7 +9,7 @@ DELAY_SEC=10
 # Counter for the loop that checks if the Docker container had been built
 count=0
 
-while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8084/?page_id=4)" != "200" ]]
+while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8084/?pagename=ready)" != "200" ]]
 
 do
   echo "$(date) - Docker container is still being built"
diff --git a/tests/e2e-tests/docker/initialize.sh b/tests/e2e-tests/docker/initialize.sh
old mode 100644
new mode 100755