From 11176317176b9f8b61c53957dd97246b06c50a01 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Fri, 16 Feb 2024 00:01:35 +0100
Subject: [PATCH] Move rr tests config back to the config/roadrunner folder

---
 bin/test/run-api-tests.sh                      | 2 +-
 .rr.test.yml => config/roadrunner/.rr.test.yml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename .rr.test.yml => config/roadrunner/.rr.test.yml (84%)

diff --git a/bin/test/run-api-tests.sh b/bin/test/run-api-tests.sh
index c90ae041..b4e38467 100755
--- a/bin/test/run-api-tests.sh
+++ b/bin/test/run-api-tests.sh
@@ -18,7 +18,7 @@ touch $OUTPUT_LOGS
 
 echo 'Starting server...'
 [ "$TEST_RUNTIME" = 'openswoole' ] && vendor/bin/laminas mezzio:swoole:start -d
-[ "$TEST_RUNTIME" = 'rr' ] && bin/rr serve -p -c=.rr.test.yml \
+[ "$TEST_RUNTIME" = 'rr' ] && bin/rr serve -p -c=config/roadrunner/.rr.test.yml -w . \
   -o=logs.output="${PWD}/${OUTPUT_LOGS}" \
   -o=logs.channels.http.output="${PWD}/${OUTPUT_LOGS}" \
   -o=logs.channels.server.output="${PWD}/${OUTPUT_LOGS}" &
diff --git a/.rr.test.yml b/config/roadrunner/.rr.test.yml
similarity index 84%
rename from .rr.test.yml
rename to config/roadrunner/.rr.test.yml
index 6925555b..f3e8bb78 100644
--- a/.rr.test.yml
+++ b/config/roadrunner/.rr.test.yml
@@ -1,9 +1,9 @@
 version: '3'
 
-###############################################################################################
-# It's important to keep this file in the project root, otherwise code coverage does not work #
-# See https://github.com/orgs/roadrunner-server/discussions/1440#discussioncomment-8486186    #
-###############################################################################################
+############################################################################################
+# Routes here need to be relative to the project root, as API tests are run with `-w .`    #
+# See https://github.com/orgs/roadrunner-server/discussions/1440#discussioncomment-8486186 #
+############################################################################################
 
 rpc:
     listen: tcp://127.0.0.1:6001