Merge branch 'trunk' into update/webfinger-endpoint

Automattic · Jan 9, 2025 · 049a6a1 · 049a6a1
2 parents 42e7690 + 2cbdfb8
commit 049a6a1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/.wp-env.json b/.wp-env.json
@@ -8,6 +8,7 @@
 				"WP_SITEURL": "http://example.org",
 				"WP_HOME": "http://example.org"
 			},
+			"port": 80,
 			"mappings": {
 				"wp-content/plugins/activitypub": ".",
 				"wp-content/plugins/activitypub/tests": "./tests"

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -7,11 +7,6 @@
 
 \define( 'ACTIVITYPUB_DISABLE_INCOMING_INTERACTIONS', false );
 
-// Defined here because setting them in .wp-env.json doesn't work for some reason.
-\define( 'WP_TESTS_DOMAIN', 'example.org' );
-\define( 'WP_SITEURL', 'http://example.org' );
-\define( 'WP_HOME', 'http://example.org' );
-
 \define( 'AP_TESTS_DIR', __DIR__ );
 $_tests_dir = \getenv( 'WP_TESTS_DIR' );