github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: correct tests and handle a few edge cases in remote command usage

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2023-01-14 19:49:14 -05:00
parent 9d380e5654
commit a4136f4719
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/dokku_client.sh
View File

@@ -168,11 +168,18 @@ main() {
remote:remove) remote:remove)
shift 1 shift 1
git remote remove "$@" git remote remove "$@"
exit "$?" local exit_code="$?"
if [[ "$(git config dokku.remote)" == "$1" ]]; then
git config --unset dokku.remote
fi
exit "$exit_code"
;; ;;
remote:unset) remote:unset)
git config --unset dokku.remote if [[ -n "$(git config dokku.remote)" ]]; then
exit "$?" git config --unset dokku.remote
exit "$?"
fi
exit 0
;; ;;
esac esac

8
tests/unit/client.bats
View File

@@ -265,13 +265,12 @@ teardown() {
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success
assert_output "dokku2"
run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh remote:list" run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh remote:list"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success
assert_output "dokku\dokku2" assert_output "$(printf "dokku\ndokku2")"
run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh remote:remove dokku2" run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh remote:remove dokku2"
echo "output: $output" echo "output: $output"
@@ -289,6 +288,11 @@ teardown() {
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh remote:unset"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh remote" run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh remote"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"