<!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>[30784] trunk/tests/phpunit/tests/multisite/site.php: Split current tests for `update_blog_details()`</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30784">30784</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30784","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-08 01:43:31 +0000 (Mon, 08 Dec 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Split current tests for `update_blog_details()`
The current tests for `upload_blog_details()` were focused on the actions fired whenever a site is marked as spam, archived, deleted, or matured. This breaks those into individual sections with fewer assertions per test.
See <a href="https://core.trac.wordpress.org/ticket/30080">#30080</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2014-12-07 23:58:46 UTC (rev 30783)
+++ trunk/tests/phpunit/tests/multisite/site.php 2014-12-08 01:43:31 UTC (rev 30784)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,159 +317,228 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertLessThan( 2, $time_difference );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * If `update_blog_details()` is called with any kind of empty arguments, it
+ * should return false.
+ */
+ function test_update_blog_details_with_empty_args() {
+ $result = update_blog_details( 1, array() );
+ $this->assertFalse( $result );
+ }
+
+ /**
+ * If the ID passed is not that of a current site, we should expect false.
+ */
+ function test_update_blog_details_invalid_blog_id() {
+ $result = update_blog_details( 999, array( 'domain' => 'example.com' ) );
+ $this->assertFalse( $result );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_update_blog_details() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $test_action_counter;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = $this->factory->blog->create( array( 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
- $blog_id = $this->factory->blog->create( array( 'user_id' => $user_id, 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
- $this->assertInternalType( 'int', $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = update_blog_details( $blog_id, array( 'domain' => 'example.com', 'path' => 'my_path/' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = update_blog_details( $blog_id, array('domain' => 'example.com', 'path' => 'my_path/') );
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'example.com', $blog->domain );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'my_path/', $blog->path );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->spam );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = update_blog_details( $blog_id, array('domain' => 'example2.com','spam' => 1) );
- $this->assertTrue( $result );
- $blog = get_blog_details( $blog_id );
- $this->assertEquals( 'example2.com', $blog->domain );
- $this->assertEquals( 'my_path/', $blog->path );
- $this->assertEquals( '1', $blog->spam );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_update_blog_details_make_ham_blog_action() {
+ global $test_action_counter;
+ $test_action_counter = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = update_blog_details( $blog_id );
- $this->assertFalse( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = $this->factory->blog->create( array( 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
+ update_blog_details( $blog_id, array( 'spam' => 1 ) );
+
+ add_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10 );
+ update_blog_details( $blog_id, array( 'spam' => 0 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'example2.com', $blog->domain );
- $this->assertEquals( 'my_path/', $blog->path );
- $this->assertEquals( '1', $blog->spam );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $test_action_counter = 0;
-
- add_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10, 1 );
- $result = update_blog_details( $blog_id, array( 'spam' => 0 ) );
- $this->assertTrue( $result );
- $blog = get_blog_details( $blog_id );
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->spam );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Same again
- $result = update_blog_details( $blog_id, array( 'spam' => 0 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The action should not fire if the status of 'spam' stays the same.
+ update_blog_details( $blog_id, array( 'spam' => 0 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->spam );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $test_action_counter );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10, 1 );
- $result = update_blog_details( $blog_id, array( 'spam' => 1 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10 );
+ }
+
+ function test_update_blog_details_make_spam_blog_action() {
+ global $test_action_counter;
+ $test_action_counter = 0;
+
+ $blog_id = $this->factory->blog->create( array( 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
+
+ add_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10 );
+ update_blog_details( $blog_id, array( 'spam' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->spam );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 2, $test_action_counter );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Same again
- $result = update_blog_details( $blog_id, array( 'spam' => 1 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The action should not fire if the status of 'spam' stays the same.
+ update_blog_details( $blog_id, array( 'spam' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->spam );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 2, $test_action_counter );
- remove_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
- $result = update_blog_details( $blog_id, array( 'archived' => 1 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10 );
+ }
+
+ function test_update_blog_details_archive_blog_action() {
+ global $test_action_counter;
+ $test_action_counter = 0;
+
+ $blog_id = $this->factory->blog->create( array( 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
+
+ add_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10 );
+ update_blog_details( $blog_id, array( 'archived' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->archived );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 3, $test_action_counter );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Same again
- $result = update_blog_details( $blog_id, array( 'archived' => 1 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The action should not fire if the status of 'archived' stays the same.
+ update_blog_details( $blog_id, array( 'archived' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->archived );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 3, $test_action_counter );
- remove_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
- $result = update_blog_details( $blog_id, array( 'archived' => 0 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10 );
+ }
+
+ function test_update_blog_details_unarchive_blog_action() {
+ global $test_action_counter;
+ $test_action_counter = 0;
+
+ $blog_id = $this->factory->blog->create( array( 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
+ update_blog_details( $blog_id, array( 'archived' => 1 ) );
+
+ add_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10 );
+ update_blog_details( $blog_id, array( 'archived' => 0 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->archived );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 4, $test_action_counter );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Same again
- $result = update_blog_details( $blog_id, array( 'archived' => 0 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The action should not fire if the status of 'archived' stays the same.
+ update_blog_details( $blog_id, array( 'archived' => 0 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->archived );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 4, $test_action_counter );
- remove_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
- $result = update_blog_details( $blog_id, array( 'deleted' => 1 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10 );
+ }
+
+ function test_update_blog_details_make_delete_blog_action() {
+ global $test_action_counter;
+ $test_action_counter = 0;
+
+ $blog_id = $this->factory->blog->create( array( 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
+
+ add_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10 );
+ update_blog_details( $blog_id, array( 'deleted' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->deleted );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 5, $test_action_counter );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Same again
- $result = update_blog_details( $blog_id, array( 'deleted' => 1 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The action should not fire if the status of 'deleted' stays the same.
+ update_blog_details( $blog_id, array( 'deleted' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->deleted );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 5, $test_action_counter );
- remove_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
- $result = update_blog_details( $blog_id, array( 'deleted' => 0 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10 );
+ }
+
+ function test_update_blog_details_make_undelete_blog_action() {
+ global $test_action_counter;
+ $test_action_counter = 0;
+
+ $blog_id = $this->factory->blog->create( array( 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
+ update_blog_details( $blog_id, array( 'deleted' => 1 ) );
+
+ add_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10 );
+ update_blog_details( $blog_id, array( 'deleted' => 0 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->deleted );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 6, $test_action_counter );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Same again
- $result = update_blog_details( $blog_id, array( 'deleted' => 0 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The action should not fire if the status of 'deleted' stays the same.
+ update_blog_details( $blog_id, array( 'deleted' => 0 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->deleted );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 6, $test_action_counter );
- remove_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
- $result = update_blog_details( $blog_id, array( 'mature' => 1 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10 );
+ }
+
+ function test_update_blog_details_mature_blog_action() {
+ global $test_action_counter;
+ $test_action_counter = 0;
+
+ $blog_id = $this->factory->blog->create( array( 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
+
+ add_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10 );
+ update_blog_details( $blog_id, array( 'mature' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->mature );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 7, $test_action_counter );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Same again
- $result = update_blog_details( $blog_id, array( 'mature' => 1 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The action should not fire if the status of 'mature' stays the same.
+ update_blog_details( $blog_id, array( 'mature' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->mature );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 7, $test_action_counter );
- remove_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
- $result = update_blog_details( $blog_id, array( 'mature' => 0 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10 );
+ }
+
+ function test_update_blog_details_unmature_blog_action() {
+ global $test_action_counter;
+ $test_action_counter = 0;
+
+ $blog_id = $this->factory->blog->create( array( 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
+ update_blog_details( $blog_id, array( 'mature' => 1 ) );
+
+ add_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10 );
+ update_blog_details( $blog_id, array( 'mature' => 0 ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->mature );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 8, $test_action_counter );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Same again
- $result = update_blog_details( $blog_id, array( 'mature' => 0 ) );
- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The action should not fire if the status of 'mature' stays the same.
+ update_blog_details( $blog_id, array( 'mature' => 0 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->mature );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 8, $test_action_counter );
- remove_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $test_action_counter );
+
+ remove_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _action_counter_cb( $blog_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Provide a counter to determine that hooks are firing when intended.
+ */
+ function _action_counter_cb() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>