Fix integration test dependency on mysql hostname

Author: Jacob Middag

test/helpers/setup.php

@@ -37,11 +37,11 @@ function restore_wordpress() {
 }
 
 function restore_wordpress_site() {
-    shell_exec('mysql -h mysql -u root -p' . getenv('MYSQL_ROOT_PASSWORD') . ' ' . getenv('WORDPRESS_DATABASE') . ' < /tmp/mysqldump_' . getenv('WORDPRESS_DATABASE') . '.sql');
+    shell_exec('mysql -h ' . getenv('HOST_IP') . ' -u root -p' . getenv('MYSQL_ROOT_PASSWORD') . ' ' . getenv('WORDPRESS_DATABASE') . ' < /tmp/mysqldump_' . getenv('WORDPRESS_DATABASE') . '.sql');
 }
 
 function backup_wordpress_site() {
-    shell_exec('mysqldump -h mysql -u root -p' . getenv('MYSQL_ROOT_PASSWORD') . ' ' . getenv('WORDPRESS_DATABASE') . ' > /tmp/mysqldump_' . getenv('WORDPRESS_DATABASE') . '.sql');
+    shell_exec('mysqldump -h ' . getenv('HOST_IP') . ' -u root -p' . getenv('MYSQL_ROOT_PASSWORD') . ' ' . getenv('WORDPRESS_DATABASE') . ' > /tmp/mysqldump_' . getenv('WORDPRESS_DATABASE') . '.sql');
 }
 
 function set_test_webservice_url() {
@@ -56,14 +56,14 @@ function restore_webservice_url() {
 }
 
 function set_siteurl($site_url) {
-    $db = new mysqli('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'), getenv('WORDPRESS_DATABASE'));
+    $db = new mysqli(getenv('HOST_IP'), 'root', getenv('MYSQL_ROOT_PASSWORD'), getenv('WORDPRESS_DATABASE'));
     $statement = $db->prepare("UPDATE wp_options SET option_value = ? WHERE option_name = 'home' OR option_name = 'siteurl'");
     $statement->bind_param('s', $site_url);
     $statement->execute();
 }
 
 function is_wordpress_setup() {
-    $db = new mysqli('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'));
+    $db = new mysqli(getenv('HOST_IP'), 'root', getenv('MYSQL_ROOT_PASSWORD'));
     if ($result = $db->query("SELECT * FROM information_schema.tables WHERE table_schema = '" . getenv('WORDPRESS_DATABASE') . "'")) {
         return $result->num_rows > 0;
     } else {
@@ -114,7 +114,7 @@ function login($driver) {
     $driver->get(wordpress('/wp-login.php'));
     $driver->findElement(WebDriverBy::tagName('body'))->click();
     $driver->findElement(WebDriverBy::name('log'))->clear()->click()->sendKeys('admin');
-    $driver->findElement(WebDriverBy::name('pwd'))->sendKeys('admin');
+    $driver->findElement(WebDriverBy::name('pwd'))->clear()->click()->sendKeys('admin');
     $driver->findElement(WebDriverBy::tagName('form'))->submit();
     if ($driver->findElement(WebDriverBy::tagName('h2'))->getText() == 'Dashboard') {
         print "Successfully logged into WordPress.\n";