Merge 8b9512bb35 into 6b70c40f15

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

.github/workflows/tests.yml

@@ -1,6 +1,6 @@
 name: urchin tests
 
-on: [push]
+on: [pull_request, push]
 
 permissions:
   contents: read
@@ -31,6 +31,7 @@ jobs:
         suite:
           - install_script
           - sourcing
+          - slow
         shell:
           - sh
           - bash

.travis.yml

@@ -87,11 +87,6 @@ env:
     - SHELL=bash TEST_SUITE=fast
     - SHELL=zsh TEST_SUITE=fast
     #  - SHELL=ksh TEST_SUITE=fast
-    - SHELL=sh TEST_SUITE=slow
-    - SHELL=dash TEST_SUITE=slow
-    - SHELL=bash TEST_SUITE=slow
-    - SHELL=zsh TEST_SUITE=slow
-    #  - SHELL=ksh TEST_SUITE=slow
     - SHELL=sh TEST_SUITE=installation_iojs
     - SHELL=sh TEST_SUITE=installation_iojs WITHOUT_CURL=1
     - SHELL=dash TEST_SUITE=installation_iojs

nvm.sh

@@ -196,6 +196,9 @@ nvm_install_latest_npm() {
   nvm_echo 'Attempting to upgrade to the latest working version of npm...'
   local NODE_VERSION
   NODE_VERSION="$(nvm_strip_iojs_prefix "$(nvm_ls_current)")"
+  local NPM_VERSION
+  NPM_VERSION="$(npm --version 2>/dev/null)"
+
   if [ "${NODE_VERSION}" = 'system' ]; then
     NODE_VERSION="$(node --version)"
   elif [ "${NODE_VERSION}" = 'none' ]; then
@@ -206,8 +209,6 @@ nvm_install_latest_npm() {
     nvm_err 'Unable to obtain node version.'
     return 1
   fi
-  local NPM_VERSION
-  NPM_VERSION="$(npm --version 2>/dev/null)"
   if [ -z "${NPM_VERSION}" ]; then
     nvm_err 'Unable to obtain npm version.'
     return 2
@@ -700,10 +701,12 @@ nvm_ensure_version_installed() {
       nvm_err "N/A: version \"${PREFIXED_VERSION:-$PROVIDED_VERSION}\" is not yet installed."
     fi
     nvm_err ""
-    if [ "${IS_VERSION_FROM_NVMRC}" != '1' ]; then
+    if [ "${PROVIDED_VERSION}" = 'lts' ]; then
-        nvm_err "You need to run \`nvm install ${PROVIDED_VERSION}\` to install and use it."
+      nvm_err '`lts` is not an alias - you may need to run `nvm install --lts` to install and `nvm use --lts` to use it.'
-      else
+    elif [ "${IS_VERSION_FROM_NVMRC}" != '1' ]; then
-        nvm_err 'You need to run `nvm install` to install and use the node version specified in `.nvmrc`.'
+      nvm_err "You need to run \`nvm install ${PROVIDED_VERSION}\` to install and use it."
+    else
+      nvm_err 'You need to run `nvm install` to install and use the node version specified in `.nvmrc`.'
     fi
     return 1
   fi

test/slow/nvm use/Running 'nvm use lts' shows actionable error

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -ex
+
+die () { echo "$@" ; exit 1; }
+
+\. ../../../nvm.sh
+
+# Deactivate any active node version
+nvm deactivate >/dev/null 2>&1 || die 'deactivate failed'
+
+# Attempt to use 'lts' without '--' and capture the error message
+ERROR_OUTPUT=$(nvm use lts 2>&1) || true
+
+EXPECTED_ERROR='`lts` is not an alias - you may need to run `nvm install --lts` to install and `nvm use --lts` to use it.'
+
+# Check if the error message matches the expected output
+echo "$ERROR_OUTPUT" | grep -q "$EXPECTED_ERROR" \
+  || die "Expected error message not found. Got: $ERROR_OUTPUT"