From 7f910b4e5b4234da5aad3e3dbe0c5bb244446b4d Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Tue, 9 Jul 2024 11:34:20 +0200
Subject: [PATCH] test: recipe test fixups

---
 tests/integration/recipe_new.bats | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/tests/integration/recipe_new.bats b/tests/integration/recipe_new.bats
index 3a269be61..b0e74faf1 100644
--- a/tests/integration/recipe_new.bats
+++ b/tests/integration/recipe_new.bats
@@ -16,6 +16,14 @@ setup(){
 }
 
 teardown(){
+  if [[ -f "$ABRA_DIR/servers/$TEST_SERVER/foobar.$TEST_SERVER.env" ]]; then
+    run $ABRA app undeploy "foobar.$TEST_SERVER" --no-input
+    assert_success
+
+    run $ABRA app rm "foobar.$TEST_SERVER" --no-input
+    assert_success
+  fi
+
   if [[ -d "$ABRA_DIR/recipes/foobar" ]]; then
     run rm -rf "$ABRA_DIR/recipes/foobar"
     assert_success
@@ -25,26 +33,32 @@ teardown(){
 @test "create new recipe" {
   run $ABRA recipe new foobar
   assert_success
-  assert_output --partial 'Your new foobar recipe has been created'
+  assert_output --partial "new recipe 'foobar' created"
   assert_exists "$ABRA_DIR/recipes/foobar"
 }
 
+# bats test_tags=slow
 @test "create new app from new recipe" {
   run $ABRA recipe new foobar
   assert_success
+  assert_exists "$ABRA_DIR/recipes/foobar"
 
   run $ABRA app new foobar \
     --no-input \
     --server "$TEST_SERVER" \
     --domain "foobar.$TEST_SERVER"
   assert_success
-  assert_output --partial 'A new foobar app has been created!'
+  assert_output --partial "new app 'foobar' created"
+
+  run $ABRA app deploy "foobar.$TEST_SERVER" --no-input
+  assert_success
+  assert_output --partial 'using latest commit'
 }
 
 @test "create new recipe with git credentials" {
   run $ABRA recipe new foobar --git-name fooUser --git-email foo@example.com
   assert_success
-  assert_output --partial 'Your new foobar recipe has been created'
+  assert_output --partial "new recipe 'foobar' created"
   assert_exists "$ABRA_DIR/recipes/foobar"
 
   run bash -c 'git -C "$ABRA_DIR/recipes/foobar" log -n 1'