Merge pull request #815 from WordPress/fix/replace-heroku-with-render

Replace Heroku test-server with Render alternative

.github/workflows/quicktest.yml

@@ -75,8 +75,8 @@ jobs:
           echo "REQUESTS_HTTP_PROXY_AUTH_USER=test" >> $GITHUB_ENV
           echo "REQUESTS_HTTP_PROXY_AUTH_PASS=pass" >> $GITHUB_ENV
 
-      - name: Ensure the HTTPS test instance on Heroku is spun up
-        run: curl -s -I http://requests-php-tests.herokuapp.com/ > /dev/null
+      - name: Ensure the HTTPS test instance on Render is spun up
+        run: curl -s -I https://requests-test-server.onrender.com/ > /dev/null
 
       - name: Check mitmproxy version
         run: mitmdump --version

.github/workflows/test.yml

@@ -99,8 +99,8 @@ jobs:
           echo "REQUESTS_HTTP_PROXY_AUTH_USER=test" >> $GITHUB_ENV
           echo "REQUESTS_HTTP_PROXY_AUTH_PASS=pass" >> $GITHUB_ENV
 
-      - name: Ensure the HTTPS test instance on Heroku is spun up
-        run: curl -s -I http://requests-php-tests.herokuapp.com/ > /dev/null
+      - name: Ensure the HTTPS test instance on Render is spun up
+        run: curl -s -I https://requests-test-server.onrender.com/ > /dev/null
 
       - name: Check mitmproxy version
         run: mitmdump --version

tests/EnvironmentTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace WpOrg\Requests\Tests;
+
+use WpOrg\Requests\Tests\TestCase;
+
+final class EnvironmentTest extends TestCase {
+
+	/**
+	 * Tests whether the HTTP test server is available.
+	 *
+	 * This makes sure that the build actually fails when the HTTP test
+	 * server is not available, as all tests relying on it further down
+	 * the line will just be marked as skipped.
+	 *
+	 * @return void
+	 */
+	public function testHttpTestServerAvailable() {
+		$this->assertTrue(\REQUESTS_TEST_SERVER_HTTP_AVAILABLE);
+	}
+
+	/**
+	 * Tests whether the HTTPS test server is available.
+	 *
+	 * This makes sure that the build actually fails when the HTTPS test
+	 * server is not available, as all tests relying on it further down
+	 * the line will just be marked as skipped.
+	 *
+	 * @return void
+	 */
+	public function testHttpsTestServerAvailable() {
+		$this->assertTrue(\REQUESTS_TEST_SERVER_HTTPS_AVAILABLE);
+	}
+}

tests/bootstrap.php

@@ -11,7 +11,7 @@ function define_from_env($name, $fallback = false) {
 	}
 }
 
-define_from_env('REQUESTS_TEST_HOST', 'requests-php-tests.herokuapp.com');
+define_from_env('REQUESTS_TEST_HOST', 'requests-test-server.onrender.com');
 define_from_env('REQUESTS_TEST_HOST_HTTP', REQUESTS_TEST_HOST);
 define_from_env('REQUESTS_TEST_HOST_HTTPS', REQUESTS_TEST_HOST);