Merge pull request #1153 from xwp/tests/jetpack-connector

Jetpack connector test implemented

composer.json

@@ -24,6 +24,7 @@
     "wp-phpunit/wp-phpunit": "^5.4",
     "wpackagist-plugin/advanced-custom-fields": "5.8.12",
     "wpackagist-plugin/easy-digital-downloads": "^2.9.23",
+    "wpackagist-plugin/jetpack": "^8.7",
     "wpackagist-plugin/user-switching": "^1.5.5",
     "wpsh/local": "^0.2.3"
   },

connectors/class-connector-jetpack.php

@@ -318,11 +318,16 @@ public function register() {
 				'label'   => esc_html__( 'Tiled Galleries', 'stream' ),
 				'context' => 'tiled-gallery',
 			),
+			// Monitor.
+			'monitor_receive_notification'     => array(
+				'label'   => esc_html__( 'Monitor notifications', 'stream' ),
+				'context' => 'monitor',
+			),
 		);
 	}
 
 	/**
-	 * Track Jetpack log entries
+	 * Tracks logs add to Jetpack logging.
 	 * Includes:
 	 * - Activation/Deactivation of modules
 	 * - Registration/Disconnection of blogs
@@ -374,11 +379,10 @@ public function callback_jetpack_log_entry( array $entry ) {
 			$action     = $method;
 			$meta       = compact( 'user_id', 'user_email', 'user_login' );
 			$message    = sprintf(
-				/* translators: %1$s: a user display name, %2$s: a status, %3$s: the connection either "from" or "to" (e.g. "Jane Doe", "unlinked", "from") */
-				__( '%1$s\'s account %2$s %3$s Jetpack', 'stream' ),
+				/* translators: %1$s: a user display name, %2$s: a status and the connection either "from" or "to" (e.g. "Jane Doe", "unlinked from") */
+				__( '%1$s\'s account %2$s Jetpack', 'stream' ),
 				$user->display_name,
-				( 'unlink' === $action ) ? esc_html__( 'unlinked', 'stream' ) : esc_html__( 'linked', 'stream' ),
-				( 'unlink' === $action ) ? esc_html__( 'from', 'stream' ) : esc_html__( 'to', 'stream' )
+				( 'unlink' === $action ) ? esc_html__( 'unlinked from', 'stream' ) : esc_html__( 'linked to', 'stream' )
 			);
 		} elseif ( in_array( $method, array( 'register', 'disconnect', 'subsiteregister', 'subsitedisconnect' ), true ) ) {
 			$context      = 'blogs';

local/config/wp-config.php

@@ -23,7 +23,8 @@
 
 $table_prefix = 'wptests_';
 
-define( 'WP_DEBUG', false );
+define( 'WP_DEBUG', true );
+define( 'JETPACK_DEV_DEBUG', true );
 
 define( 'ABSPATH', __DIR__ . '/' );
 

phpunit.xml

@@ -10,7 +10,7 @@
 	<php>
 		<const
 			name="WP_TEST_ACTIVATED_PLUGINS"
-			value="advanced-custom-fields/acf.php,easy-digital-downloads/easy-digital-downloads.php,user-switching/user-switching.php"
+			value="advanced-custom-fields/acf.php,easy-digital-downloads/easy-digital-downloads.php,jetpack/jetpack.php,user-switching/user-switching.php"
 		/>
 	</php>
 	<testsuites>

tests/bootstrap.php

@@ -51,15 +51,20 @@ function() {
 	}
 );
 
+/**
+ * Manually loads Mercator for testing.
+ */
 function xwp_manually_load_mercator() {
 	define( 'MERCATOR_SKIP_CHECKS', true );
 	require WPMU_PLUGIN_DIR . '/mercator/mercator.php';
 }
-
 tests_add_filter( 'muplugins_loaded', 'xwp_manually_load_mercator' );
 
+/**
+ * Manually creates EDD's database tables, users, and settings for testing.
+ */
 function xwp_install_edd() {
-	// Install Easy Digital Downloads
+
 	edd_install();
 
 	global $current_user, $edd_options;
@@ -79,6 +84,9 @@ function( $status = false, $args = array(), $url = '') {
 	);
 }
 
+// Run Jetpack in offline mode for testing.
+tests_add_filter( 'jetpack_offline_mode', '__return_true' );
+
 // @see https://core.trac.wordpress.org/browser/trunk/tests/phpunit/includes/bootstrap.php
 require $_tests_dir . '/includes/bootstrap.php';