From a5d52550840749b0123035ca22843a74aaaca091 Mon Sep 17 00:00:00 2001
From: David Shanske <david@shanske.com>
Date: Wed, 13 Nov 2024 05:28:29 +0000
Subject: [PATCH] Try eliminating redirect

---
 bin/install-cp-tests.sh | 4 ++--
 tests/bootstrap.php     | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bin/install-cp-tests.sh b/bin/install-cp-tests.sh
index 03850a1d..5586df2a 100755
--- a/bin/install-cp-tests.sh
+++ b/bin/install-cp-tests.sh
@@ -41,9 +41,9 @@ CP_RELEASE=y
 if [[ "$CP_VERSION" == latest ]]; then
 	# Find the version number of the latest release
 	download \
-		https://www.classicpress.net/latest.json \
+		https://www.classicpress.net/wp-json/cp/v1/latest \
 		"$TMPDIR/cp-latest.json"
-	CP_VERSION=$(grep -o '"version":"[^"]*' /tmp/cp-latest.json | sed 's/"version":"//')
+	CP_VERSION=$(grep -o '"version":"[^"]*' $TMPDIR/cp-latest.json | sed 's/"version":"//')
 
 	if [ -z "$CP_VERSION" ]; then
 		echo "ClassicPress version not detected correctly!"
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 451d1d6a..d703681e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,10 +1,17 @@
 <?php
 
 $_tests_dir = getenv( 'WP_TESTS_DIR' );
+if ( ! $_tests_dir ) {
+	$_tests_dir = getenv( 'CP_TESTS_DIR' );
+}
 if ( ! $_tests_dir ) {
 	$_tests_dir = rtrim( sys_get_temp_dir(), '/\\' ) . '/wordpress-tests-lib';
 }
 
+if ( ! is_dir( $_tests_dir ) ) {
+	$_tests_dir = rtrim( sys_get_temp_dir(), '/\\' ) . '/classicpress-tests-lib';
+}
+
 // Forward custom PHPUnit Polyfills configuration to PHPUnit bootstrap file.
 $_phpunit_polyfills_path = getenv( 'WP_TESTS_PHPUNIT_POLYFILLS_PATH' );
 if ( false !== $_phpunit_polyfills_path ) {