Compare commits

..

30 commits

Author SHA1 Message Date
3e5ee2d045 test
All checks were successful
PHP Code Checker / PHP Code Checker (pull_request) Successful in 37s
PHPUnit / PHPUnit – PHP 8.1 (pull_request) Successful in 56s
PHPUnit / PHPUnit – PHP 8.2 (pull_request) Successful in 1m0s
PHPUnit / PHPUnit – PHP 8.3 (pull_request) Successful in 54s
2024-09-21 14:01:49 +02:00
b4e6fef665 test
Some checks failed
PHP Code Checker / PHP Code Checker (pull_request) Successful in 1m15s
Unit Testing / PHPUnit – PHP 8.1 (pull_request) Successful in 1m47s
Unit Testing / PHPUnit – PHP 8.2 (pull_request) Failing after 1m24s
Unit Testing / PHPUnit – PHP 8.3 (pull_request) Failing after 1m5s
2024-09-21 13:44:44 +02:00
943dcd8cb5 test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 51s
Unit Testing / PHPUnit – PHP 8.2 (pull_request) Failing after 6m18s
Unit Testing / PHPUnit – PHP 8.1 (pull_request) Successful in 6m24s
Unit Testing / PHPUnit – PHP 8.3 (pull_request) Failing after 6m5s
2024-09-21 13:42:19 +02:00
e0b66de594 test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Has been cancelled
Unit Testing / Run PHPUnit 8.1 (pull_request) Has been cancelled
Unit Testing / Run PHPUnit 8.2 (pull_request) Has been cancelled
Unit Testing / Run PHPUnit 8.3 (pull_request) Has been cancelled
2024-09-21 13:41:17 +02:00
9a4351dc70 better naming of jobs
Some checks failed
Unit Testing / Run PHPunit (pull_request) Has been cancelled
PHP Code Checker / Run PHP Code Checker (pull_request) Has been cancelled
2024-09-21 13:37:49 +02:00
e18493897f add unittests for php 8.1 - 8.3
Some checks are pending
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 37s
Unit Testing / Run phpunit tests (pull_request) Has started running
2024-09-21 13:35:45 +02:00
0329ed8f19 test
All checks were successful
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 32s
Unit Testing / Run phpunit tests (pull_request) Successful in 4m22s
2024-09-21 13:32:32 +02:00
80a5e13fba test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 33s
Unit Testing / Run phpunit tests (pull_request) Failing after 35s
2024-09-21 13:30:10 +02:00
47f026b4b4 test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 36s
Unit Testing / Run phpunit tests (pull_request) Failing after 3s
2024-09-21 13:28:49 +02:00
4d32178120 test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 1m15s
Unit Testing / Run phpunit tests (pull_request) Failing after 5s
2024-09-21 13:28:08 +02:00
7204bccb03 test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Failing after 32s
Unit Testing / Run phpunit tests (pull_request) Failing after 3s
2024-09-21 13:26:35 +02:00
bd037022bc use different caches for composer
Some checks failed
Unit Testing / Run phpunit tests (pull_request) Has been cancelled
PHP Code Checker / Run PHP Code Checker (pull_request) Has been cancelled
2024-09-21 13:26:24 +02:00
380495e1b6 test
All checks were successful
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 1m40s
Unit Testing / Run phpunit tests (pull_request) Successful in 1m2s
2024-09-21 13:15:52 +02:00
6c71423d62 test
All checks were successful
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 1m3s
Unit Testing / Run phpunit tests (pull_request) Successful in 1m8s
2024-09-21 13:13:50 +02:00
1008bd62c8 test
All checks were successful
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 1m9s
Unit Testing / Run phpunit tests (pull_request) Successful in 1m13s
2024-09-21 13:11:43 +02:00
50c25cdc4e test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 40s
Unit Testing / Run phpunit tests (pull_request) Failing after 2m27s
2024-09-21 13:00:08 +02:00
c2fb6dffde test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Has been cancelled
Unit Testing / Run phpunit tests (pull_request) Successful in 2m50s
2024-09-21 12:55:55 +02:00
e3041b015f test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 33s
Unit Testing / Run phpunit tests (pull_request) Failing after 1m1s
2024-09-21 12:53:02 +02:00
535e77c017 test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 34s
Unit Testing / Run phpunit tests (pull_request) Failing after 1m1s
2024-09-21 12:47:15 +02:00
6020c1f277 test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 39s
Unit Testing / Run phpunit tests (pull_request) Failing after 1m5s
2024-09-21 12:45:07 +02:00
f8d0f01be0 test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 37s
Unit Testing / Run phpunit tests (pull_request) Failing after 4m27s
2024-09-21 12:41:36 +02:00
5b7676ee09 test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 45s
Unit Testing / Run phpunit tests (pull_request) Has been cancelled
2024-09-21 12:38:14 +02:00
2af7ea5288 test
All checks were successful
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 44s
Unit Testing / Run phpunit tests (pull_request) Successful in 3m57s
2024-09-21 12:30:23 +02:00
8b343eb46e test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Failing after 34s
Unit Testing / Run phpunit tests (pull_request) Successful in 3m56s
2024-09-21 12:22:44 +02:00
6a89c00e2d violate a coding standard
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Failing after 34s
Unit Testing / Run phpunit tests (pull_request) Successful in 3m57s
2024-09-21 12:15:29 +02:00
7bb31e1a71 test
All checks were successful
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 36s
Unit Testing / Run phpunit tests (pull_request) Successful in 3m55s
2024-09-21 12:14:14 +02:00
7ce208d7b8 test
All checks were successful
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 32s
Unit Testing / Run phpunit tests (pull_request) Successful in 3m59s
2024-09-21 12:13:22 +02:00
a1e847d465 test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 43s
Unit Testing / Run phpunit tests (pull_request) Failing after 1s
2024-09-21 12:11:04 +02:00
d520ed5939 test
Some checks failed
PHP Code Checker / Run PHP Code Checker (pull_request) Failing after 2s
Unit Testing / Run phpunit tests (pull_request) Failing after 1s
2024-09-21 12:10:31 +02:00
f0903de277 test
All checks were successful
PHP Code Checker / Run PHP Code Checker (pull_request) Successful in 41s
Unit Testing / Run phpunit tests (pull_request) Successful in 3m56s
2024-09-21 12:03:56 +02:00
15 changed files with 92 additions and 444 deletions

View file

@ -46,5 +46,5 @@ jobs:
if: steps.cache-composer.outputs.cache-hit != 'true' if: steps.cache-composer.outputs.cache-hit != 'true'
uses: ramsey/composer-install@v3 uses: ramsey/composer-install@v3
- name: Run PHP_CodeSniffer - name: Detect coding standard violations
run: ./vendor/bin/phpcs run: ./vendor/bin/phpcs

View file

@ -4,7 +4,6 @@ on:
push: push:
branches: branches:
- main - main
- improve_tests
pull_request: pull_request:
env: env:
@ -37,7 +36,7 @@ jobs:
path: | path: |
${{ env.WP_CORE_DIR }} ${{ env.WP_CORE_DIR }}
${{ env.WP_TESTS_DIR }} ${{ env.WP_TESTS_DIR }}
key: cache-wordpress-3 key: cache-wordpress-1
- name: Cache Composer - name: Cache Composer
id: cache-composer-phpunit id: cache-composer-phpunit
@ -74,7 +73,7 @@ jobs:
if: steps.cache-wordpress.outputs.cache-hit != 'false' if: steps.cache-wordpress.outputs.cache-hit != 'false'
run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 6.6 false true true true run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 6.6 false true true true
- name: Run PHPUnit - name: Unit Testing
run: cd /workspace/Event-Federation/wordpress-activitypub-event-extensions/ && ./vendor/bin/phpunit run: cd /workspace/Event-Federation/wordpress-activitypub-event-extensions/ && ./vendor/bin/phpunit
env: env:
PHP_VERSION: ${{ matrix.php-version }} PHP_VERSION: ${{ matrix.php-version }}

1
.gitignore vendored
View file

@ -1,3 +1,2 @@
vendor vendor
composer.lock composer.lock
.phpunit.result.cache

View file

@ -11,17 +11,6 @@ RUN apk update \
RUN docker-php-ext-install mysqli RUN docker-php-ext-install mysqli
# Install Xdebug
RUN apk add --no-cache $PHPIZE_DEPS \
&& apk add --update linux-headers \
&& pecl install xdebug \
&& docker-php-ext-enable xdebug \
&& apk del --purge $PHPIZE_DEPS \
&& echo "xdebug.start_with_request=yes" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
&& echo "xdebug.client_host=host.docker.internal" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
&& echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
&& echo "xdebug.idekey=VSCODE" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
# Install Composer # Install Composer
RUN EXPECTED_CHECKSUM=$(curl -s https://composer.github.io/installer.sig) \ RUN EXPECTED_CHECKSUM=$(curl -s https://composer.github.io/installer.sig) \
&& curl https://getcomposer.org/installer -o composer-setup.php \ && curl https://getcomposer.org/installer -o composer-setup.php \
@ -35,9 +24,4 @@ RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli
chmod +x wp-cli.phar && \ chmod +x wp-cli.phar && \
mv wp-cli.phar /usr/local/bin/wp mv wp-cli.phar /usr/local/bin/wp
COPY composer.json composer.lock /app/
RUN composer install --no-scripts --no-autoloader
RUN composer global require yoast/phpunit-polyfills:"^3.0" --dev
ENV PATH="/root/.composer/vendor/bin:${PATH}"
RUN chmod +x -R ./ RUN chmod +x -R ./

48
bin/install-wp-tests.sh Executable file → Normal file
View file

@ -15,16 +15,6 @@ SKIP_WP_INSTALL=${7-false}
SKIP_PLUGINS_INSTALL=${8-false} SKIP_PLUGINS_INSTALL=${8-false}
SKIP_TEST_SUITE_INSTALL=${9-false} SKIP_TEST_SUITE_INSTALL=${9-false}
# Initialize the plugin list
PLUGINS=""
# Parse optional --plugins argument
while [[ "$#" -gt 0 ]]; do
case $1 in
--plugins) PLUGINS="$2"; shift ;;
esac
shift
done
TMPDIR=${TMPDIR-/tmp} TMPDIR=${TMPDIR-/tmp}
TMPDIR=$(echo $TMPDIR | sed -e "s/\/$//") TMPDIR=$(echo $TMPDIR | sed -e "s/\/$//")
@ -192,50 +182,20 @@ install_db() {
if [ $(mysql --user="$DB_USER" --password="$DB_PASS"$EXTRA --execute='show databases;' | grep ^$DB_NAME$) ] if [ $(mysql --user="$DB_USER" --password="$DB_PASS"$EXTRA --execute='show databases;' | grep ^$DB_NAME$) ]
then then
echo "Reinstalling will delete the existing test database ($DB_NAME)" echo "Reinstalling will delete the existing test database ($DB_NAME)"
recreate_db yes read -p 'Are you sure you want to proceed? [y/N]: ' DELETE_EXISTING_DB
recreate_db $DELETE_EXISTING_DB
else else
create_db create_db
fi fi
} }
install_wp_plugin() {
PLUGIN_NAME=$1
mkdir -p "$WP_CORE_DIR/wp-content/plugins/"
if [ -d "$WP_CORE_DIR/wp-content/plugins/$PLUGIN_NAME" ]; then
return;
fi
# Get the latest tag.
LATEST_TAG=$(svn log https://plugins.svn.wordpress.org/$PLUGIN_NAME/tags --limit 1 | awk 'NR == 4 { print $4 }')
PLUGIN_FILE="$PLUGIN_NAME.$LATEST_TAG.zip"
URL="https://downloads.wordpress.org/plugin/$PLUGIN_FILE"
# Check if the plugin file already exists
if ! test -f "$TMPDIR/$PLUGIN_FILE"; then
download $URL "$TMPDIR/$PLUGIN_FILE"
fi
# Unzip the plugin into the WordPress must-use plugins directory
unzip -q -o "$TMPDIR/$PLUGIN_FILE" -d "$WP_CORE_DIR/wp-content/plugins/"
}
install_wp_plugins() { install_wp_plugins() {
if [ "$SKIP_PLUGINS_INSTALL" = "true" ]; then if [ "$SKIP_PLUGINS_INSTALL" = "true" ]; then
echo "Skipping WordPress plugin installation." echo "Skipping WordPress plugin installation."
return 0 return 0
fi fi
# Always install the ActivityPub plugin. download https://downloads.wordpress.org/plugin/activitypub.3.2.5.zip $TMPDIR/activitypub.zip
install_wp_plugin activitypub unzip $TMPDIR/activitypub.zip -d $WP_CORE_DIR/wp-content/plugins/
install_wp_plugin the-events-calendar
# Install additional plugins.
# if [[ -n "$PLUGINS" ]]; then
# IFS=',' read -ra PLUGIN_ARRAY <<< "$PLUGINS"
# for plugin in "${PLUGIN_ARRAY[@]}"; do
# install_wp_plugin "$plugin"
# done
# fi
} }
install_wp install_wp

View file

@ -3,20 +3,16 @@
"description": "The ActivityPub Event Extensions help for event custom post types to federate properly.", "description": "The ActivityPub Event Extensions help for event custom post types to federate properly.",
"type": "wordpress-plugin", "type": "wordpress-plugin",
"require": { "require": {
"php": ">=8.1.0", "php": ">=5.6.0",
"composer/installers": "^2.0" "composer/installers": "^1.0 || ^2.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7.21 || ^6.5 || ^7.5 || ^8",
"phpcompatibility/php-compatibility": "*", "phpcompatibility/php-compatibility": "*",
"phpcompatibility/phpcompatibility-wp": "*", "phpcompatibility/phpcompatibility-wp": "*",
"squizlabs/php_codesniffer": "3.*", "squizlabs/php_codesniffer": "3.*",
"wp-coding-standards/wpcs": "dev-develop", "wp-coding-standards/wpcs": "^3.1.0",
"yoast/phpunit-polyfills": "^3.0",
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0", "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
"sirbrillig/phpcs-variable-analysis": "^2.11", "sirbrillig/phpcs-variable-analysis": "^2.11"
"phpcsstandards/phpcsextra": "^1.1.0",
"dms/phpunit-arraysubset-asserts": "^0.5.0"
}, },
"config": { "config": {
"allow-plugins": true "allow-plugins": true
@ -40,11 +36,6 @@
], ],
"lint:fix": [ "lint:fix": [
"vendor/bin/phpcbf" "vendor/bin/phpcbf"
],
"test": [
"composer install",
"bin/install-wp-tests.sh wordpress-test root wordpress-test test-db latest true",
"phpunit"
] ]
} }
} }

26
docker-compose-test.yml Normal file
View file

@ -0,0 +1,26 @@
version: '3'
services:
test-db:
platform: linux/x86_64
image: mariadb
environment:
MYSQL_DATABASE: wordpress
MYSQL_ROOT_PASSWORD: wordpress
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3306"]
interval: 5s
timeout: 2s
retries: 5
test-php:
build:
context: .
dockerfile: Dockerfile
depends_on:
test-db:
condition: service_healthy
links:
- test-db
volumes:
- .:/app
command: ["composer", "run-script", "test"]

View file

@ -1,47 +0,0 @@
version: '3'
# This files purpose is to run the PHPunit tests locally.
# Install docker and docker compose and than just run:
# docker compose up
# To live debug in VSCode add this launch configuration to your .vscode/launch.json.
# It assumes that the WordPress root-dir is your workspace root.
#
# {
# "name": "Listen for PHPUnit",
# "type": "php",
# "request": "launch",
# "port": 9003,
# "pathMappings": {
# "/app/": "${workspaceRoot}/wp-content/plugins/activitypub-event-extensions/",
# "/tmp/wordpress/": "${workspaceRoot}/"
# },
# },
services:
test-db:
image: mariadb
environment:
MARIADB_DATABASE: wordpress-test
MARIADB_ROOT_PASSWORD: wordpress-test
healthcheck:
test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
start_period: 5s
interval: 4s
timeout: 5s
retries: 5
test-php:
build:
context: .
dockerfile: Dockerfile
depends_on:
test-db:
condition: service_healthy
links:
- test-db
volumes:
- .:/app
command: ["composer", "run-script", "test"]
extra_hosts:
- "host.docker.internal:host-gateway"

View file

@ -72,29 +72,6 @@ class Event extends Post {
$this->wp_taxonomy = $wp_taxonomy; $this->wp_taxonomy = $wp_taxonomy;
} }
/**
* Extract the join mode.
*
* Currently we don't handle joins, we always mark events as external.
*
* @return string
*/
public function get_join_mode() {
return 'external';
}
/**
* Extract the external participation url.
*
* Currently we don't handle joins, we always mark events as external.
* We just link back to the events HTML representation on our WordPress site.
*
* @return string|null The external participation URL.
*/
public function get_external_participation_url(): string|null {
return 'external' === $this->get_join_mode() ? $this->get_url() : null;
}
/** /**
* Set the event category, via the mapping setting. * Set the event category, via the mapping setting.
*/ */

View file

@ -96,6 +96,17 @@ final class The_Events_Calendar extends Event {
return new WP_Error( 'invalid event_status value', __( 'invalid event_status', 'activitypub' ), array( 'status' => 404 ) ); return new WP_Error( 'invalid event_status value', __( 'invalid event_status', 'activitypub' ), array( 'status' => 404 ) );
} }
/**
* Extract the join mode.
*
* If the ticket sale is active set it to restricted.
*
* @return string
*/
public function get_join_mode() {
return empty( $this->tribe_event->tickets ) ? 'free' : 'restricted';
}
/** /**
* Check if the comments are enabled for the current event. * Check if the comments are enabled for the current event.
*/ */
@ -134,55 +145,25 @@ final class The_Events_Calendar extends Event {
* @return Place|array The place/venue if one is set. * @return Place|array The place/venue if one is set.
*/ */
public function get_location(): Place|null { public function get_location(): Place|null {
// Get short handle for the venues. if ( empty( $this->wp_object->venues ) || ! empty( $this->wp_object->venues[0] ) ) {
$venues = $this->wp_object->venues;
// Get first venue. We currently only support a single venue.
if ( $venues instanceof \Tribe\Events\Collections\Lazy_Post_Collection ) {
$venue = $venues->first();
} elseif ( empty( $this->wp_object->venues ) || ! empty( $this->wp_object->venues[0] ) ) {
return null;
} else {
$venue = $venues[0];
}
if ( ! $venue ) {
return null; return null;
} }
// We currently only support a single venue.
$event_venue = $this->wp_object->venues[0];
// Set the address. $address = array(
$address = array(); 'addressCountry' => $event_venue->country,
'addressLocality' => $event_venue->city,
if ( ! empty( $venue->country ) ) { 'addressRegion' => $event_venue->province,
$address['addressCountry'] = $venue->country; 'postalCode' => $event_venue->zip,
} 'streetAddress' => $event_venue->address,
'type' => 'PostalAddress',
if ( ! empty( $venue->city ) ) { );
$address['addressLocality'] = $venue->city;
}
if ( ! empty( $venue->province ) ) {
$address['addressRegion'] = $venue->province;
}
if ( ! empty( $venue->zip ) ) {
$address['postalCode'] = $venue->zip;
}
if ( ! empty( $venue->address ) ) {
$address['streetAddress'] = $venue->address;
}
if ( ! empty( $venue->post_title ) ) {
$address['name'] = $venue->post_title;
}
$address['type'] = 'PostalAddress';
$location = new Place(); $location = new Place();
if ( count( $address ) > 1 ) {
$location->set_address( $address ); $location->set_address( $address );
} $location->set_id( $event_venue->permalink );
$location->set_id( $venue->permalink ); $location->set_name( $event_venue->post_name );
$location->set_name( $venue->post_title );
return $location; return $location;
} }

View file

@ -59,15 +59,14 @@ class Setup {
* @since 1.0.0 * @since 1.0.0
*/ */
protected function __construct() { protected function __construct() {
$this->activitypub_plugin_is_active = defined( 'ACTIVITYPUB_PLUGIN_VERSION' ) || $this->activitypub_plugin_is_active = is_plugin_active( 'activitypub/activitypub.php' );
is_plugin_active( 'activitypub/activitypub.php' );
// BeforeFirstRelease: decide whether we want to do anything at all when ActivityPub plugin is note active. // BeforeFirstRelease: decide whether we want to do anything at all when ActivityPub plugin is note active.
// if ( ! $this->activitypub_plugin_is_active ) { // if ( ! $this->activitypub_plugin_is_active ) {
// deactivate_plugins( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_FILE ); // deactivate_plugins( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_FILE );
// return; // return;
// }. // }.
$this->active_event_plugins = self::detect_active_event_plugins(); $this->active_event_plugins = self::detect_active_event_plugins();
$this->activitypub_plugin_version = self::get_activitypub_plugin_version(); $this->activitypub_plugin_version = get_file_data( WP_PLUGIN_DIR . '/activitypub/activitypub.php', array( 'Version' ) )[0];
$this->setup_hooks(); $this->setup_hooks();
} }
@ -96,19 +95,6 @@ class Setup {
return self::$instance; return self::$instance;
} }
/**
* LooksUp the current version of the ActivityPub.
*
* @return string The semantic Version.
*/
private static function get_activitypub_plugin_version(): string {
if ( defined( 'ACTIVITYPUB_PLUGIN_VERSION' ) ) {
return constant( 'ACTIVITYPUB_PLUGIN_VERSION' );
}
$version = get_file_data( WP_PLUGIN_DIR . '/activitypub/activitypub.php', array( 'Version' ) )[0];
return $version ?? '0.0.0';
}
/** /**
* Getter function for the active event plugins. * Getter function for the active event plugins.
* *
@ -180,7 +166,7 @@ class Setup {
); );
// Check if the minimum required version of the ActivityPub plugin is installed. // Check if the minimum required version of the ActivityPub plugin is installed.
if ( ! version_compare( $this->activitypub_plugin_version, ACTIVITYPUB_EVENT_EXTENSIONS_ACTIVITYPUB_PLUGIN_MIN_VERSION ) ) { if ( version_compare( $this->activitypub_plugin_version, ACTIVITYPUB_EVENT_EXTENSIONS_ACTIVITYPUB_PLUGIN_MIN_VERSION ) ) {
return; return;
} }
@ -220,7 +206,7 @@ class Setup {
// The ActivityPub plugin is not active. // The ActivityPub plugin is not active.
add_action( 'admin_notices', array( 'Activitypub_Event_Extensions\Admin\General_Admin_Notices', 'activitypub_plugin_not_enabled' ), 10, 1 ); add_action( 'admin_notices', array( 'Activitypub_Event_Extensions\Admin\General_Admin_Notices', 'activitypub_plugin_not_enabled' ), 10, 1 );
} }
if ( ! version_compare( $this->activitypub_plugin_version, ACTIVITYPUB_EVENT_EXTENSIONS_ACTIVITYPUB_PLUGIN_MIN_VERSION ) ) { if ( version_compare( $this->activitypub_plugin_version, ACTIVITYPUB_EVENT_EXTENSIONS_ACTIVITYPUB_PLUGIN_MIN_VERSION ) ) {
// The ActivityPub plugin is too old. // The ActivityPub plugin is too old.
add_action( 'admin_notices', array( 'Activitypub_Event_Extensions\Admin\General_Admin_Notices', 'activitypub_plugin_version_too_old' ), 10, 1 ); add_action( 'admin_notices', array( 'Activitypub_Event_Extensions\Admin\General_Admin_Notices', 'activitypub_plugin_version_too_old' ), 10, 1 );
} }
@ -248,9 +234,9 @@ class Setup {
// Get the transformer for a specific event plugins event-post type. // Get the transformer for a specific event plugins event-post type.
foreach ( $this->active_event_plugins as $event_plugin ) { foreach ( $this->active_event_plugins as $event_plugin ) {
if ( $wp_object->post_type === $event_plugin->get_post_type() ) { if ( $wp_object->post_type === $event_plugin->get_post_type() ) {
$transformer_class = $event_plugin::get_activitypub_event_transformer_class(); $transformer_class = $event_plugin->get_activitypub_event_transformer_class();
if ( class_exists( $transformer_class ) ) { if ( class_exists( $transformer_class ) ) {
return new $transformer_class( $wp_object, $event_plugin::get_event_category_taxonomy() ); return new $transformer_class( $wp_object, $event_plugin->get_event_category_taxonomy() );
} }
} }
} }
@ -270,8 +256,8 @@ class Setup {
// If someone installs this plugin, we simply enable ActivityPub support for all currently active event post types. // If someone installs this plugin, we simply enable ActivityPub support for all currently active event post types.
$activitypub_supported_post_types = get_option( 'activitypub_support_post_types', array() ); $activitypub_supported_post_types = get_option( 'activitypub_support_post_types', array() );
foreach ( $this->active_event_plugins as $event_plugin ) { foreach ( $this->active_event_plugins as $event_plugin ) {
if ( ! in_array( $event_plugin->get_post_type(), $activitypub_supported_post_types, true ) ) { if ( ! in_array( $event_plugin['post_type'], $activitypub_supported_post_types, true ) ) {
$activitypub_supported_post_types[] = $event_plugin->get_post_type(); $activitypub_supported_post_types[] = $event_plugin['post_type'];
} }
} }
update_option( 'activitypub_support_post_types', $activitypub_supported_post_types ); update_option( 'activitypub_support_post_types', $activitypub_supported_post_types );

View file

@ -26,21 +26,9 @@ if ( ! file_exists( "{$_tests_dir}/includes/functions.php" ) ) {
require_once "{$_tests_dir}/includes/functions.php"; require_once "{$_tests_dir}/includes/functions.php";
/** /**
* Manually load the plugin being tested and its integrations. * Manually load the plugin being tested.
*/ */
function _manually_load_plugin() { function _manually_load_plugin() {
$plugin_dir = ABSPATH . '/wp-content/plugins/';
require_once $plugin_dir . 'activitypub/activitypub.php';
$event_plugin = 'the-events-calendar';
switch ( $event_plugin ) {
case 'the-events-calendar':
$plugin_file = 'the-events-calendar/the-events-calendar.php';
require_once $plugin_dir . $plugin_file;
$current = get_option( 'active_plugins', array() );
$current[] = $plugin_file;
sort( $current );
update_option( 'active_plugins', $current );
}
require dirname( __DIR__ ) . '/activitypub-event-extensions.php'; require dirname( __DIR__ ) . '/activitypub-event-extensions.php';
} }

View file

@ -1,216 +0,0 @@
<?php
/**
* Class SampleTest
*
* @package Activitypub_Event_Extensions
*/
/**
* Sample test case.
*/
class Test_The_Events_Calendar extends WP_UnitTestCase {
/**
* Mockup events of certain complexity.
*/
public const MOCKUP_VENUS = array(
'minimal_venue' => array(
'venue' => 'Minimal Venue',
'status' => 'publish',
),
'complex_venue' => array(
'venue' => 'Complex Venue',
'status' => 'publish',
'show_map' => false,
'show_map_link' => false,
'address' => 'Venue address',
'city' => 'Venue city',
'country' => 'Venue country',
'province' => 'Venue province',
'state' => 'Venue state',
'stateprovince' => 'Venue stateprovince',
'zip' => 'Venue zip',
'phone' => 'Venue phone',
'website' => 'http://venue.com',
),
);
public const MOCKUP_EVENTS = array(
'minimal_event' => array(
'title' => 'My Event',
'content' => 'Come to my event. Let\'s connect!',
'start_date' => '+10 days 15:00:00',
'duration' => HOUR_IN_SECONDS,
'status' => 'publish',
),
'complex_event' => array(
'title' => 'My Event',
'content' => 'Come to my event. Let\'s connect!',
'start_date' => '+10 days 15:00:00',
'duration' => HOUR_IN_SECONDS,
'status' => 'publish',
),
);
/**
* Override the setup function, so that tests don't run if the Events Calendar is not active.
*/
public function set_up() {
parent::set_up();
if ( ! class_exists( '\Tribe__Events__Main' ) ) {
self::markTestSkipped( 'The Events Calendar plugin is not active.' );
}
// Make sure that ActivityPub support is enabled for The Events Calendar.
$aec = \Activitypub_Event_Extensions\Setup::get_instance();
$aec->activate_activitypub_support_for_active_event_plugins();
// Delete all posts afterwards.
_delete_all_posts();
}
/**
* Test that the right transformer gets applied.
*/
public function test_transformer_class() {
// We only test for one event plugin being active at the same time,
// even though we support multiple onces in theory.
// But testing all combinations is beyond scope.
$active_event_plugins = \Activitypub_Event_Extensions\Setup::get_instance()->get_active_event_plugins();
$this->assertEquals( 1, count( $active_event_plugins ) );
// Enable ActivityPub support for the event plugin.
$this->assertContains( 'tribe_events', get_option( 'activitypub_support_post_types' ) );
// Create a The Events Calendar Event without content.
$wp_object = tribe_events()
->set_args( self::MOCKUP_EVENTS['minimal_event'] )
->create();
// Call the transformer Factory.
$transformer = \Activitypub\Transformer\Factory::get_transformer( $wp_object );
// Check that we got the right transformer.
$this->assertInstanceOf( \Activitypub_Event_Extensions\Activitypub\Transformer\The_Events_Calendar::class, $transformer );
}
/**
* Test transformation of minimal event without venue.
*/
public function test_transform_of_minimal_event_without_venue() {
// Create a The Events Calendar Event.
$wp_object = tribe_events()
->set_args( self::MOCKUP_EVENTS['minimal_event'] )
->create();
// Call the transformer.
$event_array = \Activitypub\Transformer\Factory::get_transformer( $wp_object )->to_object()->to_array();
// Check that the event ActivityStreams representation contains everything as expected.
$this->assertEquals( 'Event', $event_array['type'] );
$this->assertEquals( 'My Event', $event_array['name'] );
$this->assertEquals( '', $event_array['content'] );
$this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 15:00:00' ) ) . 'T15:00:00Z', $event_array['startTime'] );
$this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 16:00:00' ) ) . 'T16:00:00Z', $event_array['endTime'] );
$this->assertTrue( $event_array['commentsEnabled'] );
$this->assertEquals( 'allow_all', $event_array['repliesModerationOption'] );
$this->assertEquals( 'external', $event_array['joinMode'] );
$this->assertArrayNotHasKey( 'location', $event_array );
$this->assertEquals( 'MEETING', $event_array['category'] );
}
/**
* Test transformation of event with mapped category.
*/
public function test_transform_event_with_mapped_categories() {
// Create category.
$category_id_music = wp_insert_term( 'Music', Tribe__Events__Main::TAXONOMY, array( 'slug' => 'music' ) );
$category_id_theatre = wp_insert_term( 'Theatre', Tribe__Events__Main::TAXONOMY, array( 'slug' => 'theatre' ) );
// Set default mapping for event categories.
update_option( 'activitypub_event_extensions_default_event_category', 'MUSIC' );
// Set an override for the category with the slug theatre.
update_option( 'activitypub_event_extensions_event_category_mappings', array( 'theatre' => 'THEATRE' ) );
// Create a The Events Calendar event with the music category.
$wp_object = tribe_events()
->set_args( self::MOCKUP_EVENTS['minimal_event'] )
->create();
// Set the post term music to the event.
wp_set_post_terms( $wp_object->ID, $category_id_music['term_id'], Tribe__Events__Main::TAXONOMY );
// Call the transformer.
$event_array = \Activitypub\Transformer\Factory::get_transformer( $wp_object )->to_object()->to_array();
// See if the default category mapping is applied.
$this->assertEquals( 'MUSIC', $event_array['category'] );
// Set the post term theatre to the event.
wp_set_post_terms( $wp_object->ID, $category_id_theatre['term_id'], Tribe__Events__Main::TAXONOMY, false );
// Call the transformer.
$event_array = \Activitypub\Transformer\Factory::get_transformer( $wp_object )->to_object()->to_array();
// See if the default category mapping is applied.
$this->assertEquals( 'THEATRE', $event_array['category'] );
}
/**
* Test transformation of minimal event with minimal venue.
*/
public function test_transform_of_minimal_event_with_venue() {
// Create Venue.
$venue = tribe_venues()->set_args( self::MOCKUP_VENUS['minimal_venue'] )->create();
// Create a The Events Calendar Event.
$wp_object = tribe_events()
->set_args( self::MOCKUP_EVENTS['complex_event'] )
->set( 'venue', $venue->ID )
->create();
// Call the transformer.
$event_array = \Activitypub\Transformer\Factory::get_transformer( $wp_object )->to_object()->to_array();
// Check that the event ActivityStreams representation contains everything as expected.
$this->assertEquals( 'Event', $event_array['type'] );
$this->assertEquals( 'My Event', $event_array['name'] );
$this->assertEquals( '', $event_array['content'] );
$this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 15:00:00' ) ) . 'T15:00:00Z', $event_array['startTime'] );
$this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 16:00:00' ) ) . 'T16:00:00Z', $event_array['endTime'] );
$this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 16:00:00' ) ) . 'T16:00:00Z', $event_array['commentsEnabled'] );
$this->assertArrayHasKey( 'location', $event_array );
$this->assertEquals( 'Place', $event_array['location']['type'] );
$this->assertEquals( self::MOCKUP_VENUS['minimal_venue']['venue'], $event_array['location']['name'] );
}
/**
* Test transformation of minimal event with minimal venue.
*/
public function test_transform_of_minimal_event_with_address_venue() {
// Create Venue.
$venue = tribe_venues()->set_args( self::MOCKUP_VENUS['complex_venue'] )->create();
// Create a The Events Calendar Event.
$wp_object = tribe_events()
->set_args( self::MOCKUP_EVENTS['minimal_event'] )
->set( 'venue', $venue->ID )
->create();
// Call the transformer.
$event_array = \Activitypub\Transformer\Factory::get_transformer( $wp_object )->to_object()->to_array();
// Check that the event ActivityStreams representation contains everything as expected.
$this->assertEquals( 'Event', $event_array['type'] );
$this->assertEquals( 'My Event', $event_array['name'] );
$this->assertEquals( '', $event_array['content'] );
$this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 15:00:00' ) ) . 'T15:00:00Z', $event_array['startTime'] );
$this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 16:00:00' ) ) . 'T16:00:00Z', $event_array['endTime'] );
$this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 16:00:00' ) ) . 'T16:00:00Z', $event_array['commentsEnabled'] );
$this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 16:00:00' ) ) . 'T16:00:00Z', $event_array['endTime'] );
$this->assertArrayHasKey( 'location', $event_array );
$this->assertEquals( 'Place', $event_array['location']['type'] );
$this->assertEquals( 'PostalAddress', $event_array['location']['address']['type'] );
$this->assertEquals( self::MOCKUP_VENUS['complex_venue']['venue'], $event_array['location']['name'] );
$this->assertEquals( self::MOCKUP_VENUS['complex_venue']['venue'], $event_array['location']['address']['name'] );
$this->assertEquals( self::MOCKUP_VENUS['complex_venue']['province'], $event_array['location']['address']['addressRegion'] );
$this->assertEquals( self::MOCKUP_VENUS['complex_venue']['address'], $event_array['location']['address']['streetAddress'] );
$this->assertEquals( self::MOCKUP_VENUS['complex_venue']['city'], $event_array['location']['address']['addressLocality'] );
$this->assertEquals( self::MOCKUP_VENUS['complex_venue']['country'], $event_array['location']['address']['addressCountry'] );
$this->assertEquals( self::MOCKUP_VENUS['complex_venue']['zip'], $event_array['location']['address']['postalCode'] );
}
}

View file

@ -0,0 +1,20 @@
<?php
/**
* Class SampleTest
*
* @package Activitypub_Event_Extensions
*/
/**
* Sample test case.
*/
class Test_Sample extends WP_UnitTestCase {
/**
* A single example test.
*/
public function test_sample() {
// Replace this with some actual testing code.
$this->assertTrue( true );
}
}