<!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][1268] trunk/tests/term/slashes.php: Update the tests for #WP21767 to expect slashed data.</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://core.trac.wordpress.org/changeset/1268/tests">1268</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2013-04-22 18:03:08 +0000 (Mon, 22 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update the tests for #WP21767 to expect slashed data. Round 5.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkteststermslashesphp">trunk/tests/term/slashes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkteststermslashesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/term/slashes.php (1267 => 1268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/term/slashes.php 2013-04-22 16:44:49 UTC (rev 1267)
+++ trunk/tests/term/slashes.php 2013-04-22 18:03:08 UTC (rev 1268)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $term = get_term_by( 'slug', 'string-with-1-slash', 'category' );
</span><del>- $this->assertEquals( $this->slash_1, $term->name );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_1 ), $term->name );
</ins><span class="cx">
</span><span class="cx"> $_POST = $_GET = $_REQUEST = array();
</span><span class="cx"> $_POST = array(
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $term = get_term_by( 'slug', 'string-with-3-slashes', 'category' );
</span><del>- $this->assertEquals( $this->slash_3, $term->name );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_3 ), $term->name );
</ins><span class="cx">
</span><span class="cx"> $_POST = $_GET = $_REQUEST = array();
</span><span class="cx"> $_POST = array(
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $term = get_term_by( 'slug', 'string-with-2-slashes', 'category' );
</span><del>- $this->assertEquals( $this->slash_2, $term->name );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_2 ), $term->name );
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -116,8 +116,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $term = get_term_by( 'slug', 'controller_slash_test_1_'.$taxonomy, $taxonomy );
</span><del>- $this->assertEquals( $this->slash_1, $term->name );
- $this->assertEquals( $this->slash_3, $term->description );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_1 ), $term->name );
+ $this->assertEquals( wp_unslash( $this->slash_3 ), $term->description );
</ins><span class="cx">
</span><span class="cx"> $_POST = array(
</span><span class="cx"> '_wpnonce_add-tag' => wp_create_nonce( 'add-tag' ),
</span><span class="lines">@@ -136,8 +136,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $term = get_term_by( 'slug', 'controller_slash_test_2_'.$taxonomy, $taxonomy );
</span><del>- $this->assertEquals( $this->slash_3, $term->name );
- $this->assertEquals( $this->slash_5, $term->description );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_3 ), $term->name );
+ $this->assertEquals( wp_unslash( $this->slash_5 ), $term->description );
</ins><span class="cx">
</span><span class="cx"> $_POST = array(
</span><span class="cx"> '_wpnonce_add-tag' => wp_create_nonce( 'add-tag' ),
</span><span class="lines">@@ -156,13 +156,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $term = get_term_by( 'slug', 'controller_slash_test_3_'.$taxonomy, $taxonomy );
</span><del>- $this->assertEquals( $this->slash_2, $term->name );
- $this->assertEquals( $this->slash_4, $term->description );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_2 ), $term->name );
+ $this->assertEquals( wp_unslash( $this->slash_4 ), $term->description );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Tests the model function that expects un-slashed data
</del><ins>+ * Tests the model function that expects slashed data
</ins><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function test_wp_insert_term() {
</span><span class="lines">@@ -180,8 +180,8 @@
</span><span class="cx"> )
</span><span class="cx"> );
</span><span class="cx"> $term = get_term( $insert['term_id'], $taxonomy );
</span><del>- $this->assertEquals( $this->slash_1, $term->name );
- $this->assertEquals( $this->slash_3, $term->description );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_1 ), $term->name );
+ $this->assertEquals( wp_unslash( $this->slash_3 ), $term->description );
</ins><span class="cx">
</span><span class="cx"> $insert = wp_insert_term(
</span><span class="cx"> $this->slash_3,
</span><span class="lines">@@ -192,8 +192,8 @@
</span><span class="cx"> )
</span><span class="cx"> );
</span><span class="cx"> $term = get_term( $insert['term_id'], $taxonomy );
</span><del>- $this->assertEquals( $this->slash_3, $term->name );
- $this->assertEquals( $this->slash_5, $term->description );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_3 ), $term->name );
+ $this->assertEquals( wp_unslash( $this->slash_5 ), $term->description );
</ins><span class="cx">
</span><span class="cx"> $insert = wp_insert_term(
</span><span class="cx"> $this->slash_2,
</span><span class="lines">@@ -204,13 +204,13 @@
</span><span class="cx"> )
</span><span class="cx"> );
</span><span class="cx"> $term = get_term( $insert['term_id'], $taxonomy );
</span><del>- $this->assertEquals( $this->slash_2, $term->name );
- $this->assertEquals( $this->slash_4, $term->description );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_2 ), $term->name );
+ $this->assertEquals( wp_unslash( $this->slash_4 ), $term->description );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Tests the model function that expects un-slashed data
</del><ins>+ * Tests the model function that expects slashed data
</ins><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function test_wp_update_term() {
</span><span class="lines">@@ -233,8 +233,8 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $term = get_term( $id, $taxonomy );
</span><del>- $this->assertEquals( $this->slash_1, $term->name );
- $this->assertEquals( $this->slash_3, $term->description );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_1 ), $term->name );
+ $this->assertEquals( wp_unslash( $this->slash_3 ), $term->description );
</ins><span class="cx">
</span><span class="cx"> $update = wp_update_term(
</span><span class="cx"> $id,
</span><span class="lines">@@ -245,8 +245,8 @@
</span><span class="cx"> )
</span><span class="cx"> );
</span><span class="cx"> $term = get_term( $id, $taxonomy );
</span><del>- $this->assertEquals( $this->slash_3, $term->name );
- $this->assertEquals( $this->slash_5, $term->description );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_3 ), $term->name );
+ $this->assertEquals( wp_unslash( $this->slash_5 ), $term->description );
</ins><span class="cx">
</span><span class="cx"> $update = wp_update_term(
</span><span class="cx"> $id,
</span><span class="lines">@@ -257,8 +257,8 @@
</span><span class="cx"> )
</span><span class="cx"> );
</span><span class="cx"> $term = get_term( $id, $taxonomy );
</span><del>- $this->assertEquals( $this->slash_2, $term->name );
- $this->assertEquals( $this->slash_4, $term->description );
</del><ins>+ $this->assertEquals( wp_unslash( $this->slash_2 ), $term->name );
+ $this->assertEquals( wp_unslash( $this->slash_4 ), $term->description );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>