Docker configuration updated

Author: kidunot89

.env.dist

@@ -28,4 +28,4 @@ TESTS_ENVS=tests/_envs
 
 CORE_BRANCH=develop
 JWT_AUTH_BRANCH=master
-SKIP_PCOV_CLOBBER_CLEANUP=false
+SKIP_TEST_CLEANUP=0

bin/testing-entrypoint.sh

@@ -44,9 +44,9 @@ dockerize \
     -timeout 1m
 
 # Download c3 for testing.
-if [ ! -f "${PROJECT_DIR}/c3.php" ]; then
-    echo 'Downloading c3.php'
-    curl -L 'https://raw.github.com/Codeception/c3/2.0/c3.php' > "${PROJECT_DIR}/c3.php"
+if [ ! -f "$PROJECT_DIR/c3.php" ]; then
+    echo "Downloading Codeception's c3.php"
+    curl -L 'https://raw.github.com/Codeception/c3/2.0/c3.php' > "$PROJECT_DIR/c3.php"
 fi
 
 # Install dependencies
@@ -68,14 +68,20 @@ chmod 777 ${TESTS_OUTPUT}
 # Run tests
 run_tests ${SUITES}
 
+# Remove c3.php
+if [ -f "$PROJECT_DIR/c3.php" ] && [ "$SKIP_TESTS_CLEANUP" != "1" ]; then
+    echo "Removing Codeception's c3.php"
+    rm -rf "$PROJECT_DIR/c3.php"
+fi
+
 # Clean coverage.xml and clean up PCOV configurations.
 if [ -f "${TESTS_OUTPUT}/coverage.xml" ] && [[ "$COVERAGE" == "1" ]]; then
     echo 'Cleaning coverage.xml for deployment'.
     pattern="$PROJECT_DIR/"
     sed -i "s~$pattern~~g" "$TESTS_OUTPUT"/coverage.xml
 
     # Remove pcov/clobber
-    if version_gt $PHP_VERSION 7.0 && [ ${SKIP_PCOV_CLOBBER_CLEANUP} != "true" ]; then
+    if version_gt $PHP_VERSION 7.0 && [ "$SKIP_TESTS_CLEANUP" != "1" ]; then
         echo 'Removing pcov/clobber.'
         vendor/bin/pcov unclobber
         COMPOSER_MEMORY_LIMIT=-1 composer remove --dev pcov/clobber

codeception.dist.yml

@@ -14,17 +14,15 @@ settings:
 coverage:
     enabled: true
     remote: false
-    work_dir: '%WP_ROOT_FOLDER%/wp-content/plugins/wp-graphql-woocommerce'
     c3_url: '%WP_URL%/wp-content/plugins/wp-graphql-woocommerce/wp-graphql-woocommerce.php'
-    whitelist:
-      include:
+    include:
+        - includes/*
+    exclude:
         - wp-graphql-woocommerce.php
         - access-functions.php
         - class-inflect.php
-        - includes/*.php
-    remote_context_options:
-        http:
-            timeout: 90
+        - vendor/*
+    show_only_summary: false
 extensions:
     enabled:
         - Codeception\Extension\RunFailed

docker-compose.yml

@@ -49,6 +49,7 @@ services:
       - './.log/testing:/var/log/apache2'
     env_file: .env.dist
     environment:
+      XDEBUG_CONFIG: remote_host=host.docker.internal remote_port=9000 remote_enable=1
       WPGRAPHQL_WOOCOMMERCE_AUTOLOAD: 1
       DB_HOST: app_db
       WP_URL: 'http://localhost'

tests/_support/Helper/GraphQLE2E.php

@@ -598,9 +598,8 @@ public function sendGraphQLRequest( $query, $input, $request_headers = array() )
         }
 
         // Send request.
-        $wp_url = getenv( 'WP_URL' );
         $rest->sendPOST(
-            "{$wp_url}/graphql",
+            "/graphql",
             json_encode(
                 array(
                     'query'     => $query,

wp-graphql-woocommerce.php

@@ -26,11 +26,11 @@
  *
  * This file should only exist locally or when CI bootstraps the environment for testing
  */
-if ( file_exists( plugin_dir_path( __FILE__ ) . '/c3.php' ) ) {
+if ( file_exists( __DIR__ . '/c3.php' ) ) {
 	// Get tests output directory.
-	$test_dir = plugin_dir_path( __FILE__ ) . '/tests/output';
+	$test_dir = __DIR__ . '/tests/output';
 	define( 'C3_CODECOVERAGE_ERROR_LOG_FILE', $test_dir . '/c3_error.log' );
-	require_once plugin_dir_path( __FILE__ ) . '/c3.php';
+	require_once __DIR__ . '/c3.php';
 }
 
 /**