From ccc922548b372cffe67c7de5f8c51465e104e812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lys=C3=BD?= <jan.lysy@automattic.com>
Date: Fri, 26 Jul 2024 13:12:05 +0200
Subject: [PATCH] Rename test parameter from LATEST_BETA to WORDPRESS_VERSION

[PREMIUM-230]
---
 .circleci/config.yml                              | 4 ++--
 mailpoet/RoboFile.php                             | 6 +++---
 tests_env/docker/codeception/docker-entrypoint.sh | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 16ea9ce44a..71023fc0a9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -521,7 +521,7 @@ jobs:
             -e ENABLE_HPOS=<< parameters.enable_hpos >> \
             -e ENABLE_HPOS_SYNC=<< parameters.enable_hpos_sync >> \
             -e DISABLE_HPOS=<< parameters.disable_hpos >> \
-            -e LATEST_BETA=${LATEST_WP_BETA} \
+            -e WORDPRESS_VERSION=${LATEST_WP_BETA} \
             codeception_acceptance "${args[@]}"
       - run:
           name: Check exceptions
@@ -811,7 +811,7 @@ jobs:
               -e ENABLE_HPOS=<< parameters.enable_hpos >> \
               -e ENABLE_HPOS_SYNC=<< parameters.enable_hpos_sync >> \
               -e DISABLE_HPOS=<< parameters.disable_hpos >> \
-              -e LATEST_BETA=${LATEST_WP_BETA} \
+              -e WORDPRESS_VERSION=${LATEST_WP_BETA} \
               codeception_integration "${args[@]}"
       - store_test_results:
           path: tests/_output
diff --git a/mailpoet/RoboFile.php b/mailpoet/RoboFile.php
index f32eb4a2a6..ff37fb1dc4 100644
--- a/mailpoet/RoboFile.php
+++ b/mailpoet/RoboFile.php
@@ -345,7 +345,7 @@ class RoboFile extends \Robo\Tasks {
     return $this->_exec($command);
   }
 
-  public function testIntegration(array $opts = ['file' => null, 'group' => null, 'skip-group' => null, 'xml' => false, 'multisite' => false, 'debug' => false, 'skip-deps' => false, 'skip-plugins' => false, 'disable-hpos' => false, 'enable-hpos-sync' => false, 'enable-hpos' => false, 'stop-on-fail' => false, 'beta-version' => null]) {
+  public function testIntegration(array $opts = ['file' => null, 'group' => null, 'skip-group' => null, 'xml' => false, 'multisite' => false, 'debug' => false, 'skip-deps' => false, 'skip-plugins' => false, 'disable-hpos' => false, 'enable-hpos-sync' => false, 'enable-hpos' => false, 'stop-on-fail' => false, 'wordpress-version' => null]) {
     return $this->runTestsInContainer(array_merge($opts, ['test_type' => 'integration']));
   }
 
@@ -402,7 +402,7 @@ class RoboFile extends \Robo\Tasks {
     return $this->testIntegration($opts);
   }
 
-  public function testAcceptance($opts = ['file' => null, 'skip-deps' => false, 'group' => null, 'timeout' => null, 'disable-hpos' => false, 'enable-hpos-sync' => false, 'enable-hpos' => false, 'beta-version' => null]) {
+  public function testAcceptance($opts = ['file' => null, 'skip-deps' => false, 'group' => null, 'timeout' => null, 'disable-hpos' => false, 'enable-hpos-sync' => false, 'enable-hpos' => false, 'wordpress-version' => null]) {
     return $this->runTestsInContainer($opts);
   }
 
@@ -1623,7 +1623,7 @@ class RoboFile extends \Robo\Tasks {
     $this->doctrineGenerateCache();
     return $this->taskExec(
       'COMPOSE_HTTP_TIMEOUT=200 docker-compose run ' .
-      (isset($opts['beta-version']) && $opts['beta-version'] ? '-e LATEST_BETA=' . $opts['beta-version'] . ' ' : '') .
+      (isset($opts['wordpress-version']) && $opts['wordpress-version'] ? '-e WORDPRESS_VERSION=' . $opts['wordpress-version'] . ' ' : '') .
       (isset($opts['skip-deps']) && $opts['skip-deps'] ? '-e SKIP_DEPS=1 ' : '') .
       (isset($opts['disable-hpos']) && $opts['disable-hpos'] ? '-e DISABLE_HPOS=1 ' : '') .
       (isset($opts['enable-hpos-sync']) && $opts['enable-hpos-sync'] ? '-e ENABLE_HPOS_SYNC=1 ' : '') .
diff --git a/tests_env/docker/codeception/docker-entrypoint.sh b/tests_env/docker/codeception/docker-entrypoint.sh
index 4e404fca07..610c62f296 100755
--- a/tests_env/docker/codeception/docker-entrypoint.sh
+++ b/tests_env/docker/codeception/docker-entrypoint.sh
@@ -47,9 +47,9 @@ else
   wp site create --slug=$WP_TEST_MULTISITE_SLUG
 fi
 
-if [[ $LATEST_BETA != "" ]]; then
-  echo "Installing WordPress beta version: $LATEST_BETA"
-  wp core update --version=$LATEST_BETA
+if [[ $WORDPRESS_VERSION != "" ]]; then
+  echo "Installing WordPress version: $WORDPRESS_VERSION"
+  wp core update --version=$WORDPRESS_VERSION
 fi
 echo "WORDPRESS VERSION:"
 wp core version