diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 1eea3dd3..69d73193 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -76,10 +76,10 @@ jobs: - name: "Run Tests" run: | - bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 latest + bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 latest composer phpunit rm -rf $WP_TESTS_DIR $WP_CORE_DIR - bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 nightly true + bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 nightly true WP_MULTISITE=1 composer phpunit test-behat: diff --git a/bin/behat-prepare.sh b/bin/behat-prepare.sh index 2dde26be..6d3babc9 100755 --- a/bin/behat-prepare.sh +++ b/bin/behat-prepare.sh @@ -26,7 +26,6 @@ set -ex # Set StrictHostKeyChecking to no echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config -cat /etc/ssh/ssh_config ### # Create a new environment for this particular test run. @@ -47,7 +46,7 @@ BASH_DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ### terminus connection:set $SITE_ENV git rm -rf $PREPARE_DIR -git clone -b $TERMINUS_ENV $PANTHEON_GIT_URL $PREPARE_DIR -v +git clone -b $TERMINUS_ENV $PANTHEON_GIT_URL $PREPARE_DIR ### # Add the copy of this plugin itself to the environment diff --git a/bin/install-wp-tests.sh b/bin/install-wp-tests.sh index 81d528ac..675dd975 100755 --- a/bin/install-wp-tests.sh +++ b/bin/install-wp-tests.sh @@ -5,9 +5,9 @@ if [ $# -lt 3 ]; then exit 1 fi -DB_NAME=solr-power -DB_USER=root -DB_PASS=root +DB_NAME=$1 +DB_USER=$2 +DB_PASS=$3 DB_HOST=${4-localhost} WP_VERSION=${5-latest} SKIP_DB_CREATE=${6-false}