From 17a990c94d25f28f566d6601a547321dd99bc966 Mon Sep 17 00:00:00 2001 From: Rostislav Wolny Date: Thu, 22 Sep 2022 14:42:04 +0200 Subject: [PATCH] Fix premium plugin detection When mounted the plugin was mounted directly to the plugin folder get_plugins() function ignored it. We had a similar issue in the past when we were using a softlink. Copying the plugin is a workaround that fixes the issue. [MAILPOET-4662] --- mailpoet/tests/docker/codeception/docker-entrypoint.sh | 2 ++ mailpoet/tests/docker/docker-compose.yml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mailpoet/tests/docker/codeception/docker-entrypoint.sh b/mailpoet/tests/docker/codeception/docker-entrypoint.sh index 7bf1046a63..ad29a3e36c 100755 --- a/mailpoet/tests/docker/codeception/docker-entrypoint.sh +++ b/mailpoet/tests/docker/codeception/docker-entrypoint.sh @@ -192,6 +192,8 @@ if [[ $MULTISITE == "1" ]]; then fi if [[ $CIRCLE_JOB == *"_with_premium_"* ]]; then + # Copy MailPoet Premium to plugin path + cp -r -n /project/mailpoet-premium /wp-core/wp-content/plugins/mailpoet-premium # Activate MailPoet Premium wp plugin activate mailpoet-premium fi diff --git a/mailpoet/tests/docker/docker-compose.yml b/mailpoet/tests/docker/docker-compose.yml index 0e74f6aafa..0b4b137478 100644 --- a/mailpoet/tests/docker/docker-compose.yml +++ b/mailpoet/tests/docker/docker-compose.yml @@ -12,7 +12,7 @@ services: - mailhog-data:/mailhog-data - ../..:/project - ../..:/wp-core/wp-content/plugins/mailpoet - - ../../../mailpoet-premium:/wp-core/wp-content/plugins/mailpoet-premium + - ../../../mailpoet-premium:/project/mailpoet-premium - ./codeception/docker-entrypoint.sh:/docker-entrypoint.sh - ../../../dev/php.ini:/usr/local/etc/php/conf.d/php_user.ini - ../../../dev/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini @@ -39,7 +39,7 @@ services: - mailhog-data:/mailhog-data - ../..:/project - ../..:/wp-core/wp-content/plugins/mailpoet - - ../../../mailpoet-premium:/wp-core/wp-content/plugins/mailpoet-premium + - ../../../mailpoet-premium:/project/mailpoet-premium - ./codeception/docker-entrypoint.sh:/docker-entrypoint.sh - ../../../dev/php.ini:/usr/local/etc/php/conf.d/php_user.ini - ../../../dev/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini @@ -77,7 +77,7 @@ services: volumes: - wp-core:/var/www/html - ../..:/var/www/html/wp-content/plugins/mailpoet - - ../../../mailpoet-premium:/wp-core/wp-content/plugins/mailpoet-premium + - ../../../mailpoet-premium:/project/mailpoet-premium tmpfs: - /var/www/html/wp-content/uploads/mailpoet/ ports: