Commit d3bd79d5 authored by Joe Hoyle's avatar Joe Hoyle
Browse files

Correctly detecd non-writing stream modes

parent d831fcc4

inc/class-s3-uploads-stream-wrapper.php

+3 −1
Original line number Diff line number Diff line
@@ -58,7 +58,9 @@ class S3_Uploads_Stream_Wrapper extends Aws\S3\StreamWrapper { 
			return $result;

		}



		if ( $mode === 'r' || $mode === 'a' ) {

		$mode_short = substr( $mode, 0, 1 );



		if ( $mode_short === 'r' || $mode_short === 'a' ) {

			return $result;

		}

tests/test-s3-uploads-stream-wrapper.php

+19 −0
Original line number Diff line number Diff line
@@ -114,4 +114,23 @@ class Test_S3_Uploads_Stream_Wrapper extends WP_UnitTestCase { 


		$this->assertEquals( 0, $result );

	}



	public function test_wp_handle_upload() {



		$path = tempnam( sys_get_temp_dir(), 'canola' ) . '.jpg';

		copy( dirname( __FILE__ ) . '/data/canola.jpg', $path );

		$contents = file_get_contents( $path );

		$file = array(

			'error'    => null,

			'tmp_name' => $path,

			'name'     => 'can.jpg',

			'size'     => filesize( $path ),

 		);



		$result = wp_handle_upload( $file, array( 'test_form' => false, 'test_size' => false, 'action' => 'wp_handle_sideload' ) );



		$this->assertTrue( empty( $result['error'] ) );

		$this->assertTrue( file_exists( $result['file'] ) );

		$this->assertEquals( $contents, file_get_contents( $result['file'] ) );

	}

}