Adds unit tests and is_module_active method to SAL.

json-endpoints/class.wpcom-json-api-get-site-endpoint.php

@@ -355,9 +355,8 @@ protected function render_response_key( $key, &$response, $is_user_logged_in ) {
 				$response[ $key ] = $this->site->get_capabilities();
 				break;
 			case 'jetpack_modules':
-				$jetpack_modules = $this->site->get_jetpack_modules();
-				if ( ! is_null( $jetpack_modules ) ) {
-					$response[ $key ] = $jetpack_modules;
+				if ( is_user_member_of_blog() ) {
+					$response[ $key ] = $this->site->get_jetpack_modules();
 				}
 				break;
 			case 'plan' :

phpunit.xml.dist

@@ -34,6 +34,7 @@
 		</testsuite>
 		<testsuite name="json-api">
 			<file>tests/php/test_class.json-api-jetpack-endpoints.php</file>
+			<directory prefix="test_" suffix=".php">tests/php/sal</directory>
 		</testsuite>
 		<testsuite name="infinite-scroll">
 			<directory prefix="test_" suffix=".php">tests/php/modules/infinite-scroll</directory>

sal/class.json-api-site-base.php

@@ -77,6 +77,8 @@ abstract public function is_jetpack();
 
 	abstract public function get_jetpack_modules();
 
+	abstract public function is_module_active( $module );
+
 	abstract public function is_vip();
 
 	abstract public function is_multisite();

sal/class.json-api-site-jetpack-base.php

@@ -89,11 +89,11 @@ function after_render_options( &$options ) {
 	}
 
 	function get_jetpack_modules() {
-		if ( is_user_member_of_blog() ) {
-			return array_values( Jetpack_Options::get_option( 'active_modules', array() ) );
-		}
+		return array_values( Jetpack_Options::get_option( 'active_modules', array() ) );
+	}
 
-		return null;
+	function is_module_active( $module ) {
+		return in_array ( $module, Jetpack_Options::get_option( 'active_modules', array() ), true );
 	}
 
 	function is_vip() {

tests/php/sal/test_class.json-api-platform-jetpack.php

@@ -0,0 +1,54 @@
+<?php
+
+require_once dirname( __FILE__ ) . '/../../../sal/class.json-api-platform.php';
+
+class SalSiteTest extends WP_UnitTestCase {
+	static $token;
+	static $site;
+
+	static function setUpBeforeClass( ) {
+		parent::setUpBeforeClass();
+
+		self::$token = (object) array(
+			'blog_id'          => get_current_blog_id(),
+			'user_id'          => get_current_user_id(),
+			'external_user_id' => 2,
+			'role'             => 'administrator'
+		);
+
+		$platform = wpcom_get_sal_platform( self::$token );
+
+		self::$site = $platform->get_site( self::$token->blog_id );
+	}
+
+	function test_uses_synced_api_post_type_whitelist_if_available() {
+
+		$this->assertFalse( self::$site->is_post_type_allowed( 'my_new_type' ) );
+	}
+
+	function test_is_module_active() {
+
+		// Picking random 3 modules from an array of existing ones to not slow down the test
+		$modules = array_rand( Jetpack::get_available_modules(), 3 );
+
+		foreach ( $modules as $module ) {
+			Jetpack::deactivate_module( $module );
+
+			$this->assertEquals(
+				Jetpack::is_module_active( $module ),
+				self::$site->is_module_active( $module )
+			);
+
+			Jetpack::activate_module( $module );
+
+			$this->assertEquals(
+				Jetpack::is_module_active( $module ),
+				self::$site->is_module_active( $module )
+			);
+		}
+	}
+
+	function test_interface() {
+		$this->assertTrue( method_exists( 'SAL_Site', 'is_module_active' ) );
+	}
+}

tests/php/sal/test_class.json-api-post-jetpack.php

@@ -0,0 +1,39 @@
+<?php
+
+require_once dirname( __FILE__ ) . '/../../../sal/class.json-api-platform.php';
+
+class SalPostsTest extends WP_UnitTestCase {
+	static $token;
+	static $site;
+
+	static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
+		self::$token = (object) array(
+			'blog_id'          => get_current_blog_id(),
+			'user_id'          => get_current_user_id(),
+			'external_user_id' => 2,
+			'role'             => 'administrator'
+		);
+
+		$platform = wpcom_get_sal_platform( self::$token );
+
+		self::$site = $platform->get_site( self::$token->blog_id );
+	}
+
+	function test_returns_content_wrapped_in_a_post_object() {
+		// Insert the post into the database
+		$post_id = wp_insert_post( array(
+			'post_title'    => 'Title',
+			'post_content'  => 'The content.',
+			'post_status'   => 'publish',
+			'post_author'   => get_current_user_id()
+		) );
+
+		$post = get_post( $post_id );
+
+		$wrapped_post = self::$site->wrap_post( $post, 'display' );
+
+		$this->assertEquals( $post->post_type, $wrapped_post->get_type() );
+	}
+}