From fa01041b7c49500737464f7db9d67fda4a62cd8a Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Sat, 16 Mar 2024 11:47:43 +1100 Subject: [PATCH] Updated test helper name. --- .drevops/tests/bats/_helper.deployment.bash | 2 +- .drevops/tests/bats/deployment0.bats | 4 ++-- .drevops/tests/bats/deployment1.bats | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.drevops/tests/bats/_helper.deployment.bash b/.drevops/tests/bats/_helper.deployment.bash index 92ed16514..2722f55a1 100644 --- a/.drevops/tests/bats/_helper.deployment.bash +++ b/.drevops/tests/bats/_helper.deployment.bash @@ -98,7 +98,7 @@ assert_deployment_files_present() { popd >/dev/null || exit 1 } -provision_site() { +install_and_build_site() { local dir="${1:-$(pwd)}" local should_build="${2:-1}" shift || true diff --git a/.drevops/tests/bats/deployment0.bats b/.drevops/tests/bats/deployment0.bats index 59916419e..d7ff255ce 100644 --- a/.drevops/tests/bats/deployment0.bats +++ b/.drevops/tests/bats/deployment0.bats @@ -31,7 +31,7 @@ load _helper.deployment.bash # from for deployment. They may be the same place, but we are testing them # if they are separate, because most likely SRC_DIR will contain code # built on previous build stages of the CI process. - provision_site "${CURRENT_PROJECT_DIR}" + install_and_build_site "${CURRENT_PROJECT_DIR}" substep "Copying built codebase into code source directory ${SRC_DIR}." cp -R "${CURRENT_PROJECT_DIR}/." "${SRC_DIR}/" @@ -134,7 +134,7 @@ load _helper.deployment.bash fixture_prepare_dir "${SRC_DIR}" # Do not build - only structure. - provision_site "${CURRENT_PROJECT_DIR}" 0 + install_and_build_site "${CURRENT_PROJECT_DIR}" 0 substep "Copying built codebase into code source directory ${SRC_DIR}." cp -R "${CURRENT_PROJECT_DIR}/." "${SRC_DIR}/" diff --git a/.drevops/tests/bats/deployment1.bats b/.drevops/tests/bats/deployment1.bats index d0ea4b24e..07303ccfe 100644 --- a/.drevops/tests/bats/deployment1.bats +++ b/.drevops/tests/bats/deployment1.bats @@ -43,7 +43,7 @@ load _helper.deployment.bash # from for deployment. They may be the same place, but we are testing them # if they are separate, because most likely SRC_DIR will contain code # built on previous build stages. - provision_site "${CURRENT_PROJECT_DIR}" + install_and_build_site "${CURRENT_PROJECT_DIR}" substep "Copying built codebase into code source directory ${SRC_DIR}" cp -R "${CURRENT_PROJECT_DIR}/." "${SRC_DIR}/" @@ -146,7 +146,7 @@ load _helper.deployment.bash ) # Do not build - only structure. - provision_site "${CURRENT_PROJECT_DIR}" 0 "${answers[@]}" + install_and_build_site "${CURRENT_PROJECT_DIR}" 0 "${answers[@]}" substep "Copying built codebase into code source directory ${SRC_DIR}" cp -R "${CURRENT_PROJECT_DIR}/." "${SRC_DIR}/" @@ -245,7 +245,7 @@ load _helper.deployment.bash ) # Do not build - only structure. - provision_site "${CURRENT_PROJECT_DIR}" 0 "${answers[@]}" + install_and_build_site "${CURRENT_PROJECT_DIR}" 0 "${answers[@]}" substep "Copying built codebase into code source directory ${SRC_DIR}" cp -R "${CURRENT_PROJECT_DIR}/." "${SRC_DIR}/"