From 3f0a0b9a9e3ed3df2ffe48aec44bb9db945be4d5 Mon Sep 17 00:00:00 2001 From: Raphael Reitzig <4246780+reitzig@users.noreply.github.com> Date: Fri, 26 Feb 2021 17:30:37 +0100 Subject: [PATCH] Fix `autoenv` test Using `current` as version doesn't work; it's a symlink that can change. Resolve the symlink before comparison! --- test/features/autoenv.feature | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/test/features/autoenv.feature b/test/features/autoenv.feature index e1d6e09..f974643 100644 --- a/test/features/autoenv.feature +++ b/test/features/autoenv.feature @@ -18,17 +18,17 @@ Feature: Support autoenv setting """ When we run fish script """ - echo (basename $ANT_HOME) > /tmp/autoenv-test.log + echo (basename (realpath $ANT_HOME)) > /tmp/autoenv-test.log cd /tmp/autoenv-test - echo (basename $ANT_HOME) >> /tmp/autoenv-test.log + echo (basename (realpath $ANT_HOME)) >> /tmp/autoenv-test.log cd .. - echo (basename $ANT_HOME) >> /tmp/autoenv-test.log + echo (basename (realpath $ANT_HOME)) >> /tmp/autoenv-test.log """ Then file /tmp/autoenv-test.log contains """ - current - current - current + 1.10.1 + 1.10.1 + 1.10.1 """ Scenario: .sdkmanrc loaded if autoenv turned on @@ -39,19 +39,18 @@ Feature: Support autoenv setting """ When we run fish script """ - echo (basename $ANT_HOME) > /tmp/autoenv-test.log + echo (basename (realpath $ANT_HOME)) > /tmp/autoenv-test.log cd /tmp/autoenv-test - echo (basename $ANT_HOME) >> /tmp/autoenv-test.log + echo (basename (realpath $ANT_HOME)) >> /tmp/autoenv-test.log cd .. - echo (basename $ANT_HOME) >> /tmp/autoenv-test.log + echo (basename (realpath $ANT_HOME)) >> /tmp/autoenv-test.log """ Then file /tmp/autoenv-test.log contains """ - current + 1.10.1 1.9.9 1.10.1 """ - # TODO: we would expect `current` in the last line -- but that's what sdk currently does! # TODO: This one doesn't work due to a bug in sdkman. Track: https://github.com/sdkman/sdkman-cli/pull/878 @pending @@ -68,18 +67,18 @@ Feature: Support autoenv setting """ When we run fish script """ - echo (basename $ANT_HOME),(basename $CRASH_HOME) > /tmp/autoenv-test.log + echo (basename (realpath $ANT_HOME)),(basename (realpath $CRASH_HOME)) > /tmp/autoenv-test.log cd /tmp/autoenv-test-1 - echo (basename $ANT_HOME),(basename $CRASH_HOME) >> /tmp/autoenv-test.log + echo (basename (realpath $ANT_HOME)),(basename (realpath $CRASH_HOME)) >> /tmp/autoenv-test.log cd ../autoenv-test-2 - echo (basename $ANT_HOME),(basename $CRASH_HOME) >> /tmp/autoenv-test.log + echo (basename (realpath $ANT_HOME)),(basename (realpath $CRASH_HOME)) >> /tmp/autoenv-test.log cd .. - echo (basename $ANT_HOME),(basename $CRASH_HOME) >> /tmp/autoenv-test.log + echo (basename (realpath $ANT_HOME)),(basename (realpath $CRASH_HOME)) >> /tmp/autoenv-test.log """ Then file /tmp/autoenv-test.log contains """ - current,current + 1.10.1,1.3.0 1.9.9,1.2.11 - 1.9.7,current - current,current + 1.9.7,1.3.0 + 1.10.1,1.3.0 """