From 84296e5ab8ba5ef3263f31233a9dbb9431c4f494 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Wed, 30 Oct 2024 23:41:50 -0700 Subject: [PATCH 1/2] [Tests] ensure that unit tests use only mocked LTS names --- test/fast/Unit tests/nvm_alias LTS-N | 18 ++++++++++++++---- test/fast/Unit tests/nvm_normalize_lts | 21 +++++++++++++++++---- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/test/fast/Unit tests/nvm_alias LTS-N b/test/fast/Unit tests/nvm_alias LTS-N index b110117..bbc6343 100755 --- a/test/fast/Unit tests/nvm_alias LTS-N +++ b/test/fast/Unit tests/nvm_alias LTS-N @@ -5,14 +5,26 @@ die () { echo "$@" ; cleanup ; exit 1; } cleanup() { unset -f nvm_download + rm -rf "${NVM_DIR}/alias/lts" + mv "${NVM_DIR}/alias/lts-backup" "${NVM_DIR}/alias/lts" } \. ../../../nvm.sh -set -ex - MOCKS_DIR="${PWD}/mocks" +LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt" +LTS_LIST="$(cat "${LTS_NAMES_PATH}" | tail -n +2)" + +mv "${NVM_DIR}/alias/lts" "${NVM_DIR}/alias/lts-backup" ||: +mkdir -p "${NVM_DIR}/alias/lts" + +for LTS in $LTS_LIST; do + cp "${NVM_DIR}/alias/lts-backup/${LTS}" "${NVM_DIR}/alias/lts/" +done + +set -ex + # sample output at the time the test was written TAB_PATH="${MOCKS_DIR}/nodejs.org-dist-index.tab" nvm_download() { @@ -21,8 +33,6 @@ nvm_download() { nvm_ls_remote >/dev/null || die "nvm_ls_remote_failed?!" -LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt" - N=0 while IFS= read -r LTS; do if [ $N -gt 0 ]; then diff --git a/test/fast/Unit tests/nvm_normalize_lts b/test/fast/Unit tests/nvm_normalize_lts index 8f4f20d..079529e 100755 --- a/test/fast/Unit tests/nvm_normalize_lts +++ b/test/fast/Unit tests/nvm_normalize_lts @@ -2,12 +2,26 @@ cleanup() { unset nvm_get_os + rm -rf "${NVM_DIR}/alias/lts" + mv "${NVM_DIR}/alias/lts-backup" "${NVM_DIR}/alias/lts" } die () { cleanup; echo "$@" ; exit 1; } \. ../../../nvm.sh +MOCKS_DIR="../Unit tests/mocks" + +LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt" +LTS_LIST="$(cat "${LTS_NAMES_PATH}" | tail -n +2)" + +mv "${NVM_DIR}/alias/lts" "${NVM_DIR}/alias/lts-backup" ||: +mkdir -p "${NVM_DIR}/alias/lts" + +for LTS in $LTS_LIST; do + cp "${NVM_DIR}/alias/lts-backup/${LTS}" "${NVM_DIR}/alias/lts/" +done + ACTUAL="$(nvm_normalize_lts "foo")" EXPECTED='foo' [ "${ACTUAL}" = "${EXPECTED}" ] || die "expected >${EXPECTED}<, got >${ACTUAL}<" @@ -20,15 +34,14 @@ if ACTUAL="$(nvm_normalize_lts lts/ARGON)"; then die "expected failure, got >${ACTUAL}<" fi -MOCKS_DIR="../Unit tests/mocks" -STAR="$(cat "$MOCKS_DIR/lts-star.txt")" +STAR="$(cat "${MOCKS_DIR}/lts-star.txt")" ACTUAL="$(nvm_normalize_lts "${STAR}")" EXPECTED="${STAR}" [ "${ACTUAL}" = "${EXPECTED}" ] || die "expected >${EXPECTED}<, got >${ACTUAL}<" -LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt" -LTS_LIST="$(cat "${LTS_NAMES_PATH}" | tail -n +2)" +# or, back up LTS aliases, copy backups that are in LTS names +# INDEX=1 printf '%s\n' "${LTS_LIST}" | while IFS= read -r LTS; do From f4c7c77fe3111830fe33b26c9c654061036508f2 Mon Sep 17 00:00:00 2001 From: Cheerag Patel Date: Wed, 30 Oct 2024 14:03:05 -0700 Subject: [PATCH 2/2] [meta] Rename .github/ISSUE_TEMPLATE.md to .github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md Moved issue template into ISSUE_TEMPLATE folder --- .github/{ => ISSUE_TEMPLATE}/ISSUE_TEMPLATE.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => ISSUE_TEMPLATE}/ISSUE_TEMPLATE.md (100%) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md similarity index 100% rename from .github/ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md