From 47cbc562c0a9ee719789178c9c345dd7d58ecde3 Mon Sep 17 00:00:00 2001
From: Omar <omar.lopesino@metadrop.net>
Date: Mon, 1 Apr 2024 09:16:36 +0200
Subject: [PATCH] TESTS - Use docker compose instead of docker-compose

---
 .github/shellspec/shellspec_spec/folders___spec.sh | 4 ++--
 .github/shellspec/shellspec_spec/phpqa___spec.sh   | 2 +-
 .github/shellspec/shellspec_spec/spec_helper.sh    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/shellspec/shellspec_spec/folders___spec.sh b/.github/shellspec/shellspec_spec/folders___spec.sh
index e1ecae4..42da65d 100644
--- a/.github/shellspec/shellspec_spec/folders___spec.sh
+++ b/.github/shellspec/shellspec_spec/folders___spec.sh
@@ -22,8 +22,8 @@ Describe 'Boilerplate folder structure' folders
   It 'has main boilerplate files'
     The path 'composer.json' should be file
     The path 'behat.yml' should be file
-    The path 'docker-compose.yml' should be file
-    The path "docker-compose.override.yml" should be file
+    The path 'compose.yml' should be file
+    The path "compose.override.yml" should be file
     The path "web/sites/default/settings.local.php" should be file
   End
 
diff --git a/.github/shellspec/shellspec_spec/phpqa___spec.sh b/.github/shellspec/shellspec_spec/phpqa___spec.sh
index ec594ba..7d3a64e 100644
--- a/.github/shellspec/shellspec_spec/phpqa___spec.sh
+++ b/.github/shellspec/shellspec_spec/phpqa___spec.sh
@@ -7,7 +7,7 @@ Describe 'Phpqa' phpqa static-code-analisys
 # Test disabled because Radix includes a file with a phpqa error in the file
 # src/kits/radix_starterkit/includes/theme.inc
 #  It 'should detect no errors'
-#    When run command docker-compose exec php phpqa
+#    When run command docker compose exec php phpqa
 #    The status should be success
 #    The output should include 'No failed tools'
 #    The error should not include 'This is a dummy text to discard standard error output'
diff --git a/.github/shellspec/shellspec_spec/spec_helper.sh b/.github/shellspec/shellspec_spec/spec_helper.sh
index 4ec336f..8ca6590 100644
--- a/.github/shellspec/shellspec_spec/spec_helper.sh
+++ b/.github/shellspec/shellspec_spec/spec_helper.sh
@@ -30,7 +30,7 @@ spec_helper_configure() {
 # Checks if a given container is running.
 # $1: name of the container.
 container_is_alive() {
-  count=$(docker-compose ps --services --filter "status=running" | grep $1| wc -l)
+  count=$(docker compose ps --services --filter "status=running" | grep $1| wc -l)
   if [ $count  -eq "1" ]
   then
     return 0
@@ -40,6 +40,6 @@ container_is_alive() {
 }
 
 container_count() {
-  docker-compose ps --services --filter "status=running" | wc -l
+  docker compose ps --services --filter "status=running" | wc -l
 }