Skip to content

Commit

Permalink
TESTS - Use docker compose instead of docker-compose
Browse files Browse the repository at this point in the history
  • Loading branch information
omarlopesino committed Apr 1, 2024
1 parent 1b88718 commit 47cbc56
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/shellspec/shellspec_spec/folders___spec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/shellspec/shellspec_spec/phpqa___spec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/shellspec/shellspec_spec/spec_helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}

0 comments on commit 47cbc56

Please sign in to comment.