From 1e12f0b49b8a2fe6d50c28a517591d9698ba4000 Mon Sep 17 00:00:00 2001
From: Rohit T P <tprohit9@gmail.com>
Date: Thu, 2 May 2024 16:36:10 +0000
Subject: [PATCH] chore: added skip for ssl

---
 docker-compose/setup-script/tests/configure/setup.sh  | 5 +----
 docker-compose/setup-script/tests/configure/stop.bats | 7 +++----
 docker-compose/setup-script/tests/install/ssl.bats    | 5 +++++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docker-compose/setup-script/tests/configure/setup.sh b/docker-compose/setup-script/tests/configure/setup.sh
index 346d769262..3eee2485b5 100755
--- a/docker-compose/setup-script/tests/configure/setup.sh
+++ b/docker-compose/setup-script/tests/configure/setup.sh
@@ -13,8 +13,5 @@ cd "$WORKING_DIR" || exit
 rm -rf "$NOCO_HOME"
 
 if [ "$1" = "setup" ]; then
-../noco.sh <<< $'\n\nN\n'
-
-  cd "$NOCO_HOME" || exit
-  docker compose down
+  ../noco.sh <<< $'\n\nN\n'
 fi
diff --git a/docker-compose/setup-script/tests/configure/stop.bats b/docker-compose/setup-script/tests/configure/stop.bats
index f075c23058..e9b39c3b21 100755
--- a/docker-compose/setup-script/tests/configure/stop.bats
+++ b/docker-compose/setup-script/tests/configure/stop.bats
@@ -7,7 +7,7 @@ export NOCO_HOME
 
 setup() {
   cd "${WORKING_DIR}/configure" || exit 1
-  ./setup.sh
+  ./setup.sh setup
 }
 
 teardown() {
@@ -21,7 +21,6 @@ teardown() {
     cd "${NOCO_HOME}" || exit 1
 
     # Verify container is not running
-    docker compose ps | grep -q 'redis' && exit 1
-    docker compose ps | grep -q 'watchtower' && exit 1
-    docker compose ps | grep -q 'nocodb' && exit 1
+    count=$(docker compose ps -q | wc -l)
+    [ "$count" -eq 0 ]
 }
diff --git a/docker-compose/setup-script/tests/install/ssl.bats b/docker-compose/setup-script/tests/install/ssl.bats
index 62d57be1af..1d44344072 100644
--- a/docker-compose/setup-script/tests/install/ssl.bats
+++ b/docker-compose/setup-script/tests/install/ssl.bats
@@ -15,6 +15,11 @@ teardown() {
 }
 
 @test "Should create SSL certificates" {
+    if [ -z "$TEST_SSL" ]
+    then
+        skip "Skipping SSL tests"
+    fi
+
     ../expects/install/ssl.sh "$RANDOM_NUMBER"
 
     curl -ksS --head "https://${RANDOM_NUMBER}.ssl.nocodb.dev" > /dev/null