From deb4293fba78cc48bdfb12392ff08ab2bda88dd0 Mon Sep 17 00:00:00 2001
From: p4u1 <p4u1_f4u1@riseup.net>
Date: Fri, 23 Feb 2024 14:51:10 +0100
Subject: [PATCH] wip try to get tests running

---
 cli/app/list.go                    |  9 ++++++---
 tests/integration/helpers/app.bash | 24 +++++++++++++-----------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/cli/app/list.go b/cli/app/list.go
index 39bc3325..d7389369 100644
--- a/cli/app/list.go
+++ b/cli/app/list.go
@@ -18,14 +18,16 @@ import (
 
 var status bool
 var statusFlag = &cli.BoolFlag{
-	Name:        "status, S",
+	Name:        "status",
+	Aliases:     []string{"S"},
 	Usage:       "Show app deployment status",
 	Destination: &status,
 }
 
 var recipeFilter string
 var recipeFlag = &cli.StringFlag{
-	Name:        "recipe, r",
+	Name:        "recipe",
+	Aliases:     []string{"r"},
 	Value:       "",
 	Usage:       "Show apps of a specific recipe",
 	Destination: &recipeFilter,
@@ -33,7 +35,8 @@ var recipeFlag = &cli.StringFlag{
 
 var listAppServer string
 var listAppServerFlag = &cli.StringFlag{
-	Name:        "server, s",
+	Name:        "server",
+	Aliases:     []string{"s"},
 	Value:       "",
 	Usage:       "Show apps of a specific server",
 	Destination: &listAppServer,
diff --git a/tests/integration/helpers/app.bash b/tests/integration/helpers/app.bash
index ee3e30f6..a6c2420e 100644
--- a/tests/integration/helpers/app.bash
+++ b/tests/integration/helpers/app.bash
@@ -1,30 +1,31 @@
 #!/usr/bin/env bash
 
 _new_app() {
-  run $ABRA app new "$TEST_RECIPE" \
+  run $ABRA app new \
     --no-input \
     --server "$TEST_SERVER" \
     --domain "$TEST_APP_DOMAIN" \
-    --secrets
+    --secrets \
+    "$TEST_RECIPE"
   assert_success
   assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
 }
 
 _deploy_app() {
-  run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input
+  run $ABRA app deploy --no-input "$TEST_APP_DOMAIN"
   assert_success
 
-  run $ABRA app ls --server "$TEST_SERVER" --status
+  run $ABRA app --server "$TEST_SERVER" --status
   assert_success
   assert_output --partial "$TEST_APP_DOMAIN"
   assert_output --partial 'deployed'
 }
 
 _undeploy_app() {
-  run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input
+  run $ABRA app undeploy --no-input "$TEST_APP_DOMAIN"
   assert_success
 
-  run $ABRA app ls --server "$TEST_SERVER" --status
+  run $ABRA app ls --server "$TEST_SERVER" --status 
   assert_success
   assert_output --partial "$TEST_APP_DOMAIN"
   assert_output --partial 'unknown'
@@ -34,10 +35,10 @@ _rm_app() {
   # NOTE(d1): not asserting outcomes on teardown here since some might fail
   # depending on what the test created. all commands run through anyway
   if [[ -f "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env" ]]; then
-    run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input
-    run $ABRA app secret remove "$TEST_APP_DOMAIN" --all --no-input
-    run $ABRA app volume remove "$TEST_APP_DOMAIN" --no-input
-    run $ABRA app remove "$TEST_APP_DOMAIN" --no-input
+    run $ABRA app undeploy --no-input "$TEST_APP_DOMAIN"
+    run $ABRA app secret remove --all --no-input "$TEST_APP_DOMAIN"
+    run $ABRA app volume remove --no-input "$TEST_APP_DOMAIN"
+    run $ABRA app remove --no-input "$TEST_APP_DOMAIN"
   fi
 }
 
@@ -46,10 +47,11 @@ _reset_app(){
   assert_success
   assert_not_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
 
-  run $ABRA app new "$TEST_RECIPE" \
+  run $ABRA app new \
     --no-input \
     --server "$TEST_SERVER" \
     --domain "$TEST_APP_DOMAIN" \
+    "$TEST_RECIPE"
   assert_success
   assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
 }