litefeel / writing-on-github

views/options.php

Spacing +12 added lines, -12 removed lines

@@ -6,27 +6,27 @@
 
 ?>
 <div class="wrap">
-	<h2><?php esc_html_e( 'Writing On GitHub', 'writing-on-github' ); ?></h2>
+	<h2><?php esc_html_e('Writing On GitHub', 'writing-on-github'); ?></h2>
 
 	<form method="post" action="options.php">
-		<?php settings_fields( Writing_On_GitHub::$text_domain ); ?>
-		<?php do_settings_sections( Writing_On_GitHub::$text_domain ); ?>
+		<?php settings_fields(Writing_On_GitHub::$text_domain); ?>
+		<?php do_settings_sections(Writing_On_GitHub::$text_domain); ?>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Webhook callback', 'writing-on-github' ); ?></th>
-				<td><code><?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>?action=wogh_push_request</code></td>
+				<th scope="row"><?php esc_html_e('Webhook callback', 'writing-on-github'); ?></th>
+				<td><code><?php echo esc_url(admin_url('admin-ajax.php')); ?>?action=wogh_push_request</code></td>
 			</tr>
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Bulk actions', 'writing-on-github' ); ?></th>
+				<th scope="row"><?php esc_html_e('Bulk actions', 'writing-on-github'); ?></th>
 				<td>
-					<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'export' ) ) ); ?>">
-						<?php esc_html_e( 'Export to GitHub', 'writing-on-github' ); ?>
+					<a href="<?php echo esc_url(add_query_arg(array('action' => 'export'))); ?>">
+						<?php esc_html_e('Export to GitHub', 'writing-on-github'); ?>
 					</a> |
-                    <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'force_export' ) ) ); ?>">
-                        <?php esc_html_e( 'Force export to GitHub', 'writing-on-github' ); ?>
+                    <a href="<?php echo esc_url(add_query_arg(array('action' => 'force_export'))); ?>">
+                        <?php esc_html_e('Force export to GitHub', 'writing-on-github'); ?>
                     </a> |
-					<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'import' ) ) ); ?>">
-						<?php esc_html_e( 'Import from GitHub', 'writing-on-github' ); ?>
+					<a href="<?php echo esc_url(add_query_arg(array('action' => 'import'))); ?>">
+						<?php esc_html_e('Import from GitHub', 'writing-on-github'); ?>
 					</a>
 				</td>
 		</table>

views/user-setting-field.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<select name="<?php echo esc_attr( $args['name'] ) ?>" id="<?php echo esc_attr( $args['name'] ) ?>">
-	<?php foreach ( get_users() as $user ) : ?>
-		<option value="<?php echo esc_attr( $user->ID ); ?>"<?php echo (int) $value === $user->ID ? ' selected' : '';?>>
-			<?php echo esc_html( $user->display_name ); ?>
+<?php $value = get_option($args['name'], $args['default']); ?>
+<select name="<?php echo esc_attr($args['name']) ?>" id="<?php echo esc_attr($args['name']) ?>">
+	<?php foreach (get_users() as $user) : ?>
+		<option value="<?php echo esc_attr($user->ID); ?>"<?php echo (int) $value === $user->ID ? ' selected' : ''; ?>>
+			<?php echo esc_html($user->display_name); ?>
 		</option>
 	<?php endforeach; ?>
 </select>

views/checkbox-setting-field.php

Spacing +2 added lines, -2 removed lines

@@ -5,6 +5,6 @@
  */
 
 ?>
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<input type="checkbox" name="<?php echo esc_attr( $args['name'] ); ?>" id="<?php echo esc_attr( $args['name'] ); ?>" value="yes" <?php echo 'yes' === $value ? 'checked' : '';  ?> />
+<?php $value = get_option($args['name'], $args['default']); ?>
+<input type="checkbox" name="<?php echo esc_attr($args['name']); ?>" id="<?php echo esc_attr($args['name']); ?>" value="yes" <?php echo 'yes' === $value ? 'checked' : ''; ?> />
 <p class="description"><?php echo $args['help_text']; ?></p>

views/setting-field.php

Spacing +2 added lines, -2 removed lines

@@ -5,6 +5,6 @@
  */
 
 ?>
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<input name="<?php echo esc_attr( $args['name'] ); ?>" id="<?php echo esc_attr( $args['name'] ); ?>" type="<?php echo 'wogh_secret' === $args['name'] ? 'password' : 'text'; ?>" value="<?php echo esc_attr( $value ); ?>" />
+<?php $value = get_option($args['name'], $args['default']); ?>
+<input name="<?php echo esc_attr($args['name']); ?>" id="<?php echo esc_attr($args['name']); ?>" type="<?php echo 'wogh_secret' === $args['name'] ? 'password' : 'text'; ?>" value="<?php echo esc_attr($value); ?>" />
 <p class="description"><?php echo $args['help_text']; ?></p>

tests/include/testcase.php

Spacing +39 added lines, -39 removed lines

@@ -85,69 +85,69 @@
 	public function setUp() {
 		parent::setUp();
 
-		$this->data_dir = dirname( __DIR__ ) . '/data/';
-
-		$this->app        = Mockery::mock( 'Writing_On_GitHub' );
-		$this->controller = Mockery::mock( 'Writing_On_GitHub_Controller' );
-		$this->request    = Mockery::mock( 'Writing_On_GitHub_Request' );
-		$this->import     = Mockery::mock( 'Writing_On_GitHub_Import' );
-		$this->export     = Mockery::mock( 'Writing_On_GitHub_Export' );
-		$this->response   = Mockery::mock( 'Writing_On_GitHub_Response' );
-		$this->payload    = Mockery::mock( 'Writing_On_GitHub_Payload' );
-		$this->api        = Mockery::mock( 'Writing_On_GitHub_Api' );
-		$this->semaphore  = Mockery::mock( 'Writing_On_GitHub_Semaphore' );
-		$this->database   = Mockery::mock( 'Writing_On_GitHub_Database' );
-		$this->post       = Mockery::mock( 'Writing_On_GitHub_Post' );
-		$this->blob       = Mockery::mock( 'Writing_On_GitHub_Blob' );
-		$this->api_cache  = Mockery::mock( 'Writing_On_GitHub_Cache' );
-		$this->fetch      = Mockery::mock( 'Writing_On_GitHub_Fetch_Client' );
-		$this->persist    = Mockery::mock( 'Writing_On_GitHub_Persist_Client' );
+		$this->data_dir = dirname(__DIR__) . '/data/';
+
+		$this->app        = Mockery::mock('Writing_On_GitHub');
+		$this->controller = Mockery::mock('Writing_On_GitHub_Controller');
+		$this->request    = Mockery::mock('Writing_On_GitHub_Request');
+		$this->import     = Mockery::mock('Writing_On_GitHub_Import');
+		$this->export     = Mockery::mock('Writing_On_GitHub_Export');
+		$this->response   = Mockery::mock('Writing_On_GitHub_Response');
+		$this->payload    = Mockery::mock('Writing_On_GitHub_Payload');
+		$this->api        = Mockery::mock('Writing_On_GitHub_Api');
+		$this->semaphore  = Mockery::mock('Writing_On_GitHub_Semaphore');
+		$this->database   = Mockery::mock('Writing_On_GitHub_Database');
+		$this->post       = Mockery::mock('Writing_On_GitHub_Post');
+		$this->blob       = Mockery::mock('Writing_On_GitHub_Blob');
+		$this->api_cache  = Mockery::mock('Writing_On_GitHub_Cache');
+		$this->fetch      = Mockery::mock('Writing_On_GitHub_Fetch_Client');
+		$this->persist    = Mockery::mock('Writing_On_GitHub_Persist_Client');
 
 		Writing_On_GitHub::$instance = $this->app;
 
 		$this->app
-			->shouldReceive( 'request' )
-			->andReturn( $this->request )
+			->shouldReceive('request')
+			->andReturn($this->request)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'import' )
-			->andReturn( $this->import )
+			->shouldReceive('import')
+			->andReturn($this->import)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'export' )
-			->andReturn( $this->export )
+			->shouldReceive('export')
+			->andReturn($this->export)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'response' )
-			->andReturn( $this->response )
+			->shouldReceive('response')
+			->andReturn($this->response)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'api' )
-			->andReturn( $this->api )
+			->shouldReceive('api')
+			->andReturn($this->api)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'semaphore' )
-			->andReturn( $this->semaphore )
+			->shouldReceive('semaphore')
+			->andReturn($this->semaphore)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'database' )
-			->andReturn( $this->database )
+			->shouldReceive('database')
+			->andReturn($this->database)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'blob' )
-			->andReturn( $this->blob )
+			->shouldReceive('blob')
+			->andReturn($this->blob)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'cache' )
-			->andReturn( $this->api_cache )
+			->shouldReceive('cache')
+			->andReturn($this->api_cache)
 			->byDefault();
 		$this->api
-			->shouldReceive( 'fetch' )
-			->andReturn( $this->fetch )
+			->shouldReceive('fetch')
+			->andReturn($this->fetch)
 			->byDefault();
 		$this->api
-			->shouldReceive( 'persist' )
-			->andReturn( $this->persist )
+			->shouldReceive('persist')
+			->andReturn($this->persist)
 			->byDefault();
 	}
 

tests/unit/client/test-base.php

Spacing +63 added lines, -63 removed lines

@@ -31,10 +31,10 @@ 
 		parent::setUp();
 
 		WP_HTTP_TestCase::init();
-		update_option( 'wogh_repository', self::REPO_OPTION_VALUE );
-		update_option( 'wogh_oauth_token', self::TOKEN_OPTION_VALUE );
-		update_option( 'wogh_host', self::HOST_OPTION_VALUE );
-		$this->http_responder = array( $this, 'mock_github_api' );
+		update_option('wogh_repository', self::REPO_OPTION_VALUE);
+		update_option('wogh_oauth_token', self::TOKEN_OPTION_VALUE);
+		update_option('wogh_host', self::HOST_OPTION_VALUE);
+		$this->http_responder = array($this, 'mock_github_api');
 	}
 
 	/**
@@ -43,45 +43,45 @@ 
 	 *
 	 * @return void|string
 	 */
-	public function mock_github_api( $request, $url ) {
-		$host_length = strlen( self::HOST_OPTION_VALUE );
+	public function mock_github_api($request, $url) {
+		$host_length = strlen(self::HOST_OPTION_VALUE);
 
-		if ( self::HOST_OPTION_VALUE !== substr( $url, 0, $host_length ) ) {
-			$this->assertTrue( false, 'Called wrong host.' );
+		if (self::HOST_OPTION_VALUE !== substr($url, 0, $host_length)) {
+			$this->assertTrue(false, 'Called wrong host.');
 		}
 
 		if (
-			! isset( $request['headers']['Authorization'] ) ||
+			! isset($request['headers']['Authorization']) ||
 			'token ' . self::TOKEN_OPTION_VALUE !== $request['headers']['Authorization']
 		) {
-			$this->assertTrue( false, 'Missing authorization key.' );
+			$this->assertTrue(false, 'Missing authorization key.');
 		}
 
-		$url = explode( '/', substr( $url, $host_length + 1 ) );
+		$url = explode('/', substr($url, $host_length + 1));
 
-		if ( 'repos' !== $url[0] ) {
-			$this->assertTrue( false, 'Called wrong endpoint.' );
+		if ('repos' !== $url[0]) {
+			$this->assertTrue(false, 'Called wrong endpoint.');
 		}
 
 		$repo = $url[1] . '/' . $url[2];
 
-		if ( self::REPO_OPTION_VALUE !== $repo ) {
-			$this->assertTrue( false, 'Called wrong repo.' );
+		if (self::REPO_OPTION_VALUE !== $repo) {
+			$this->assertTrue(false, 'Called wrong repo.');
 		}
 
-		$parts = array_slice( $url, 4 );
-		array_unshift( $parts, strtolower( $request['method'] ) );
-		$endpoint = implode( '_', $parts );
-		$endpoint = str_replace( '?recursive=1', '', $endpoint );
-		$this->assertTrue( call_user_func( static::$validations[ $endpoint ], $request ), 'Request did not validate.' );
+		$parts = array_slice($url, 4);
+		array_unshift($parts, strtolower($request['method']));
+		$endpoint = implode('_', $parts);
+		$endpoint = str_replace('?recursive=1', '', $endpoint);
+		$this->assertTrue(call_user_func(static::$validations[$endpoint], $request), 'Request did not validate.');
 
-		return static::$responses[ $endpoint ];
+		return static::$responses[$endpoint];
 	}
 
-	protected function set_get_refs_heads_master( $succeed ) {
+	protected function set_get_refs_heads_master($succeed) {
 		$this->set_endpoint(
-			function ( $request ) {
-				if ( '[]' === $request['body'] ) {
+			function($request) {
+				if ('[]' === $request['body']) {
 					return false;
 				}
 
@@ -90,10 +90,10 @@ 
 		);
 	}
 
-	protected function set_get_commits( $succeed ) {
+	protected function set_get_commits($succeed) {
 		$this->set_endpoint(
-			function ( $request ) {
-				if ( '[]' === $request['body'] ) {
+			function($request) {
+				if ('[]' === $request['body']) {
 					return false;
 				}
 
@@ -102,10 +102,10 @@ 
 		);
 	}
 
-	protected function set_get_trees( $succeed, $sha = '' ) {
+	protected function set_get_trees($succeed, $sha = '') {
 		$this->set_endpoint(
-			function ( $request ) {
-				if ( '[]' === $request['body'] ) {
+			function($request) {
+				if ('[]' === $request['body']) {
 					return false;
 				}
 
@@ -115,17 +115,17 @@ 
 		);
 	}
 
-	protected function set_get_blobs( $succeed ) {
+	protected function set_get_blobs($succeed) {
 		$shas = array(
 			'9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
 			'8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
 			'2d73165945b0ccbe4932f1363457986b0ed49f19',
 		);
 
-		foreach ( $shas as $sha ) {
+		foreach ($shas as $sha) {
 			$this->set_endpoint(
-				function ( $request ) {
-					if ( '[]' === $request['body'] ) {
+				function($request) {
+					if ('[]' === $request['body']) {
 						return false;
 					}
 
@@ -135,26 +135,26 @@ 
 		}
 	}
 
-	protected function set_post_trees( $succeed ) {
+	protected function set_post_trees($succeed) {
 		$this->set_endpoint(
-			function ( $request ) {
-				$body = json_decode( $request['body'], true );
+			function($request) {
+				$body = json_decode($request['body'], true);
 
-				if ( ! isset( $body['tree'] ) ) {
+				if ( ! isset($body['tree'])) {
 					return false;
 				}
 
-				if ( 1 !== count( $body['tree'] ) ) {
+				if (1 !== count($body['tree'])) {
 					return false;
 				}
 
-				$blob = reset( $body['tree'] );
+				$blob = reset($body['tree']);
 
 				if (
-					! isset( $blob['path'] ) ||
-					! isset( $blob['type'] ) ||
-					! isset( $blob['content'] ) ||
-					! isset( $blob['mode'] )
+					! isset($blob['path']) ||
+					! isset($blob['type']) ||
+					! isset($blob['content']) ||
+					! isset($blob['mode'])
 				) {
 					return false;
 				}
@@ -166,25 +166,25 @@ 
 		);
 	}
 
-	protected function set_post_commits( $succeed, $anonymous = true ) {
+	protected function set_post_commits($succeed, $anonymous = true) {
 		$this->set_endpoint(
-			function ( $request ) use ( $anonymous ) {
-				$body = json_decode( $request['body'], true );
+			function($request) use ($anonymous) {
+				$body = json_decode($request['body'], true);
 
 				if (
-					! isset( $body['tree'] ) ||
-					! isset( $body['message'] ) ||
-					! isset( $body['parents'] ) ||
-					! isset( $body['author'] )
+					! isset($body['tree']) ||
+					! isset($body['message']) ||
+					! isset($body['parents']) ||
+					! isset($body['author'])
 				) {
 					return false;
 				}
 
-				if ( 1 !== count( $body['parents'] ) ) {
+				if (1 !== count($body['parents'])) {
 					return false;
 				}
 
-				if ( ! $anonymous ) {
+				if ( ! $anonymous) {
 					if (
 						'James DiGioia' !== $body['author']['name'] ||
 						'jamesorodig@gmail.com' !== $body['author']['email']
@@ -207,12 +207,12 @@ 
 		);
 	}
 
-	protected function set_patch_refs_heads_master( $succeed ) {
+	protected function set_patch_refs_heads_master($succeed) {
 		$this->set_endpoint(
-			function ( $request ) {
-				$body = json_decode( $request['body'], true );
+			function($request) {
+				$body = json_decode($request['body'], true);
 
-				if ( ! isset( $body['sha'] ) ) {
+				if ( ! isset($body['sha'])) {
 					return false;
 				}
 
@@ -223,18 +223,18 @@ 
 		);
 	}
 
-	private function set_endpoint( $validation, $status, $succeed, $sha = '' ) {
-		list( , $caller ) = debug_backtrace( false );
-		$endpoint = substr( $caller['function'], 4 ) . ( $sha ? "_$sha" : '' );
+	private function set_endpoint($validation, $status, $succeed, $sha = '') {
+		list(, $caller) = debug_backtrace(false);
+		$endpoint = substr($caller['function'], 4) . ($sha ? "_$sha" : '');
 
-		static::$validations[ $endpoint ] = $validation;
+		static::$validations[$endpoint] = $validation;
 
-		static::$responses[ $endpoint ] = array(
+		static::$responses[$endpoint] = array(
 			'headers' => array(
 				'status' => $status,
 			),
 			'body'    => file_get_contents(
-				$this->data_dir . $endpoint . '_' . ( $succeed ? 'succeed' : 'fail' ) . '.json'
+				$this->data_dir . $endpoint . '_' . ($succeed ? 'succeed' : 'fail') . '.json'
 			),
 		);
 	}

tests/unit/client/test-fetch.php

Doc Comments +3 added lines

@@ -159,6 +159,9 @@
     //  }
     // }
 
+    /**
+     * @param string $repo
+     */
     protected function malformed_repo( $repo ) {
         update_option( Base::REPO_OPTION_KEY, $repo );
 

Indentation +159 added lines, -159 removed lines

@@ -6,163 +6,163 @@
  */
 class Writing_On_GitHub_Fetch_Client_Test extends Writing_On_GitHub_Base_Client_Test {
 
-    public function setUp() {
-        parent::setUp();
-
-        $this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
-        $this->api_cache
-            ->shouldReceive( 'fetch_blob' )
-            ->andReturn( false )
-            ->byDefault();
-    }
-
-    public function test_should_fail_if_missing_token() {
-        delete_option( Base::TOKEN_OPTION_KEY );
-
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'missing_token', $error->get_error_code() );
-    }
-
-    public function test_should_fail_if_missing_repo() {
-        delete_option( Base::REPO_OPTION_KEY );
-
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'missing_repository', $error->get_error_code() );
-    }
-
-    public function test_should_fail_if_malformed_repo() {
-        // If you find a particular name passing that shouldn't,
-        // add it to the list here and make it pass.
-        $this->malformed_repo( 'repositoryname' );
-    }
-
-    public function test_should_return_files_with_tree() {
-        // $this->set_get_refs_heads_master( true );
-        // $this->set_get_commits( true );
-        $this->set_get_trees( true, 'master' );
-
-        $this->assertCount( 3, $this->fetch->tree_recursive() );
-    }
-
-    public function test_should_fail_if_cant_fetch_tree() {
-        $this->set_get_trees( false, 'master' );
-
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( '422_unprocessable_entity', $error->get_error_code() );
-    }
-
-    // public function test_should_return_commit_with_blobs_from_cache() {
-    //  $this->set_get_trees( true, 'master' );
-    //  $this->set_get_blobs( true );
-    //  $this->api_cache
-    //      ->shouldReceive( 'fetch_blob' )
-    //      ->times( 3 )
-    //      ->with( Mockery::anyOf(
-    //          '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
-    //          '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
-    //          '2d73165945b0ccbe4932f1363457986b0ed49f19'
-    //      ) )
-    //      ->andReturn( $this->blob );
-
-    //  $this->assertCount( 3, $files = $this->fetch->tree_recursive() );
-
-    //  foreach ( $files as $file ) {
-    //      $this->assertSame( $this->blob, $this->fetch->blob( $file ) );
-    //  }
-    // }
-
-    public function test_should_return_commit_with_no_blobs_if_api_fails() {
-        $this->set_get_trees( true, 'master' );
-        $this->set_get_blobs( false );
-
-        $this->assertCount( 3, $files = $this->fetch->tree_recursive() );
-
-        foreach ( $files as $file ) {
-            $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->blob( $file ) );
-            $this->assertSame( '404_not_found', $error->get_error_code() );
-        }
-    }
-
-    // public function test_should_return_and_validate_full_commit() {
-    //  $this->set_get_refs_heads_master( true );
-    //  $this->set_get_commits( true );
-    //  $this->set_get_trees( true );
-    //  $this->set_get_blobs( true );
-    //  $this->api_cache
-    //      ->shouldReceive( 'set_blob' )
-    //      ->times( 3 )
-    //      ->with(
-    //          Mockery::anyOf(
-    //              '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
-    //              '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
-    //              '2d73165945b0ccbe4932f1363457986b0ed49f19'
-    //          ),
-    //          Mockery::type( 'Writing_On_GitHub_Blob' )
-    //      )
-    //      ->andReturnUsing( function ( $sha, $blob ) {
-    //          return $blob;
-    //      } );
-    //  $this->api_cache
-    //      ->shouldReceive( 'set_tree' )
-    //      ->once()
-    //      ->with( '9108868e3800bec6763e51beb0d33e15036c3626', Mockery::type( 'Writing_On_GitHub_Tree' ) )
-    //      ->andReturnUsing( function ( $sha, $tree ) {
-    //          return $tree;
-    //      } );
-    //  $this->api_cache
-    //      ->shouldReceive( 'set_commit' )
-    //      ->once()
-    //      ->with( 'db2510854e6aeab68ead26b48328b19f4bdf926e', Mockery::type( 'Writing_On_GitHub_Commit' ) )
-    //      ->andReturnUsing( function ( $sha, $commit ) {
-    //          return $commit;
-    //      } );
-
-    //  $this->assertInstanceOf( 'Writing_On_GitHub_Commit', $master = $this->fetch->master() );
-
-    //  /**
-    //   * Validate the commit's api data mapped correctly.
-    //   */
-    //  $this->assertSame( '7497c0574b9430ff5e5521b4572b7452ea36a056', $master->sha() );
-    //  $this->assertSame( 'test@test.com', $master->author()->email );
-    //  $this->assertSame( '2015-11-02T00:36:54Z', $master->author()->date );
-    //  $this->assertSame( 'test@test.com', $master->committer()->email );
-    //  $this->assertSame( '2015-11-02T00:36:54Z', $master->committer()->date );
-    //  $this->assertSame( 'Initial full site export - wogh', $master->message() );
-    //  $this->assertCount( 1, $parents = $master->parents() );
-    //  $this->assertSame( 'db2510854e6aeab68ead26b48328b19f4bdf926e', $parents[0]->sha );
-
-    //  $this->assertInstanceOf( 'Writing_On_GitHub_Tree', $tree = $master->tree() );
-
-    //  /**
-    //   * Validate the tree's api data mapped correctly.
-    //   */
-    //  $this->assertSame( '9108868e3800bec6763e51beb0d33e15036c3626', $tree->sha() );
-
-    //  $this->assertCount( 3, $blobs = $tree->blobs() );
-
-    //  /**
-    //   * Validate the blobs' api data mapped correctly.
-    //   */
-    //  $blobs = $tree->blobs();
-    //  $this->assertCount( 3, $blobs );
-    //  foreach ( $blobs as $blob ) {
-    //      $this->assertTrue( in_array( $blob->sha(), array(
-    //          '2d73165945b0ccbe4932f1363457986b0ed49f19',
-    //          '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
-    //          '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
-    //      ) ) );
-    //      $this->assertTrue( in_array( $blob->path(), array(
-    //          '_pages/sample-page.md',
-    //          '_posts/2015-11-02-hello-world.md',
-    //          'README.md',
-    //      ) ) );
-    //  }
-    // }
-
-    protected function malformed_repo( $repo ) {
-        update_option( Base::REPO_OPTION_KEY, $repo );
-
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'malformed_repository', $error->get_error_code() );
-    }
+	public function setUp() {
+		parent::setUp();
+
+		$this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+		$this->api_cache
+			->shouldReceive( 'fetch_blob' )
+			->andReturn( false )
+			->byDefault();
+	}
+
+	public function test_should_fail_if_missing_token() {
+		delete_option( Base::TOKEN_OPTION_KEY );
+
+		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
+		$this->assertSame( 'missing_token', $error->get_error_code() );
+	}
+
+	public function test_should_fail_if_missing_repo() {
+		delete_option( Base::REPO_OPTION_KEY );
+
+		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
+		$this->assertSame( 'missing_repository', $error->get_error_code() );
+	}
+
+	public function test_should_fail_if_malformed_repo() {
+		// If you find a particular name passing that shouldn't,
+		// add it to the list here and make it pass.
+		$this->malformed_repo( 'repositoryname' );
+	}
+
+	public function test_should_return_files_with_tree() {
+		// $this->set_get_refs_heads_master( true );
+		// $this->set_get_commits( true );
+		$this->set_get_trees( true, 'master' );
+
+		$this->assertCount( 3, $this->fetch->tree_recursive() );
+	}
+
+	public function test_should_fail_if_cant_fetch_tree() {
+		$this->set_get_trees( false, 'master' );
+
+		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
+		$this->assertSame( '422_unprocessable_entity', $error->get_error_code() );
+	}
+
+	// public function test_should_return_commit_with_blobs_from_cache() {
+	//  $this->set_get_trees( true, 'master' );
+	//  $this->set_get_blobs( true );
+	//  $this->api_cache
+	//      ->shouldReceive( 'fetch_blob' )
+	//      ->times( 3 )
+	//      ->with( Mockery::anyOf(
+	//          '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
+	//          '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
+	//          '2d73165945b0ccbe4932f1363457986b0ed49f19'
+	//      ) )
+	//      ->andReturn( $this->blob );
+
+	//  $this->assertCount( 3, $files = $this->fetch->tree_recursive() );
+
+	//  foreach ( $files as $file ) {
+	//      $this->assertSame( $this->blob, $this->fetch->blob( $file ) );
+	//  }
+	// }
+
+	public function test_should_return_commit_with_no_blobs_if_api_fails() {
+		$this->set_get_trees( true, 'master' );
+		$this->set_get_blobs( false );
+
+		$this->assertCount( 3, $files = $this->fetch->tree_recursive() );
+
+		foreach ( $files as $file ) {
+			$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->blob( $file ) );
+			$this->assertSame( '404_not_found', $error->get_error_code() );
+		}
+	}
+
+	// public function test_should_return_and_validate_full_commit() {
+	//  $this->set_get_refs_heads_master( true );
+	//  $this->set_get_commits( true );
+	//  $this->set_get_trees( true );
+	//  $this->set_get_blobs( true );
+	//  $this->api_cache
+	//      ->shouldReceive( 'set_blob' )
+	//      ->times( 3 )
+	//      ->with(
+	//          Mockery::anyOf(
+	//              '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
+	//              '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
+	//              '2d73165945b0ccbe4932f1363457986b0ed49f19'
+	//          ),
+	//          Mockery::type( 'Writing_On_GitHub_Blob' )
+	//      )
+	//      ->andReturnUsing( function ( $sha, $blob ) {
+	//          return $blob;
+	//      } );
+	//  $this->api_cache
+	//      ->shouldReceive( 'set_tree' )
+	//      ->once()
+	//      ->with( '9108868e3800bec6763e51beb0d33e15036c3626', Mockery::type( 'Writing_On_GitHub_Tree' ) )
+	//      ->andReturnUsing( function ( $sha, $tree ) {
+	//          return $tree;
+	//      } );
+	//  $this->api_cache
+	//      ->shouldReceive( 'set_commit' )
+	//      ->once()
+	//      ->with( 'db2510854e6aeab68ead26b48328b19f4bdf926e', Mockery::type( 'Writing_On_GitHub_Commit' ) )
+	//      ->andReturnUsing( function ( $sha, $commit ) {
+	//          return $commit;
+	//      } );
+
+	//  $this->assertInstanceOf( 'Writing_On_GitHub_Commit', $master = $this->fetch->master() );
+
+	//  /**
+	//   * Validate the commit's api data mapped correctly.
+	//   */
+	//  $this->assertSame( '7497c0574b9430ff5e5521b4572b7452ea36a056', $master->sha() );
+	//  $this->assertSame( 'test@test.com', $master->author()->email );
+	//  $this->assertSame( '2015-11-02T00:36:54Z', $master->author()->date );
+	//  $this->assertSame( 'test@test.com', $master->committer()->email );
+	//  $this->assertSame( '2015-11-02T00:36:54Z', $master->committer()->date );
+	//  $this->assertSame( 'Initial full site export - wogh', $master->message() );
+	//  $this->assertCount( 1, $parents = $master->parents() );
+	//  $this->assertSame( 'db2510854e6aeab68ead26b48328b19f4bdf926e', $parents[0]->sha );
+
+	//  $this->assertInstanceOf( 'Writing_On_GitHub_Tree', $tree = $master->tree() );
+
+	//  /**
+	//   * Validate the tree's api data mapped correctly.
+	//   */
+	//  $this->assertSame( '9108868e3800bec6763e51beb0d33e15036c3626', $tree->sha() );
+
+	//  $this->assertCount( 3, $blobs = $tree->blobs() );
+
+	//  /**
+	//   * Validate the blobs' api data mapped correctly.
+	//   */
+	//  $blobs = $tree->blobs();
+	//  $this->assertCount( 3, $blobs );
+	//  foreach ( $blobs as $blob ) {
+	//      $this->assertTrue( in_array( $blob->sha(), array(
+	//          '2d73165945b0ccbe4932f1363457986b0ed49f19',
+	//          '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
+	//          '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
+	//      ) ) );
+	//      $this->assertTrue( in_array( $blob->path(), array(
+	//          '_pages/sample-page.md',
+	//          '_posts/2015-11-02-hello-world.md',
+	//          'README.md',
+	//      ) ) );
+	//  }
+	// }
+
+	protected function malformed_repo( $repo ) {
+		update_option( Base::REPO_OPTION_KEY, $repo );
+
+		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
+		$this->assertSame( 'malformed_repository', $error->get_error_code() );
+	}
 }

Spacing +25 added lines, -25 removed lines

@@ -9,46 +9,46 @@ 
     public function setUp() {
         parent::setUp();
 
-        $this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+        $this->fetch = new Writing_On_GitHub_Fetch_Client($this->app);
         $this->api_cache
-            ->shouldReceive( 'fetch_blob' )
-            ->andReturn( false )
+            ->shouldReceive('fetch_blob')
+            ->andReturn(false)
             ->byDefault();
     }
 
     public function test_should_fail_if_missing_token() {
-        delete_option( Base::TOKEN_OPTION_KEY );
+        delete_option(Base::TOKEN_OPTION_KEY);
 
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'missing_token', $error->get_error_code() );
+        $this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+        $this->assertSame('missing_token', $error->get_error_code());
     }
 
     public function test_should_fail_if_missing_repo() {
-        delete_option( Base::REPO_OPTION_KEY );
+        delete_option(Base::REPO_OPTION_KEY);
 
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'missing_repository', $error->get_error_code() );
+        $this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+        $this->assertSame('missing_repository', $error->get_error_code());
     }
 
     public function test_should_fail_if_malformed_repo() {
         // If you find a particular name passing that shouldn't,
         // add it to the list here and make it pass.
-        $this->malformed_repo( 'repositoryname' );
+        $this->malformed_repo('repositoryname');
     }
 
     public function test_should_return_files_with_tree() {
         // $this->set_get_refs_heads_master( true );
         // $this->set_get_commits( true );
-        $this->set_get_trees( true, 'master' );
+        $this->set_get_trees(true, 'master');
 
-        $this->assertCount( 3, $this->fetch->tree_recursive() );
+        $this->assertCount(3, $this->fetch->tree_recursive());
     }
 
     public function test_should_fail_if_cant_fetch_tree() {
-        $this->set_get_trees( false, 'master' );
+        $this->set_get_trees(false, 'master');
 
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( '422_unprocessable_entity', $error->get_error_code() );
+        $this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+        $this->assertSame('422_unprocessable_entity', $error->get_error_code());
     }
 
     // public function test_should_return_commit_with_blobs_from_cache() {
@@ -72,14 +72,14 @@ 
     // }
 
     public function test_should_return_commit_with_no_blobs_if_api_fails() {
-        $this->set_get_trees( true, 'master' );
-        $this->set_get_blobs( false );
+        $this->set_get_trees(true, 'master');
+        $this->set_get_blobs(false);
 
-        $this->assertCount( 3, $files = $this->fetch->tree_recursive() );
+        $this->assertCount(3, $files = $this->fetch->tree_recursive());
 
-        foreach ( $files as $file ) {
-            $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->blob( $file ) );
-            $this->assertSame( '404_not_found', $error->get_error_code() );
+        foreach ($files as $file) {
+            $this->assertInstanceOf('WP_Error', $error = $this->fetch->blob($file));
+            $this->assertSame('404_not_found', $error->get_error_code());
         }
     }
 
@@ -159,10 +159,10 @@ 
     //  }
     // }
 
-    protected function malformed_repo( $repo ) {
-        update_option( Base::REPO_OPTION_KEY, $repo );
+    protected function malformed_repo($repo) {
+        update_option(Base::REPO_OPTION_KEY, $repo);
 
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'malformed_repository', $error->get_error_code() );
+        $this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+        $this->assertSame('malformed_repository', $error->get_error_code());
     }
 }

tests/include/bootstrap.php

Indentation +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
  */
 $_tests_dir = getenv( 'WP_TESTS_DIR' );
 if ( ! $_tests_dir ) {
-    $_tests_dir = '/tmp/wordpress-tests-lib';
+	$_tests_dir = '/tmp/wordpress-tests-lib';
 }
 // Give access to tests_add_filter() function.
 require_once $_tests_dir . '/includes/functions.php';
@@ -15,8 +15,8 @@ 
  * Manually load the plugin being tested.
  */
 function _manually_load_plugin() {
-    require dirname( __FILE__ ) . '/../../writing-on-github.php';
-    remove_action( 'plugins_loaded', array( Writing_On_GitHub::$instance, 'boot' ) );
+	require dirname( __FILE__ ) . '/../../writing-on-github.php';
+	remove_action( 'plugins_loaded', array( Writing_On_GitHub::$instance, 'boot' ) );
 }
 tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
 // Start up the WP testing environment.

Spacing +7 added lines, -7 removed lines

@@ -2,24 +2,24 @@
 /**
  * PHPUnit bootstrap file
  */
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
-if ( ! $_tests_dir ) {
+$_tests_dir = getenv('WP_TESTS_DIR');
+if ( ! $_tests_dir) {
     $_tests_dir = '/tmp/wordpress-tests-lib';
 }
 // Give access to tests_add_filter() function.
 require_once $_tests_dir . '/includes/functions.php';
 
-define( 'WRITING_ON_GITHUB_TEST', true );
+define('WRITING_ON_GITHUB_TEST', true);
 
 /**
  * Manually load the plugin being tested.
  */
 function _manually_load_plugin() {
-    require dirname( __FILE__ ) . '/../../writing-on-github.php';
-    remove_action( 'plugins_loaded', array( Writing_On_GitHub::$instance, 'boot' ) );
+    require dirname(__FILE__) . '/../../writing-on-github.php';
+    remove_action('plugins_loaded', array(Writing_On_GitHub::$instance, 'boot'));
 }
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
 // Start up the WP testing environment.
 require $_tests_dir . '/includes/bootstrap.php';
 
-error_reporting( E_ALL ^ E_DEPRECATED );
+error_reporting(E_ALL ^ E_DEPRECATED);