<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Tests][938] trunk/tests/xmlrpc/wp/uploadFile.php: XML-RPC: Added mime test to wp.uploadFile.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://unit-tests.trac.wordpress.org/changeset/938">938</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2012-07-26 22:42:24 +0000 (Thu, 26 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>XML-RPC: Added mime test to wp.uploadFile. Also removed base64_encode() since it breaks the image</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsxmlrpcwpuploadFilephp">trunk/tests/xmlrpc/wp/uploadFile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsxmlrpcwpuploadFilephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/xmlrpc/wp/uploadFile.php (937 => 938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/xmlrpc/wp/uploadFile.php 2012-07-26 21:19:52 UTC (rev 937)
+++ trunk/tests/xmlrpc/wp/uploadFile.php 2012-07-26 22:42:24 UTC (rev 938)
</span><span class="lines">@@ -4,16 +4,17 @@
</span><span class="cx"> * @group xmlrpc
</span><span class="cx"> */
</span><span class="cx"> class Tests_XMLRPC_wp_uploadFile extends WP_XMLRPC_UnitTestCase {
</span><ins>+
</ins><span class="cx"> function test_valid_attachment() {
</span><span class="cx"> $this->make_user_by_role( 'editor' );
</span><span class="cx">
</span><span class="cx"> // create attachment
</span><del>- $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
</del><ins>+ $filename = ( DIR_TESTDATA . '/images/a2-small.jpg' );
</ins><span class="cx"> $contents = file_get_contents( $filename );
</span><span class="cx"> $data = array(
</span><span class="cx"> 'name' => 'a2-small.jpg',
</span><span class="cx"> 'type' => 'image/jpeg',
</span><del>- 'bits' => base64_encode( $contents )
</del><ins>+ 'bits' => $contents
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -29,7 +30,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @ticket 21292
</del><ins>+ * @tickets 21292
</ins><span class="cx"> */
</span><span class="cx"> function test_network_limit() {
</span><span class="cx"> $this->make_user_by_role( 'editor' );
</span><span class="lines">@@ -37,23 +38,42 @@
</span><span class="cx"> update_option( 'blog_upload_space', 0.1 );
</span><span class="cx">
</span><span class="cx"> // create attachment
</span><del>- $filename = ( DIR_TESTDATA.'/images/canola.jpg' );
</del><ins>+ $filename = ( DIR_TESTDATA . '/images/canola.jpg' );
</ins><span class="cx"> $contents = file_get_contents( $filename );
</span><span class="cx"> $data = array(
</span><del>- 'name' => 'a2-small.jpg',
</del><ins>+ 'name' => 'canola.jpg',
</ins><span class="cx"> 'type' => 'image/jpeg',
</span><del>- 'bits' => base64_encode( $contents )
</del><ins>+ 'bits' => $contents
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $result = $this->myxmlrpcserver->mw_newMediaObject( array( 0, 'editor', 'editor', $data ) );
</span><span class="cx">
</span><span class="cx"> // Only multisite should have a limit
</span><del>- if ( is_multisite() ) {
</del><ins>+ if ( is_multisite() )
</ins><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><del>- }
- else {
</del><ins>+ else
</ins><span class="cx"> $this->assertNotInstanceOf( 'IXR_Error', $result );
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><ins>+ /**
+ * @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'] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>