<!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][1335] branches/3.6: Tests: Remove [1329] [1317] [1316] from the 3.6 branch.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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://core.trac.wordpress.org/changeset/1335/tests">1335</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-08-01 18:53:50 +0000 (Thu, 01 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tests: Remove <a href="http://core.trac.wordpress.org/changeset/1329/tests">[1329]</a> <a href="http://core.trac.wordpress.org/changeset/1317/tests">[1317]</a> <a href="http://core.trac.wordpress.org/changeset/1316/tests">[1316]</a> from the 3.6 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches36dataWPHTTPtestcaseredirectionscriptphp">branches/3.6/data/WPHTTP-testcase-redirection-script.php</a></li>
<li><a href="#branches36testshttpbasephp">branches/3.6/tests/http/base.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches36dataWPHTTPtestcaseredirectionscriptphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/data/WPHTTP-testcase-redirection-script.php (1334 => 1335)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/data/WPHTTP-testcase-redirection-script.php 2013-08-01 18:47:30 UTC (rev 1334)
+++ branches/3.6/data/WPHTTP-testcase-redirection-script.php 2013-08-01 18:53:50 UTC (rev 1335)
</span><span class="lines">@@ -83,19 +83,6 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( isset( $_GET['multiple-location-headers'] ) ) {
- if ( ! isset( $_GET['redirected'] ) ) {
- header( "Location: $url?multiple-location-headers=1&redirected=one", false );
- header( "Location: $url?multiple-location-headers=1&redirected=two", false );
- exit;
- }
- if ( 'two' != $_GET['redirected'] )
- echo 'FAIL';
- else
- echo 'PASS';
- exit;
-}
-
</del><span class="cx"> $rt = isset($_GET['rt']) ? $_GET['rt'] : 5;
</span><span class="cx"> $r = isset($_GET['r']) ? $_GET['r'] : 0;
</span><span class="cx">
</span></span></pre></div>
<a id="branches36testshttpbasephp"></a>
<div class="modfile"><h4>Modified: branches/3.6/tests/http/base.php (1334 => 1335)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/tests/http/base.php 2013-08-01 18:47:30 UTC (rev 1334)
+++ branches/3.6/tests/http/base.php 2013-08-01 18:53:50 UTC (rev 1335)
</span><span class="lines">@@ -140,20 +140,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Test handling of PUT requests on redirects
- *
- * @ticket 16889
- */
- function test_no_redirection_on_PUT() {
- $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?201-location=1';
-
- // Test 301 - POST to POST
- $res = wp_remote_request( $url, array( 'method' => 'PUT', 'timeout' => 30 ) );
- $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
- $this->assertTrue( !empty( $res['headers']['location'] ) );
- }
-
- /**
</del><span class="cx"> * @ticket 11888
</span><span class="cx"> */
</span><span class="cx"> function test_send_headers() {
</span><span class="lines">@@ -168,7 +154,7 @@
</span><span class="cx"> if ( empty($value) )
</span><span class="cx"> continue;
</span><span class="cx"> $parts = explode(':', $value,2);
</span><del>- unset($headers[$key]);
</del><ins>+ unset($heaers[$key]);
</ins><span class="cx"> $headers[ $parts[0] ] = $parts[1];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -191,72 +177,4 @@
</span><span class="cx">
</span><span class="cx"> unlink($res['filename']); // Remove the temporary file
</span><span class="cx"> }
</span><del>-
- /**
- * Test POST redirection methods
- *
- * @ticket 17588
- */
- function test_post_redirect_to_method_300() {
- $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?post-redirect-to-method=1';
-
- // Test 300 - POST to POST
- $res = wp_remote_post( add_query_arg( 'response_code', 300, $url ), array( 'timeout' => 30 ) );
- $this->assertEquals( 'POST', wp_remote_retrieve_body( $res ) );
-
- // Test 301 - POST to POST
- $res = wp_remote_post( add_query_arg( 'response_code', 301, $url ), array( 'timeout' => 30 ) );
- $this->assertEquals( 'POST', wp_remote_retrieve_body( $res ) );
-
- // Test 302 - POST to GET
- $res = wp_remote_post( add_query_arg( 'response_code', 302, $url ), array( 'timeout' => 30 ) );
- $this->assertEquals( 'GET', wp_remote_retrieve_body( $res ) );
-
- // Test 303 - POST to GET
- $res = wp_remote_post( add_query_arg( 'response_code', 303, $url ), array( 'timeout' => 30 ) );
- $this->assertEquals( 'GET', wp_remote_retrieve_body( $res ) );
-
- // Test 304 - POST to POST
- $res = wp_remote_post( add_query_arg( 'response_code', 304, $url ), array( 'timeout' => 30 ) );
- $this->assertEquals( 'POST', wp_remote_retrieve_body( $res ) );
- }
-
- /**
- * Test HTTP Requests using an IP url, with a HOST header specified
- *
- * @ticket 24182
- */
- function test_ip_url_with_host_header() {
- $ip = gethostbyname( 'api.wordpress.org' );
- $url = 'http://' . $ip . '/core/tests/1.0/redirection.php?print-pass=1';
- $args = array(
- 'headers' => array(
- 'Host' => 'api.wordpress.org',
- ),
- 'timeout' => 30,
- 'redirection' => 0,
- );
-
- $res = wp_remote_get( $url, $args );
- $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
-
- }
-
- /**
- * Test HTTP Redirects with multiple Location headers specified
- *
- * @ticket 16890
- */
- function test_multiple_location_headers() {
- $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?multiple-location-headers=1';
- $res = wp_remote_head( $url, array( 'timeout' => 30 ) );
-
- $this->assertInternalType( 'array', wp_remote_retrieve_header( $res, 'location' ) );
- $this->assertCount( 2, wp_remote_retrieve_header( $res, 'location' ) );
-
- $res = wp_remote_get( $url, array( 'timeout' => 30 ) );
- $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
-
- }
-
</del><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>