Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Rename test parameter from LATEST_BETA to WORDPRESS_VERSION

Browse Source 
[PREMIUM-230]
This commit is contained in:
Jan Lysý
2024-07-26 13:12:05 +02:00
committed by alex-mpoet
parent a2f35526fa
commit ccc922548b
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -521,7 +521,7 @@ jobs:
-e ENABLE_HPOS=<< parameters.enable_hpos >> \ -e ENABLE_HPOS=<< parameters.enable_hpos >> \
-e ENABLE_HPOS_SYNC=<< parameters.enable_hpos_sync >> \ -e ENABLE_HPOS_SYNC=<< parameters.enable_hpos_sync >> \
-e DISABLE_HPOS=<< parameters.disable_hpos >> \ -e DISABLE_HPOS=<< parameters.disable_hpos >> \
-e LATEST_BETA=${LATEST_WP_BETA} \ -e WORDPRESS_VERSION=${LATEST_WP_BETA} \
codeception_acceptance "${args[@]}" codeception_acceptance "${args[@]}"
- run: - run:
name: Check exceptions name: Check exceptions
@ -811,7 +811,7 @@ jobs:
-e ENABLE_HPOS=<< parameters.enable_hpos >> \ -e ENABLE_HPOS=<< parameters.enable_hpos >> \
-e ENABLE_HPOS_SYNC=<< parameters.enable_hpos_sync >> \ -e ENABLE_HPOS_SYNC=<< parameters.enable_hpos_sync >> \
-e DISABLE_HPOS=<< parameters.disable_hpos >> \ -e DISABLE_HPOS=<< parameters.disable_hpos >> \
-e LATEST_BETA=${LATEST_WP_BETA} \ -e WORDPRESS_VERSION=${LATEST_WP_BETA} \
codeception_integration "${args[@]}" codeception_integration "${args[@]}"
- store_test_results: - store_test_results:
path: tests/_output path: tests/_output

6
mailpoet/RoboFile.php
View File

@ -345,7 +345,7 @@ class RoboFile extends \Robo\Tasks {
return $this->_exec($command); 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'])); return $this->runTestsInContainer(array_merge($opts, ['test_type' => 'integration']));
} }
@ -402,7 +402,7 @@ class RoboFile extends \Robo\Tasks {
return $this->testIntegration($opts); 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); return $this->runTestsInContainer($opts);
} }
@ -1623,7 +1623,7 @@ class RoboFile extends \Robo\Tasks {
$this->doctrineGenerateCache(); $this->doctrineGenerateCache();
return $this->taskExec( return $this->taskExec(
'COMPOSE_HTTP_TIMEOUT=200 docker-compose run ' . '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['skip-deps']) && $opts['skip-deps'] ? '-e SKIP_DEPS=1 ' : '') .
(isset($opts['disable-hpos']) && $opts['disable-hpos'] ? '-e DISABLE_HPOS=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 ' : '') . (isset($opts['enable-hpos-sync']) && $opts['enable-hpos-sync'] ? '-e ENABLE_HPOS_SYNC=1 ' : '') .

6
tests_env/docker/codeception/docker-entrypoint.sh
View File

@ -47,9 +47,9 @@ else
wp site create --slug=$WP_TEST_MULTISITE_SLUG wp site create --slug=$WP_TEST_MULTISITE_SLUG
fi fi
if [[ $LATEST_BETA != "" ]]; then if [[ $WORDPRESS_VERSION != "" ]]; then
echo "Installing WordPress beta version: $LATEST_BETA" echo "Installing WordPress version: $WORDPRESS_VERSION"
wp core update --version=$LATEST_BETA wp core update --version=$WORDPRESS_VERSION
fi fi
echo "WORDPRESS VERSION:" echo "WORDPRESS VERSION:"
wp core version wp core version