From 889d237669823b9dfcd32237fd42361ef360fce7 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 17 Sep 2025 00:58:46 -0400
Subject: [PATCH] chore: combine tests and ensure that pack is selected

---
 tests/unit/builder-pack.bats | 23 +++++++++++++++++++++++
 tests/unit/ps-cnb.bats       | 35 -----------------------------------
 2 files changed, 23 insertions(+), 35 deletions(-)
 delete mode 100644 tests/unit/ps-cnb.bats

diff --git a/tests/unit/builder-pack.bats b/tests/unit/builder-pack.bats
index 3becd43a6..fad2052fb 100644
--- a/tests/unit/builder-pack.bats
+++ b/tests/unit/builder-pack.bats
@@ -103,3 +103,26 @@ teardown() {
   echo "status: $status"
   assert_success
 }
+
+@test "(ps) cnb env vars" {
+  run /bin/bash -c "dokku config:set $TEST_APP APP_RESPECTS_ENV_VARS=1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku builder:set $TEST_APP selected pack"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run deploy_app python dokku@$DOKKU_DOMAIN:$TEST_APP add_requirements_txt_cnb
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "curl $(dokku url $TEST_APP)/env"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains '"APP_RESPECTS_ENV_VARS": "1"'
+}
diff --git a/tests/unit/ps-cnb.bats b/tests/unit/ps-cnb.bats
deleted file mode 100644
index 25fe17e42..000000000
--- a/tests/unit/ps-cnb.bats
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-setup_file() {
-  install_pack
-}
-
-setup() {
-  global_setup
-  create_app
-}
-
-teardown() {
-  destroy_app
-  global_teardown
-}
-
-@test "(ps) cnb env vars" {
-  run /bin/bash -c "dokku config:set $TEST_APP APP_RESPECTS_ENV_VARS=1"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run deploy_app python dokku@$DOKKU_DOMAIN:$TEST_APP add_requirements_txt_cnb
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "curl $(dokku url $TEST_APP)/env"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-  assert_output_contains '"APP_RESPECTS_ENV_VARS": "1"'
-}