test: align triplet tests with actual plugin behavior
Fixes CI failures from the prior commit's bats additions. storage report mounts are prefixed with `-v `, logs.bats setup does not auto-create the test app, the nginx-vhosts shell report emits JSON keys without the `nginx-` plugin prefix, registry computed-image-repo falls back to the default `dokku/<app>` repo name when no template is set, cron computed-maintenance follows OR-not-override semantics so a per-app `false` does not override a global `true`, the scheduler subcommand help string is `Manage scheduler settings`, and bringing ps procfile-path into the #8640 raw convention required updating the pre-existing `(ps:set) procfile` assertion. Also extends fn-git-keep-git-dir to fall back through the global property before the built-in default so global keep-git-dir actually takes effect at deploy time.
This commit is contained in:
@@ -624,8 +624,11 @@ fn-git-keep-git-dir() {
|
||||
local DEFAULT_KEEP_GIT_DIR="${2-false}"
|
||||
|
||||
local DOKKU_KEEP_GIT_DIR="$(fn-plugin-property-get "git" "$APP" "keep-git-dir" "")"
|
||||
local DOKKU_GLOBAL_KEEP_GIT_DIR="$(fn-plugin-property-get "git" "--global" "keep-git-dir" "")"
|
||||
if [[ -n "$DOKKU_KEEP_GIT_DIR" ]]; then
|
||||
echo "$DOKKU_KEEP_GIT_DIR"
|
||||
elif [[ -n "$DOKKU_GLOBAL_KEEP_GIT_DIR" ]]; then
|
||||
echo "$DOKKU_GLOBAL_KEEP_GIT_DIR"
|
||||
else
|
||||
echo "$DEFAULT_KEEP_GIT_DIR"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user