<!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>[33254] trunk/tests/phpunit/tests/multisite/updateBlogDetails.php: Tests: Use a data provider when testing path slashing in `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/33254">33254</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/33254","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>2015-07-14 05:51:05 +0000 (Tue, 14 Jul 2015)</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'>Tests: Use a data provider when testing path slashing in `update_blog_details()`.
Trims down 11 tests to 1 clean area of testing and makes for a much saner read.
See <a href="https://core.trac.wordpress.org/ticket/32988">#32988</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmultisiteupdateBlogDetailsphp">trunk/tests/phpunit/tests/multisite/updateBlogDetails.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2015-07-14 05:49:28 UTC (rev 33253)
+++ trunk/tests/phpunit/tests/multisite/updateBlogDetails.php 2015-07-14 05:51:05 UTC (rev 33254)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,81 +234,36 @@
</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">- * When the path for a site is updated with update_blog_details(), the final
- * path should have a leading and trailing slash. When multiple directories
- * are part of the path, only one slash should separate each directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When the path for a site is updated with update_blog_details(), the final path
+ * should have a leading and trailing slash.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 18117
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_single_directory_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">- function test_update_blog_details_single_path_no_slashes() {
- update_blog_details( 1, array( 'path' => 'my_path' ) );
- $blog = get_blog_details( 1 );
- $this->assertEquals( '/my_path/', $blog->path );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_blog_details_single_directory_path( $path, $expected ) {
+ update_blog_details( 1, array( 'path' => $path ) );
+ $site = get_blog_details( 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_blog_details_single_path_double_trailing_slashes() {
- update_blog_details( 1, array( 'path' => 'my_path//' ) );
- $blog = get_blog_details( 1 );
- $this->assertEquals( '/my_path/', $blog->path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $expected, $site->path );
</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 test_update_blog_details_single_path_double_leading_slashes() {
- update_blog_details( 1, array( 'path' => '//my_path' ) );
- $blog = get_blog_details( 1 );
- $this->assertEquals( '/my_path/', $blog->path );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_single_directory_path() {
+ return array(
+ array( 'my_path', '/my_path/' ),
+ array( 'my_path//', '/my_path/' ),
+ array( '//my_path', '/my_path/' ),
+ array( 'my_path/', '/my_path/' ),
+ array( '/my_path', '/my_path/' ),
+ array( '/my_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">- function test_update_blog_details_single_path_single_trailing_slash() {
- update_blog_details( 1, array( 'path' => 'my_path/' ) );
- $blog = get_blog_details( 1 );
- $this->assertEquals( '/my_path/', $blog->path );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'multiple/dirs', '/multiple/dirs/' ),
+ array( '/multiple/dirs', '/multiple/dirs/' ),
+ array( 'multiple/dirs/', '/multiple/dirs/' ),
+ array( '/multiple/dirs/', '/multiple/dirs/' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_update_blog_details_single_path_single_leading_slashes() {
- update_blog_details( 1, array( 'path' => '/my_path' ) );
- $blog = get_blog_details( 1 );
- $this->assertEquals( '/my_path/', $blog->path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // update_blog_details() does not resolve multiple slashes in the middle of a path string.
+ array( 'multiple///dirs', '/multiple///dirs/' ),
+ );
</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 test_update_blog_details_single_path_both_slashes() {
- update_blog_details( 1, array( 'path' => '/my_path/' ) );
- $blog = get_blog_details( 1 );
- $this->assertEquals( '/my_path/', $blog->path );
- }
-
- function test_update_blog_details_multiple_paths_no_slashes() {
- update_blog_details( 1, array( 'path' => 'multiple/dirs' ) );
- $blog = get_blog_details( 1 );
- $this->assertEquals( '/multiple/dirs/', $blog->path );
- }
-
- /**
- * `update_blog_details()` does not resolve multiple slashes in the
- * middle of a path string.
- */
- function test_update_blog_details_multiple_paths_middle_slashes() {
- update_blog_details( 1, array( 'path' => 'multiple///dirs' ) );
- $blog = get_blog_details( 1 );
- $this->assertEquals( '/multiple///dirs/', $blog->path );
- }
-
- function test_update_blog_details_multiple_paths_leading_slash() {
- update_blog_details( 1, array( 'path' => '/multiple/dirs' ) );
- $blog = get_blog_details( 1 );
- $this->assertEquals( '/multiple/dirs/', $blog->path );
- }
-
- function test_update_blog_details_multiple_paths_trailing_slash() {
- update_blog_details( 1, array( 'path' => 'multiple/dirs/' ) );
- $blog = get_blog_details( 1 );
- $this->assertEquals( '/multiple/dirs/', $blog->path );
- }
-
- function test_update_blog_details_multiple_paths_both_slashes() {
- update_blog_details( 1, array( 'path' => '/multiple/dirs/' ) );
- $blog = get_blog_details( 1 );
- $this->assertEquals( '/multiple/dirs/', $blog->path );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>