<!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>[38935] trunk/tests/phpunit: Multisite: Use `get_site()` in tests where `get_blog_details()` is not tested.</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/38935">38935</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/38935","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>2016-10-25 23:03:15 +0000 (Tue, 25 Oct 2016)</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'>Multisite: Use `get_site()` in tests where `get_blog_details()` is not tested.
Remaining tests either rely on the `blog-details` cache key or test `get_blog_details()` itself.
Props flixos90.
Fixes <a href="https://core.trac.wordpress.org/ticket/38497">#38497</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryforblogphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
<li><a href="#trunktestsphpunittestsmultisiteupdateBlogDetailsphp">trunk/tests/phpunit/tests/multisite/updateBlogDetails.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesfactoryclasswpunittestfactoryforblogphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php 2016-10-25 22:53:44 UTC (rev 38934)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php 2016-10-25 23:03:15 UTC (rev 38935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +31,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function update_object( $blog_id, $fields ) {}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function get_object_by_id( $blog_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return get_blog_details( $blog_id, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<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 2016-10-25 22:53:44 UTC (rev 38934)
+++ trunk/tests/phpunit/tests/multisite/site.php 2016-10-25 23:03:15 UTC (rev 38935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,7 +301,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_update_blogs_date();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // compare the update time with the current time, allow delta < 2
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $wpdb->blogid );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $wpdb->blogid );
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_time = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $time_difference = $current_time - strtotime( $blog->last_updated );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertLessThan( 2, $time_difference );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,14 +368,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'spam', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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><span class="cx" style="display: block; padding: 0 10px"> // The action should fire if the status of 'spam' stays the same.
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'spam', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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( 2, $test_action_counter );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,14 +391,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'spam', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $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><span class="cx" style="display: block; padding: 0 10px"> // The action should fire if the status of 'spam' stays the same.
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'spam', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->spam );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $test_action_counter );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,14 +414,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'archived', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->archived );
</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><span class="cx" style="display: block; padding: 0 10px"> // The action should fire if the status of 'archived' stays the same.
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'archived', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->archived );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $test_action_counter );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,14 +438,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'archived', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->archived );
</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><span class="cx" style="display: block; padding: 0 10px"> // The action should fire if the status of 'archived' stays the same.
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'archived', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->archived );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $test_action_counter );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,14 +460,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'deleted', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->deleted );
</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><span class="cx" style="display: block; padding: 0 10px"> // The action should fire if the status of 'deleted' stays the same.
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'deleted', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->deleted );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $test_action_counter );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,14 +484,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'deleted', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->deleted );
</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><span class="cx" style="display: block; padding: 0 10px"> // The action should fire if the status of 'deleted' stays the same.
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'deleted', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->deleted );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $test_action_counter );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -507,14 +507,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'mature', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->mature );
</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><span class="cx" style="display: block; padding: 0 10px"> // The action should fire if the status of 'mature' stays the same.
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'mature', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '1', $blog->mature );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $test_action_counter );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,13 +532,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'mature', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->mature );
</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><span class="cx" style="display: block; padding: 0 10px"> // The action should fire if the status of 'mature' stays the same.
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'mature', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->mature );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $test_action_counter );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,13 +555,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_blog_public', array( $this, '_action_counter_cb' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'public', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->public );
</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><span class="cx" style="display: block; padding: 0 10px"> // The action should fire if the status of 'mature' stays the same.
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'public', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->public );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $test_action_counter );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -575,10 +575,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_posts_count() {
</span><span class="cx" style="display: block; padding: 0 10px"> self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post2 = self::factory()->post->create();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 2, get_blog_details()->post_count );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 2, get_site()->post_count );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post( $post2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 1, get_blog_details()->post_count );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, get_site()->post_count );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,11 +586,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_blog_details_cache_invalidation() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'blogname', 'foo' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = get_blog_details( get_current_blog_id() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = get_site( get_current_blog_id() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'foo', $details->blogname );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'blogname', 'bar' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = get_blog_details( get_current_blog_id() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = get_site( get_current_blog_id() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'bar', $details->blogname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,7 +600,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_blog_id_from_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = get_blog_details( $blog_id, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $details->domain . $details->path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test the original response and cached response for the newly created site.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -613,7 +613,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_blog_id_from_url_is_case_insensitive() {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create( array( 'domain' => 'example.com', 'path' => '/xyz' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = get_blog_details( $blog_id, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $blog_id, get_blog_id_from_url( strtoupper( $details->domain ), strtoupper( $details->path ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,7 +623,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_blog_id_from_url_that_does_not_exist() {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create( array( 'path' => '/xyz' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = get_blog_details( $blog_id, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, get_blog_id_from_url( $details->domain, 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( -1, wp_cache_get( md5( $details->domain . 'foo' ), 'blog-id-cache' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,7 +635,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_blog_id_from_url_with_deleted_flag() {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = get_blog_details( $blog_id, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $details->domain . $details->path );
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,7 +649,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_blog_id_from_url_after_dropped() {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = get_blog_details( $blog_id, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $details->domain . $details->path );
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $blog_id, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -766,13 +766,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_domain_exists_with_default_site_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = get_blog_details( 1, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = get_site( 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, domain_exists( $details->domain, $details->path ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_domain_exists_with_specified_site_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = get_blog_details( 1, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = get_site( 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, domain_exists( $details->domain, $details->path, $details->site_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -782,7 +782,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * it is marked as not existing.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_domain_does_not_exist_with_invalid_site_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = get_blog_details( 1, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = get_site( 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( null, domain_exists( $details->domain, $details->path, 999 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisiteupdateBlogDetailsphp"></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/updateBlogDetails.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/updateBlogDetails.php 2016-10-25 22:53:44 UTC (rev 38934)
+++ trunk/tests/phpunit/tests/multisite/updateBlogDetails.php 2016-10-25 23:03:15 UTC (rev 38935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( $hook, array( $this, '_action_counter_cb' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $blog_id, array( $flag => $flag_value ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = get_blog_details( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = get_site( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $flag_value, $blog->{$flag} );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_blog_details_single_directory_path( $path, $expected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( 1, array( 'path' => $path ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site = get_blog_details( 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site = get_site( 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $site->path );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,4 +133,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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">-endif;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins></span></pre>
</div>
</div>
</body>
</html>