<!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>[58340] trunk/tests: REST API: improve code quality for class_list field fixtures.</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 { white-space: pre-line; 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/58340">58340</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/58340","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>oandregal</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-06-05 11:53:31 +0000 (Wed, 05 Jun 2024)</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'>REST API: improve code quality for class_list field fixtures.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/58326">[58326]</a>, <a href="https://core.trac.wordpress.org/ticket/61360">#61360</a>.
Props antonvlasenko, oandregal.
Fixes <a href="https://core.trac.wordpress.org/ticket/61369">#61369</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsrestapirestschemasetupphp">trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php</a></li>
<li><a href="#trunktestsqunitfixtureswpapigeneratedjs">trunk/tests/qunit/fixtures/wp-api-generated.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsrestapirestschemasetupphp"></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/rest-api/rest-schema-setup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php 2024-06-05 08:11:03 UTC (rev 58339)
+++ trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php 2024-06-05 11:53:31 UTC (rev 58340)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,6 +577,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'oembeds.author_url' => 'http://example.org',
</span><span class="cx" style="display: block; padding: 0 10px"> 'oembeds.html' => '<blockquote class="wp-embedded-content">...</blockquote>...',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PostsCollection.0.id' => 4,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'PostsCollection.0.class_list.0' => 'post-4',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PostsCollection.0.guid.rendered' => 'http://example.org/?p=4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PostsCollection.0.link' => 'http://example.org/?p=4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PostsCollection.0._links.self.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/posts/4',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,6 +591,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'PostsCollection.0._links.wp:term.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PostsCollection.0._links.wp:term.1.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PostModel.id' => 4,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'PostModel.class_list.0' => 'post-4',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PostModel.guid.rendered' => 'http://example.org/?p=4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PostModel.link' => 'http://example.org/?p=4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'postRevisions.0.author' => 2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,6 +623,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'autosave.slug' => '4-autosave-v1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'autosave.guid.rendered' => 'http://example.org/?p=6',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PagesCollection.0.id' => 7,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'PagesCollection.0.class_list.0' => 'post-7',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PagesCollection.0.guid.rendered' => 'http://example.org/?page_id=7',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PagesCollection.0.link' => 'http://example.org/?page_id=7',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PagesCollection.0._links.self.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/pages/7',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,6 +635,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'PagesCollection.0._links.predecessor-version.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/pages/7/revisions/9',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PagesCollection.0._links.wp:attachment.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=7',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PageModel.id' => 7,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'PageModel.class_list.0' => 'post-7',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PageModel.guid.rendered' => 'http://example.org/?page_id=7',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PageModel.link' => 'http://example.org/?page_id=7',
</span><span class="cx" style="display: block; padding: 0 10px"> 'pageRevisions.0.author' => 2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,6 +667,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'pageAutosave.slug' => '7-autosave-v1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'pageAutosave.guid.rendered' => 'http://example.org/?p=9',
</span><span class="cx" style="display: block; padding: 0 10px"> 'MediaCollection.0.id' => 10,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'MediaCollection.0.class_list.0' => 'post-10',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'MediaCollection.0.guid.rendered' => 'http://example.org/?attachment_id=10',
</span><span class="cx" style="display: block; padding: 0 10px"> 'MediaCollection.0.link' => 'http://example.org/?attachment_id=10',
</span><span class="cx" style="display: block; padding: 0 10px"> 'MediaCollection.0.description.rendered' => '<p class="attachment"><!-- <a...><img.../></a> --></p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,6 +677,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'MediaCollection.0._links.about.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/types/attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'MediaCollection.0._links.replies.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=10',
</span><span class="cx" style="display: block; padding: 0 10px"> 'MediaModel.id' => 10,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'MediaModel.class_list.0' => 'post-10',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'MediaModel.guid.rendered' => 'http://example.org/?attachment_id=10',
</span><span class="cx" style="display: block; padding: 0 10px"> 'MediaModel.link' => 'http://example.org/?attachment_id=10',
</span><span class="cx" style="display: block; padding: 0 10px"> 'MediaModel.description.rendered' => '<p class="attachment"><!-- <a...><img.../></a> --></p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -762,17 +768,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $datetime_keys = array( 'date', 'date_gmt', 'modified', 'modified_gmt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $data as $key => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_string( $value ) ) {
- if ( in_array( $key, $datetime_keys, true ) ) {
- $data[ $key ] = '2017-02-14T00:00:00';
- continue;
- }
-
- if ( 1 === preg_match( '/^post-\d+$/', $value ) ) {
- // Normalize the class value to ensure test stability.
- $data[ $key ] = 'post-1073';
- continue;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_string( $value ) && in_array( $key, $datetime_keys, true ) ) {
+ $data[ $key ] = '2017-02-14T00:00:00';
+ continue;
</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"> $data[ $key ] = $this->normalize_fixture( $value, "$path.$key" );
</span></span></pre></div>
<a id="trunktestsqunitfixtureswpapigeneratedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/fixtures/wp-api-generated.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/wp-api-generated.js 2024-06-05 08:11:03 UTC (rev 58339)
+++ trunk/tests/qunit/fixtures/wp-api-generated.js 2024-06-05 11:53:31 UTC (rev 58340)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12323,7 +12323,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> "tags": [],
</span><span class="cx" style="display: block; padding: 0 10px"> "class_list": [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "post-1073",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "post-4",
</ins><span class="cx" style="display: block; padding: 0 10px"> "post",
</span><span class="cx" style="display: block; padding: 0 10px"> "type-post",
</span><span class="cx" style="display: block; padding: 0 10px"> "status-publish",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12432,7 +12432,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> "tags": [],
</span><span class="cx" style="display: block; padding: 0 10px"> "class_list": [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "post-1073",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "post-4",
</ins><span class="cx" style="display: block; padding: 0 10px"> "post",
</span><span class="cx" style="display: block; padding: 0 10px"> "type-post",
</span><span class="cx" style="display: block; padding: 0 10px"> "status-publish",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12632,7 +12632,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "meta_key": ""
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "class_list": [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "post-1073",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "post-7",
</ins><span class="cx" style="display: block; padding: 0 10px"> "page",
</span><span class="cx" style="display: block; padding: 0 10px"> "type-page",
</span><span class="cx" style="display: block; padding: 0 10px"> "status-publish",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12723,7 +12723,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "meta_key": ""
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "class_list": [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "post-1073",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "post-7",
</ins><span class="cx" style="display: block; padding: 0 10px"> "page",
</span><span class="cx" style="display: block; padding: 0 10px"> "type-page",
</span><span class="cx" style="display: block; padding: 0 10px"> "status-publish",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12911,7 +12911,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "meta_key": ""
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "class_list": [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "post-1073",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "post-10",
</ins><span class="cx" style="display: block; padding: 0 10px"> "attachment",
</span><span class="cx" style="display: block; padding: 0 10px"> "type-attachment",
</span><span class="cx" style="display: block; padding: 0 10px"> "status-inherit",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12980,7 +12980,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "meta_key": ""
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "class_list": [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "post-1073",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "post-10",
</ins><span class="cx" style="display: block; padding: 0 10px"> "attachment",
</span><span class="cx" style="display: block; padding: 0 10px"> "type-attachment",
</span><span class="cx" style="display: block; padding: 0 10px"> "status-inherit",
</span></span></pre>
</div>
</div>
</body>
</html>