From 316b59b465b7cc6e0ab09edfc25760d81fb9a424 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 27 Nov 2023 10:41:46 +0100 Subject: [PATCH] test: support local-first testing Cherry-picked from https://git.coopcloud.tech/coop-cloud/abra/pulls/389 Thanks @p4u1. --- tests/integration/helpers/common.bash | 6 +++--- tests/integration/helpers/server.bash | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/integration/helpers/common.bash b/tests/integration/helpers/common.bash index 66876a2b..a97d3e94 100644 --- a/tests/integration/helpers/common.bash +++ b/tests/integration/helpers/common.bash @@ -1,9 +1,9 @@ #!/usr/bin/env bash _common_setup() { - load '/usr/lib/bats/bats-support/load' - load '/usr/lib/bats/bats-assert/load' - load '/usr/lib/bats/bats-file/load' + bats_load_library bats-support + bats_load_library bats-assert + bats_load_library bats-file load "$PWD/tests/integration/helpers/app" load "$PWD/tests/integration/helpers/git" diff --git a/tests/integration/helpers/server.bash b/tests/integration/helpers/server.bash index edeb9115..3c6c74d7 100644 --- a/tests/integration/helpers/server.bash +++ b/tests/integration/helpers/server.bash @@ -1,7 +1,11 @@ #!/usr/bin/env bash _add_server() { - run $ABRA server add "$TEST_SERVER" + if [[ "$TEST_SERVER" == "default" ]]; then + run $ABRA server add -l + else + run $ABRA server add "$TEST_SERVER" + fi assert_success assert_exists "$ABRA_DIR/servers/$TEST_SERVER" }