Changeset 938 in tests for trunk/tests/xmlrpc/wp/uploadFile.php

Timestamp:

07/26/2012 10:42:24 PM (14 years ago)

Author:

markoheijnen

Message:

XML-RPC: Added mime test to wp.uploadFile. Also removed base64_encode() since it breaks the image

File:

• trunk/tests/xmlrpc/wp/uploadFile.php (modified) (4 diffs)

trunk/tests/xmlrpc/wp/uploadFile.php

@@ -5 +5 @@
  */
 class Tests_XMLRPC_wp_uploadFile extends WP_XMLRPC_UnitTestCase {
+
         function test_valid_attachment() {
                 $this->make_user_by_role( 'editor' );
 
                 // create attachment
-                $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
+                $filename = ( DIR_TESTDATA . '/images/a2-small.jpg' );
                 $contents = file_get_contents( $filename );
                 $data = array(
                         'name' => 'a2-small.jpg',
                         'type' => 'image/jpeg',
-                        'bits' => base64_encode( $contents )
+                        'bits' => $contents
                 );
 
@@ -30 +31 @@
 
         /**
-         * @ticket 21292
+         * @tickets 21292
          */
         function test_network_limit() {
@@ -38 +39 @@
 
                 // create attachment
-                $filename = ( DIR_TESTDATA.'/images/canola.jpg' );
+                $filename = ( DIR_TESTDATA . '/images/canola.jpg' );
                 $contents = file_get_contents( $filename );
                 $data = array(
-                        'name' => 'a2-small.jpg',
+                        'name' => 'canola.jpg',
                         'type' => 'image/jpeg',
-                        'bits' => base64_encode( $contents )
+                        'bits' => $contents
                 );
 
@@ -49 +50 @@
 
                 // Only multisite should have a limit
-                if ( is_multisite() ) {
+                if ( is_multisite() )
                         $this->assertInstanceOf( 'IXR_Error', $result );
-                }
-                else {
+                else
                         $this->assertNotInstanceOf( 'IXR_Error', $result );
-                }
+        }
 
+        /**
+         * @ticket 11946
+         */
+        function test_valid_mime() {
+                $this->make_user_by_role( 'editor' );
+
+                // create attachment
+                $filename = ( DIR_TESTDATA . '/images/test-image-mime-jpg.png' );
+                $contents = file_get_contents( $filename );
+                $data = array(
+                        'name' => 'test-image-mime-jpg.png',
+                        'type' => 'image/png',
+                        'bits' => $contents
+                );
+
+                $result = $this->myxmlrpcserver->mw_newMediaObject( array( 0, 'editor', 'editor', $data ) );
+
+                $this->assertNotInstanceOf( 'IXR_Error', $result );
+
+                $this->assertEquals( 'image/jpeg', $result['type'] );
         }
 }