<!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>[722] wp-testcase: Better handling of wp_die() in ajax unit tests.</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/722">722</a></dd>
<dt>Author</dt> <dd>kurtpayne</dd>
<dt>Date</dt> <dd>2012-05-24 18:16:26 +0000 (Thu, 24 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better handling of wp_die() in ajax unit tests. See <a href="http://unit-tests.trac.wordpress.org/ticket/40">#40</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetestajaxactionstest_admin_ajax_delete_commentsphp">wp-testcase/test-ajax-actions/test_admin_ajax_delete_comments.php</a></li>
<li><a href="#wptestcasetestajaxactionstest_admin_ajax_dim_commentsphp">wp-testcase/test-ajax-actions/test_admin_ajax_dim_comments.php</a></li>
<li><a href="#wptestcasetestajaxactionstest_admin_ajax_edit_commentphp">wp-testcase/test-ajax-actions/test_admin_ajax_edit_comment.php</a></li>
<li><a href="#wptestcasetestajaxactionstest_admin_ajax_get_commentsphp">wp-testcase/test-ajax-actions/test_admin_ajax_get_comments.php</a></li>
<li><a href="#wptestcasetestajaxactionstest_admin_ajax_replyto_commentphp">wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php</a></li>
<li><a href="#wptestcasetestajaxactionstest_admin_ajax_save_draftphp">wp-testcase/test-ajax-actions/test_admin_ajax_save_draft.php</a></li>
<li><a href="#wptestcasetest_admin_includes_ajax_actionsphp">wp-testcase/test_admin_includes_ajax_actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetestajaxactionstest_admin_ajax_delete_commentsphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-ajax-actions/test_admin_ajax_delete_comments.php (721 => 722)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-ajax-actions/test_admin_ajax_delete_comments.php 2012-05-23 20:47:35 UTC (rev 721)
+++ wp-testcase/test-ajax-actions/test_admin_ajax_delete_comments.php 2012-05-24 18:16:26 UTC (rev 722)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> unset($_POST['spam']);
</span><span class="cx"> unset($_POST['unspam']);
</span><span class="cx"> unset($_POST['delete']);
</span><ins>+ $this->_last_response = '';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /***********************************************************/
</span><span class="lines">@@ -84,7 +85,11 @@
</span><span class="cx"> $_POST['_url'] = admin_url( 'edit-comments.php' );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->_handleAjax( 'delete-comment' );
</del><ins>+ try {
+ $this->_handleAjax( 'delete-comment' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
</ins><span class="cx">
</span><span class="cx"> // Get the response
</span><span class="cx"> $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );
</span><span class="lines">@@ -137,7 +142,7 @@
</span><span class="cx"> $_POST['_url'] = admin_url( 'edit-comments.php' );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'delete-comment' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -167,7 +172,7 @@
</span><span class="cx"> $_POST['_url'] = admin_url( 'edit-comments.php' );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'delete-comment' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -198,8 +203,8 @@
</span><span class="cx"> // Make the request, look for a timestamp in the exception
</span><span class="cx"> try {
</span><span class="cx"> $this->_handleAjax( 'delete-comment' );
</span><del>- $this->fail( 'Expected exception: WPAjaxDieException' );
- } catch ( WPAjaxDieException $e ) {
</del><ins>+ $this->fail( 'Expected exception: WPAjaxDieStopException' );
+ } catch ( WPAjaxDieStopException $e ) {
</ins><span class="cx"> $this->assertEquals( 10, strlen( $e->getMessage() ) );
</span><span class="cx"> $this->assertTrue( is_numeric( $e->getMessage() ) );
</span><span class="cx"> } catch ( Exception $e ) {
</span><span class="lines">@@ -232,7 +237,12 @@
</span><span class="cx"> $_POST['_url'] = admin_url( 'edit-comments.php' );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->_handleAjax( 'delete-comment' );
</del><ins>+ try {
+ $this->_handleAjax( 'delete-comment' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+ $this->_last_response = '';
</ins><span class="cx">
</span><span class="cx"> // Force delete the comment
</span><span class="cx"> if ( 'delete' == $action ) {
</span><span class="lines">@@ -242,8 +252,8 @@
</span><span class="cx"> // Make the request again, look for a timestamp in the exception
</span><span class="cx"> try {
</span><span class="cx"> $this->_handleAjax( 'delete-comment' );
</span><del>- $this->fail( 'Expected exception: WPAjaxDieException' );
- } catch ( WPAjaxDieException $e ) {
</del><ins>+ $this->fail( 'Expected exception: WPAjaxDieStopException' );
+ } catch ( WPAjaxDieStopException $e ) {
</ins><span class="cx"> $this->assertEquals( 10, strlen( $e->getMessage() ) );
</span><span class="cx"> $this->assertTrue( is_numeric( $e->getMessage() ) );
</span><span class="cx"> } catch ( Exception $e ) {
</span></span></pre></div>
<a id="wptestcasetestajaxactionstest_admin_ajax_dim_commentsphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-ajax-actions/test_admin_ajax_dim_comments.php (721 => 722)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-ajax-actions/test_admin_ajax_dim_comments.php 2012-05-23 20:47:35 UTC (rev 721)
+++ wp-testcase/test-ajax-actions/test_admin_ajax_dim_comments.php 2012-05-24 18:16:26 UTC (rev 722)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> protected function _clear_post_action() {
</span><span class="cx"> unset($_POST['id']);
</span><span class="cx"> unset($_POST['new']);
</span><ins>+ $this->_last_response = '';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /***********************************************************/
</span><span class="lines">@@ -82,7 +83,11 @@
</span><span class="cx"> $prev_status = wp_get_comment_status( $comment->comment_ID );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->_handleAjax( 'dim-comment' );
</del><ins>+ try {
+ $this->_handleAjax( 'dim-comment' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
</ins><span class="cx">
</span><span class="cx"> // Get the response
</span><span class="cx"> $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );
</span><span class="lines">@@ -135,7 +140,7 @@
</span><span class="cx"> $_POST['_url'] = admin_url( 'edit-comments.php' );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'dim-comment' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -162,7 +167,7 @@
</span><span class="cx"> $_POST['_url'] = admin_url( 'edit-comments.php' );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'dim-comment' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -191,10 +196,17 @@
</span><span class="cx"> // Make the request, look for a timestamp in the exception
</span><span class="cx"> try {
</span><span class="cx"> $this->_handleAjax( 'dim-comment' );
</span><del>- $this->fail( 'Expected exception: WPAjaxDieException' );
- } catch ( WPAjaxDieException $e ) {
- $this->assertEquals( 10, strlen( $e->getMessage() ) );
- $this->assertTrue( is_numeric( $e->getMessage() ) );
</del><ins>+ $this->fail( 'Expected exception: WPAjaxDieContinueException' );
+ } catch ( WPAjaxDieContinueException $e ) {
+
+ // Get the response
+ $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );
+
+ // Ensure everything is correct
+ $this->assertEquals( '0', (string) $xml->response[0]->comment['id'] );
+ $this->assertEquals( 'dim-comment_0', (string) $xml->response['action'] );
+ $this->assertContains( 'Comment ' . $_POST['id'] . ' does not exist', $this->_last_response );
+
</ins><span class="cx"> } catch ( Exception $e ) {
</span><span class="cx"> $this->fail( 'Unexpected exception type: ' . get_class( $e ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="wptestcasetestajaxactionstest_admin_ajax_edit_commentphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-ajax-actions/test_admin_ajax_edit_comment.php (721 => 722)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-ajax-actions/test_admin_ajax_edit_comment.php 2012-05-23 20:47:35 UTC (rev 721)
+++ wp-testcase/test-ajax-actions/test_admin_ajax_edit_comment.php 2012-05-24 18:16:26 UTC (rev 722)
</span><span class="lines">@@ -75,7 +75,11 @@
</span><span class="cx"> $_POST['content'] = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->_handleAjax( 'edit-comment' );
</del><ins>+ try {
+ $this->_handleAjax( 'edit-comment' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
</ins><span class="cx">
</span><span class="cx"> // Get the response
</span><span class="cx"> $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );
</span><span class="lines">@@ -114,7 +118,7 @@
</span><span class="cx"> $_POST['content'] = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'edit-comment' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -140,7 +144,7 @@
</span><span class="cx"> $_POST['content'] = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'get-comments' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -160,7 +164,7 @@
</span><span class="cx"> $_POST['content'] = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'edit-comment' );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="wptestcasetestajaxactionstest_admin_ajax_get_commentsphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-ajax-actions/test_admin_ajax_get_comments.php (721 => 722)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-ajax-actions/test_admin_ajax_get_comments.php 2012-05-23 20:47:35 UTC (rev 721)
+++ wp-testcase/test-ajax-actions/test_admin_ajax_get_comments.php 2012-05-24 18:16:26 UTC (rev 722)
</span><span class="lines">@@ -80,7 +80,11 @@
</span><span class="cx"> $_POST['p'] = $this->_comment_post->ID;
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->_handleAjax( 'get-comments' );
</del><ins>+ try {
+ $this->_handleAjax( 'get-comments' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
</ins><span class="cx">
</span><span class="cx"> // Get the response
</span><span class="cx"> $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );
</span><span class="lines">@@ -113,7 +117,7 @@
</span><span class="cx"> $_POST['p'] = $this->_comment_post->ID;
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'get-comments' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -133,7 +137,7 @@
</span><span class="cx"> $_POST['p'] = $this->_comment_post->ID;
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'get-comments' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -153,7 +157,7 @@
</span><span class="cx"> $_POST['p'] = 'b0rk';
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'get-comments' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -173,7 +177,7 @@
</span><span class="cx"> $_POST['p'] = $this->_no_comment_post->ID;
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '1' );
</ins><span class="cx"> $this->_handleAjax( 'get-comments' );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="wptestcasetestajaxactionstest_admin_ajax_replyto_commentphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php (721 => 722)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php 2012-05-23 20:47:35 UTC (rev 721)
+++ wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php 2012-05-24 18:16:26 UTC (rev 722)
</span><span class="lines">@@ -88,7 +88,11 @@
</span><span class="cx"> $_POST['comment_post_ID'] = $this->_comment_post->ID;
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->_handleAjax( 'replyto-comment' );
</del><ins>+ try {
+ $this->_handleAjax( 'replyto-comment' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
</ins><span class="cx">
</span><span class="cx"> // Get the response
</span><span class="cx"> $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );
</span><span class="lines">@@ -128,7 +132,7 @@
</span><span class="cx"> $_POST['comment_post_ID'] = $this->_comment_post->ID;
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'replyto-comment' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -155,7 +159,7 @@
</span><span class="cx"> $_POST['comment_post_ID'] = $this->_comment_post->ID;
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'replyto-comment' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -175,7 +179,7 @@
</span><span class="cx"> $_POST['comment_post_ID'] = 123456789;
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'replyto-comment' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -195,7 +199,7 @@
</span><span class="cx"> $_POST['comment_post_ID'] = $this->_draft_post->ID;
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', 'ERROR: you are replying to a comment on a draft post.' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', 'ERROR: you are replying to a comment on a draft post.' );
</ins><span class="cx"> $this->_handleAjax( 'replyto-comment' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -218,7 +222,7 @@
</span><span class="cx"> add_filter( 'query', array( $this, '_block_comments' ) );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '1' );
</ins><span class="cx"> $this->_handleAjax( 'replyto-comment' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="wptestcasetestajaxactionstest_admin_ajax_save_draftphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test-ajax-actions/test_admin_ajax_save_draft.php (721 => 722)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test-ajax-actions/test_admin_ajax_save_draft.php 2012-05-23 20:47:35 UTC (rev 721)
+++ wp-testcase/test-ajax-actions/test_admin_ajax_save_draft.php 2012-05-24 18:16:26 UTC (rev 722)
</span><span class="lines">@@ -54,7 +54,11 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->_handleAjax( 'nopriv_autosave' );
</del><ins>+ try {
+ $this->_handleAjax( 'nopriv_autosave' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
</ins><span class="cx">
</span><span class="cx"> // Get the response
</span><span class="cx"> $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );
</span><span class="lines">@@ -79,7 +83,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'nopriv_autosave' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -102,7 +106,11 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->_handleAjax( 'autosave' );
</del><ins>+ try {
+ $this->_handleAjax( 'autosave' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
</ins><span class="cx">
</span><span class="cx"> // Get the response
</span><span class="cx"> $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );
</span><span class="lines">@@ -133,7 +141,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', '-1' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx"> $this->_handleAjax( 'autosave' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -154,7 +162,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->setExpectedException( 'WPAjaxDieException', 'You are not allowed to edit this post.' );
</del><ins>+ $this->setExpectedException( 'WPAjaxDieStopException', 'You are not allowed to edit this post.' );
</ins><span class="cx"> $this->_handleAjax( 'autosave' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -181,7 +189,11 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->_handleAjax( 'autosave' );
</del><ins>+ try {
+ $this->_handleAjax( 'autosave' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
</ins><span class="cx">
</span><span class="cx"> // Get the response
</span><span class="cx"> $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );
</span><span class="lines">@@ -212,7 +224,11 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Make the request
</span><del>- $this->_handleAjax( 'autosave' );
</del><ins>+ try {
+ $this->_handleAjax( 'autosave' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
</ins><span class="cx">
</span><span class="cx"> // Look for the warning
</span><span class="cx"> $this->assertRegExp( '/Your login has expired. Please open a new browser window/' , $this->_last_response );
</span></span></pre></div>
<a id="wptestcasetest_admin_includes_ajax_actionsphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_admin_includes_ajax_actions.php (721 => 722)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_admin_includes_ajax_actions.php 2012-05-23 20:47:35 UTC (rev 721)
+++ wp-testcase/test_admin_includes_ajax_actions.php 2012-05-24 18:16:26 UTC (rev 722)
</span><span class="lines">@@ -14,14 +14,28 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Exception for cases of wp_die()
</span><ins>+ * This means there was an error (no output, and a call to wp_die)
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Unit Tests
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><del>-class WPAjaxDieException extends Exception {}
</del><ins>+class WPAjaxDieStopException extends Exception {}
</ins><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Exception for cases of wp_die()
+ * This means execution of the ajax function should be halted, but the unit
+ * test can continue. The function finished normally and there was not an
+ * error (output happened, but wp_die was called to end execution) This is
+ * used with WP_Ajax_Response::send
+ *
+ * @package WordPress
+ * @subpackage Unit Tests
+ * @since 3.4.0
+ */
+class WPAjaxDieContinueException extends Exception {}
+
+/**
</ins><span class="cx"> * Ajax test case class
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="lines">@@ -115,17 +129,29 @@
</span><span class="cx"> /**
</span><span class="cx"> * Handler for wp_die()
</span><span class="cx"> * Save the output for analysis, stop execution by throwing an exception.
</span><del>- * If you're testing ajax and you expect wp_die(<anything>), you must use:
</del><ins>+ * Error conditions (no output, just die) will throw <code>WPAjaxDieStopException( $message )</code>
+ * You can test for this with:
</ins><span class="cx"> * <code>
</span><del>- * $this->setExpectedException('WPAjaxDieException', '<anything>');
</del><ins>+ * $this->setExpectedException( 'WPAjaxDieStopException', 'something contained in $message' );
</ins><span class="cx"> * </code>
</span><ins>+ * Normal program termination (wp_die called at then end of output) will throw <code>WPAjaxDieContinueException( $message )</code>
+ * You can test for this with:
+ * <code>
+ * $this->setExpectedException( 'WPAjaxDieContinueException', 'something contained in $message' );
+ * </code>
</ins><span class="cx"> * @param string $message
</span><span class="cx"> */
</span><span class="cx"> public function dieHandler( $message ) {
</span><del>- $this->_last_response = $message;
- if ( !empty( $message ) ) {
- ob_end_clean();
- throw new WPAjaxDieException( $message );
</del><ins>+ $this->_last_response .= ob_get_clean();
+ ob_end_clean();
+ if ( '' === $this->_last_response ) {
+ if ( is_scalar( $message) ) {
+ throw new WPAjaxDieStopException( (string) $message );
+ } else {
+ throw new WPAjaxDieStopException( '0' );
+ }
+ } else {
+ throw new WPAjaxDieContinueException( $message );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -159,11 +185,11 @@
</span><span class="cx">
</span><span class="cx"> // Call the hooks
</span><span class="cx"> do_action( 'admin_init' );
</span><del>- do_action( 'wp_ajax_' . $_REQUEST['action'] );
</del><ins>+ do_action( 'wp_ajax_' . $_REQUEST['action'], null );
</ins><span class="cx">
</span><span class="cx"> // Save the output
</span><del>- $buffer = ob_get_clean();
- if ( !empty($buffer) )
</del><ins>+ $buffer = ob_get_clean();
+ if ( !empty( $buffer ) )
</ins><span class="cx"> $this->_last_response = $buffer;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>