From 5da13ff15aa88b36452b0819b512ba65cf3ebe16 Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Mon, 29 Sep 2025 23:18:04 +0200
Subject: [PATCH] test: adjust integration suite

---
 tests/integration/app_deploy.bats          |  1 +
 tests/integration/app_deploy_overview.bats |  4 ++--
 tests/integration/app_rollback.bats        |  9 +++++----
 tests/integration/app_undeploy.bats        |  1 +
 tests/integration/app_upgrade.bats         | 12 ++++++------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/tests/integration/app_deploy.bats b/tests/integration/app_deploy.bats
index 76f984d4..bb39b716 100644
--- a/tests/integration/app_deploy.bats
+++ b/tests/integration/app_deploy.bats
@@ -250,6 +250,7 @@ teardown(){
   run $ABRA app deploy "$TEST_APP_DOMAIN" \
     --no-input --no-converge-checks --chaos
   assert_success
+  assert_output --regexp "NEW DEPLOYMENT.*${_get_head_hash:0:8}"
 }
 
 # bats test_tags=slow
diff --git a/tests/integration/app_deploy_overview.bats b/tests/integration/app_deploy_overview.bats
index 6abae8b4..20bfd7fc 100644
--- a/tests/integration/app_deploy_overview.bats
+++ b/tests/integration/app_deploy_overview.bats
@@ -163,7 +163,7 @@ teardown(){
   assert_success
 }
 
-@test "can not redeploy chaos version without --chaos" {
+@test "cannot redeploy chaos version without --chaos" {
   headHash=$(_get_head_hash)
   latestRelease=$(_latest_release)
 
@@ -181,7 +181,7 @@ teardown(){
   run $ABRA app deploy "$TEST_APP_DOMAIN" \
     --no-input --no-converge-checks --force --debug
   assert_failure
-  assert_output --regexp 'can not redeploy chaos version .*' + "${headHash:0:8}+U"
+  assert_output --regexp 'cannot redeploy previous chaos version .*' + "${headHash:0:8}+U"
 }
 
 @test "deploy then force commit deploy" {
diff --git a/tests/integration/app_rollback.bats b/tests/integration/app_rollback.bats
index deb9e340..eb786c6e 100644
--- a/tests/integration/app_rollback.bats
+++ b/tests/integration/app_rollback.bats
@@ -181,7 +181,7 @@ teardown(){
 }
 
 # bats test_tags=slow
-@test "rollback chaos deployment is not possible" {
+@test "rollback chaos deployment is possible" {
   tagHash=$(_get_tag_hash "0.2.0+1.21.0")
   run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" checkout "$tagHash"
   assert_success
@@ -191,12 +191,13 @@ teardown(){
   assert_output --partial "${tagHash:0:8}"
 
   run $ABRA app rollback "$TEST_APP_DOMAIN" "0.1.1+1.20.2" --no-input --no-converge-checks
-  assert_failure
-  assert_output --partial 'current deployment' + "${tagHash:0:8}" + 'is not a known version'
+  assert_success
+  assert_output --regexp "CURRENT DEPLOYMENT.*${tagHash:0:8}"
+  assert_output --regexp "ENV VERSION.*${tagHash:0:8}"
 }
 
 # bats test_tags=slow
-@test "chaos commit rollback not possible" {
+@test "specific chaos commit rollback not possible" {
   _deploy_app
 
   tagHash=$(_get_tag_hash "0.2.0+1.21.0")
diff --git a/tests/integration/app_undeploy.bats b/tests/integration/app_undeploy.bats
index f9d3ddd2..f3382380 100644
--- a/tests/integration/app_undeploy.bats
+++ b/tests/integration/app_undeploy.bats
@@ -106,6 +106,7 @@ teardown(){
 
   run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input
   assert_success
+  assert_output --regexp "CURRENT DEPLOYMENT.*${_get_head_hash:0:8}"
 }
 
 # bats test_tags=slow
diff --git a/tests/integration/app_upgrade.bats b/tests/integration/app_upgrade.bats
index 0569cbcf..b0cfd183 100644
--- a/tests/integration/app_upgrade.bats
+++ b/tests/integration/app_upgrade.bats
@@ -256,7 +256,7 @@ teardown(){
 }
 
 # bats test_tags=slow
-@test "upgrade commit deployment not possible" {
+@test "commit deploy upgrade is possible" {
   tagHash=$(_get_tag_hash "0.1.0+1.20.0")
   run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" checkout "$tagHash"
   assert_success
@@ -266,11 +266,12 @@ teardown(){
   assert_output --partial "${tagHash:0:8}"
 
   run $ABRA app upgrade "$TEST_APP_DOMAIN" "0.1.1+1.20.2" --no-input --no-converge-checks
-  assert_failure
-  assert_output --partial "not a known version"
+  assert_success
+  assert_output --regexp "CURRENT DEPLOYMENT.*${tagHash:0:8}"
+  assert_output --regexp "ENV VERSION.*${tagHash:0:8}"
 }
 
-@test "chaos commit upgrade not possible" {
+@test "chaos commit upgrade is possible" {
   run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" --no-input --no-converge-checks
   assert_success
   assert_output --partial '0.1.0+1.20.0'
@@ -278,8 +279,7 @@ teardown(){
   tagHash=$(_get_tag_hash "0.2.0+1.21.0")
 
   run $ABRA app upgrade "$TEST_APP_DOMAIN" "$tagHash" --no-input --no-converge-checks
-  assert_failure
-  assert_output --partial "not a known version"
+  assert_success
 }
 
 # bats test_tags=slow