From ee7edbd9aa0515cfefa9238ff15edf5c34a9c264 Mon Sep 17 00:00:00 2001
From: Raphael Reitzig <4246780+reitzig@users.noreply.github.com>
Date: Sun, 25 Jun 2023 19:00:02 +0200
Subject: [PATCH] fix(test): Adapt tests to changes 5.9 -> 5.18
ref: issue #41
---
.idea/runConfigurations/Test.xml | 4 +--
CHANGELOG.md | 3 +-
README.md | 6 ++--
test/features/autoenv.feature | 4 +--
test/features/completions.feature | 54 ++++++++++++++----------------
test/features/corner_cases.feature | 1 +
test/features/wrapper.feature | 2 +-
7 files changed, 36 insertions(+), 38 deletions(-)
diff --git a/.idea/runConfigurations/Test.xml b/.idea/runConfigurations/Test.xml
index f354de3..d9dacd3 100644
--- a/.idea/runConfigurations/Test.xml
+++ b/.idea/runConfigurations/Test.xml
@@ -3,9 +3,9 @@
-
+
-
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11f0737..e49d4e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,10 +13,11 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
### Features
-- Compatibility with SDKMAN! 5.9.2
+- Compatibility with SDKMAN! 5.18.2
- Completions for `env`, `home`, `flush` (issue #35)
- Correct behaviour of `env clear`.
- Honor `sdkman_auto_env=true` (issue #38)
+ - `broadcast` removed
- TODO: custom SDKMAN! install path (issue #34)
- Compatibility with fisher 4 (PR #37, #39)
diff --git a/README.md b/README.md
index a68c575..7e82e95 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,9 @@ Also adds binaries from installed SDKs to the PATH.
Version 2.0.0 has been tested with
- - fish 3.1.2, and
- - SDKMAN! 5.11.0, on
- - Ubuntu 20.04 LTS and macOS 10.15
+ - fish 3.6.1, and
+ - SDKMAN! 5.18.2, on
+ - Ubuntu 22.04 LTS and macOS 12.6
## Install
diff --git a/test/features/autoenv.feature b/test/features/autoenv.feature
index bfe259f..f13209d 100644
--- a/test/features/autoenv.feature
+++ b/test/features/autoenv.feature
@@ -52,8 +52,8 @@ Feature: Support autoenv setting
1.10.1
"""
- # TODO: This one doesn't work due to a bug in sdkman. Track: https://github.com/sdkman/sdkman-cli/pull/878
- @pending
+ # TODO: But that PR had been merged back when -- re-investigate
+ @pending # This one doesn't work due to a bug in sdkman. Track: https://github.com/sdkman/sdkman-cli/pull/878
Scenario: Switching between directories with .sdkmanrc
Given SDKMAN! config sets sdkman_auto_env to true
And file /tmp/autoenv-test-1/.sdkmanrc exists with content
diff --git a/test/features/completions.feature b/test/features/completions.feature
index 9955fe1..6565e10 100644
--- a/test/features/completions.feature
+++ b/test/features/completions.feature
@@ -9,7 +9,7 @@ Feature: Shell Completion
Scenario: Command list correct
When the user enters " " into the prompt
- Then completion should propose "b, broadcast, c, current, d, default, flush, h, help, i, install, list, ls, offline, rm, selfupdate, u, ug, uninstall, update, upgrade, use, v, version"
+ Then completion should propose "c, current, d, default, flush, h, help, i, install, list, ls, offline, rm, selfupdate, u, ug, uninstall, update, upgrade, use, v, version"
Scenario Outline: Commands complete
When the user enters "" into the prompt
@@ -17,7 +17,6 @@ Feature: Shell Completion
But completion should not propose
Examples:
| cmd | completions | exclusions |
- | b | b, broadcast | /^[^b]+$/ |
| c | c, current | /^[^c]+$/ |
| d | d, default | /^[^d]+$/ |
| e | e, env | /^[^e]+$/ |
@@ -39,6 +38,7 @@ Feature: Shell Completion
# Currently uncovered (except by fuzzy matches);
# include negatives to prevent accidents:
| a | | /^a/ |
+ | b | | /^b/ |
| g | | /^g/ |
| j | | /^j/ |
| k | | /^k/ |
@@ -143,16 +143,16 @@ Feature: Shell Completion
Then completion should propose ""
But completion should not propose
Examples:
- | cmd | completions | exclusions |
- | | init, install, clear | /^(?!init\|install\|clear).*$/ |
- | i | init, install | /^(?!init\|install).*$/ |
- | ini | init | /^(?!init).*$/ |
- | ins | install | /^(?!install).*$/ |
- | c | clear | /^(?!clear).*$/ |
- | b | | /.*/ |
- | 'init ' | | /.*/ |
- | 'clear ' | | /.*/ |
- | 'install ' | | /.*/ |
+ | cmd | completions | exclusions |
+ | | init, install, clear | /^(?!init\|install\|clear).*$/ |
+ | i | init, install | /^(?!init\|install).*$/ |
+ | ini | init | /^(?!init).*$/ |
+ | ins | install | /^(?!install).*$/ |
+ | c | clear | /^(?!clear).*$/ |
+ | b | | /.*/ |
+ | 'init ' | | /.*/ |
+ | 'clear ' | | /.*/ |
+ | 'install ' | | /.*/ |
Scenario Outline: Completion for 'current'
When the user enters "current " into the prompt
@@ -206,25 +206,21 @@ Feature: Shell Completion
Then completion should propose ""
But completion should not propose
Examples:
- | cmd | completions | exclusions |
- | | archives, broadcast, tmp, version | /^(?!archives\|broadcast\|tmp\|version).*$/ |
- | b | broadcast | /^(?!broadcast).*$/ |
- | a | archives | /^(?!archives\|broadcast).*$/ |
- | t | tmp | /^(?!tmp\|broadcast).*$/ |
- | v | version | /^(?!version\|archives).*$/ |
- | x | | /.*/ |
- | 'tmp ' | | /.*/ |
+ | cmd | completions | exclusions |
+ | | temp, version | /^(?!temp\|version).*$/ |
+ | t | temp | /^(?!temp).*$/ |
+ | v | version | /^(?!version).*$/ |
+ | x | | /.*/ |
+ | 'tmp ' | | /.*/ |
Scenario Outline: Completion for commands without parameters
When the user enters "" into the prompt
Then completion should not propose /.*/
Examples:
- | cmd |
- | 'version ' |
- | 'version a' |
- | 'broadcast ' |
- | 'broadcast a' |
- | 'help ' |
- | 'help a' |
- | 'update ' |
- | 'update a' |
+ | cmd |
+ | 'version ' |
+ | 'version a' |
+ | 'help ' |
+ | 'help a' |
+ | 'update ' |
+ | 'update a' |
diff --git a/test/features/corner_cases.feature b/test/features/corner_cases.feature
index df27e43..23e2c16 100644
--- a/test/features/corner_cases.feature
+++ b/test/features/corner_cases.feature
@@ -12,6 +12,7 @@ Feature: Corner Cases
# TODO: add test that fails if `test` in conf.d/sdk.fish:80 errors (cf issue #28 et al.)
+ @pending # cf. issue #10
Scenario: PATH should contain only valid paths
Given candidate kscript is installed
When candidate kscript is uninstalled
diff --git a/test/features/wrapper.feature b/test/features/wrapper.feature
index 2bb6a3e..f6942f5 100644
--- a/test/features/wrapper.feature
+++ b/test/features/wrapper.feature
@@ -31,7 +31,7 @@ Feature: Wrapping of Bash
| sdk update |
| sdk use ant 1.9.9 |
| sdk offline enable > /dev/null; sdk install ant foo |
- | sdk use ant 1.9.9 > /dev/null; sdk broadcast |
+ | sdk use ant 1.9.9 > /dev/null; sdk version |
| sdk home ant 1.9.9 |
| cd /tmp/env-test; sdk env |
| cd /tmp/env-test; sdk env; sdk env clear |