Skip to content

Commit 5cc74a6

Browse files
committed
[Tests] fix failing test
1 parent aa57406 commit 5cc74a6

File tree

3 files changed

+34
-28
lines changed

3 files changed

+34
-28
lines changed

test/fast/Aliases/nvm_list_aliases works with LTS aliases

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ nvm_alias_path() {
1313
nvm_echo "../../../alias"
1414
}
1515

16+
nvm ls-remote >/dev/null || die 'nvm ls-remote (to populate LTS aliases) failed'
17+
1618
MOCKS_DIR="../Unit tests/mocks"
1719

1820
EXPECTED_OUTPUT="$(cat "$MOCKS_DIR/lts-star.txt")"

test/fast/Unit tests/nvm ls-remote

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,48 +22,52 @@ nvm deactivate 2>/dev/null || die 'unable to deactivate'
2222

2323
\. ../../common.sh
2424

25-
REMOTE="$PWD/mocks/nvm_ls_remote.txt"
26-
nvm_ls_remote() {
27-
cat "$REMOTE"
28-
}
29-
REMOTE_IOJS="$PWD/mocks/nvm_ls_remote_iojs.txt"
30-
nvm_ls_remote_iojs() {
31-
cat "$REMOTE_IOJS"
32-
}
33-
3425
MOCKS_DIR="$PWD/mocks"
3526

36-
EXPECTED_OUTPUT_PATH="${MOCKS_DIR}/nvm ls-remote.txt"
37-
OUTPUT="$(nvm ls-remote | sed 's/[ \t]*$//')"
38-
EXPECTED_OUTPUT="$(cat "$EXPECTED_OUTPUT_PATH" | sed 's/[ \t]*$//' )"
39-
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "bare nvm ls-remote did not output expected sorted versions; got $(echo ">$OUTPUT<") expected $(echo ">$EXPECTED_OUTPUT<")"
27+
nvm_download() {
28+
if [ "$*" = "-L -s $(nvm_get_mirror node std)/index.tab -o -" ]; then
29+
cat "$MOCKS_DIR/nodejs.org-dist-index.tab"
30+
return
31+
fi
32+
return 42
33+
}
4034

4135
EXPECTED_OUTPUT_PATH="${MOCKS_DIR}/nvm ls-remote lts.txt"
42-
OUTPUT="$(nvm ls-remote --lts="*" | sed 's/[ \t]*$//')"
36+
OUTPUT="$(nvm ls-remote --lts | sed 's/[ \t]*$//')"
4337
EXPECTED_OUTPUT="$(cat "$EXPECTED_OUTPUT_PATH" | sed 's/[ \t]*$//' )"
44-
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm ls-remote --lts=* did not output expected sorted versions; got $(echo ">$OUTPUT<") expected $(echo ">$EXPECTED_OUTPUT<")"
38+
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm ls-remote --lts did not output expected sorted versions; got $(echo ">$OUTPUT<") expected $(echo ">$EXPECTED_OUTPUT<")"
4539

4640
EXPECTED_OUTPUT_PATH="${MOCKS_DIR}/nvm ls-remote lts.txt"
4741
OUTPUT="$(nvm ls-remote "lts/*" | sed 's/[ \t]*$//')"
4842
EXPECTED_OUTPUT="$(cat "$EXPECTED_OUTPUT_PATH" | sed 's/[ \t]*$//' )"
4943
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm ls-remote lts/* did not output expected sorted versions; got $(echo ">$OUTPUT<") expected $(echo ">$EXPECTED_OUTPUT<")"
5044

51-
EXPECTED_OUTPUT_PATH="${MOCKS_DIR}/nvm ls-remote lts.txt"
52-
OUTPUT="$(nvm ls-remote "lts/-1" | sed 's/[ \t]*$//')"
53-
EXPECTED_OUTPUT="$(cat "$EXPECTED_OUTPUT_PATH" | sed 's/[ \t]*$//' )"
54-
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm ls-remote lts/* did not output expected sorted versions; got $(echo ">$OUTPUT<") expected $(echo ">$EXPECTED_OUTPUT<")"
55-
45+
MOCKS_DIR="$PWD/mocks"
5646
LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt"
5747
LTS_LIST="$(cat "${LTS_NAMES_PATH}" | tail -n +2)"
5848

5949
INDEX=1
60-
for LTS in $LTS_LIST; do
61-
ACTUAL="$(nvm ls-remote "lts/-${INDEX}" | sed 's/[ \t]*$//')"
62-
MESSAGE="for lts/-${INDEX} / ${LTS}"
63-
EXPECTED="$(nvm ls-remote "lts/${LTS}" | sed 's/[ \t]*$//')"
64-
[ "${ACTUAL}" = "${EXPECTED}" ] || die "${MESSAGE}: expected >${EXPECTED}<, got >${ACTUAL}<"
50+
printf '%s\n' "${LTS_LIST}" | while IFS= read -r LTS; do
51+
ACTUAL="$(nvm ls-remote "lts/-${INDEX}" | sed 's/[ \t]*$//')"
52+
MESSAGE="for lts/-${INDEX} (${LTS})"
53+
EXPECTED="$(nvm ls-remote "lts/${LTS}" | sed 's/[ \t]*$//')"
54+
[ "${ACTUAL}" = "${EXPECTED}" ] || die "${MESSAGE}: expected >${EXPECTED}<, got >${ACTUAL}<"
6555

66-
INDEX=$(($INDEX + 1))
56+
INDEX=$(($INDEX + 1))
6757
done
6858

59+
REMOTE="$PWD/mocks/nvm_ls_remote.txt"
60+
nvm_ls_remote() {
61+
cat "$REMOTE"
62+
}
63+
REMOTE_IOJS="$PWD/mocks/nvm_ls_remote_iojs.txt"
64+
nvm_ls_remote_iojs() {
65+
cat "$REMOTE_IOJS"
66+
}
67+
68+
EXPECTED_OUTPUT_PATH="${MOCKS_DIR}/nvm ls-remote.txt"
69+
OUTPUT="$(nvm ls-remote | sed 's/[ \t]*$//')"
70+
EXPECTED_OUTPUT="$(cat "$EXPECTED_OUTPUT_PATH" | sed 's/[ \t]*$//' )"
71+
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "bare nvm ls-remote did not output expected sorted versions; got $(echo ">$OUTPUT<") expected $(echo ">$EXPECTED_OUTPUT<")"
72+
6973
cleanup

test/fast/Unit tests/nvm_normalize_lts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt"
2828
LTS_LIST="$(cat "${LTS_NAMES_PATH}" | tail -n +2)"
2929

3030
INDEX=1
31-
for LTS in $LTS_LIST; do
31+
printf '%s\n' "${LTS_LIST}" | while IFS= read -r LTS; do
3232
ACTUAL="$(nvm_normalize_lts "lts/-${INDEX}")"
33-
MESSAGE="for lts/-${INDEX}"
33+
MESSAGE="for lts/-${INDEX} (${LTS})"
3434
EXPECTED="lts/$(echo "${LTS_LIST}" | tail -n +${INDEX} | head -n1)"
3535
[ "${ACTUAL}" = "${EXPECTED}" ] || die "${MESSAGE}: expected >${EXPECTED}<, got >${ACTUAL}<"
3636

0 commit comments

Comments
 (0)