From fb5c34158b993a12cf36a7fbe96587ecb6910759 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 20 Feb 2023 23:35:12 -0500 Subject: [PATCH] chore: make all the service names used in the service_link tests the same --- tests/service_link.bats | 60 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/service_link.bats b/tests/service_link.bats index eda2626..afbc9df 100755 --- a/tests/service_link.bats +++ b/tests/service_link.bats @@ -2,14 +2,14 @@ load test_helper setup() { - dokku "$PLUGIN_COMMAND_PREFIX:create" l - dokku "$PLUGIN_COMMAND_PREFIX:create" m + dokku "$PLUGIN_COMMAND_PREFIX:create" ls + dokku "$PLUGIN_COMMAND_PREFIX:create" ms dokku apps:create my-app } teardown() { - dokku --force "$PLUGIN_COMMAND_PREFIX:destroy" m - dokku --force "$PLUGIN_COMMAND_PREFIX:destroy" l + dokku --force "$PLUGIN_COMMAND_PREFIX:destroy" ms + dokku --force "$PLUGIN_COMMAND_PREFIX:destroy" ls dokku --force apps:destroy my-app } @@ -22,7 +22,7 @@ teardown() { } @test "($PLUGIN_COMMAND_PREFIX:link) error when the app argument is missing" { - run dokku "$PLUGIN_COMMAND_PREFIX:link" l + run dokku "$PLUGIN_COMMAND_PREFIX:link" ls echo "output: $output" echo "status: $status" assert_contains "${lines[*]}" "Please specify an app to run the command on" @@ -30,7 +30,7 @@ teardown() { } @test "($PLUGIN_COMMAND_PREFIX:link) error when the app does not exist" { - run dokku "$PLUGIN_COMMAND_PREFIX:link" l not_existing_app + run dokku "$PLUGIN_COMMAND_PREFIX:link" ls not_existing_app echo "output: $output" echo "status: $status" assert_contains "${lines[*]}" "App not_existing_app does not exist" @@ -46,73 +46,73 @@ teardown() { } @test "($PLUGIN_COMMAND_PREFIX:link) error when the service is already linked to app" { - dokku "$PLUGIN_COMMAND_PREFIX:link" l my-app - run dokku "$PLUGIN_COMMAND_PREFIX:link" l my-app + dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app + run dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app echo "output: $output" echo "status: $status" assert_contains "${lines[*]}" "Already linked as DATABASE_URL" assert_failure - dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my-app + dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app } @test "($PLUGIN_COMMAND_PREFIX:link) exports DATABASE_URL to app" { - run dokku "$PLUGIN_COMMAND_PREFIX:link" l my-app + run dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app echo "output: $output" echo "status: $status" url=$(dokku config:get my-app DATABASE_URL) - password="$(sudo cat "$PLUGIN_DATA_ROOT/l/PASSWORD")" - assert_contains "$url" "postgres://postgres:$password@dokku-postgres-l:5432/l" + password="$(sudo cat "$PLUGIN_DATA_ROOT/ls/PASSWORD")" + assert_contains "$url" "postgres://postgres:$password@dokku-postgres-ls:5432/ls" assert_success - dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my-app + dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app } @test "($PLUGIN_COMMAND_PREFIX:link) generates an alternate config url when DATABASE_URL already in use" { dokku config:set my-app DATABASE_URL=postgres://user:pass@host:5432/db - dokku "$PLUGIN_COMMAND_PREFIX:link" l my-app + dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app run dokku config my-app assert_contains "${lines[*]}" "DOKKU_POSTGRES_AQUA_URL" assert_success - dokku "$PLUGIN_COMMAND_PREFIX:link" m my-app + dokku "$PLUGIN_COMMAND_PREFIX:link" ms my-app run dokku config my-app assert_contains "${lines[*]}" "DOKKU_POSTGRES_BLACK_URL" assert_success - dokku "$PLUGIN_COMMAND_PREFIX:unlink" m my-app - dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my-app + dokku "$PLUGIN_COMMAND_PREFIX:unlink" ms my-app + dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app } @test "($PLUGIN_COMMAND_PREFIX:link) links to app with docker-options" { - dokku "$PLUGIN_COMMAND_PREFIX:link" l my-app + dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app run dokku docker-options:report my-app - assert_contains "${lines[*]}" "--link dokku.postgres.l:dokku-postgres-l" + assert_contains "${lines[*]}" "--link dokku.postgres.ls:dokku-postgres-ls" assert_success - dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my-app + dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app } @test "($PLUGIN_COMMAND_PREFIX:link) uses apps POSTGRES_DATABASE_SCHEME variable" { dokku config:set my-app POSTGRES_DATABASE_SCHEME=postgres2 - dokku "$PLUGIN_COMMAND_PREFIX:link" l my-app + dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app url=$(dokku config:get my-app DATABASE_URL) - password="$(sudo cat "$PLUGIN_DATA_ROOT/l/PASSWORD")" - assert_contains "$url" "postgres2://postgres:$password@dokku-postgres-l:5432/l" + password="$(sudo cat "$PLUGIN_DATA_ROOT/ls/PASSWORD")" + assert_contains "$url" "postgres2://postgres:$password@dokku-postgres-ls:5432/ls" assert_success - dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my-app + dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app } @test "($PLUGIN_COMMAND_PREFIX:link) adds a querystring" { - dokku "$PLUGIN_COMMAND_PREFIX:link" l my-app --querystring "pool=5" + dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app --querystring "pool=5" url=$(dokku config:get my-app DATABASE_URL) assert_contains "$url" "?pool=5" assert_success - dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my-app + dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app } @test "($PLUGIN_COMMAND_PREFIX:link) uses a specified config url when alias is specified" { - dokku "$PLUGIN_COMMAND_PREFIX:link" l my-app --alias "ALIAS" + dokku "$PLUGIN_COMMAND_PREFIX:link" ls my-app --alias "ALIAS" url=$(dokku config:get my-app ALIAS_URL) - password="$(sudo cat "$PLUGIN_DATA_ROOT/l/PASSWORD")" - assert_contains "$url" "postgres://postgres:$password@dokku-postgres-l:5432/l" + password="$(sudo cat "$PLUGIN_DATA_ROOT/ls/PASSWORD")" + assert_contains "$url" "postgres://postgres:$password@dokku-postgres-ls:5432/ls" assert_success - dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my-app + dokku "$PLUGIN_COMMAND_PREFIX:unlink" ls my-app }