<!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>[35225] trunk/tests/phpunit: Unit Tests: one `$factory` to rule them all, and it shall be `static`.</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/35225">35225</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/35225","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-16 21:04:12 +0000 (Fri, 16 Oct 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'>Unit Tests: one `$factory` to rule them all, and it shall be `static`.
Using more than one instance of `WP_UnitTest_Factory` causes all kinds of craziness, due to out-of-sync internal generator sequences. Since we want to use `setUpBeforeClass`, we were creating ad hoc instances. To avoid that, we were injecting one `static` instance via Dependency Injection in `wpSetUpBeforeClass`. All tests should really use the `static` instance, so we will remove the instance prop `$factory`.
Replace `$this->factory` with `self::$factory` over 2000 times.
Rewrite all of the tests that were hard-coding dynamic values.
#YOLOFriday</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludestestcaseajaxphp">trunk/tests/phpunit/includes/testcase-ajax.php</a></li>
<li><a href="#trunktestsphpunitincludestestcasecanonicalphp">trunk/tests/phpunit/includes/testcase-canonical.php</a></li>
<li><a href="#trunktestsphpunitincludestestcasexmlrpcphp">trunk/tests/phpunit/includes/testcase-xmlrpc.php</a></li>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesCommentphp">trunk/tests/phpunit/tests/admin/includesComment.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPluginphp">trunk/tests/phpunit/tests/admin/includesPlugin.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPostphp">trunk/tests/phpunit/tests/admin/includesPost.php</a></li>
<li><a href="#trunktestsphpunittestsadminbarphp">trunk/tests/phpunit/tests/adminbar.php</a></li>
<li><a href="#trunktestsphpunittestsajaxAutosavephp">trunk/tests/phpunit/tests/ajax/Autosave.php</a></li>
<li><a href="#trunktestsphpunittestsajaxCustomizeMenusphp">trunk/tests/phpunit/tests/ajax/CustomizeMenus.php</a></li>
<li><a href="#trunktestsphpunittestsajaxDeleteCommentphp">trunk/tests/phpunit/tests/ajax/DeleteComment.php</a></li>
<li><a href="#trunktestsphpunittestsajaxDimCommentphp">trunk/tests/phpunit/tests/ajax/DimComment.php</a></li>
<li><a href="#trunktestsphpunittestsajaxEditCommentphp">trunk/tests/phpunit/tests/ajax/EditComment.php</a></li>
<li><a href="#trunktestsphpunittestsajaxGetCommentsphp">trunk/tests/phpunit/tests/ajax/GetComments.php</a></li>
<li><a href="#trunktestsphpunittestsajaxQuickEditphp">trunk/tests/phpunit/tests/ajax/QuickEdit.php</a></li>
<li><a href="#trunktestsphpunittestsajaxReplytoCommentphp">trunk/tests/phpunit/tests/ajax/ReplytoComment.php</a></li>
<li><a href="#trunktestsphpunittestsattachmentslashesphp">trunk/tests/phpunit/tests/attachment/slashes.php</a></li>
<li><a href="#trunktestsphpunittestsavatarphp">trunk/tests/phpunit/tests/avatar.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalpageOnFrontphp">trunk/tests/phpunit/tests/canonical/pageOnFront.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalpagedphp">trunk/tests/phpunit/tests/canonical/paged.php</a></li>
<li><a href="#trunktestsphpunittestscategorygetCategoryParentsphp">trunk/tests/phpunit/tests/category/getCategoryParents.php</a></li>
<li><a href="#trunktestsphpunittestscategorywpListCategoriesphp">trunk/tests/phpunit/tests/category/wpListCategories.php</a></li>
<li><a href="#trunktestsphpunittestscategoryphp">trunk/tests/phpunit/tests/category.php</a></li>
<li><a href="#trunktestsphpunittestscommentcheckCommentphp">trunk/tests/phpunit/tests/comment/checkComment.php</a></li>
<li><a href="#trunktestsphpunittestscommentcommentFormphp">trunk/tests/phpunit/tests/comment/commentForm.php</a></li>
<li><a href="#trunktestsphpunittestscommentcommentsTemplatephp">trunk/tests/phpunit/tests/comment/commentsTemplate.php</a></li>
<li><a href="#trunktestsphpunittestscommentdateQueryphp">trunk/tests/phpunit/tests/comment/dateQuery.php</a></li>
<li><a href="#trunktestsphpunittestscommentgetCommentClassphp">trunk/tests/phpunit/tests/comment/getCommentClass.php</a></li>
<li><a href="#trunktestsphpunittestscommentgetCommentCountphp">trunk/tests/phpunit/tests/comment/getCommentCount.php</a></li>
<li><a href="#trunktestsphpunittestscommentgetCommentExcerptphp">trunk/tests/phpunit/tests/comment/getCommentExcerpt.php</a></li>
<li><a href="#trunktestsphpunittestscommentgetCommentLinkphp">trunk/tests/phpunit/tests/comment/getCommentLink.php</a></li>
<li><a href="#trunktestsphpunittestscommentgetCommentsPagesCountphp">trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php</a></li>
<li><a href="#trunktestsphpunittestscommentgetPageOfCommentphp">trunk/tests/phpunit/tests/comment/getPageOfComment.php</a></li>
<li><a href="#trunktestsphpunittestscommentmetaCachephp">trunk/tests/phpunit/tests/comment/metaCache.php</a></li>
<li><a href="#trunktestsphpunittestscommentqueryphp">trunk/tests/phpunit/tests/comment/query.php</a></li>
<li><a href="#trunktestsphpunittestscommentslashesphp">trunk/tests/phpunit/tests/comment/slashes.php</a></li>
<li><a href="#trunktestsphpunittestscommenttemplatephp">trunk/tests/phpunit/tests/comment/template.php</a></li>
<li><a href="#trunktestsphpunittestscommentwalkerphp">trunk/tests/phpunit/tests/comment/walker.php</a></li>
<li><a href="#trunktestsphpunittestscommentwpCountCommentsphp">trunk/tests/phpunit/tests/comment/wpCountComments.php</a></li>
<li><a href="#trunktestsphpunittestscommentsubmissionphp">trunk/tests/phpunit/tests/comment-submission.php</a></li>
<li><a href="#trunktestsphpunittestscommentphp">trunk/tests/phpunit/tests/comment.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenuitemsettingphp">trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusettingphp">trunk/tests/phpunit/tests/customize/nav-menu-setting.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusphp">trunk/tests/phpunit/tests/customize/nav-menus.php</a></li>
<li><a href="#trunktestsphpunittestscustomizepanelphp">trunk/tests/phpunit/tests/customize/panel.php</a></li>
<li><a href="#trunktestsphpunittestscustomizesectionphp">trunk/tests/phpunit/tests/customize/section.php</a></li>
<li><a href="#trunktestsphpunittestscustomizesettingphp">trunk/tests/phpunit/tests/customize/setting.php</a></li>
<li><a href="#trunktestsphpunittestscustomizewidgetsphp">trunk/tests/phpunit/tests/customize/widgets.php</a></li>
<li><a href="#trunktestsphpunittestsdatequeryphp">trunk/tests/phpunit/tests/date/query.php</a></li>
<li><a href="#trunktestsphpunittestsdbphp">trunk/tests/phpunit/tests/db.php</a></li>
<li><a href="#trunktestsphpunittestsformattingSanitizePostphp">trunk/tests/phpunit/tests/formatting/SanitizePost.php</a></li>
<li><a href="#trunktestsphpunittestsformattingWpTrimExcerptphp">trunk/tests/phpunit/tests/formatting/WpTrimExcerpt.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsgetArchivesphp">trunk/tests/phpunit/tests/functions/getArchives.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralarchivesphp">trunk/tests/phpunit/tests/general/archives.php</a></li>
<li><a href="#trunktestsphpunittestsincludesfactoryphp">trunk/tests/phpunit/tests/includes/factory.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetAdjacentPostLinkphp">trunk/tests/phpunit/tests/link/getAdjacentPostLink.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetNextCommentsLinkphp">trunk/tests/phpunit/tests/link/getNextCommentsLink.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetPostCommentsFeedLinkphp">trunk/tests/phpunit/tests/link/getPostCommentsFeedLink.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetPreviousCommentsLinkphp">trunk/tests/phpunit/tests/link/getPreviousCommentsLink.php</a></li>
<li><a href="#trunktestsphpunittestslinkphp">trunk/tests/phpunit/tests/link.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
<li><a href="#trunktestsphpunittestsmetaslashesphp">trunk/tests/phpunit/tests/meta/slashes.php</a></li>
<li><a href="#trunktestsphpunittestsmetaphp">trunk/tests/phpunit/tests/meta.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitebootstrapphp">trunk/tests/phpunit/tests/multisite/bootstrap.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitegetSpaceUsedphp">trunk/tests/phpunit/tests/multisite/getSpaceUsed.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitemsfilesrewritingphp">trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitenetworkphp">trunk/tests/phpunit/tests/multisite/network.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>
<li><a href="#trunktestsphpunittestsmultisitewpmuValidateUserSignupphp">trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php</a></li>
<li><a href="#trunktestsphpunittestsoembedcontrollerphp">trunk/tests/phpunit/tests/oembed/controller.php</a></li>
<li><a href="#trunktestsphpunittestsoembeddiscoveryphp">trunk/tests/phpunit/tests/oembed/discovery.php</a></li>
<li><a href="#trunktestsphpunittestsoembedgetResponseDataphp">trunk/tests/phpunit/tests/oembed/getResponseData.php</a></li>
<li><a href="#trunktestsphpunittestsoembedheadersphp">trunk/tests/phpunit/tests/oembed/headers.php</a></li>
<li><a href="#trunktestsphpunittestsoembedpostEmbedUrlphp">trunk/tests/phpunit/tests/oembed/postEmbedUrl.php</a></li>
<li><a href="#trunktestsphpunittestsoembedtemplatephp">trunk/tests/phpunit/tests/oembed/template.php</a></li>
<li><a href="#trunktestsphpunittestsoptionmultisitephp">trunk/tests/phpunit/tests/option/multisite.php</a></li>
<li><a href="#trunktestsphpunittestsoptionnetworkOptionphp">trunk/tests/phpunit/tests/option/networkOption.php</a></li>
<li><a href="#trunktestsphpunittestsoptionuserSettingsphp">trunk/tests/phpunit/tests/option/userSettings.php</a></li>
<li><a href="#trunktestsphpunittestspostfilteringphp">trunk/tests/phpunit/tests/post/filtering.php</a></li>
<li><a href="#trunktestsphpunittestspostformatsphp">trunk/tests/phpunit/tests/post/formats.php</a></li>
<li><a href="#trunktestsphpunittestspostgetBodyClassphp">trunk/tests/phpunit/tests/post/getBodyClass.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPagesphp">trunk/tests/phpunit/tests/post/getPages.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPostClassphp">trunk/tests/phpunit/tests/post/getPostClass.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPostsByAuthorSqlphp">trunk/tests/phpunit/tests/post/getPostsByAuthorSql.php</a></li>
<li><a href="#trunktestsphpunittestspostlistPagesphp">trunk/tests/phpunit/tests/post/listPages.php</a></li>
<li><a href="#trunktestsphpunittestspostmetaphp">trunk/tests/phpunit/tests/post/meta.php</a></li>
<li><a href="#trunktestsphpunittestspostnavmenuphp">trunk/tests/phpunit/tests/post/nav-menu.php</a></li>
<li><a href="#trunktestsphpunittestspostobjectsphp">trunk/tests/phpunit/tests/post/objects.php</a></li>
<li><a href="#trunktestsphpunittestspostoutputphp">trunk/tests/phpunit/tests/post/output.php</a></li>
<li><a href="#trunktestsphpunittestspostqueryphp">trunk/tests/phpunit/tests/post/query.php</a></li>
<li><a href="#trunktestsphpunittestspostrevisionsphp">trunk/tests/phpunit/tests/post/revisions.php</a></li>
<li><a href="#trunktestsphpunittestspostslashesphp">trunk/tests/phpunit/tests/post/slashes.php</a></li>
<li><a href="#trunktestsphpunittestsposttemplatephp">trunk/tests/phpunit/tests/post/template.php</a></li>
<li><a href="#trunktestsphpunittestspostwpUniquePostSlugphp">trunk/tests/phpunit/tests/post/wpUniquePostSlug.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
<li><a href="#trunktestsphpunittestsqueryconditionalsphp">trunk/tests/phpunit/tests/query/conditionals.php</a></li>
<li><a href="#trunktestsphpunittestsquerydateQueryphp">trunk/tests/phpunit/tests/query/dateQuery.php</a></li>
<li><a href="#trunktestsphpunittestsqueryisTermphp">trunk/tests/phpunit/tests/query/isTerm.php</a></li>
<li><a href="#trunktestsphpunittestsquerymetaQueryphp">trunk/tests/phpunit/tests/query/metaQuery.php</a></li>
<li><a href="#trunktestsphpunittestsquerypostStatusphp">trunk/tests/phpunit/tests/query/postStatus.php</a></li>
<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>
<li><a href="#trunktestsphpunittestsquerysearchphp">trunk/tests/phpunit/tests/query/search.php</a></li>
<li><a href="#trunktestsphpunittestsquerysetupPostdataphp">trunk/tests/phpunit/tests/query/setupPostdata.php</a></li>
<li><a href="#trunktestsphpunittestsquerytaxQueryphp">trunk/tests/phpunit/tests/query/taxQuery.php</a></li>
<li><a href="#trunktestsphpunittestsqueryphp">trunk/tests/phpunit/tests/query.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestserverphp">trunk/tests/phpunit/tests/rest-api/rest-server.php</a></li>
<li><a href="#trunktestsphpunittestsrewritenumericSlugsphp">trunk/tests/phpunit/tests/rewrite/numericSlugs.php</a></li>
<li><a href="#trunktestsphpunittestsrewriteoldSlugRedirectphp">trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php</a></li>
<li><a href="#trunktestsphpunittestsrewritephp">trunk/tests/phpunit/tests/rewrite.php</a></li>
<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermcachephp">trunk/tests/phpunit/tests/term/cache.php</a></li>
<li><a href="#trunktestsphpunitteststermcategoryExistsphp">trunk/tests/phpunit/tests/term/categoryExists.php</a></li>
<li><a href="#trunktestsphpunitteststermgetEditTermLinkphp">trunk/tests/phpunit/tests/term/getEditTermLink.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermphp">trunk/tests/phpunit/tests/term/getTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermByphp">trunk/tests/phpunit/tests/term/getTermBy.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermFieldphp">trunk/tests/phpunit/tests/term/getTermField.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermLinkphp">trunk/tests/phpunit/tests/term/getTermLink.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermsphp">trunk/tests/phpunit/tests/term/getTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermisObjectInTermphp">trunk/tests/phpunit/tests/term/isObjectInTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermmetaphp">trunk/tests/phpunit/tests/term/meta.php</a></li>
<li><a href="#trunktestsphpunitteststermqueryphp">trunk/tests/phpunit/tests/term/query.php</a></li>
<li><a href="#trunktestsphpunitteststermslashesphp">trunk/tests/phpunit/tests/term/slashes.php</a></li>
<li><a href="#trunktestsphpunitteststermtermExistsphp">trunk/tests/phpunit/tests/term/termExists.php</a></li>
<li><a href="#trunktestsphpunitteststermwpDeleteObjectTermRelationshipsphp">trunk/tests/phpunit/tests/term/wpDeleteObjectTermRelationships.php</a></li>
<li><a href="#trunktestsphpunitteststermwpDeleteTermphp">trunk/tests/phpunit/tests/term/wpDeleteTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermwpGenerateTagCloudphp">trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php</a></li>
<li><a href="#trunktestsphpunitteststermwpGetObjectTermsphp">trunk/tests/phpunit/tests/term/wpGetObjectTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermwpInsertTermphp">trunk/tests/phpunit/tests/term/wpInsertTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermwpUniqueTermSlugphp">trunk/tests/phpunit/tests/term/wpUniqueTermSlug.php</a></li>
<li><a href="#trunktestsphpunitteststermwpUpdateTermphp">trunk/tests/phpunit/tests/term/wpUpdateTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermphp">trunk/tests/phpunit/tests/term.php</a></li>
<li><a href="#trunktestsphpunittestsurlphp">trunk/tests/phpunit/tests/url.php</a></li>
<li><a href="#trunktestsphpunittestsuserauthorphp">trunk/tests/phpunit/tests/user/author.php</a></li>
<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>
<li><a href="#trunktestsphpunittestsusercountUsersphp">trunk/tests/phpunit/tests/user/countUsers.php</a></li>
<li><a href="#trunktestsphpunittestsuserdateQueryphp">trunk/tests/phpunit/tests/user/dateQuery.php</a></li>
<li><a href="#trunktestsphpunittestsuserlistAuthorsphp">trunk/tests/phpunit/tests/user/listAuthors.php</a></li>
<li><a href="#trunktestsphpunittestsusermapMetaCapphp">trunk/tests/phpunit/tests/user/mapMetaCap.php</a></li>
<li><a href="#trunktestsphpunittestsusermultisitephp">trunk/tests/phpunit/tests/user/multisite.php</a></li>
<li><a href="#trunktestsphpunittestsuserqueryphp">trunk/tests/phpunit/tests/user/query.php</a></li>
<li><a href="#trunktestsphpunittestsusersessionphp">trunk/tests/phpunit/tests/user/session.php</a></li>
<li><a href="#trunktestsphpunittestsuserslashesphp">trunk/tests/phpunit/tests/user/slashes.php</a></li>
<li><a href="#trunktestsphpunittestsuserupdateUserCachesphp">trunk/tests/phpunit/tests/user/updateUserCaches.php</a></li>
<li><a href="#trunktestsphpunittestsuserwpDeleteUserphp">trunk/tests/phpunit/tests/user/wpDeleteUser.php</a></li>
<li><a href="#trunktestsphpunittestsuserwpGetUsersWithNoRolephp">trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php</a></li>
<li><a href="#trunktestsphpunittestsuserwpSetCurrentUserphp">trunk/tests/phpunit/tests/user/wpSetCurrentUser.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsphp">trunk/tests/phpunit/tests/widgets.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmtgetRecentPostTitlesphp">trunk/tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmweditPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmwgetPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmwgetRecentPostsphp">trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmwnewPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpdeletePostphp">trunk/tests/phpunit/tests/xmlrpc/wp/deletePost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpeditCommentphp">trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpeditPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetCommentphp">trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetCommentsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetRevisionsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetTermsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetUsersphp">trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpnewCommentphp">trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpnewPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwprestoreRevisionphp">trunk/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludestestcaseajaxphp"></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/testcase-ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase-ajax.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/includes/testcase-ajax.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> error_reporting( $this->_error_level & ~E_WARNING );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make some posts
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 5 );
</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">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _setRole( $role ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = $_POST;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array( 'role' => $role ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => $role ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = array_merge($_POST, $post);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitincludestestcasecanonicalphp"></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/testcase-canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase-canonical.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/includes/testcase-canonical.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Already created by install defaults:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // $this->factory->term->create( array( 'taxonomy' => 'category', 'name' => 'uncategorized' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // self::$factory->term->create( array( 'taxonomy' => 'category', 'name' => 'uncategorized' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_ids[] = $factory->post->create( array( 'import_id' => 587, 'post_title' => 'post-format-test-audio', 'post_date' => '2008-06-02 00:00:00' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_ids[] = $post_id = $factory->post->create( array( 'post_title' => 'post-format-test-gallery', 'post_date' => '2008-06-10 00:00:00' ) );
</span></span></pre></div>
<a id="trunktestsphpunitincludestestcasexmlrpcphp"></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/testcase-xmlrpc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase-xmlrpc.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/includes/testcase-xmlrpc.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</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"> protected function make_user_by_role( $role ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => $role,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_pass' => $role,
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => $role
</span></span></pre></div>
<a id="trunktestsphpunitincludestestcasephp"></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/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/includes/testcase.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,10 +17,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @var WP_UnitTest_Factory
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $factory;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $factory;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected static $static_factory;
-
</del><span class="cx" style="display: block; padding: 0 10px"> public static function get_called_class() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'get_called_class' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return get_called_class();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,17 +37,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function setUpBeforeClass() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUpBeforeClass();
</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 ( ! self::$factory ) {
+ self::$factory = new WP_UnitTest_Factory();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $c = self::get_called_class();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! method_exists( $c, 'wpSetUpBeforeClass' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- if ( ! self::$static_factory ) {
- self::$static_factory = new WP_UnitTest_Factory();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ call_user_func( array( $c, 'wpSetUpBeforeClass' ), self::$factory );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- call_user_func( array( $c, 'wpSetUpBeforeClass' ), self::$static_factory );
-
</del><span class="cx" style="display: block; padding: 0 10px"> self::commit_transaction();
</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">@@ -82,7 +80,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->show_errors = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->db_connect();
</span><span class="cx" style="display: block; padding: 0 10px"> ini_set('display_errors', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory = new WP_UnitTest_Factory;
</del><span class="cx" style="display: block; padding: 0 10px"> $this->clean_up_global_scope();
</span><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="trunktestsphpunittestsadminincludesCommentphp"></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/admin/includesComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesComment.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/admin/includesComment.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,15 +6,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Admin_IncludesComment extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_must_match_date_and_author() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $c1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $c1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date' => '2014-05-06 12:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p1,
</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">- $p2 = $this->factory->post->create();
- $c2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create();
+ $c2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date' => '2004-01-02 12:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,8 +28,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33871
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_default_value_of_timezone_should_be_blog() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date' => '2014-05-06 12:00:00',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,8 +43,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33871
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_timezone_blog() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date' => '2014-05-06 12:00:00',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,8 +58,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33871
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_timezone_gmt() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date' => '2014-05-06 12:00:00',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,8 +73,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33871
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_invalid_timezone_should_fall_back_on_blog() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date' => '2014-05-06 12:00:00',
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPluginphp"></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/admin/includesPlugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPlugin.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/admin/includesPlugin.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_menu_page_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = get_current_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'siteurl', 'http://example.com' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // add some pages
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPostphp"></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/admin/includesPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPost.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/admin/includesPost.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,8 +11,8 @@
</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__wp_translate_postdata_cap_checks_contributor() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $contributor_id = $this->factory->user->create( array( 'role' => 'contributor' ) );
- $editor_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $contributor_id = self::$factory->user->create( array( 'role' => 'contributor' ) );
+ $editor_id = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $contributor_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Edit Draft Post for another user
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_post_data['post_ID'] = $this->factory->post->create( array( 'post_author' => $editor_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_post_data['post_ID'] = self::$factory->post->create( array( 'post_author' => $editor_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post_data['post_author'] = $editor_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data['post_type'] = 'post';
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data['post_status'] = 'draft';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,8 +64,8 @@
</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__wp_translate_postdata_cap_checks_editor() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $contributor_id = $this->factory->user->create( array( 'role' => 'contributor' ) );
- $editor_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $contributor_id = self::$factory->user->create( array( 'role' => 'contributor' ) );
+ $editor_id = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $editor_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +104,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Edit Draft Post for another user
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_post_data['post_ID'] = $this->factory->post->create( array( 'post_author' => $contributor_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_post_data['post_ID'] = self::$factory->post->create( array( 'post_author' => $contributor_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post_data['post_author'] = $contributor_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data['post_type'] = 'post';
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data['post_status'] = 'draft';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,9 +122,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25272
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_edit_post_auto_draft() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array( 'post_status' => 'auto-draft' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array( 'post_status' => 'auto-draft' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'auto-draft', $post->post_status );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Post title',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,22 +140,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30615
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_edit_post_should_parse_tax_input_by_name_rather_than_slug_for_nonhierarchical_taxonomies() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', array( 'post' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</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">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_ID' => $p,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,17 +179,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30615
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_edit_post_should_not_create_terms_for_an_empty_tag_input_field() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', array( 'post' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</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">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_ID' => $p,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,18 +209,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27792
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_bulk_edit_posts_stomping() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin = $this->factory->user->create( array( 'role' => 'administrator' ) );
- $users = $this->factory->user->create_many( 2, array( 'role' => 'author' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = self::$factory->user->create( array( 'role' => 'administrator' ) );
+ $users = self::$factory->user->create_many( 2, array( 'role' => 'author' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $admin );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $users[0],
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_status' => 'open',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ping_status' => 'open',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</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">- $post2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $users[1],
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_status' => 'closed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ping_status' => 'closed',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( "/$permalink_structure/" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $future_date = date( 'Y-m-d H:i:s', time() + 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_sample_permalink( $p );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = trailingslashit( home_url( $permalink_structure ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,10 +268,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18306
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_html_should_use_default_permalink_for_view_post_link_when_pretty_permalinks_are_disabled() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $future_date = date( 'Y-m-d H:i:s', time() + 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_sample_permalink_html( $p );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'href="' . get_option( 'home' ) . '/?p=' . $p . '"', $found );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,10 +284,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_html_should_use_pretty_permalink_for_view_post_link_when_pretty_permalinks_are_enabled() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $future_date = date( 'Y-m-d H:i:s', time() + 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_sample_permalink_html( $p );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $p );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,10 +301,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_html_should_use_correct_permalink_for_view_post_link_when_changing_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Published posts should use published permalink
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'publish', 'post_name' => 'foo' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'publish', 'post_name' => 'foo' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_sample_permalink_html( $p, null, 'new_slug' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $p );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,7 +313,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Scheduled posts should use published permalink
</span><span class="cx" style="display: block; padding: 0 10px"> $future_date = date( 'Y-m-d H:i:s', time() + 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'future', 'post_name' => 'bar', 'post_date' => $future_date ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'future', 'post_name' => 'bar', 'post_date' => $future_date ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_sample_permalink_html( $p, null, 'new_slug' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $p );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'href="' . get_option( 'home' ) . "/" . $post->post_name . '/"', $found, $message );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Draft posts should use preview link
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'draft', 'post_name' => 'baz' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'draft', 'post_name' => 'baz' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_sample_permalink_html( $p, null, 'new_slug' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $p );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_year_archives() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '2015',
</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">@@ -353,7 +353,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_allow_yearlike_slugs_if_permastruct_does_not_cause_an_archive_conflict() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '2015',
</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">@@ -367,7 +367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_month_archives() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '11',
</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">@@ -381,7 +381,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_ignore_potential_month_conflicts_for_invalid_monthnum() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '13',
</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">@@ -395,7 +395,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_day_archives() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '30',
</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">@@ -409,11 +409,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_iterate_slug_suffix_when_a_date_conflict_is_found() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '30-2',
</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">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '30',
</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">@@ -427,7 +427,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_ignore_potential_day_conflicts_for_invalid_day() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '32',
</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">@@ -441,7 +441,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_allow_daylike_slugs_if_permastruct_does_not_cause_an_archive_conflict() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%month%/%day%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '30',
</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">@@ -450,7 +450,7 @@
</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"> public function test_post_exists_should_match_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Foo Bar',
</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">@@ -458,7 +458,7 @@
</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"> public function test_post_exists_should_not_match_nonexistent_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Foo Bar',
</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">@@ -468,7 +468,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_exists_should_match_nonempty_content() {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = 'Foo Bar';
</span><span class="cx" style="display: block; padding: 0 10px"> $content = 'Foo Bar Baz';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => $title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => $content,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,7 +479,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_exists_should_not_match_when_nonempty_content_doesnt_match() {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = 'Foo Bar';
</span><span class="cx" style="display: block; padding: 0 10px"> $content = 'Foo Bar Baz';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => $title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => $content . ' Quz',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -490,7 +490,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_exists_should_match_nonempty_date() {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = 'Foo Bar';
</span><span class="cx" style="display: block; padding: 0 10px"> $date = '2014-05-08 12:00:00';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => $title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => $date,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,7 +501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_exists_should_not_match_when_nonempty_date_doesnt_match() {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = 'Foo Bar';
</span><span class="cx" style="display: block; padding: 0 10px"> $date = '2014-05-08 12:00:00';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => $title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2015-10-10 00:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,7 +513,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = 'Foo Bar';
</span><span class="cx" style="display: block; padding: 0 10px"> $content = 'Foo Bar Baz';
</span><span class="cx" style="display: block; padding: 0 10px"> $date = '2014-05-08 12:00:00';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => $title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => $content,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => $date,
</span></span></pre></div>
<a id="trunktestsphpunittestsadminbarphp"></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/adminbar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/adminbar.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/adminbar.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21117
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_content_post_type() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'editor' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'editor' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'content', array( 'show_in_admin_bar' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21117
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_merging_existing_meta_values() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'editor' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'editor' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_bar = new WP_Admin_Bar;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test does not run in multisite' );
</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">- $nobody = $this->factory->user->create( array( 'role' => '' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nobody = self::$factory->user->create( array( 'role' => '' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( $nobody, 'read' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $nobody );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test does not run in multisite' );
</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">- $editor = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( $editor, 'read' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $editor );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,13 +125,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test only runs in multisite' );
</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">- $admin = $this->factory->user->create( array( 'role' => 'administrator' ) );
- $editor = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = self::$factory->user->create( array( 'role' => 'administrator' ) );
+ $editor = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( $admin, 'read' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( $editor, 'read' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_blog_id = $this->factory->blog->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_blog_id = self::$factory->blog->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $admin,
</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">@@ -179,13 +179,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test only runs in multisite' );
</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">- $admin = $this->factory->user->create( array( 'role' => 'administrator' ) );
- $nobody = $this->factory->user->create( array( 'role' => '' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = self::$factory->user->create( array( 'role' => 'administrator' ) );
+ $nobody = self::$factory->user->create( array( 'role' => '' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( $admin, 'read' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( $nobody, 'read' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_blog_id = $this->factory->blog->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_blog_id = self::$factory->blog->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $admin,
</span><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="trunktestsphpunittestsajaxAutosavephp"></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/ajax/Autosave.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/Autosave.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/ajax/Autosave.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,10 +33,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> // Set a user so the $post has 'post_author'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_status' => 'draft' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_post = get_post( $post_id );
</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">@@ -97,7 +97,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_autosave_locked_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Lock the post to another user
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $another_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $another_user_id = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $another_user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_lock( $this->_post->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxCustomizeMenusphp"></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/ajax/CustomizeMenus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/CustomizeMenus.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/ajax/CustomizeMenus.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize = new WP_Customize_Manager();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = $this->wp_customize;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->setExpectedException( 'WPAjaxDieStopException' );
</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">- wp_set_current_user( $this->factory->user->create( array( 'role' => $role ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => $role ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'load-available-menu-items-customizer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,8 +307,8 @@
</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"> // Create some terms and pages.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->term->create_many( 5 );
- $this->factory->post->create_many( 5, array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->term->create_many( 5 );
+ self::$factory->post->create_many( 5, array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = array_merge( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'load-available-menu-items-customizer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,7 +396,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->setExpectedException( 'WPAjaxDieStopException' );
</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">- wp_set_current_user( $this->factory->user->create( array( 'role' => $role ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => $role ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'search-available-menu-items-customizer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,7 +469,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_ajax_search_available_items_results( $post_args, $expected_results ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 5, array( 'post_title' => 'Test Post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 5, array( 'post_title' => 'Test Post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = array_merge( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'search-available-menu-items-customizer',
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxDeleteCommentphp"></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/ajax/DeleteComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/DeleteComment.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/ajax/DeleteComment.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,8 +26,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $this->_comments = $this->factory->comment->create_post_comments( $post_id, 15 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $this->_comments = self::$factory->comment->create_post_comments( $post_id, 15 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_comments = array_map( 'get_comment', $this->_comments );
</span><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="trunktestsphpunittestsajaxDimCommentphp"></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/ajax/DimComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/DimComment.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/ajax/DimComment.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,8 +26,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $this->_comments = $this->factory->comment->create_post_comments( $post_id, 15 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $this->_comments = self::$factory->comment->create_post_comments( $post_id, 15 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_comments = array_map( 'get_comment', $this->_comments );
</span><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="trunktestsphpunittestsajaxEditCommentphp"></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/ajax/EditComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/EditComment.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/ajax/EditComment.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,8 +26,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $this->factory->comment->create_post_comments( $post_id, 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ self::$factory->comment->create_post_comments( $post_id, 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_comment_post = get_post( $post_id );
</span><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="trunktestsphpunittestsajaxGetCommentsphp"></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/ajax/GetComments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/GetComments.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/ajax/GetComments.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,11 +32,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $this->factory->comment->create_post_comments( $post_id, 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ self::$factory->comment->create_post_comments( $post_id, 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_comment_post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_no_comment_post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['post_id'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxQuickEditphp"></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/ajax/QuickEdit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/QuickEdit.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/ajax/QuickEdit.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,17 +25,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</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">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_1',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_2',
</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"> // Become an administrator.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_setRole( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => get_current_user_id(),
</span><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="trunktestsphpunittestsajaxReplytoCommentphp"></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/ajax/ReplytoComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/ReplytoComment.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/ajax/ReplytoComment.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,11 +32,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $this->factory->comment->create_post_comments( $post_id, 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ self::$factory->comment->create_post_comments( $post_id, 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_comment_post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_status' => 'draft' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_draft_post = get_post( $post_id );
</span><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="trunktestsphpunittestsattachmentslashesphp"></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/attachment/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/attachment/slashes.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/attachment/slashes.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Attachment_Slashes extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->author_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->author_id = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->old_current_user = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsavatarphp"></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/avatar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/avatar.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/avatar.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,12 +87,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url2 = get_avatar_url( $user );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $url, $url2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_author' => 1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_author' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $url2 = get_avatar_url( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $url, $url2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_id = $this->factory->comment->create( array( 'comment_post_ID' => $post_id, 'user_id' => 1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $post_id, 'user_id' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $url2 = get_avatar_url( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $url, $url2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,8 +138,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_avatar_comment_types_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_avatar_url( 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_author' => 1 ) );
- $comment_id = $this->factory->comment->create( array( 'comment_post_ID' => $post_id, 'user_id' => 1, 'comment_type' => 'pingback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_author' => 1 ) );
+ $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $post_id, 'user_id' => 1, 'comment_type' => 'pingback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url2 = get_avatar_url( $comment );
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalpageOnFrontphp"></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/canonical/pageOnFront.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/pageOnFront.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/canonical/pageOnFront.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,8 +18,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'page_for_posts', $this->factory->post->create( array( 'post_title' => 'blog-page', 'post_type' => 'page' ) ) );
- update_option( 'page_on_front', $this->factory->post->create( array( 'post_title' => 'front-page', 'post_type' => 'page' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'page_for_posts', self::$factory->post->create( array( 'post_title' => 'blog-page', 'post_type' => 'page' ) ) );
+ update_option( 'page_on_front', self::$factory->post->create( array( 'post_title' => 'front-page', 'post_type' => 'page' ) ) );
</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></pre></div>
<a id="trunktestsphpunittestscanonicalpagedphp"></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/canonical/paged.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/paged.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/canonical/paged.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> This is a paragraph.';
</span><span class="cx" style="display: block; padding: 0 10px"> $next = '<!--nextpage-->';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => "{$para}{$next}{$para}{$next}{$para}"
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestscategorygetCategoryParentsphp"></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/category/getCategoryParents.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/category/getCategoryParents.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/category/getCategoryParents.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,8 +10,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->c1 = $this->factory->category->create_and_get();
- $this->c2 = $this->factory->category->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->c1 = self::$factory->category->create_and_get();
+ $this->c2 = self::$factory->category->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $this->c1->term_id,
</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">@@ -51,10 +51,10 @@
</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"> public function test_visited() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->category->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->category->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $this->c2->term_id,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c4 = $this->factory->category->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c4 = self::$factory->category->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $c3->term_id,
</span><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="trunktestsphpunittestscategorywpListCategoriesphp"></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/category/wpListCategories.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/category/wpListCategories.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/category/wpListCategories.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Category_WpListCategories extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_class() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = $this->factory->category->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::$factory->category->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_list_categories( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,8 +16,8 @@
</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"> public function test_class_containing_current_cat() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create();
- $c2 = $this->factory->category->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create();
+ $c2 = self::$factory->category->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_list_categories( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,8 +30,8 @@
</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"> public function test_class_containing_current_cat_parent() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create();
- $c2 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create();
+ $c2 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $c1,
</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">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33565
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_current_category_should_accept_an_array_of_ids() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cats = $this->factory->category->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cats = self::$factory->category->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_list_categories( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,10 +66,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16792
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_not_create_element_when_cat_name_is_filtered_to_empty_string() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Cat 1',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c2 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Cat 2',
</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">@@ -88,7 +88,7 @@
</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"> public function test_show_option_all_link_should_go_to_home_page_when_show_on_front_is_false() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cats = $this->factory->category->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cats = self::$factory->category->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_list_categories( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,8 +101,8 @@
</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"> public function test_show_option_all_link_should_respect_page_for_posts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cats = $this->factory->category->create_many( 2 );
- $p = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cats = self::$factory->category->create_many( 2 );
+ $p = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_for_posts', $p );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +125,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt2', array( 'has_archive' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'wptests_pt2' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt2', array( 'has_archive' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'wptests_pt2' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -170,7 +170,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt2', array( 'has_archive' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'post', 'wptests_pt2' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -191,7 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt2', array( 'has_archive' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'wptests_pt2' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -254,7 +254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33460
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_hide_title_if_empty_should_be_ignored_when_category_list_is_not_empty() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat = $this->factory->category->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat = self::$factory->category->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_list_categories( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,9 +269,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12981
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_exclude_tree_should_be_respected() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = $this->factory->category->create();
- $parent = $this->factory->category->create( array( 'name' => 'Parent', 'slug' => 'parent' ) );
- $child = $this->factory->category->create( array( 'name' => 'Child', 'slug' => 'child', 'parent' => $parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::$factory->category->create();
+ $parent = self::$factory->category->create( array( 'name' => 'Parent', 'slug' => 'parent' ) );
+ $child = self::$factory->category->create( array( 'name' => 'Child', 'slug' => 'child', 'parent' => $parent ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'echo' => 0, 'hide_empty' => 0, 'exclude_tree' => $parent );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,11 +286,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12981
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_exclude_tree_should_be_merged_with_exclude() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = $this->factory->category->create();
- $parent = $this->factory->category->create( array( 'name' => 'Parent', 'slug' => 'parent' ) );
- $child = $this->factory->category->create( array( 'name' => 'Child', 'slug' => 'child', 'parent' => $parent ) );
- $parent2 = $this->factory->category->create( array( 'name' => 'Parent', 'slug' => 'parent2' ) );
- $child2 = $this->factory->category->create( array( 'name' => 'Child', 'slug' => 'child2', 'parent' => $parent2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::$factory->category->create();
+ $parent = self::$factory->category->create( array( 'name' => 'Parent', 'slug' => 'parent' ) );
+ $child = self::$factory->category->create( array( 'name' => 'Child', 'slug' => 'child', 'parent' => $parent ) );
+ $parent2 = self::$factory->category->create( array( 'name' => 'Parent', 'slug' => 'parent2' ) );
+ $child2 = self::$factory->category->create( array( 'name' => 'Child', 'slug' => 'child2', 'parent' => $parent2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'echo' => 0, 'hide_empty' => 0, 'exclude_tree' => $parent );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscategoryphp"></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/category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/category.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/category.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_all_category_ids() {
</span><span class="cx" style="display: block; padding: 0 10px"> // create categories
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->category->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->category->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create new taxonomy to ensure not included
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'test_tax_cat', 'post' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,13 +38,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_category_by_slug() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create Test Categories
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $testcat = $this->factory->category->create_and_get(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $testcat = self::$factory->category->create_and_get(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'testcat',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 1'
</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">- $testcat2 = $this->factory->category->create_and_get(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $testcat2 = self::$factory->category->create_and_get(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'testcat2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 2'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test MCC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'Category Test'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $testcat = $this->factory->category->create_and_get( $testcat_array );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $testcat = self::$factory->category->create_and_get( $testcat_array );
</ins><span class="cx" style="display: block; padding: 0 10px"> $testcat_array['term_id'] = $testcat->term_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $testcat2_array = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'Category Test',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $testcat->term_id
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $testcat2 = $this->factory->category->create_and_get( $testcat2_array );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $testcat2 = self::$factory->category->create_and_get( $testcat2_array );
</ins><span class="cx" style="display: block; padding: 0 10px"> $testcat2_array['term_id'] = $testcat2->term_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // unset properties to enable validation of object
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_cat_name() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create Test Category
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $testcat = $this->factory->category->create_and_get(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $testcat = self::$factory->category->create_and_get(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'testcat',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 1'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_cat_ID() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create Test Category
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $testcat = $this->factory->category->create_and_get(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $testcat = self::$factory->category->create_and_get(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'testcat',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 1'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,42 +185,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_category_by_path() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create Test Categories
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $root_id = $this->factory->category->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $root_id = self::$factory->category->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'root',
</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">- $root_cat_id = $this->factory->category->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $root_cat_id = self::$factory->category->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'cat',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $root_id
</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">- $root_cat_cat_id = $this->factory->category->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $root_cat_cat_id = self::$factory->category->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'cat', //note this is modified on create
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $root_cat_id
</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">- $root_path_id = $this->factory->category->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $root_path_id = self::$factory->category->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'path',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $root_id
</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">- $root_path_cat_id = $this->factory->category->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $root_path_cat_id = self::$factory->category->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'cat', //note this is modified on create
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $root_path_id
</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">- $root_level_id = $this->factory->category->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $root_level_id = self::$factory->category->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'level-1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $root_id
</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">- $root_level_cat_id = $this->factory->category->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $root_level_cat_id = self::$factory->category->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'cat', //note this is modified on create
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $root_level_id
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_categories_value_field_should_default_to_term_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a test category.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_id = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test_category',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_categories_value_field_term_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a test category.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_id = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test_category',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,7 +289,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_categories_value_field_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a test category.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_id = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test_category',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_categories_value_field_should_fall_back_on_term_id_when_an_invalid_value_is_provided() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a test category.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_id = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test_category',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,12 +330,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32330
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_categories_selected_should_respect_custom_value_field() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test_category_1',
</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">- $c2 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test_category_2',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,7 +354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33452
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_categories_show_option_all_should_be_selected_if_no_selected_value_is_explicitly_passed_and_value_field_does_not_have_string_values() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cats = $this->factory->category->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cats = self::$factory->category->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_dropdown_categories( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,7 +375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33452
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_categories_show_option_all_should_be_selected_if_selected_value_of_0_string_is_explicitly_passed_and_value_field_does_not_have_string_values() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cats = $this->factory->category->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cats = self::$factory->category->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_dropdown_categories( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 0,
</span></span></pre></div>
<a id="trunktestsphpunittestscommentcheckCommentphp"></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/comment/checkComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/checkComment.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/checkComment.php 2015-10-16 21:04:12 UTC (rev 35225)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_true_when_comment_whitelist_is_enabled_and_author_has_approved_comment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $prev_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => 'Can we build it?',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author_email' => 'bob@example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 'BobtheBuilder',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $prev_comment_id = $this->factory->comment->create( $prev_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prev_comment_id = self::$factory->comment->create( $prev_args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'comment_whitelist', 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscommentcommentFormphp"></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/comment/commentForm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/commentForm.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/commentForm.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Comment_CommentForm extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_default_markup_for_submit_button_and_wrapper() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name_submit' => 'foo-name',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</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"> public function test_custom_submit_button() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name_submit' => 'foo-name',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</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"> public function test_custom_submit_field() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name_submit' => 'foo-name',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32312
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_submit_button_and_submit_field_should_fall_back_on_defaults_when_filtered_defaults_do_not_contain_the_keys() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name_submit' => 'foo-name',
</span></span></pre></div>
<a id="trunktestsphpunittestscommentcommentsTemplatephp"></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/comment/commentsTemplate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/commentsTemplate.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/commentsTemplate.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,13 +12,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_comment_order_asc_when_default_comments_page_is_newest() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,13 +42,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_comment_order_desc_when_default_comments_page_is_newest() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,13 +72,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_comment_order_asc_when_default_comments_page_is_oldest() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,13 +102,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_comment_order_desc_when_default_comments_page_is_oldest() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,33 +132,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_comment_order_asc_when_default_comments_page_is_newest_on_subsequent_pages() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_4 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_4 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_5 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_5 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 500 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_6 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_6 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 600 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,33 +187,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_comment_order_desc_when_default_comments_page_is_newest_on_subsequent_pages() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_4 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_4 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_5 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_5 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 500 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_6 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_6 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 600 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,23 +242,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_comment_order_asc_when_default_comments_page_is_oldest_on_subsequent_pages() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_4 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_4 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,23 +287,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_comment_order_desc_when_default_comments_page_is_oldest_on_subsequent_pages() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_4 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_4 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,18 +334,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_last_page_of_comments_should_be_full_when_default_comment_page_is_newest() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,18 +376,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_first_page_of_comments_should_have_remainder_when_default_comments_page_is_newest() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,23 +416,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_comment_permalinks_should_be_correct_when_using_default_display_callback_with_default_comment_page_oldest() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_4 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_4 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -480,33 +480,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_comment_permalinks_should_be_correct_when_using_default_display_callback_with_default_comment_page_newest() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment_1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment_1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_4 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_4 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_5 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_5 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 500 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_6 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_6 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 600 ),
</span></span></pre></div>
<a id="trunktestsphpunittestscommentdateQueryphp"></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/comment/dateQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/dateQuery.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/dateQuery.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Just some dummy posts to use as parents for comments
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1; $i <= 2; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->posts[$i] = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->posts[$i] = self::$factory->post->create();
</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"> // Be careful modifying this. Tests are coded to expect this exact sample data.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</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"> foreach ( $comment_dates as $comment_date => $comment_parent ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_date' => $comment_date,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->posts[ $comment_parent ],
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestscommentgetCommentClassphp"></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/comment/getCommentClass.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentClass.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/getCommentClass.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,32 +5,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Comment_GetCommentClass extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_accept_comment_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $comment_id = $this->factory->comment->create( array( 'comment_post_ID' => $post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = get_comment_class( '', $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'comment', $classes );
</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"> public function test_should_accept_comment_object() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $comment = $this->factory->comment->create_and_get( array( 'comment_post_ID' => $post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $comment = self::$factory->comment->create_and_get( array( 'comment_post_ID' => $post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = get_comment_class( '', $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'comment', $classes );
</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"> public function test_should_append_single_class() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $comment_id = $this->factory->comment->create( array( 'comment_post_ID' => $post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = get_comment_class( 'foo', $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'foo', $classes );
</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"> public function test_should_append_array_of_classes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $comment_id = $this->factory->comment->create( array( 'comment_post_ID' => $post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = get_comment_class( array( 'foo', 'bar' ), $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'foo', $classes );
</span></span></pre></div>
<a id="trunktestsphpunittestscommentgetCommentCountphp"></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/comment/getCommentCount.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentCount.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/getCommentCount.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</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"> public function test_get_comment_count_approved() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => 1
</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">@@ -29,7 +29,7 @@
</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"> public function test_get_comment_count_awaiting() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => 0
</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">@@ -44,7 +44,7 @@
</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"> public function test_get_comment_count_spam() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => 'spam'
</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">@@ -59,7 +59,7 @@
</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"> public function test_get_comment_count_trash() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => 'trash'
</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">@@ -74,7 +74,7 @@
</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"> public function test_get_comment_count_post_trashed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => 'post-trashed'
</span><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="trunktestsphpunittestscommentgetCommentExcerptphp"></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/comment/getCommentExcerpt.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentExcerpt.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/getCommentExcerpt.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</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"> public function test_get_comment_excerpt() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_id = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => self::$bacon_comment
</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">@@ -24,7 +24,7 @@
</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"> public function test_get_comment_excerpt_filtered() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_id = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => self::$bacon_comment
</span><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="trunktestsphpunittestscommentgetCommentLinkphp"></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/comment/getCommentLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentLink.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/getCommentLink.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,33 +11,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->p = $this->factory->post->create();
- $this->comments[] = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->p = self::$factory->post->create();
+ $this->comments[] = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->comments[] = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->comments[] = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->comments[] = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->comments[] = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->comments[] = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->comments[] = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->comments[] = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->comments[] = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 500 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->comments[] = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->comments[] = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->p,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => '4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 600 ),
</span></span></pre></div>
<a id="trunktestsphpunittestscommentgetCommentsPagesCountphp"></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/comment/getCommentsPagesCount.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_empty() {
</span><span class="cx" style="display: block; padding: 0 10px"> //setup post and comments
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?p=' . $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,9 +60,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_threaded_comments( ) {
</span><span class="cx" style="display: block; padding: 0 10px"> //setup post and comments
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
- $comments = $this->factory->comment->create_post_comments( $post->ID, 15 );
- $this->factory->comment->create_post_comments( $post->ID, 6, array( 'comment_parent' => $comments[0] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
+ $comments = self::$factory->comment->create_post_comments( $post->ID, 15 );
+ self::$factory->comment->create_post_comments( $post->ID, 6, array( 'comment_parent' => $comments[0] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments = get_comments( array( 'post_id' => $post->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 3, get_comment_pages_count( $comments, 10, false ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,9 +76,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_option_thread_comments() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //setup post and comments
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
- $comments = $this->factory->comment->create_post_comments( $post->ID, 15 );
- $this->factory->comment->create_post_comments( $post->ID, 6, array('comment_parent' => $comments[0] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
+ $comments = self::$factory->comment->create_post_comments( $post->ID, 15 );
+ self::$factory->comment->create_post_comments( $post->ID, 6, array('comment_parent' => $comments[0] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments = get_comments( array( 'post_id' => $post->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'thread_comments', false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,8 +104,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_rss', 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array( 'post_title' => 'comment-post', 'post_type' => 'post' ) );
- $comments = $this->factory->comment->create_post_comments( $post->ID, 25 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array( 'post_title' => 'comment-post', 'post_type' => 'post' ) );
+ $comments = self::$factory->comment->create_post_comments( $post->ID, 25 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_query = new WP_Query( array( 'p' => $post->ID, 'comments_per_page' => 10, 'feed' =>'comments-' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscommentgetPageOfCommentphp"></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/comment/getPageOfComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getPageOfComment.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/getPageOfComment.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,26 +7,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Comment_GetPageOfComment extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_last_comment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // page 4
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_last = $this->factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-24 00:00:00' ) );
- $this->factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-23 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_last = self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-24 00:00:00' ) );
+ self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-23 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // page 3
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-22 00:00:00' ) );
- $this->factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-21 00:00:00' ) );
- $this->factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-20 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-22 00:00:00' ) );
+ self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-21 00:00:00' ) );
+ self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-20 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // page 2
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-19 00:00:00' ) );
- $this->factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-18 00:00:00' ) );
- $this->factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-17 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-19 00:00:00' ) );
+ self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-18 00:00:00' ) );
+ self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-17 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // page 1
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-16 00:00:00' ) );
- $this->factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-15 00:00:00' ) );
- $comment_first = $this->factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-14 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-16 00:00:00' ) );
+ self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-15 00:00:00' ) );
+ $comment_first = self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-14 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 4, get_page_of_comment( $comment_last[0], array( 'per_page' => 3 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, get_page_of_comment( $comment_last[0], array( 'per_page' => 10 ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,18 +36,18 @@
</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"> public function test_type_pings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $trackbacks = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i <= 3; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $trackbacks[ $i ] = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'trackback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $trackbacks[ $i ] = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'trackback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $now -= 10 * $i;
</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"> $pingbacks = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i <= 6; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pingbacks[ $i ] = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'pingback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pingbacks[ $i ] = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'pingback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $now -= 10 * $i;
</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">@@ -62,8 +62,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_subsequent_calls_should_hit_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c = $this->factory->comment->create( array( 'comment_post_ID' => $p ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime cache.
</span><span class="cx" style="display: block; padding: 0 10px"> $page_1 = get_page_of_comment( $c, array( 'per_page' => 3 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,13 +81,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_cache_hits_should_be_sensitive_to_comment_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $comment = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'comment' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $comment = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'comment' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $trackbacks = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i <= 5; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $trackbacks[ $i ] = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'trackback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( 10 * $i ) ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $trackbacks[ $i ] = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'trackback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( 10 * $i ) ) ) );
</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"> // Prime cache for trackbacks.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,8 +105,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11334
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_cache_should_be_invalidated_when_comment_is_approved() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_approved' => 0 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_approved' => 0 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime cache.
</span><span class="cx" style="display: block; padding: 0 10px"> $page_1 = get_page_of_comment( $c, array( 'per_page' => 3 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,8 +121,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11334
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_cache_should_be_invalidated_when_comment_is_deleted() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c = $this->factory->comment->create( array( 'comment_post_ID' => $p ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime cache.
</span><span class="cx" style="display: block; padding: 0 10px"> $page_1 = get_page_of_comment( $c, array( 'per_page' => 3 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,8 +137,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11334
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_cache_should_be_invalidated_when_comment_is_spammed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c = $this->factory->comment->create( array( 'comment_post_ID' => $p ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime cache.
</span><span class="cx" style="display: block; padding: 0 10px"> $page_1 = get_page_of_comment( $c, array( 'per_page' => 3 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,10 +155,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_cache_should_be_invalidated_when_older_comment_is_published() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_approved' => 0, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_approved' => 0, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, get_page_of_comment( $c1, array( 'per_page' => 2 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,13 +171,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34057
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_query_should_be_limited_to_comments_on_the_proper_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $comments_0 = $comments_1 = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments_0[] = $this->factory->comment->create( array( 'comment_post_ID' => $posts[0], 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
- $comments_1[] = $this->factory->comment->create( array( 'comment_post_ID' => $posts[1], 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments_0[] = self::$factory->comment->create( array( 'comment_post_ID' => $posts[0], 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
+ $comments_1[] = self::$factory->comment->create( array( 'comment_post_ID' => $posts[1], 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
</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"> $found_0 = get_page_of_comment( $comments_0[0], array( 'per_page' => 2 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,15 +191,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 13939
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_only_top_level_comments_should_be_included_in_older_count() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_parents = $comment_children = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent = $this->factory->comment->create( array( 'comment_post_ID' => $post, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent = self::$factory->comment->create( array( 'comment_post_ID' => $post, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_parents[ $i ] = $parent;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $child = $this->factory->comment->create( array( 'comment_post_ID' => $post, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 59 ) ), 'comment_parent' => $parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $child = self::$factory->comment->create( array( 'comment_post_ID' => $post, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 59 ) ), 'comment_parent' => $parent ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_children[ $i ] = $child;
</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">@@ -228,10 +228,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_comments_per_page_option_should_be_fallback_when_query_var_is_not_available() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'comments_per_page', 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscommentmetaCachephp"></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/comment/metaCache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/metaCache.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/metaCache.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,8 +10,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_comment_meta_cache_should_default_to_true() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'publish' ) );
- $comment_ids = $this->factory->comment->create_post_comments( $p, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'publish' ) );
+ $comment_ids = self::$factory->comment->create_post_comments( $p, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comment_ids as $cid ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_comment_meta( $cid, 'foo', 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,8 +38,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_comment_meta_cache_true() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'publish' ) );
- $comment_ids = $this->factory->comment->create_post_comments( $p, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'publish' ) );
+ $comment_ids = self::$factory->comment->create_post_comments( $p, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comment_ids as $cid ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_comment_meta( $cid, 'foo', 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,8 +67,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_comment_meta_cache_false() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'publish' ) );
- $comment_ids = $this->factory->comment->create_post_comments( $p, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'publish' ) );
+ $comment_ids = self::$factory->comment->create_post_comments( $p, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comment_ids as $cid ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_comment_meta( $cid, 'foo', 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,8 +93,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_comment_meta_should_be_lazy_loaded_for_all_comments_in_comments_template() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'publish' ) );
- $comment_ids = $this->factory->comment->create_post_comments( $p, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'publish' ) );
+ $comment_ids = self::$factory->comment->create_post_comments( $p, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comment_ids as $cid ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_comment_meta( $cid, 'sauce', 'fire' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,12 +128,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_comment_meta_should_be_lazy_loaded_in_comment_feed_queries() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 2, array( 'post_status' => 'publish' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2, array( 'post_status' => 'publish' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments[] = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments[] = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $posts[0],
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( 60 * $i ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,12 +172,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_comment_meta_should_be_lazy_loaded_in_single_post_comment_feed_queries() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 2, array( 'post_status' => 'publish' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2, array( 'post_status' => 'publish' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments[] = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments[] = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $posts[0],
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( 60 * $i ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestscommentqueryphp"></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/comment/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/query.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/query.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,15 +12,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = self::$factory->post->create();
</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"> public function test_query() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_query_post_id_0() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,11 +46,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_query_type_empty_string() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,11 +65,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_query_type_comment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,10 +81,10 @@
</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"> public function test_query_type_pingback() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,10 +97,10 @@
</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"> public function test_query_type_trackback() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,11 +116,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'pings' is an alias for 'trackback' + 'pingback'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_query_type_pings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,12 +136,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_array_comments_and_custom() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
- $c6 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+ $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,12 +156,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_not__in_array_custom() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
- $c6 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+ $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,12 +176,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type__in_array_and_not_type_array_custom() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
- $c6 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+ $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,12 +197,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_array_and_type__not_in_array_custom() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
- $c6 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+ $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,12 +218,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type__not_in_custom() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
- $c6 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+ $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,11 +238,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_array_comments_and_pings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,9 +257,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_array_comment_pings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,9 +274,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_array_pingback() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,9 +291,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_array_custom_pingpack() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,9 +308,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_array_pings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,10 +325,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_status_approved_array_comment_pings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0', 'comment_type' => 'pingback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0', 'comment_type' => 'pingback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,9 +344,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_array_trackback() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,9 +361,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_array_custom_trackback() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,10 +378,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12668
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_type_array_pings_approved() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0', 'comment_type' => 'trackback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0', 'comment_type' => 'trackback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,9 +397,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29612
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_status_empty_string() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'spam' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'spam' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,8 +414,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21101
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_status_hold() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,8 +430,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21101
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_status_approve() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,9 +443,9 @@
</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"> public function test_status_custom() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -457,9 +457,9 @@
</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"> public function test_status_all() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,9 +471,9 @@
</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"> public function test_status_default_to_all() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,9 +487,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29612
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_status_comma_any() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,9 +504,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29612
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_status_comma_separated() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,9 +521,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29612
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_status_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,24 +537,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_comments_for_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> $limit = 5;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $this->factory->comment->create_post_comments( $post_id, $limit );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ self::$factory->comment->create_post_comments( $post_id, $limit );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments = get_comments( array( 'post_id' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $limit, count( $comments ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comments as $comment ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $post_id, $comment->comment_post_ID );
</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">- $post_id2 = $this->factory->post->create();
- $this->factory->comment->create_post_comments( $post_id2, $limit );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id2 = self::$factory->post->create();
+ self::$factory->comment->create_post_comments( $post_id2, $limit );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments = get_comments( array( 'post_id' => $post_id2 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $limit, count( $comments ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comments as $comment ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $post_id2, $comment->comment_post_ID );
</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">- $post_id3 = $this->factory->post->create();
- $this->factory->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id3 = self::$factory->post->create();
+ self::$factory->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments = get_comments( array( 'post_id' => $post_id3 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $limit, count( $comments ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comments as $comment ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,7 +570,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = get_comments( array( 'post_id' => $post_id3, 'status' => 'approve' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, count( $comments ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments = get_comments( array( 'post_id' => $post_id3 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $limit * 2, count( $comments ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comments as $comment ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,9 +582,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21003
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_orderby_meta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_id = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
- $comment_id2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
- $comment_id3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
+ $comment_id2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
+ $comment_id3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comment_id, 'key', 'value1', true );
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comment_id, 'key1', 'value1', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,7 +632,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30478
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_clause_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->factory->comment->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = self::$factory->comment->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comments[0], 'foo', 'aaa' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comments[1], 'foo', 'zzz' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comments[2], 'foo', 'jjj' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -657,13 +657,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30478
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_clause_key_as_secondary_sort() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_date' => '2015-01-28 03:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_date' => '2015-01-28 05:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_date' => '2015-01-28 03:00:00',
</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">@@ -693,7 +693,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30478
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_more_than_one_clause_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->factory->comment->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = self::$factory->comment->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comments[0], 'foo', 'jjj' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comments[1], 'foo', 'zzz' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -728,7 +728,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group 32081
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_should_work_with_comment__in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->factory->comment->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = self::$factory->comment->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comments[0], 'foo', 'jjj' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comments[1], 'foo', 'zzz' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -752,7 +752,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group 32081
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_should_work_with_comment__not_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->factory->comment->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = self::$factory->comment->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comments[0], 'foo', 'jjj' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $comments[1], 'foo', 'zzz' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -776,10 +776,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27064
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_comments_by_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 2 );
- $this->factory->comment->create( array( 'user_id' => $users[0], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $this->factory->comment->create( array( 'user_id' => $users[0], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $this->factory->comment->create( array( 'user_id' => $users[1], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $users = self::$factory->user->create_many( 2 );
+ self::$factory->comment->create( array( 'user_id' => $users[0], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ self::$factory->comment->create( array( 'user_id' => $users[0], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ self::$factory->comment->create( array( 'user_id' => $users[1], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $users[0],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -808,9 +808,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28434
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_fields_ids_query() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
- $comment_2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
- $comment_3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $comment_2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $comment_3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure we are dealing with integers, and not objects.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'integer', $comment_1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -826,9 +826,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29189
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_fields_comment__in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
- $comment_2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
- $comment_3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $comment_2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $comment_3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -842,9 +842,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29189
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_fields_comment__not_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
- $comment_2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
- $comment_3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $comment_2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $comment_3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,13 +858,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29189
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_fields_post__in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 7, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -878,13 +878,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29189
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_fields_post__not_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 7, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -901,13 +901,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id1 = 105;
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id2 = 106;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_author' => $author_id1 ) );
- $p2 = $this->factory->post->create( array( 'post_author' => $author_id1 ) );
- $p3 = $this->factory->post->create( array( 'post_author' => $author_id2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_author' => $author_id1 ) );
+ $p2 = self::$factory->post->create( array( 'post_author' => $author_id1 ) );
+ $p3 = self::$factory->post->create( array( 'post_author' => $author_id2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -924,13 +924,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id1 = 111;
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id2 = 112;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_author' => $author_id1 ) );
- $p2 = $this->factory->post->create( array( 'post_author' => $author_id1 ) );
- $p3 = $this->factory->post->create( array( 'post_author' => $author_id2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_author' => $author_id1 ) );
+ $p2 = self::$factory->post->create( array( 'post_author' => $author_id1 ) );
+ $p3 = self::$factory->post->create( array( 'post_author' => $author_id2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -944,15 +944,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29885
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_fields_author__in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
- $p4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
+ $p4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 2, 'comment_approved' => '1' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 3, 'comment_approved' => '1' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $p4, 'user_id' => 4, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 2, 'comment_approved' => '1' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 3, 'comment_approved' => '1' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $p4, 'user_id' => 4, 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -966,15 +966,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29885
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_fields_author__not_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
- $p4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
+ $p4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 2, 'comment_approved' => '1' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 3, 'comment_approved' => '1' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $p4, 'user_id' => 4, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 2, 'comment_approved' => '1' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 3, 'comment_approved' => '1' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $p4, 'user_id' => 4, 'comment_approved' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -988,9 +988,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19623
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_comments_with_status_all() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
- $comment_2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
- $comment_3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $comment_2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $comment_3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments_approved_1 = get_comments( array( 'status' => 'all' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = get_comments( array( 'fields' => 'ids' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1001,10 +1001,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19623
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_comments_with_include_unapproved_user_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1019,11 +1019,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19623
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_comments_with_include_unapproved_user_id_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 8, 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 8, 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1038,11 +1038,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19623
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_comments_with_include_unapproved_user_id_comma_separated() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 8, 'comment_approved' => '0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 8, 'comment_approved' => '0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1057,10 +1057,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19623
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_comments_with_include_unapproved_author_email() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1075,11 +1075,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19623
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_comments_with_include_unapproved_mixed_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1094,11 +1094,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19623
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_comments_with_include_unapproved_mixed_comma_separated() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_comments( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1110,12 +1110,12 @@
</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"> public function test_search() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'foo@example.com' ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://foo.bar' ) );
- $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com', 'comment_author_IP' => 'foo.bar' ) );
- $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com', 'comment_content' => 'Nice foo comment' ) );
- $c6 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'foo@example.com' ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://foo.bar' ) );
+ $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com', 'comment_author_IP' => 'foo.bar' ) );
+ $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com', 'comment_content' => 'Nice foo comment' ) );
+ $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1363,7 +1363,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_date_modified_gmt_should_order_by_comment_ID_in_case_of_tie_ASC() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = current_time( 'mysql', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->factory->comment->create_many( 5, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = self::$factory->comment->create_many( 5, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => $now,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1383,7 +1383,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_date_modified_gmt_should_order_by_comment_ID_in_case_of_tie_DESC() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = current_time( 'mysql', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->factory->comment->create_many( 5, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = self::$factory->comment->create_many( 5, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => $now,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1416,8 +1416,8 @@
</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"> public function test_count() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1431,9 +1431,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23369
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_count_with_meta_query() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
- $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
- $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+ $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+ $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $c1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $c3, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1455,11 +1455,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'post-type-1' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'post-type-2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_type' => 'post-type-1' ) );
- $p2 = $this->factory->post->create( array( 'post_type' => 'post-type-2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_type' => 'post-type-1' ) );
+ $p2 = self::$factory->post->create( array( 'post_type' => 'post-type-2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create_post_comments( $p1, 1 );
- $c2 = $this->factory->comment->create_post_comments( $p2, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
+ $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1480,11 +1480,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'post-type-1' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'post-type-2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_type' => 'post-type-1' ) );
- $p2 = $this->factory->post->create( array( 'post_type' => 'post-type-2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_type' => 'post-type-1' ) );
+ $p2 = self::$factory->post->create( array( 'post_type' => 'post-type-2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create_post_comments( $p1, 1 );
- $c2 = $this->factory->comment->create_post_comments( $p2, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
+ $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1505,13 +1505,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'post-type-1' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'post-type-2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_type' => 'post-type-1' ) );
- $p2 = $this->factory->post->create( array( 'post_type' => 'post-type-2' ) );
- $p3 = $this->factory->post->create( array( 'post_type' => 'post-type-3' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_type' => 'post-type-1' ) );
+ $p2 = self::$factory->post->create( array( 'post_type' => 'post-type-2' ) );
+ $p3 = self::$factory->post->create( array( 'post_type' => 'post-type-3' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create_post_comments( $p1, 1 );
- $c2 = $this->factory->comment->create_post_comments( $p2, 1 );
- $c3 = $this->factory->comment->create_post_comments( $p3, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
+ $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
+ $c3 = self::$factory->comment->create_post_comments( $p3, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1526,11 +1526,11 @@
</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"> public function test_post_name_single_value() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_name' => 'foo' ) );
- $p2 = $this->factory->post->create( array( 'post_name' => 'bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_name' => 'foo' ) );
+ $p2 = self::$factory->post->create( array( 'post_name' => 'bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create_post_comments( $p1, 1 );
- $c2 = $this->factory->comment->create_post_comments( $p2, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
+ $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1545,11 +1545,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20006
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_name_singleton_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_name' => 'foo' ) );
- $p2 = $this->factory->post->create( array( 'post_name' => 'bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_name' => 'foo' ) );
+ $p2 = self::$factory->post->create( array( 'post_name' => 'bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create_post_comments( $p1, 1 );
- $c2 = $this->factory->comment->create_post_comments( $p2, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
+ $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1564,13 +1564,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20006
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_name_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_name' => 'foo' ) );
- $p2 = $this->factory->post->create( array( 'post_name' => 'bar' ) );
- $p3 = $this->factory->post->create( array( 'post_name' => 'baz' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_name' => 'foo' ) );
+ $p2 = self::$factory->post->create( array( 'post_name' => 'bar' ) );
+ $p3 = self::$factory->post->create( array( 'post_name' => 'baz' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create_post_comments( $p1, 1 );
- $c2 = $this->factory->comment->create_post_comments( $p2, 1 );
- $c3 = $this->factory->comment->create_post_comments( $p3, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
+ $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
+ $c3 = self::$factory->comment->create_post_comments( $p3, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1582,11 +1582,11 @@
</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"> public function test_post_status_single_value() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
- $p2 = $this->factory->post->create( array( 'post_status' => 'draft' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_status' => 'publish' ) );
+ $p2 = self::$factory->post->create( array( 'post_status' => 'draft' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create_post_comments( $p1, 1 );
- $c2 = $this->factory->comment->create_post_comments( $p2, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
+ $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1601,11 +1601,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20006
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_status_singleton_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
- $p2 = $this->factory->post->create( array( 'post_status' => 'draft' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_status' => 'publish' ) );
+ $p2 = self::$factory->post->create( array( 'post_status' => 'draft' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create_post_comments( $p1, 1 );
- $c2 = $this->factory->comment->create_post_comments( $p2, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
+ $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1620,13 +1620,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20006
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_status_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
- $p2 = $this->factory->post->create( array( 'post_status' => 'draft' ) );
- $p3 = $this->factory->post->create( array( 'post_status' => 'future' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_status' => 'publish' ) );
+ $p2 = self::$factory->post->create( array( 'post_status' => 'draft' ) );
+ $p3 = self::$factory->post->create( array( 'post_status' => 'future' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create_post_comments( $p1, 1 );
- $c2 = $this->factory->comment->create_post_comments( $p2, 1 );
- $c3 = $this->factory->comment->create_post_comments( $p3, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
+ $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
+ $c3 = self::$factory->comment->create_post_comments( $p3, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $found = $q->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1641,7 +1641,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24826
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_comment_query_object() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_id = $this->factory->comment->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id = self::$factory->comment->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query1 = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $query1->query_vars );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1663,8 +1663,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_comment_cache_key_should_ignore_custom_params() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c = $this->factory->comment->create( array( 'comment_post_ID' => $p ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q1 = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $q1->query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1688,7 +1688,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32762
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_it_should_be_possible_to_modify_meta_query_using_pre_get_comments_action() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->factory->comment->create_many( 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = self::$factory->comment->create_many( 2, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</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">@@ -1719,7 +1719,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32762
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_it_should_be_possible_to_modify_meta_params_using_pre_get_comments_action() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->factory->comment->create_many( 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = self::$factory->comment->create_many( 2, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</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">@@ -1746,8 +1746,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33882
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_parent__in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1766,17 +1766,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33882
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_parent__in_commas() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c4 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c4 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1795,9 +1795,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33882
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_parent__not_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '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">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1816,18 +1816,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33882
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_parent__not_in_commas() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
- $c2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+ $c2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1'
</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">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1846,21 +1846,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33883
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_comment__in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1'
</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">- $c2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1'
</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">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1880,7 +1880,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8071
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_no_found_rows_should_default_to_true() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->factory->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = self::$factory->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => $this->post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1895,7 +1895,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8071
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_no_found_rows_true() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->factory->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = self::$factory->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => $this->post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1911,7 +1911,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8071
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_no_found_rows_false() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->factory->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = self::$factory->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => $this->post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1927,18 +1927,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8071
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_hierarchical_should_skip_child_comments_in_offset() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $top_level_0 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $top_level_0 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</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">- $child_of_0 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $child_of_0 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $top_level_0,
</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">- $top_level_comments = $this->factory->comment->create_many( 3, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $top_level_comments = self::$factory->comment->create_many( 3, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1960,18 +1960,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8071
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_hierarchical_should_not_include_child_comments_in_number() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $top_level_0 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $top_level_0 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</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">- $child_of_0 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $child_of_0 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $top_level_0,
</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">- $top_level_comments = $this->factory->comment->create_many( 3, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $top_level_comments = self::$factory->comment->create_many( 3, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1991,35 +1991,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8071
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_hierarchical_threaded() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</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">- $c2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c1,
</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">- $c3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c2,
</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">- $c4 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c4 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c1,
</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">- $c5 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c5 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</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">- $c6 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c6 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c5,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2054,35 +2054,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8071
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_hierarchical_threaded_approved() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</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">- $c2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c1,
</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">- $c3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '0',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c2,
</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">- $c4 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c4 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c1,
</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">- $c5 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c5 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</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">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c5,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2117,8 +2117,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_comment_post_cache_should_be_disabled_by_default() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c = $this->factory->comment->create( array( 'comment_post_ID' => $p ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_ID' => $p,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2135,8 +2135,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_respect_update_comment_post_cache_true() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $c = $this->factory->comment->create( array( 'comment_post_ID' => $p ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Comment_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_ID' => $p,
</span></span></pre></div>
<a id="trunktestsphpunittestscommentslashesphp"></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/comment/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/slashes.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/slashes.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> // we need an admin user to bypass comment flood protection
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->author_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->author_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->old_current_user = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</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_wp_new_comment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // not testing comment_author_email or comment_author_url
</span><span class="cx" style="display: block; padding: 0 10px"> // as slashes are not permitted in that data
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,8 +74,8 @@
</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_edit_comment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $comment_id = $this->factory->comment->create(array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $comment_id = self::$factory->comment->create(array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post_id
</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">@@ -117,7 +117,7 @@
</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_wp_insert_comment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_id = wp_insert_comment(array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,8 +145,8 @@
</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_wp_update_comment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $comment_id = $this->factory->comment->create(array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $comment_id = self::$factory->comment->create(array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post_id
</span><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="trunktestsphpunittestscommenttemplatephp"></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/comment/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/template.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/template.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,26 +5,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Comment_Template extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_comments_number() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, get_comments_number( 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, get_comments_number( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, get_comments_number( get_post( $post_id ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create_post_comments( $post_id, 12 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create_post_comments( $post_id, 12 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 12, get_comments_number( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 12, get_comments_number( get_post( $post_id ) ) );
</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_get_comments_number_without_arg() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $permalink );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, get_comments_number() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create_post_comments( $post_id, 12 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create_post_comments( $post_id, 12 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $permalink );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 12, get_comments_number() );
</span></span></pre></div>
<a id="trunktestsphpunittestscommentwalkerphp"></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/comment/walker.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/walker.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/walker.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,15 +8,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = self::$factory->post->create();
</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="cx" style="display: block; padding: 0 10px"> * @ticket 14041
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_has_children() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_parent = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
- $comment_child = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_parent' => $comment_parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_parent = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
+ $comment_child = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_parent' => $comment_parent ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_parent = get_comment( $comment_parent );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_child = get_comment( $comment_child );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscommentwpCountCommentsphp"></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/comment/wpCountComments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpCountComments.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment/wpCountComments.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</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"> public function test_wp_count_comments_approved() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => 1
</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">@@ -31,7 +31,7 @@
</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"> public function test_wp_count_comments_awaiting() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => 0
</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">@@ -47,7 +47,7 @@
</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"> public function test_wp_count_comments_spam() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => 'spam'
</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">@@ -63,7 +63,7 @@
</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"> public function test_wp_count_comments_trash() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => 'trash'
</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">@@ -79,7 +79,7 @@
</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"> public function test_wp_count_comments_post_trashed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => 'post-trashed'
</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">@@ -95,10 +95,10 @@
</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"> public function test_wp_count_comments_cache() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_id = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post_id
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestscommentsubmissionphp"></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/comment-submission.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment-submission.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment-submission.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, did_action( $error ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_status' => 'closed',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, did_action( $error ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_trash_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, did_action( $error ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'draft',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, did_action( $error ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => date( 'Y-m-d H:i:s', strtotime( '+1 day' ) ),
</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">@@ -121,7 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, did_action( $error ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_password' => 'password',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_COOKIE['wp-postpass_' . COOKIEHASH] = $hasher->HashPassword( $password );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_password' => $password,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,13 +162,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_submitting_valid_comment_as_logged_in_user_succeeds() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_url' => 'http://user.example.org'
</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"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment' => 'Comment',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_submitting_valid_comment_anonymously_succeeds() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment' => 'Comment',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_submitting_comment_handles_slashes_correctly_handles_slashes() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment' => 'Comment with 1 slash: \\',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $error = 'not_logged_in';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'private',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,11 +252,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_submitting_comment_to_own_private_post_succeeds() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'private',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,16 +274,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_submitting_comment_to_accessible_private_post_succeeds() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'editor',
</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"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'private',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $author->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_anonymous_user_cannot_comment_unfiltered_html() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment' => 'Comment <script>alert(document.cookie);</script>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,14 +318,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_unprivileged_user_cannot_comment_unfiltered_html() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_user_can( 'unfiltered_html' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment' => 'Comment <script>alert(document.cookie);</script>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,14 +340,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_unprivileged_user_cannot_comment_unfiltered_html_even_with_valid_nonce() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_user_can( 'unfiltered_html' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = 'unfiltered-html-comment_' . $post->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = wp_create_nonce( $action );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,7 +370,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( defined( 'DISALLOW_UNFILTERED_HTML' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'editor',
</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">@@ -384,7 +384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_user_can( 'unfiltered_html' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = 'unfiltered-html-comment_' . $post->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = wp_create_nonce( $action );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,7 +405,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_privileged_user_cannot_comment_unfiltered_html_without_valid_nonce() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'editor',
</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">@@ -419,7 +419,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_user_can( 'unfiltered_html' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment' => 'Comment <script>alert(document.cookie);</script>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,7 +439,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_comment_registration = get_option( 'comment_registration' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'comment_registration', '1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_require_name_email = get_option( 'require_name_email' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'require_name_email', '1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment' => 'Comment',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -481,7 +481,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_require_name_email = get_option( 'require_name_email' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'require_name_email', '1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment' => 'Comment',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,7 +503,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_require_name_email = get_option( 'require_name_email' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'require_name_email', '1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment' => 'Comment',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,7 +523,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $error = 'require_valid_comment';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment' => '',
</span></span></pre></div>
<a id="trunktestsphpunittestscommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/comment.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,9 +21,9 @@
</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_wp_update_comment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post' ) );
- $post2 = $this->factory->post->create_and_get( array( 'post_title' => 'some-post-2', 'post_type' => 'post' ) );
- $comments = $this->factory->comment->create_post_comments( $post->ID, 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post' ) );
+ $post2 = self::$factory->post->create_and_get( array( 'post_title' => 'some-post-2', 'post_type' => 'post' ) );
+ $comments = self::$factory->comment->create_post_comments( $post->ID, 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = wp_update_comment( array( 'comment_ID' => $comments[0], 'comment_parent' => $comments[1] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comments[0] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30627
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_update_comment_updates_comment_type() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_id = $this->factory->comment->create( array( 'comment_post_ID' => self::$post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => self::$post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_comment( array( 'comment_ID' => $comment_id, 'comment_type' => 'pingback' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30307
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_update_comment_updates_user_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_id = $this->factory->comment->create( array( 'comment_post_ID' => self::$post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => self::$post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_comment( array( 'comment_ID' => $comment_id, 'user_id' => 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,25 +60,25 @@
</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"> public function test_get_approved_comments() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ca1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ca1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id, 'comment_approved' => '1'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ca2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ca2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id, 'comment_approved' => '1'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ca3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ca3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id, 'comment_approved' => '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">- $c2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id, 'comment_approved' => '1', 'comment_type' => 'pingback'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id, 'comment_approved' => '1', 'comment_type' => 'trackback'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c4 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c4 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id, 'comment_approved' => '1', 'comment_type' => 'mario'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c5 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c5 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id, 'comment_approved' => '1', 'comment_type' => 'luigi'
</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">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30412
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_approved_comments_with_post_id_0_should_return_empty_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ca1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ca1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id, 'comment_approved' => '1'
</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">@@ -256,11 +256,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32566
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_notify_moderator_should_not_throw_notice_when_post_author_is_0() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => 0,
</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">- $c = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $p,
</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">@@ -271,7 +271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33587
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_new_comment_notify_postauthor_should_not_send_email_when_comment_has_been_marked_as_spam() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => 'spam',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,7 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12431
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_new_comment_with_meta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_meta' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'food' => 'taco',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,35 +299,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8071
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_comment_get_children_should_fill_children() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</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">- $c2 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c1,
</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">- $c3 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c2,
</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">- $c4 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c4 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c1,
</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">- $c5 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c5 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</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">- $c6 = $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c6 = self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent' => $c5,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +347,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group 27571
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_properties_should_be_lazyloaded() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = $this->factory->comment->create( array( 'comment_post_ID' => self::$post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::$factory->comment->create( array( 'comment_post_ID' => self::$post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( self::$post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $c );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></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/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/customize/manager.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,10 +251,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::set_return_url()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_return_url() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'author' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'author' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_admin_url(), $this->manager->get_return_url() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_user_can( 'edit_theme_options' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( admin_url( 'themes.php' ), $this->manager->get_return_url() );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * @see WP_Customize_Manager::customize_pane_settings()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_customize_pane_settings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager->register_controls();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->prepare_controls();
</span><span class="cx" style="display: block; padding: 0 10px"> $autofocus = array( 'control' => 'blogname' );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenuitemsettingphp"></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/customize/nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize = new WP_Customize_Manager();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_value_type_post_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Menu' );
</span><span class="cx" style="display: block; padding: 0 10px"> $item_title = 'Greetings';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_value_type_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax_id = $this->factory->category->create( array( 'name' => 'Salutations' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax_id = self::$factory->category->create( array( 'name' => 'Salutations' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Menu' );
</span><span class="cx" style="display: block; padding: 0 10px"> $item_title = 'Greetings';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $menu->value();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $post_value, $value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,8 +296,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_preview_updated() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
- $second_post_id = $this->factory->post->create( array( 'post_title' => 'Hola Muno' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
+ $second_post_id = self::$factory->post->create( array( 'post_title' => 'Hola Muno' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $primary_menu_id = wp_create_nav_menu( 'Primary' );
</span><span class="cx" style="display: block; padding: 0 10px"> $secondary_menu_id = wp_create_nav_menu( 'Secondary' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,7 +348,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $item_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i += 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,7 +403,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $item_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i += 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,8 +488,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_save_updated() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
- $second_post_id = $this->factory->post->create( array( 'post_title' => 'Hola Muno' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
+ $second_post_id = self::$factory->post->create( array( 'post_title' => 'Hola Muno' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $primary_menu_id = wp_create_nav_menu( 'Primary' );
</span><span class="cx" style="display: block; padding: 0 10px"> $secondary_menu_id = wp_create_nav_menu( 'Secondary' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,7 +554,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $item_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i += 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
</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"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $item_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i += 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenusettingphp"></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/customize/nav-menu-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize = new WP_Customize_Manager();
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenusphp"></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/customize/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menus.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/customize/nav-menus.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize = new WP_Customize_Manager();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = $this->wp_customize;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</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"> // Create pages.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 12, array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 12, array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Home is included in menu items when page is zero.
</span><span class="cx" style="display: block; padding: 0 10px"> $items = $menus->load_available_items_query( 'post_type', 'page', 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,10 +145,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create page.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'Post Title' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'Post Title' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create pages.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 10 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expected menu item array.
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create page.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_title' => 'Page Title', 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_title' => 'Page Title', 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expected menu item array.
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'Post Title' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'Post Title' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expected menu item array.
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,7 +227,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create term.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id = $this->factory->category->create( array( 'name' => 'Term Title' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id = self::$factory->category->create( array( 'name' => 'Term Title' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expected menu item array.
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,13 +279,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create posts
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ids[] = $this->factory->post->create( array( 'post_title' => 'Search & Test' ) );
- $post_ids[] = $this->factory->post->create( array( 'post_title' => 'Some Other Title' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids[] = self::$factory->post->create( array( 'post_title' => 'Search & Test' ) );
+ $post_ids[] = self::$factory->post->create( array( 'post_title' => 'Some Other Title' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create terms
</span><span class="cx" style="display: block; padding: 0 10px"> $term_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_ids[] = $this->factory->category->create( array( 'name' => 'Dogs Are Cool' ) );
- $term_ids[] = $this->factory->category->create( array( 'name' => 'Cats Drool' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_ids[] = self::$factory->category->create( array( 'name' => 'Dogs Are Cool' ) );
+ $term_ids[] = self::$factory->category->create( array( 'name' => 'Cats Drool' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test empty results
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_customize_register() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = wp_create_nav_menu( 'Primary' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => 'post',
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizepanelphp"></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/customize/panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/panel.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/customize/panel.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Panel::check_capabilities()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_check_capabilities() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $panel = new WP_Customize_Panel( $this->manager, 'foo' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Panel::maybe_render()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_maybe_render() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $panel = new WP_Customize_Panel( $this->manager, 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $customize_render_panel_count = did_action( 'customize_render_panel' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'customize_render_panel', array( $this, 'action_customize_render_panel_test' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Panel::print_template()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_print_templates_standard() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $panel = new WP_Customize_Panel( $this->manager, 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Panel::print_template()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_print_templates_custom() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $panel = new Custom_Panel_Test( $this->manager, 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizesectionphp"></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/customize/section.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/section.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/customize/section.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Section::check_capabilities()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_check_capabilities() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $section = new WP_Customize_Section( $this->manager, 'foo' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +161,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Section::maybe_render()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_maybe_render() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $section = new WP_Customize_Section( $this->manager, 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $customize_render_section_count = did_action( 'customize_render_section' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'customize_render_section', array( $this, 'action_customize_render_section_test' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Section::print_template()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_print_templates_standard() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $section = new WP_Customize_Section( $this->manager, 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Section::print_template()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_print_templates_custom() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $section = new Custom_Section_Test( $this->manager, 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizesettingphp"></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/customize/setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/setting.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/customize/setting.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +394,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( 0 === did_action( 'customize_save_foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Satisfy all requirements for save to happen.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( false !== $setting->save() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( 1 === did_action( 'customize_update_custom' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( 1 === did_action( 'customize_save_foo' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,7 +465,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $setting->preview();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $setting->is_current_blog_previewed() );
</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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $setting->is_current_blog_previewed() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( $post_value, $setting->value() );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizewidgetsphp"></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/customize/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/widgets.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/customize/widgets.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'after_setup_theme', 'twentyfifteen_setup' ); // @todo We should not be including a theme anyway
</span><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' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><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="trunktestsphpunittestsdatequeryphp"></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/date/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/query.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/date/query.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -975,8 +975,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31001
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate_date_values_should_process_array_value_for_year() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2013-01-12 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2013-01-12 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -995,8 +995,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31001
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate_date_values_should_process_array_value_for_day() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2015-01-10 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2015-01-10 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,8 +1016,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage WP_Date_Query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validate_date_values_should_process_array_value_for_day_when_values_are_invalid() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2015-01-10 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2015-01-10 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span></span></pre></div>
<a id="trunktestsphpunittestsdbphp"></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/db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/db.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,7 +509,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'procedure could not be created (missing privileges?)' );
</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">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $wpdb->get_results( 'CALL `test_mysqli_flush_sync_procedure`' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $wpdb->get_results( "SELECT ID FROM `{$wpdb->posts}` LIMIT 1" ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingSanitizePostphp"></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/formatting/SanitizePost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizePost.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/formatting/SanitizePost.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22324
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_int_fields() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $int_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => 'integer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => 'integer',
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWpTrimExcerptphp"></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/formatting/WpTrimExcerpt.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WpTrimExcerpt.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/formatting/WpTrimExcerpt.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,10 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25349
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_secondary_loop_respect_more() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Post 1 Page 1<!--more-->Post 1 Page 2',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Post 2 Page 1<!--more-->Post 2 Page 2',
</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">@@ -34,10 +34,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25349
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_secondary_loop_respect_nextpage() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Post 1 Page 1<!--nextpage-->Post 1 Page 2',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Post 2 Page 1<!--nextpage-->Post 2 Page 2',
</span><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="trunktestsphpunittestsfunctionsgetArchivesphp"></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/functions/getArchives.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/getArchives.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/functions/getArchives.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@
</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_wp_get_archives_order() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => '1', 'post_date' => '2012-10-23 19:34:42' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_type' => 'post', 'post_author' => '1', 'post_date' => '2012-10-23 19:34:42' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $date_full = date( 'F Y' );
</span><span class="cx" style="display: block; padding: 0 10px"> $oct_url = get_month_link( 2012, 10 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_archives_post_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'taco', array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'taco',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2014-10-23 19:34:42'
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/functions.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -689,7 +689,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', $actual );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['post'] = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['post'] = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2015-09-16 08:00:00'
</span><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="trunktestsphpunittestsgeneralarchivesphp"></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/general/archives.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/archives.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/general/archives.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_archives_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 3, array( 'post_type' => 'post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 3, array( 'post_type' => 'post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'last_changed', 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsincludesfactoryphp"></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/includes/factory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/includes/factory.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/includes/factory.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_factory_create_and_get_should_return_term_object() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->term->create_and_get( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->term->create_and_get( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'object', $term );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $term->term_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestslinkgetAdjacentPostLinkphp"></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/link/getAdjacentPostLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getAdjacentPostLink.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/link/getAdjacentPostLink.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,13 +10,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp(){
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->cat_id = $this->factory->category->create( array( 'name' => 'other' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->cat_id = self::$factory->category->create( array( 'name' => 'other' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->post_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_ids[] = $this->factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 05:32:29', 'category_id' => 1 ) );
- $this->post_ids[] = $this->factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 04:32:29', 'category_id' => $this->cat_id ) );
- $this->post_ids[] = $this->factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 03:32:29', 'category_id' => 1 ) );
- $this->post_ids[] = $this->factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 02:32:29', 'category_id' => $this->cat_id ) );
- $this->post_ids[] = $this->factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 01:32:29', 'category_id' => 1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_ids[] = self::$factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 05:32:29', 'category_id' => 1 ) );
+ $this->post_ids[] = self::$factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 04:32:29', 'category_id' => $this->cat_id ) );
+ $this->post_ids[] = self::$factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 03:32:29', 'category_id' => 1 ) );
+ $this->post_ids[] = self::$factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 02:32:29', 'category_id' => $this->cat_id ) );
+ $this->post_ids[] = self::$factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 01:32:29', 'category_id' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //set current post (has 2 on each end)
</span><span class="cx" style="display: block; padding: 0 10px"> global $GLOBALS;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,37 +25,43 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_next_post_link_default() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = get_next_post_link();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = '<a href="' . home_url( '?p=' . $this->post_ids[1] ) . '" rel="next">Post title 2</a> »';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = get_post( $this->post_ids[1] )->post_title;
+ $expected = '<a href="' . home_url( '?p=' . $this->post_ids[1] ) . '" rel="next">' . $title . '</a> »';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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"> public function test_get_previous_post_link_default() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = get_previous_post_link();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = '« <a href="' . home_url( '?p=' . $this->post_ids[3] ) . '" rel="prev">Post title 4</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = get_post( $this->post_ids[3] )->post_title;
+ $expected = '« <a href="' . home_url( '?p=' . $this->post_ids[3] ) . '" rel="prev">' . $title . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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"> public function test_get_next_post_link_same_category() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = get_next_post_link( '%link »', '%title', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = '<a href="' . home_url( '?p=' . $this->post_ids[1] ) . '" rel="next">Post title 2</a> »';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = get_post( $this->post_ids[1] )->post_title;
+ $expected = '<a href="' . home_url( '?p=' . $this->post_ids[1] ) . '" rel="next">' . $title . '</a> »';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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"> public function test_get_previous_post_link_same_category() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = get_previous_post_link( '« %link', '%title', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = '« <a href="' . home_url( '?p=' . $this->post_ids[3] ) . '" rel="prev">Post title 4</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = get_post( $this->post_ids[3] )->post_title;
+ $expected = '« <a href="' . home_url( '?p=' . $this->post_ids[3] ) . '" rel="prev">' . $title . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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"> public function test_get_next_post_link_exclude_category() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = get_next_post_link( '%link »', '%title', false, $this->cat_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = '<a href="' . home_url( '?p=' . $this->post_ids[1] ) . '" rel="next">Post title 2</a> »';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = get_post( $this->post_ids[1] )->post_title;
+ $expected = '<a href="' . home_url( '?p=' . $this->post_ids[1] ) . '" rel="next">' . $title . '</a> »';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</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"> public function test_get_previous_post_link_exclude_category() {
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = get_previous_post_link( '« %link', '%title', false, $this->cat_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = '« <a href="' . home_url( '?p=' . $this->post_ids[3] ) . '" rel="prev">Post title 4</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = get_post( $this->post_ids[3] )->post_title;
+ $expected = '« <a href="' . home_url( '?p=' . $this->post_ids[3] ) . '" rel="prev">' . $title . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><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="trunktestsphpunittestslinkgetNextCommentsLinkphp"></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/link/getNextCommentsLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getNextCommentsLink.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/link/getNextCommentsLink.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Link_GetNextCommentsLink extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_page_should_respect_value_of_cpage_query_var() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $p ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpage = get_query_var( 'cpage' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20319
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_page_should_default_to_1_when_no_cpage_query_var_is_found() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $p ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpage = get_query_var( 'cpage' );
</span></span></pre></div>
<a id="trunktestsphpunittestslinkgetPostCommentsFeedLinkphp"></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/link/getPostCommentsFeedLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getPostCommentsFeedLink.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/link/getPostCommentsFeedLink.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Link_GetPostCommentsFeedLink extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_link() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = get_post_comments_feed_link( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = add_query_arg( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_pretty_link() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = get_post_comments_feed_link( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = get_permalink( $post_id ) . 'feed/';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,8 +28,8 @@
</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"> public function test_attachment_link() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $attachment_id = $this->factory->attachment->create_object( 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $attachment_id = self::$factory->attachment->create_object( 'image.jpg', $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,10 +46,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_attachment_pretty_link() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( 'image.jpg', $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Burrito'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,8 +66,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_attachment_no_name_pretty_link() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $attachment_id = $this->factory->attachment->create_object( 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $attachment_id = self::$factory->attachment->create_object( 'image.jpg', $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@
</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"> public function test_unattached_link() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( 'image.jpg', 0, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_unattached_pretty_link() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( 'image.jpg', 0, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestslinkgetPreviousCommentsLinkphp"></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/link/getPreviousCommentsLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getPreviousCommentsLink.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/link/getPreviousCommentsLink.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Link_GetPreviousCommentsLink extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_page_should_respect_value_of_cpage_query_var() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $p ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpage = get_query_var( 'cpage' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</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"> public function test_page_should_default_to_1_when_no_cpage_query_var_is_found() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $p ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpage = get_query_var( 'cpage' );
</span></span></pre></div>
<a id="trunktestsphpunittestslinkphp"></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/link.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/link.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,8 +33,8 @@
</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_wp_get_shortlink() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $post_id2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $post_id2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Basic case
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_permalink( $post_id ), wp_get_shortlink( $post_id, 'post' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@
</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_wp_get_shortlink_with_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Basic case
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't test against get_permalink() since it uses ?page_id= for pages.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26871
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_shortlink_with_home_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_on_front', $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,22 +108,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_adjacent_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Need some sample posts to test adjacency
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_one = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_one = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'First',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-01-01 12:00:00'
</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">- $post_two = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_two = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Second',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-02-01 12:00:00'
</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">- $post_three = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_three = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Third',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-03-01 12:00:00'
</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">- $post_four = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_four = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Fourth',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-04-01 12:00:00'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,33 +183,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $wpdb->term_taxonomy, array( 'taxonomy' => 'foo', 'term_id' => 12345, 'description' => '' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $include = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $include = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Include',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exclude = $this->factory->category->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exclude = self::$factory->category->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $one = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $one = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-01-01 12:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_category' => array( $include, $exclude ),
</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">- $two = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $two = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-01-02 12:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_category' => array(),
</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">- $three = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $three = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-01-03 12:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_category' => array( $include, $exclude ),
</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">- $four = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $four = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-01-04 12:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_category' => array( $include ),
</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">- $five = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $five = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-01-05 12:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_category' => array( $include, $exclude ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,13 +249,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_adjacent_post_excluded_terms() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $p1 = $this->factory->post->create( array( 'post_date' => '2015-08-27 12:00:00' ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2015-08-26 12:00:00' ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2015-08-25 12:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2015-08-27 12:00:00' ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2015-08-26 12:00:00' ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2015-08-25 12:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p2, array( $t ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,13 +281,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_adjacent_post_excluded_terms_should_not_require_posts_to_have_terms_in_any_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $p1 = $this->factory->post->create( array( 'post_date' => '2015-08-27 12:00:00' ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2015-08-26 12:00:00' ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2015-08-25 12:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2015-08-27 12:00:00' ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2015-08-26 12:00:00' ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2015-08-25 12:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p2, array( $t ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,7 +348,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> flush_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 day' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,7 +368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> flush_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'future',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_pt',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 day' ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,7 +388,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_unattached_attachment_has_a_pretty_permalink() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( 'image.jpg', 0, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'An Attachment!',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,9 +412,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> flush_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'not_a_post_type' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'not_a_post_type' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( 'image.jpg', $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( 'image.jpg', $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'An Attachment!',
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/media.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,8 +236,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22960
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_attached_images() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $attachment_id = $this->factory->attachment->create_object( $this->img_name, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $attachment_id = self::$factory->attachment->create_object( $this->img_name, $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ids1 = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $ids1_srcs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, 3 ) as $i ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( "image$i.jpg", 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( "image$i.jpg", 0, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,7 +266,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ids2 = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $ids2_srcs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 4, 6 ) as $i ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( "image$i.jpg", 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( "image$i.jpg", 0, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,7 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> [gallery ids="$ids2_joined"]
</span><span class="cx" style="display: block; padding: 0 10px"> BLOB;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_content' => $blob ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_content' => $blob ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $srcs = get_post_galleries_images( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $srcs, array( $ids1_srcs, $ids2_srcs ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ids1 = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $ids1_srcs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, 3 ) as $i ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( "image$i.jpg", 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( "image$i.jpg", 0, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,7 +309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ids2 = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $ids2_srcs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 4, 6 ) as $i ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( "image$i.jpg", 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( "image$i.jpg", 0, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> [gallery ids="$ids2_joined"]
</span><span class="cx" style="display: block; padding: 0 10px"> BLOB;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_content' => $blob ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_content' => $blob ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $srcs = get_post_gallery_images( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $srcs, $ids1_srcs );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,7 +505,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_attachment_url_to_postid() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_path = '2014/11/' . $this->img_name;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( $image_path, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( $image_path, 0, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +516,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_attachment_url_to_postid_schemes() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_path = '2014/11/' . $this->img_name;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( $image_path, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( $image_path, 0, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,7 +530,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_attachment_url_to_postid_filtered() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_path = '2014/11/' . $this->img_name;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( $image_path, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( $image_path, 0, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -704,8 +704,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_image_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_attachment_image_url( 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">- $post_id = $this->factory->post->create();
- $attachment_id = $this->factory->attachment->create_object( $this->img_name, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $attachment_id = self::$factory->attachment->create_object( $this->img_name, $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -760,7 +760,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make an image.
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = DIR_TESTDATA . '/images/test-image-large.png';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->attachment->create_upload_object( $filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->attachment->create_upload_object( $filename );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $image = wp_get_attachment_metadata( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaslashesphp"></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/meta/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta/slashes.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/meta/slashes.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,8 +8,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Meta_Slashes extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->author_id = $this->factory->user->create( array( 'role' => 'editor' ) );
- $this->post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->author_id = self::$factory->user->create( array( 'role' => 'editor' ) );
+ $this->post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->old_current_user = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</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_edit_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'wp_add_post_meta' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_1 = wp_add_post_meta( $id, 'slash_test_1', 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_2 = wp_add_post_meta( $id, 'slash_test_2', 'foo' );
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_add_post_meta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $id, 'slash_test_1', addslashes( $this->slash_1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $id, 'slash_test_2', addslashes( $this->slash_3 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $id, 'slash_test_3', addslashes( $this->slash_4 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@
</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_update_post_meta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $id, 'slash_test_1', addslashes( $this->slash_1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $id, 'slash_test_2', addslashes( $this->slash_3 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $id, 'slash_test_3', addslashes( $this->slash_4 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !function_exists( 'wp_add_post_meta' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_add_post_meta( $id, 'slash_test_1', $this->slash_1 );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_post_meta( $id, 'slash_test_2', $this->slash_3 );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_post_meta( $id, 'slash_test_3', $this->slash_4 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !function_exists( 'wp_update_post_meta' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post_meta( $id, 'slash_test_1', $this->slash_1 );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post_meta( $id, 'slash_test_2', $this->slash_3 );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post_meta( $id, 'slash_test_3', $this->slash_4 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@
</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_add_comment_meta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $id, 'slash_test_1', $this->slash_1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $id, 'slash_test_2', $this->slash_3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +198,7 @@
</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_update_comment_meta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $id, 'slash_test_1', 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_comment_meta( $id, 'slash_test_2', 'foo' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +226,7 @@
</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_add_user_meta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_meta( $id, 'slash_test_1', $this->slash_1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_meta( $id, 'slash_test_2', $this->slash_3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,7 +250,7 @@
</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_update_user_meta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_meta( $id, 'slash_test_1', 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_meta( $id, 'slash_test_2', 'foo' );
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaphp"></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/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/meta.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->author = new WP_User( $this->factory->user->create( array( 'role' => 'author' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->author = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->meta_id = add_metadata( 'user', $this->author->ID, 'meta_key', 'meta_value' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->delete_meta_id = add_metadata( 'user', $this->author->ID, 'delete_meta_key', 'delete_meta_value' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,10 +194,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16814
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_meta_type_cast() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id1 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id1 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id1, 'num_as_longtext', 123 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id1, 'num_as_longtext_desc', 10 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id2, 'num_as_longtext', 99 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id2, 'num_as_longtext_desc', 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +258,7 @@
</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_meta_cache_order_asc() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $colors = array( 'red', 'blue', 'yellow', 'green' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $colors as $color )
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'color', $color );
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitebootstrapphp"></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/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/bootstrap.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/multisite/bootstrap.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</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"> foreach ( $ids as &$id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->network->create( $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->network->create( $id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@
</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"> foreach ( $ids as &$id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->blog->create( $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->blog->create( $id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,7 @@
</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"> foreach ( $network_ids as &$id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->network->create( $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->network->create( $id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,7 @@
</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"> foreach ( $ids as &$id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->blog->create( $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->blog->create( $id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitegetSpaceUsedphp"></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/getSpaceUsed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/getSpaceUsed.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/multisite/getSpaceUsed.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</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_get_space_used_switched_site() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Our comparison of space relies on an initial value of 0. If a previous test has failed or if the
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // will be polluted. We create sites until an empty one is available.
</span><span class="cx" style="display: block; padding: 0 10px"> while ( 0 != get_space_used() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</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">@@ -58,7 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_space_used_main_site() {
</span><span class="cx" style="display: block; padding: 0 10px"> $space_used = get_space_used();
</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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We don't rely on an initial value of 0 for space used, but should have a clean space available
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // existing content directories in src.
</span><span class="cx" style="display: block; padding: 0 10px"> while ( 0 != get_space_used() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><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="trunktestsphpunittestsmultisitemsfilesrewritingphp"></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/ms-files-rewriting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,8 +37,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site = get_current_site();
</span><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_id2 = $this->factory->blog->create( array( 'user_id' => $user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+ $blog_id2 = self::$factory->blog->create( array( 'user_id' => $user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $info = wp_upload_dir();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'http://' . $site->domain . '/wp-content/uploads/' . gmstrftime('%Y/%m'), $info['url'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( ABSPATH . 'wp-content/uploads/' . gmstrftime('%Y/%m'), $info['path'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Upload a file to the main site on the network.
</span><span class="cx" style="display: block; padding: 0 10px"> $file1 = wp_upload_bits( $filename, null, $contents );
</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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $file2 = wp_upload_bits( $filename, null, $contents );
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitenetworkphp"></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/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/network.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/multisite/network.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * as the main network ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_main_network_id_two_networks() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->network->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->network->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, get_main_network_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_main_network_id_after_network_switch() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $current_site;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->network->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->network->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_site->id = (int) $id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_main_network_id_after_network_delete() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $current_site;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->network->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->network->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_site->id = (int) $id;
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "UPDATE {$wpdb->site} SET id=100 WHERE id=1" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,13 +90,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $site_count_start = get_blog_count();
</span><span class="cx" style="display: block; padding: 0 10px"> // false for large networks by default
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'enable_live_network_counts', '__return_false' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->blog->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->blog->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // count only updated when cron runs, so unchanged
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $site_count_start, (int) get_blog_count() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'enable_live_network_counts', '__return_true' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_ids = $this->factory->blog->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_ids = self::$factory->blog->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $site_count_start + 9, (int) get_blog_count() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only false for large networks as of 3.7
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'enable_live_network_counts', '__return_false' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $count = get_user_count(); // No change, cache not refreshed
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $start_count, $count );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,8 +240,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dashboard_blog = get_dashboard_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $dashboard_blog->blog_id );
</span><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 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+ $blog_id = self::$factory->blog->create( array( 'user_id' => $user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'int', $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // set the dashboard blog to another one
</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 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/multisite/site.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'switch-test', $current_blog_id, 'switch-test' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $current_blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
</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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cap_key = wp_get_current_user()->cap_key;
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_created_site_details() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'int', $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $prefix = $wpdb->get_blog_prefix( $blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * When a site is flagged as 'deleted', its data should be cleared from cache.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_data_in_cache_after_wpmu_delete_blog_drop_false() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $details = get_blog_details( $blog_id, false );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $details->domain . $details->path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +151,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_data_in_tables_after_wpmu_delete_blog_drop_false() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete the site without forcing a table drop.
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $blog_id, false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * When a site is fully deleted, its data should be cleared from cache.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_data_in_cache_after_wpmu_delete_blog_drop_true() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $details = get_blog_details( $blog_id, false );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $details->domain . $details->path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_data_in_tables_after_wpmu_delete_blog_drop_true() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete the site and force a table drop.
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $blog_id, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The site count of a network should change when a site is flagged as 'deleted'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_network_count_after_wpmu_delete_blog_drop_false() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete the site without forcing a table drop.
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $blog_id, false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +261,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The site count of a network should change when a site is fully deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_blog_count_after_wpmu_delete_blog_drop_true() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete the site and force a table drop.
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $blog_id, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Upload a file to the main site on the network.
</span><span class="cx" style="display: block; padding: 0 10px"> $file1 = wp_upload_bits( $filename, null, $contents );
</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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $file2 = wp_upload_bits( $filename, null, $contents );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,7 +329,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_details_when_site_does_not_exist() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create an unused site so that we can then assume an invalid site ID.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id++;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime the cache for an invalid site.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( -1, wp_cache_get( $blog_id, 'blog-details' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a site in the invalid site's place.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // When a new site is created, its cache is cleared through refresh_blog_details.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,7 +370,7 @@
</span><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 = 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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $blog_id, array( 'spam' => 1 ) );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +394,7 @@
</span><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 = 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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +417,7 @@
</span><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 = 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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,7 +440,7 @@
</span><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 = 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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $blog_id, array( 'archived' => 1 ) );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -463,7 +463,7 @@
</span><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 = 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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,7 +486,7 @@
</span><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 = 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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $blog_id, array( 'deleted' => 1 ) );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -510,7 +510,7 @@
</span><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 = 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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -533,7 +533,7 @@
</span><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 = 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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $blog_id, array( 'mature' => 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -557,7 +557,7 @@
</span><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 = 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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,7 +583,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 14511
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_sites_with_default_arguments() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->blog->create( array( 'site_id' => 2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->blog->create( array( 'site_id' => 2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, wp_get_sites() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,7 +599,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * A network ID of null should query for all public sites on all networks.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_sites_with_network_id_null() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->blog->create( array( 'site_id' => 2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->blog->create( array( 'site_id' => 2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, wp_get_sites( array( 'network_id' => null ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -608,7 +608,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Expect only sites on the specified network ID to be returned.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_sites_with_specific_network_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->blog->create( array( 'site_id' => 2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->blog->create( array( 'site_id' => 2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, wp_get_sites( array( 'network_id' => 2 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -617,7 +617,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Expect sites from both networks if both network IDs are specified.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_sites_with_multiple_network_ids() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->blog->create( array( 'site_id' => 2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->blog->create( array( 'site_id' => 2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, wp_get_sites( array( 'network_id' => array( 1, 2 ) ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,7 +626,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Queries for public or non public sites should work across all networks if network ID is null.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_sites_with_public_meta_on_all_networks() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->blog->create( array( 'site_id' => 2, 'meta' => array( 'public' => 0 ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->blog->create( array( 'site_id' => 2, 'meta' => array( 'public' => 0 ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, wp_get_sites( array( 'public' => 1, 'network_id' => null ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertcount( 1, wp_get_sites( array( 'public' => 0, 'network_id' => null ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,7 +636,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If a network ID is specified, queries for public sites should be restricted to that network.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_sites_with_public_meta_restrict_to_one_network() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->blog->create( array( 'site_id' => 1, 'meta' => array( 'public' => 0 ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->blog->create( array( 'site_id' => 1, 'meta' => array( 'public' => 0 ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, wp_get_sites( array( 'public' => 1, 'network_id' => 1 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 0, wp_get_sites( array( 'public' => 1, 'network_id' => 2 ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,7 +647,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_sites_limit_offset() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create 2 more sites (in addition to the default one)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->blog->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->blog->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expect first 2 sites when using limit
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, wp_get_sites( array( 'limit' => 2 ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -670,8 +670,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27952
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_posts_count() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create();
- $post2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create();
+ $post2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, get_blog_details()->post_count );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post( $post2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,7 +701,7 @@
</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"> foreach ( $network_ids as &$id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->network->create( $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->network->create( $id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -714,7 +714,7 @@
</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"> foreach ( $ids as &$id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->blog->create( $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->blog->create( $id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -772,7 +772,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * the blog ID is requested through get_blog_id_from_url().
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $details = get_blog_details( $blog_id, false );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -785,7 +785,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test the case insensitivity of the site lookup.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create( array( 'domain' => 'example.com', 'path' => '/xyz' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create( array( 'domain' => 'example.com', 'path' => '/xyz' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $details = get_blog_details( $blog_id, false );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -795,7 +795,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test the first and cached responses for a site that does not exist.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create( array( 'path' => '/xyz' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create( array( 'path' => '/xyz' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $details = get_blog_details( $blog_id, false );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -807,7 +807,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * behavior would be expected if passing `false` explicitly to `wpmu_delete_blog()`.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $details = get_blog_details( $blog_id, false );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,7 +821,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * -1 after an attempt at `get_blog_id_from_url()` is made.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $details = get_blog_details( $blog_id, false );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -850,7 +850,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test with a site ID other than the main site to ensure a false response.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_main_site_is_false_with_other_blog_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_main_site( $blog_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -859,7 +859,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test with no passed ID after switching to another site ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_main_site_is_false_after_switch_to_blog() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_main_site() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -878,7 +878,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', $info['error'] );
</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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $info = wp_upload_dir();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -900,8 +900,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * another site on the network.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_blog_post_from_another_site_on_network() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
- $post_id = $this->factory->post->create(); // Create a post on the primary site, ID 1.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
+ $post_id = self::$factory->post->create(); // Create a post on the primary site, ID 1.
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_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">@@ -915,7 +915,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If get_blog_post() is used on the same site, it should still work.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_blog_post_from_same_site() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_blog_post( 1, $post_id ), get_post( $post_id ) );
</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 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/multisite/updateBlogDetails.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</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_update_blog_details() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = update_blog_details( $blog_id, array( 'domain' => 'example.com', 'path' => 'my_path/' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><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 = 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_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set an initial value of '1' for the flag when '0' is the flag value being tested.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '0' === $flag_value ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitewpmuValidateUserSignupphp"></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/wpmuValidateUserSignup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,13 +63,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"> public function test_should_fail_for_existing_user_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create( array( 'user_login' => 'foo123' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create( array( 'user_login' => 'foo123' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $v = wpmu_validate_user_signup( 'foo123', 'foo@example.com' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'user_name', $v['errors']->get_error_codes() );
</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"> public function test_should_fail_for_existing_user_email() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create( array( 'user_email' => 'foo@example.com' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create( array( 'user_email' => 'foo@example.com' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $v = wpmu_validate_user_signup( 'foo123', 'foo@example.com' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'user_email', $v['errors']->get_error_codes() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedcontrollerphp"></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/oembed/controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/controller.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/oembed/controller.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,10 +17,10 @@
</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_request_json() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,10 +60,10 @@
</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_request_jsonp() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,10 +83,10 @@
</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_request_jsonp_invalid_callback() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,10 +118,10 @@
</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_request_xml() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,11 +177,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
</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">- $child = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $child = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $child );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello Child Blog',
</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">@@ -207,7 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( home_url() . '/?oembed=true', get_oembed_endpoint_url( '', 'json' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( home_url() . '/?oembed=true', get_oembed_endpoint_url( '', 'xml' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $url_encoded = urlencode( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsoembeddiscoveryphp"></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/oembed/discovery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/discovery.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/oembed/discovery.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</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_add_oembed_discovery_links_to_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_single', 'is_singular' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</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_add_oembed_discovery_links_to_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page'
</span><span class="cx" style="display: block; padding: 0 10px"> ));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,9 +46,9 @@
</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_add_oembed_discovery_links_to_attachment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( $file, $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><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="trunktestsphpunittestsoembedgetResponseDataphp"></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/oembed/getResponseData.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/getResponseData.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/oembed/getResponseData.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</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_get_oembed_response_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Some Post',
</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">@@ -33,11 +33,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test get_oembed_response_data with an author.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_oembed_response_data_author() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</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">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Some Post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_oembed_response_link() {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'oembed_response_data', 'get_oembed_response_data_rich' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Some Post',
</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">@@ -81,7 +81,7 @@
</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_get_oembed_response_data_with_draft_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'draft',
</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">@@ -89,7 +89,7 @@
</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_get_oembed_response_data_with_scheduled_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'future',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 day' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</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_get_oembed_response_data_with_private_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'private',
</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">@@ -106,7 +106,7 @@
</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_get_oembed_response_data_maxwidth_too_high() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = get_oembed_response_data( $post, 1000 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@
</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_get_oembed_response_data_maxwidth_too_low() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = get_oembed_response_data( $post, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</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_get_oembed_response_data_maxwidth_invalid() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = get_oembed_response_data( $post, '400;" DROP TABLES' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,9 +138,9 @@
</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_get_oembed_response_data_with_thumbnail() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( $file, $post->ID, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( $file, $post->ID, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> set_post_thumbnail( $post, $attachment_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,9 +154,9 @@
</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_get_oembed_response_data_for_attachment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->attachment->create_object( $file, $parent, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->attachment->create_object( $file, $parent, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><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="trunktestsphpunittestsoembedheadersphp"></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/oembed/headers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/headers.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/oembed/headers.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'xdebug is required for this test' );
</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">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</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">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'xdebug is required for this test' );
</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">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><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="trunktestsphpunittestsoembedpostEmbedUrlphp"></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/oembed/postEmbedUrl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/postEmbedUrl.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/oembed/postEmbedUrl.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_post_embed_url_with_pretty_permalinks() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'permalink_structure', '/%postname%' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $embed_url = get_post_embed_url( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</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_get_post_embed_url_with_ugly_permalinks() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $embed_url = get_post_embed_url( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedtemplatephp"></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/oembed/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/template.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/oembed/template.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,11 +5,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Embed_Template extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> function test_oembed_output_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</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">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Foo Bar',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,13 +30,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_oembed_output_post_with_thumbnail() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Foo Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Bar Baz',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( $file, $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> set_post_thumbnail( $post_id, $attachment_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,9 +72,9 @@
</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_oembed_output_attachment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( $file, $post->ID, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( $file, $post->ID, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Foo Bar',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@
</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_oembed_output_draft_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Foo Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Bar Baz',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@
</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_oembed_output_scheduled_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Foo Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Bar Baz',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@
</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_oembed_output_private_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Foo Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Bar Baz',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,10 +161,10 @@
</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_oembed_output_private_post_with_permissions() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Hello World',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Foo Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Bar Baz',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +193,7 @@
</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_wp_oembed_excerpt_more() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Foo Bar',
</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">@@ -214,15 +214,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_embed_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_embed() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_post_embed_url( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_embed() );
</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_is_embed_attachment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( $file, $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_post_embed_url( $attachment_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +240,7 @@
</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_get_post_embed_html() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '<iframe sandbox="allow-scripts" security="restricted" src="' . esc_url( get_post_embed_url( $post_id ) ) . '" width="200" height="200" title="Embedded WordPress Post" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" class="wp-embedded-content"></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionmultisitephp"></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/option/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/multisite.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/option/multisite.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,10 +98,10 @@
</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_with_another_site() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'integer', $user_id );
</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_id = $this->factory->blog->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => 1,
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionnetworkOptionphp"></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/option/networkOption.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/networkOption.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/option/networkOption.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Option_NetworkOption extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> function test_add_network_option_not_available_on_other_network() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->network->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->network->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $option = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $value = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</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_add_network_option_available_on_same_network() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->network->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->network->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $option = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $value = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</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_delete_network_option_on_only_one_network() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->network->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->network->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $option = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $value = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionuserSettingsphp"></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/option/userSettings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/userSettings.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/option/userSettings.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->user_id = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->user_id = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'administrator'
</span><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="trunktestsphpunittestspostfilteringphp"></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/post/filtering.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/filtering.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/filtering.php 2015-10-16 21:04:12 UTC (rev 35225)
</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"> no such tag
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array( 'post_content' => $content ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array( 'post_content' => $content ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post($id);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $post->post_content );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <i>italics</i>
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array( 'post_content' => $content ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array( 'post_content' => $content ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post($id);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $post->post_content );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <img src='foo' width='500' />
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array( 'post_content' => $content ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array( 'post_content' => $content ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post($id);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $post->post_content );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <img src='foo' width='500' height='300' />
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array( 'post_content' => $content ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array( 'post_content' => $content ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post($id);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $post->post_content );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +104,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> breaks the graf</p>
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array( 'post_content' => $content ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array( 'post_content' => $content ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post($id);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $content, $post->post_content );
</span></span></pre></div>
<a id="trunktestsphpunittestspostformatsphp"></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/post/formats.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/formats.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/formats.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</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_set_get_post_format_for_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $format = get_post_format( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $format );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22473
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_set_get_post_format_for_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $format = get_post_format( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $format );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@
</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_has_format() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_post_format( 'standard', $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_post_format( '', $post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,11 +111,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $commentary
</span><span class="cx" style="display: block; padding: 0 10px"> DATA;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link_post_id = $this->factory->post->create( array( 'post_content' => $link ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link_post_id = self::$factory->post->create( array( 'post_content' => $link ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_link = get_url_in_content( get_post_field( 'post_content', $link_post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, $content_link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link_with_post_id = $this->factory->post->create( array( 'post_content' => $link_with_commentary ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link_with_post_id = self::$factory->post->create( array( 'post_content' => $link_with_commentary ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_link = get_url_in_content( get_post_field( 'post_content', $link_with_post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, $content_link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,20 +125,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content_link = get_url_in_content( get_post_field( 'post_content', $link_with_post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, $content_link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $empty_post_id = $this->factory->post->create( array( 'post_content' => '' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $empty_post_id = self::$factory->post->create( array( 'post_content' => '' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_link = get_url_in_content( get_post_field( 'post_content', $empty_post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, $content_link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comm_post_id = $this->factory->post->create( array( 'post_content' => $commentary ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comm_post_id = self::$factory->post->create( array( 'post_content' => $commentary ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_link = get_url_in_content( get_post_field( 'post_content', $comm_post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, $content_link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now with an href
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $href_post_id = $this->factory->post->create( array( 'post_content' => $href ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $href_post_id = self::$factory->post->create( array( 'post_content' => $href ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_link = get_url_in_content( get_post_field( 'post_content', $href_post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $link, $content_link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $href_with_post_id = $this->factory->post->create( array( 'post_content' => $href_with_commentary ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $href_with_post_id = self::$factory->post->create( array( 'post_content' => $href_with_commentary ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_link = get_url_in_content( get_post_field( 'post_content', $href_with_post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $link, $content_link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,11 +148,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content_link = get_url_in_content( get_post_field( 'post_content', $href_with_post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $link, $content_link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $empty_post_id = $this->factory->post->create( array( 'post_content' => '' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $empty_post_id = self::$factory->post->create( array( 'post_content' => '' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_link = get_url_in_content( get_post_field( 'post_content', $empty_post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, $content_link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comm_post_id = $this->factory->post->create( array( 'post_content' => $commentary ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comm_post_id = self::$factory->post->create( array( 'post_content' => $commentary ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_link = get_url_in_content( get_post_field( 'post_content', $comm_post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, $content_link );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetBodyClassphp"></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/post/getBodyClass.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getBodyClass.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/getBodyClass.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,16 +9,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = self::$factory->post->create();
</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="cx" style="display: block; padding: 0 10px"> * @ticket 30883
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_with_utf8_category_slugs() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id1 = $this->factory->category->create( array( 'name' => 'Первая рубрика' ) );
- $cat_id2 = $this->factory->category->create( array( 'name' => 'Вторая рубрика' ) );
- $cat_id3 = $this->factory->category->create( array( 'name' => '25кадр' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_id1 = self::$factory->category->create( array( 'name' => 'Первая рубрика' ) );
+ $cat_id2 = self::$factory->category->create( array( 'name' => 'Вторая рубрика' ) );
+ $cat_id3 = self::$factory->category->create( array( 'name' => '25кадр' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $this->post_id, array( $cat_id1, $cat_id2, $cat_id3 ), 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( home_url( "?cat=$cat_id1" ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,9 +35,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30883
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_with_utf8_tag_slugs() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag_id1 = $this->factory->tag->create( array( 'name' => 'Первая метка' ) );
- $tag_id2 = $this->factory->tag->create( array( 'name' => 'Вторая метка' ) );
- $tag_id3 = $this->factory->tag->create( array( 'name' => '25кадр' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag_id1 = self::$factory->tag->create( array( 'name' => 'Первая метка' ) );
+ $tag_id2 = self::$factory->tag->create( array( 'name' => 'Вторая метка' ) );
+ $tag_id3 = self::$factory->tag->create( array( 'name' => '25кадр' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $this->post_id, array( $tag_id1, $tag_id2, $tag_id3 ), 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag1 = get_term( $tag_id1, 'post_tag' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,9 +59,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_with_utf8_term_slugs() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Первая метка' ) );
- $term_id2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Вторая метка' ) );
- $term_id3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => '25кадр' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Первая метка' ) );
+ $term_id2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Вторая метка' ) );
+ $term_id3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => '25кадр' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $this->post_id, array( $term_id1, $term_id2, $term_id3 ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term1 = get_term( $term_id1, 'wptests_tax' );
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPagesphp"></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/post/getPages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPages.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/getPages.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_pages_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 3, array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 3, array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'last_changed', 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20376
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_pages_meta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3, array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3, array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'some-meta-key', '0' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'some-meta-key', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[2], 'some-meta-key', '1' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, 20 ) as $i )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_ids[] = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $inc = array_slice( $page_ids, 0, 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> sort( $inc );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,10 +138,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 9470
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_pages_parent() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $page_id2 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
- $page_id3 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id2 ) );
- $page_id4 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $page_id2 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
+ $page_id3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id2 ) );
+ $page_id4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = get_pages( array( 'parent' => 0, 'hierarchical' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $page_id1 ), wp_list_pluck( $pages, 'ID' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22389
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_dropdown_pages() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 5, array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 5, array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match_all( '#<option#', wp_dropdown_pages( 'echo=0' ), $matches );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,8 +177,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22208
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_chidren_fields_ids() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $child_ids = $this->factory->post->create_many( 5, array( 'post_parent' => $post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $child_ids = self::$factory->post->create_many( 5, array( 'post_parent' => $post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ids = get_children( array( 'fields' => 'ids', 'post_parent' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $child_ids, $post_ids );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,10 +189,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_pages_hierarchical_and_no_parent() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $page_2 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
- $page_3 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
- $page_4 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $page_2 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+ $page_3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+ $page_4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = get_pages(); // Defaults: hierarchical = true, parent = -1
</span><span class="cx" style="display: block; padding: 0 10px"> $pages_default_args = get_pages( array( 'hierarchical' => true, 'parent' => -1 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,10 +218,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18701
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_pages_hierarchical_empty_child_of() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $page_2 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $page_3 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
- $page_4 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $page_2 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $page_3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+ $page_4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = get_pages(); // Defaults: hierarchical = true, child_of = '', parent = -1
</span><span class="cx" style="display: block; padding: 0 10px"> $default_args = get_pages( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,10 +252,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18701
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_pages_non_hierarchical_empty_child_of() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $page_2 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $page_3 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
- $page_4 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $page_2 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $page_3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+ $page_4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = get_pages( array( 'hierarchical' => false ) ); // child_of = '', parent = -1
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,11 +278,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18701
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_pages_hierarchical_non_empty_child_of() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $page_2 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $page_3 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
- $page_4 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_3 ) );
- $page_5 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $page_2 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $page_3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+ $page_4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_3 ) );
+ $page_5 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = get_pages( array( 'child_of' => $page_1 ) ); // Defaults: hierarchical = true, parent = -1.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,11 +306,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18701
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_pages_non_hierarchical_non_empty_child_of() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $page_2 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $page_3 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
- $page_4 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_3 ) );
- $page_5 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $page_2 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $page_3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+ $page_4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_3 ) );
+ $page_5 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = get_pages( array( 'hierarchical' => false, 'child_of' => $page_1 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,7 +338,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'taco';
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $type, array( 'hierarchical' => true, 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 2, array( 'post_type' => $type ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2, array( 'post_type' => $type ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = reset( $posts );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?p=$post_id&post_type=$type" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,10 +360,10 @@
</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_exclude_tree() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $post_id2 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id1 ) );
- $post_id3 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $post_id4 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id3 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $post_id2 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id1 ) );
+ $post_id3 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $post_id4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id3 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $all = get_pages();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,8 +384,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $exclude5 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 0, $exclude5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id5 = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $post_id6 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id5 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id5 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $post_id6 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id5 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $exclude6 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $exclude6 );
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPostClassphp"></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/post/getPostClass.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPostClass.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/getPostClass.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = self::$factory->post->create();
</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"> public function test_with_tags() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</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"> public function test_with_categories() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cats = $this->factory->category->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cats = self::$factory->category->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $this->post_id, $cats, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cat0 = get_term( $cats[0], 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,9 +57,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30883
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_with_utf8_category_slugs() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id1 = $this->factory->category->create( array( 'name' => 'Первая рубрика' ) );
- $cat_id2 = $this->factory->category->create( array( 'name' => 'Вторая рубрика' ) );
- $cat_id3 = $this->factory->category->create( array( 'name' => '25кадр' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_id1 = self::$factory->category->create( array( 'name' => 'Первая рубрика' ) );
+ $cat_id2 = self::$factory->category->create( array( 'name' => 'Вторая рубрика' ) );
+ $cat_id3 = self::$factory->category->create( array( 'name' => '25кадр' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $this->post_id, array( $cat_id1, $cat_id2, $cat_id3 ), 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_post_class( '', $this->post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,9 +73,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30883
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_with_utf8_tag_slugs() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag_id1 = $this->factory->tag->create( array( 'name' => 'Первая метка' ) );
- $tag_id2 = $this->factory->tag->create( array( 'name' => 'Вторая метка' ) );
- $tag_id3 = $this->factory->tag->create( array( 'name' => '25кадр' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag_id1 = self::$factory->tag->create( array( 'name' => 'Первая метка' ) );
+ $tag_id2 = self::$factory->tag->create( array( 'name' => 'Вторая метка' ) );
+ $tag_id3 = self::$factory->tag->create( array( 'name' => '25кадр' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $this->post_id, array( $tag_id1, $tag_id2, $tag_id3 ), 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_post_class( '', $this->post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,9 +90,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_with_utf8_term_slugs() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Первая метка' ) );
- $term_id2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Вторая метка' ) );
- $term_id3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => '25кадр' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Первая метка' ) );
+ $term_id2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Вторая метка' ) );
+ $term_id3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => '25кадр' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $this->post_id, array( $term_id1, $term_id2, $term_id3 ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_post_class( '', $this->post_id );
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPostsByAuthorSqlphp"></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/post/getPostsByAuthorSql.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPostsByAuthorSql.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/getPostsByAuthorSql.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_public_only_true_should_not_allow_any_private_posts_for_loggedin_user(){
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = get_current_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $maybe_string = get_posts_by_author_sql( 'post', true, $u, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_public_only_should_default_to_false(){
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = get_current_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_posts_by_author_sql( 'post', true, $u, false ), get_posts_by_author_sql( 'post', true, $u ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_public_only_false_should_allow_current_user_access_to_own_private_posts_when_current_user_matches_post_author(){
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = get_current_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $maybe_string = get_posts_by_author_sql( 'post', true, $u, false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,8 +91,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_public_only_false_should_not_allow_access_to_private_posts_if_current_user_is_not_post_author(){
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = get_current_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u1 = $this->factory->user->create();
- $u2 = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u1 = self::$factory->user->create();
+ $u2 = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $maybe_string = get_posts_by_author_sql( 'post', true, $u2, false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_public_only_false_should_allow_current_user_access_to_own_private_posts_when_post_author_is_not_provided(){
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = get_current_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $maybe_string = get_posts_by_author_sql( 'post', true, $u, false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_administrator_should_have_access_to_private_posts_when_public_only_is_false(){
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = get_current_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $maybe_string = get_posts_by_author_sql( 'post', true, null, false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'bar', array( 'capabilities' => array( 'read_private_posts' => 'read_private_bar' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'baz', array( 'capabilities' => array( 'read_private_posts' => 'read_private_baz' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = get_current_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_role = get_role('editor');
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_role->add_cap( 'read_private_baz' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u );
</span></span></pre></div>
<a id="trunktestsphpunittestspostlistPagesphp"></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/post/listPages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/listPages.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/listPages.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,15 +27,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( 'TRUNCATE ' . $wpdb->prefix . 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create();
- $pages[] = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 1' ) );
- $pages[] = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 2' ) );
- $pages[] = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 3', 'post_author' => '2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->user->create();
+ $pages[] = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 1' ) );
+ $pages[] = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 2' ) );
+ $pages[] = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 3', 'post_author' => '2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $pages as $page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->pages[$page] = $this->factory->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 1' ) );
- $this->pages[$page] = $this->factory->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 2' ) );
- $this->pages[$page] = $this->factory->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 3' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->pages[$page] = self::$factory->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 1' ) );
+ $this->pages[$page] = self::$factory->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 2' ) );
+ $this->pages[$page] = self::$factory->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 3' ) );
</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></pre></div>
<a id="trunktestsphpunittestspostmetaphp"></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/post/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/meta.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/meta.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->author = new WP_User( $this->factory->user->create( array( 'role' => 'editor' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->author = new WP_User( self::$factory->user->create( array( 'role' => 'editor' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author->ID,
</span></span></pre></div>
<a id="trunktestsphpunittestspostnavmenuphp"></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/post/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/nav-menu.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/nav-menu.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,11 +16,11 @@
</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_wp_get_associated_nav_menu_items() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag_id = $this->factory->tag->create();
- $cat_id = $this->factory->category->create();
- $post_id = $this->factory->post->create();
- $post_2_id = $this->factory->post->create();
- $page_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag_id = self::$factory->tag->create();
+ $cat_id = self::$factory->category->create();
+ $post_id = self::$factory->post->create();
+ $post_2_id = self::$factory->post->create();
+ $page_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_insert = wp_update_nav_menu_item( $this->menu_id, 0, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'Wordpress.org', $custom_item->title );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the orphan with an associated nav menu
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_nav_menu_item( $this->menu_id, $custom_item_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_nav_menu_item( $this->menu_id, $custom_item_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-title' => 'WordPress.org',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items = wp_get_nav_menu_items( $this->menu_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,8 +119,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_get_nav_menu_items_with_taxonomy_term() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
- $child_terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax', 'parent' => $t ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+ $child_terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax', 'parent' => $t ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_menu_item = wp_update_nav_menu_item( $this->menu_id, 0, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-type' => 'taxonomy',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29460
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_orderby_name_by_default() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // We are going to create a random number of menus (min 2, max 10)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We are going to create a random number of menus (min 2, max 10)
</ins><span class="cx" style="display: block; padding: 0 10px"> $menus_no = rand( 2, 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i <= $menus_no; $i++ ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,14 +148,14 @@
</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"> // This is the expected array of menu names
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected_nav_menus_names = wp_list_pluck(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_nav_menus_names = wp_list_pluck(
</ins><span class="cx" style="display: block; padding: 0 10px"> get_terms( 'nav_menu', array( 'hide_empty' => false, 'orderby' => 'name' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'name'
</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"> // And this is what we got when calling wp_get_nav_menus()
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menus_names = wp_list_pluck( wp_get_nav_menus(), 'name' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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( $nav_menus_names, $expected_nav_menus_names );
</span><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="trunktestsphpunittestspostobjectsphp"></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/post/objects.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/objects.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/objects.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Post_Objects extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Post', $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,9 +67,9 @@
</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_get_post_ancestors() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = $this->factory->post->create();
- $child_id = $this->factory->post->create();
- $grandchild_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_id = self::$factory->post->create();
+ $child_id = self::$factory->post->create();
+ $grandchild_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $updated = wp_update_post( array( 'ID' => $child_id, 'post_parent' => $parent_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $updated, $child_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $updated = wp_update_post( array( 'ID' => $grandchild_id, 'post_parent' => $child_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</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_get_post_category_property() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $post->post_category );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@
</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_get_tags_input_property() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $post->tags_input );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</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_get_page_template_property() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'string', $post->page_template );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@
</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_get_post_filter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = get_post( $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => "Mary's home"
</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">@@ -178,7 +178,7 @@
</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_get_post_identity() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = get_post( $this->factory->post->create() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( self::$factory->post->create() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post->foo = 'bar';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@
</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_get_post_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id, ARRAY_A );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_post_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $id, 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // get_post( stdClass ) should not prime the cache
</span></span></pre></div>
<a id="trunktestsphpunittestspostoutputphp"></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/post/output.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/output.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/output.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> This is the <b>body</b>.
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( compact( 'post_content' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( compact( 'post_content' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = <<<EOF
</span><span class="cx" style="display: block; padding: 0 10px"> <p><i>This is the excerpt.</i><br />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( compact( 'post_content' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( compact( 'post_content' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_single() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( have_posts() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( compact( 'post_content' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( compact( 'post_content' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_single() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( have_posts() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><span class="Z3988" title="ctx_ver=Z39.88-2004&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&rft.aulast=Mariat&rft.aufirst=Denis&rft. au=Denis+Mariat&rft.au=Sead+Taourit&rft.au=G%C3%A9rard+Gu%C3%A9rin& rft.title=Genetics+Selection+Evolution&rft.atitle=&rft.date=2003&rft. volume=35&rft.issue=1&rft.spage=119&rft.epage=133&rft.genre=article& rft.id=info:DOI/10.1051%2Fgse%3A2002039"></span>Mariat, D., Taourit, S., Guérin, G. (2003). . <span style="font-style: italic">Genetics Selection Evolution, 35</span>(1), 119-133. DOI: <a rev="review" href="http://dx.doi.org/10.1051/gse:2002039">10.1051/gse:2002039</a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( compact( 'post_content' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( compact( 'post_content' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_single() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( have_posts() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><span title="My friends: Alice, Bob and Carol">foo</span></p>
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( compact( 'post_content' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( compact( 'post_content' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_single() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( have_posts() );
</span></span></pre></div>
<a id="trunktestsphpunittestspostqueryphp"></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/post/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/query.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/query.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,9 +11,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_category__and_var() {
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id = $this->factory->category->create( array( 'slug' => 'woo', 'name' => 'WOO!' ) );
- $term_id2 = $this->factory->category->create( array( 'slug' => 'hoo', 'name' => 'HOO!' ) );
- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id = self::$factory->category->create( array( 'slug' => 'woo', 'name' => 'WOO!' ) );
+ $term_id2 = self::$factory->category->create( array( 'slug' => 'hoo', 'name' => 'HOO!' ) );
+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_categories( $post_id, $term_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,8 +41,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_empty_category__in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id = $this->factory->category->create();
- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_id = self::$factory->category->create();
+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_categories( $post_id, $cat_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q1 = get_posts( array( 'category__in' => array( $cat_id ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_the_posts_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create posts and clear their caches.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ids = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_ids as $post_id )
</span><span class="cx" style="display: block; padding: 0 10px"> clean_post_cache( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,19 +115,19 @@
</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_post__in_ordering() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id1 = $this->factory->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
- $post_id2 = $this->factory->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
- $post_id3 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id1 = self::$factory->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
+ $post_id2 = self::$factory->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
+ $post_id3 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $post_id2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id4 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id4 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $post_id2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id5 = $this->factory->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id5 = self::$factory->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ordered = array( $post_id2, $post_id4, $post_id3, $post_id1, $post_id5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,26 +140,26 @@
</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_post__in_attachment_ordering() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $att_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $att_ids[1] = $this->factory->attachment->create_object( $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $att_ids[1] = self::$factory->attachment->create_object( $file, $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $att_ids[2] = $this->factory->attachment->create_object( $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $att_ids[2] = self::$factory->attachment->create_object( $file, $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $att_ids[3] = $this->factory->attachment->create_object( $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $att_ids[3] = self::$factory->attachment->create_object( $file, $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $att_ids[4] = $this->factory->attachment->create_object( $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $att_ids[4] = self::$factory->attachment->create_object( $file, $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $att_ids[5] = $this->factory->attachment->create_object( $file, $post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $att_ids[5] = self::$factory->attachment->create_object( $file, $post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => rand( 1, 100 )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,10 +311,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_name__in() {
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ids[0] = $this->factory->post->create( array( 'post_title' => 'woo', 'post_date' => '2015-07-23 00:00:00' ) );
- $post_ids[1] = $this->factory->post->create( array( 'post_title' => 'hoo', 'post_date' => '2015-07-23 00:00:00' ) );
- $post_ids[2] = $this->factory->post->create( array( 'post_title' => 'test', 'post_date' => '2015-07-23 00:00:00' ) );
- $post_ids[3] = $this->factory->post->create( array( 'post_title' => 'me', 'post_date' => '2015-07-23 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids[0] = self::$factory->post->create( array( 'post_title' => 'woo', 'post_date' => '2015-07-23 00:00:00' ) );
+ $post_ids[1] = self::$factory->post->create( array( 'post_title' => 'hoo', 'post_date' => '2015-07-23 00:00:00' ) );
+ $post_ids[2] = self::$factory->post->create( array( 'post_title' => 'test', 'post_date' => '2015-07-23 00:00:00' ) );
+ $post_ids[3] = self::$factory->post->create( array( 'post_title' => 'me', 'post_date' => '2015-07-23 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $requested = array( $post_ids[0], $post_ids[3] );
</span><span class="cx" style="display: block; padding: 0 10px"> $q->query( array(
</span></span></pre></div>
<a id="trunktestsphpunittestspostrevisionsphp"></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/post/revisions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/revisions.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/revisions.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_view_caps_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_restore_caps_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_diff_caps_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is even better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array( 'revisions' ),
</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">- $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_user->add_cap( 'edit_published_events' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //create a post as Editor
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_id = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_status' => 'draft' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => $this->post_type, 'post_status' => 'draft' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,7 +314,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array( 'revisions' ),
</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">- $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is even better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_post_revisions_should_order_by_post_date() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = (array) $post;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_revision_fields = _wp_post_revision_fields( $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +365,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26042
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_post_revisions_should_order_by_ID_when_post_date_matches() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = (array) $post;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_revision_fields = _wp_post_revision_fields( $post );
</span></span></pre></div>
<a id="trunktestsphpunittestspostslashesphp"></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/post/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/slashes.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/slashes.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Post_Slashes extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->author_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->author_id = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->old_current_user = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</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_edit_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['post_ID'] = $id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@
</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_wp_update_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post(array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $id,
</span></span></pre></div>
<a id="trunktestsphpunittestsposttemplatephp"></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/post/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/template.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/template.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_link_pages() {
</span><span class="cx" style="display: block; padding: 0 10px"> $contents = array( 'One', 'Two', 'Three' );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = join( '<!--nextpage-->', $contents );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_content' => $content ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_content' => $content ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '?p=' . $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,15 +81,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $none );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $bump = ' ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $child_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id ) );
- $grandchild_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $child_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $child_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id ) );
+ $grandchild_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $child_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title1 = get_post( $page_id )->post_title;
+ $title2 = get_post( $child_id )->post_title;
+ $title3 = get_post( $grandchild_id )->post_title;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $lineage =<<<LINEAGE
</span><span class="cx" style="display: block; padding: 0 10px"> <select name='page_id' id='page_id'>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option class="level-0" value="$page_id">Post title 1</option>
- <option class="level-1" value="$child_id">{$bump}Post title 2</option>
- <option class="level-2" value="$grandchild_id">{$bump}{$bump}Post title 3</option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option class="level-0" value="$page_id">$title1</option>
+ <option class="level-1" value="$child_id">{$bump}$title2</option>
+ <option class="level-2" value="$grandchild_id">{$bump}{$bump}$title3</option>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> LINEAGE;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $depth =<<<DEPTH
</span><span class="cx" style="display: block; padding: 0 10px"> <select name='page_id' id='page_id'>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option class="level-0" value="$page_id">Post title 1</option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option class="level-0" value="$page_id">$title1</option>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> DEPTH;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $option_none =<<<NONE
</span><span class="cx" style="display: block; padding: 0 10px"> <select name='page_id' id='page_id'>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="Woo">Hoo</option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option class="level-0" value="$page_id">Post title 1</option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option class="level-0" value="$page_id">$title1</option>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> NONE;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <select name='page_id' id='page_id'>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="-1">Burrito</option>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="Woo">Hoo</option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option class="level-0" value="$page_id">Post title 1</option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option class="level-0" value="$page_id">$title1</option>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> NO;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12494
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_pages_value_field_should_default_to_ID() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</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">@@ -155,7 +159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12494
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_pages_value_field_ID() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</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">@@ -171,7 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12494
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_pages_value_field_post_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +192,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 12494
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_pages_value_field_should_fall_back_on_ID_when_an_invalid_value_is_provided() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30082
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_pages_should_not_contain_class_attribute_when_no_class_is_passed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30082
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_dropdown_pages_should_obey_class_parameter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +242,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31389
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_page_template_slug_by_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</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">@@ -255,7 +259,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31389
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_page_template_slug_from_loop() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</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">@@ -269,7 +273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31389
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_page_template_slug_non_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</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">@@ -284,7 +288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33974
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_page_menu_wp_nav_menu_fallback() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pages = $this->factory->post->create_many( 3, array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pages = self::$factory->post->create_many( 3, array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No menus + wp_nav_menu() falls back to wp_page_menu().
</span><span class="cx" style="display: block; padding: 0 10px"> $menu = wp_nav_menu( array( 'echo' => false ) );
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpUniquePostSlugphp"></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/post/wpUniquePostSlug.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21013
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_non_latin_slugs() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_id = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $inputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Αρνάκι άσπρο και παχύ της μάνας του καμάρι, και άλλα τραγούδια',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,9 +49,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'some-slug',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $one = $this->factory->post->create( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $one = self::$factory->post->create( $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['post_type'] = 'post-type-2';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $two = $this->factory->post->create( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $two = self::$factory->post->create( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'some-slug', get_post( $one )->post_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'some-slug', get_post( $two )->post_name );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,9 +74,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'some-slug',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $one = $this->factory->post->create( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $one = self::$factory->post->create( $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['post_name'] = 'some-slug-2';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $two = $this->factory->post->create( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $two = self::$factory->post->create( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'some-slug', get_post( $one )->post_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'some-slug-2', get_post( $two )->post_name );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,14 +97,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'some-slug',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $one = $this->factory->post->create( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $one = self::$factory->post->create( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'image'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment = $this->factory->attachment->create_object( 'image.jpg', $one, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment = self::$factory->attachment->create_object( 'image.jpg', $one, $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post-type-1',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $one
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $two = $this->factory->post->create( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $two = self::$factory->post->create( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'some-slug', get_post( $one )->post_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'image', get_post( $attachment )->post_name );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,12 +128,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider whitelist_post_statuses
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_whitelisted_post_statuses_should_not_be_forced_to_be_unique( $status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</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">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</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">@@ -151,12 +151,12 @@
</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"> public function test_revisions_should_not_be_forced_to_be_unique() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</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">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</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">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_slugs_resulting_in_permalinks_that_resemble_year_archives_should_be_suffixed() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_slugs_resulting_in_permalinks_that_resemble_year_archives_should_not_be_suffixed_for_already_published_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_yearlike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_year_archives() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_slugs_resulting_in_permalinks_that_resemble_month_archives_should_be_suffixed() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,7 +232,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_monthlike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_month_archives() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/foo/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_monthlike_slugs_should_not_be_suffixed_for_invalid_month_numbers() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +262,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_slugs_resulting_in_permalinks_that_resemble_day_archives_should_be_suffixed() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,7 +277,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_daylike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_day_archives() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +292,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_daylike_slugs_should_not_be_suffixed_for_invalid_day_numbers() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestspostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/post.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,9 +545,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_page_by_path_priority() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment = $this->factory->post->create_and_get( array( 'post_title' => 'some-page', 'post_type' => 'attachment' ) );
- $page = $this->factory->post->create_and_get( array( 'post_title' => 'some-page', 'post_type' => 'page' ) );
- $other_att = $this->factory->post->create_and_get( array( 'post_title' => 'some-other-page', 'post_type' => 'attachment' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment = self::$factory->post->create_and_get( array( 'post_title' => 'some-page', 'post_type' => 'attachment' ) );
+ $page = self::$factory->post->create_and_get( array( 'post_title' => 'some-page', 'post_type' => 'page' ) );
+ $other_att = self::$factory->post->create_and_get( array( 'post_title' => 'some-other-page', 'post_type' => 'attachment' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->posts, array( 'post_name' => 'some-page' ), array( 'ID' => $page->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> clean_post_cache( $page->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,7 +565,7 @@
</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_wp_publish_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $draft_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $draft_id = self::$factory->post->create( array( 'post_status' => 'draft' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $draft_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'draft', $post->post_status );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,7 +581,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_insert_post_and_wp_publish_post_with_future_date() {
</span><span class="cx" style="display: block; padding: 0 10px"> $future_date = gmdate( 'Y-m-d H:i:s', time() + 10000000 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => $future_date,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -641,7 +641,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22883
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_page_uri_with_stdclass_post_object() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_name' => 'get-page-uri-post-name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_name' => 'get-page-uri-post-name' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Mimick an old stdClass post object, missing the ancestors field.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_array = (object) get_post( $post_id, ARRAY_A );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,8 +664,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15963
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_post_uri_check_orphan() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = $this->factory->post->create( array( 'post_name' => 'parent' ) );
- $child_id = $this->factory->post->create( array( 'post_name' => 'child', 'post_parent' => $parent_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_id = self::$factory->post->create( array( 'post_name' => 'parent' ) );
+ $child_id = self::$factory->post->create( array( 'post_name' => 'child', 'post_parent' => $parent_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // check the parent for good measure
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'parent', get_page_uri( $parent_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -683,8 +683,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_post_ancestors_within_loop() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = $this->factory->post->create();
- $post = $this->factory->post->create_and_get( array( 'post_parent' => $parent_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_id = self::$factory->post->create();
+ $post = self::$factory->post->create_and_get( array( 'post_parent' => $parent_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $parent_id ), get_post_ancestors( 0 ) );
</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">@@ -692,7 +692,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23474
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_update_invalid_post_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_name' => 'get-page-uri-post-name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_name' => 'get-page-uri-post-name' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id, ARRAY_A );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post['ID'] = 123456789;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -707,7 +707,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_parse_post_content_single_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_content' => 'Page 0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_content' => 'Page 0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $multipage );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -718,7 +718,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_parse_post_content_multi_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $multipage );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -729,7 +729,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_parse_post_content_remaining_single_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_content' => 'Page 0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_content' => 'Page 0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $multipage );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,7 +740,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_parse_post_content_remaining_multi_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $multipage );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -754,7 +754,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_parse_post_content_starting_with_nextpage() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_content' => '<!--nextpage-->Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_content' => '<!--nextpage-->Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $multipage );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,7 +768,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_parse_post_content_starting_with_nextpage_multi() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $multipage, $pages, $numpages;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_content' => '<!--nextpage-->Page 0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_content' => '<!--nextpage-->Page 0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $multipage );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -809,7 +809,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_count_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = rand_str(20);
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => $post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$editor_id
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -822,7 +822,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_count_posts_filtered() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = rand_str(20);
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 3, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 3, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => $post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$editor_id
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -842,7 +842,7 @@
</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_wp_count_posts_insert_invalidation() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ids = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $initial_counts = wp_count_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = array_rand( $post_ids );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -860,7 +860,7 @@
</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_wp_count_posts_trash_invalidation() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ids = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $initial_counts = wp_count_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = array_rand( $post_ids );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -881,7 +881,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 13771
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_the_date_with_id_returns_correct_time() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'March 1, 2014', get_the_date( 'F j, Y', $post_id ) );
</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">@@ -899,7 +899,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28310
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_the_time_with_id_returns_correct_time() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '16:35:00', get_the_time( 'H:i:s', $post_id ) );
</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">@@ -917,7 +917,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28310
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_post_time_with_id_returns_correct_time() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '16:35:00', get_post_time( 'H:i:s', false, $post_id ) );
</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">@@ -935,7 +935,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28310
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_post_modified_time_with_id_returns_correct_time() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '16:35:00', get_post_modified_time( 'H:i:s', false, $post_id ) );
</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">@@ -973,7 +973,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type, array( 'taxonomies' => array( 'post_tag', $tax ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $tax, $post_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create( array( 'post_type' => $post_type ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create( array( 'post_type' => $post_type ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $post, rand_str(), $tax );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_tag_cloud = wp_tag_cloud( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1015,7 +1015,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . '/wp-admin/includes/post.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_ID' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1043,7 +1043,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31168
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_insert_post_default_comment_ping_status_open() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$editor_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'public',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1059,7 +1059,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31168
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_insert_post_page_default_comment_ping_status_closed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$editor_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'public',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1078,7 +1078,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_insert_post_cpt_default_comment_ping_status_open() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = rand_str(20);
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type, array( 'supports' => array( 'comments', 'trackbacks' ) ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$editor_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'public',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1098,7 +1098,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_insert_post_cpt_default_comment_ping_status_closed() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = rand_str(20);
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$editor_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'public',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1127,7 +1127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_user_can( 'edit_published_posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a sticky post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Will be changed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Will be changed',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1156,7 +1156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_user_without_publish_cannot_affect_sticky_with_edit_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a sticky post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Will be changed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Will be changed',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1191,7 +1191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32585
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_post_author_zero() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_author' => 0 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_author' => 0 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, get_post( $post_id )->post_author );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1200,7 +1200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32585
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_post_author_null() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_author' => null ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_author' => null ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( self::$editor_id, get_post( $post_id )->post_author );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryconditionalsphp"></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/query/conditionals.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/conditionals.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/query/conditionals.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,50 +45,50 @@
</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_permalink() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'hello-world' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'hello-world' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_single', 'is_singular');
</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_post_comments_feed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'hello-world' ) );
- $this->factory->comment->create_post_comments( $post_id, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'hello-world' ) );
+ self::$factory->comment->create_post_comments( $post_id, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_post_comments_feed_link( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_feed', 'is_single', 'is_singular', 'is_comment_feed');
</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><span class="cx" style="display: block; padding: 0 10px"> function test_post_comments_feed_with_no_comments() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'hello-world' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'hello-world' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_post_comments_feed_link( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_feed', 'is_single', 'is_singular', 'is_comment_feed');
</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_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $page_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_page','is_singular');
</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_parent_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $page_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_page','is_singular');
</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_child_page_1() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $page_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_page','is_singular');
</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_child_page_2() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $page_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_page','is_singular');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,9 +97,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // '(about)/trackback/?$' => 'index.php?pagename=$matches[1]&tb=1'
</span><span class="cx" style="display: block; padding: 0 10px"> function test_page_trackback() {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $page_ids as $page_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_permalink( $page_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to("{$url}trackback/");
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,11 +116,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //'(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'
</span><span class="cx" style="display: block; padding: 0 10px"> function test_page_feed() {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $page_ids as $page_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create_post_comments( $page_id, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create_post_comments( $page_id, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = get_permalink( $page_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to("{$url}feed/");
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,9 +135,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_page_feed_with_no_comments() {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $page_ids as $page_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_permalink( $page_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to("{$url}feed/");
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,11 +154,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // '(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'
</span><span class="cx" style="display: block; padding: 0 10px"> function test_page_feed_atom() {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
- $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+ $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $page_ids as $page_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create_post_comments( $page_id, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create_post_comments( $page_id, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_permalink( $page_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to("{$url}feed/atom/");
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '(about)/page/?([0-9]{1,})/?$' => 'index.php?pagename=$matches[1]&paged=$matches[2]'
</span><span class="cx" style="display: block; padding: 0 10px"> function test_page_page_2() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to("/about/page/2/");
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure the correct wp_query flags are set
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '(about)/page/?([0-9]{1,})/?$' => 'index.php?pagename=$matches[1]&paged=$matches[2]'
</span><span class="cx" style="display: block; padding: 0 10px"> function test_page_page_2_no_slash() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to("/about/page2/");
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure the correct wp_query flags are set
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // FIXME: what is this for?
</span><span class="cx" style="display: block; padding: 0 10px"> // '(about)(/[0-9]+)?/?$' => 'index.php?pagename=$matches[1]&page=$matches[2]'
</span><span class="cx" style="display: block; padding: 0 10px"> function test_pagination_of_posts_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_for_posts', $page_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 'feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]',
</span><span class="cx" style="display: block; padding: 0 10px"> // '(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_main_feed_2() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create(); // @test_404
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create(); // @test_404
</ins><span class="cx" style="display: block; padding: 0 10px"> $feeds = array('feed', 'rdf', 'rss', 'rss2', 'atom');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // long version
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,7 +241,7 @@
</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_main_feed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create(); // @test_404
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create(); // @test_404
</ins><span class="cx" style="display: block; padding: 0 10px"> $types = array('rss2', 'rss', 'atom');
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($types as $type) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to(get_feed_link($type));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 'page/?([0-9]{1,})/?$' => 'index.php?&paged=$matches[1]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_paged() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 2; $i <= 3; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to("/page/{$i}/");
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_home', 'is_paged');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,8 +262,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 'comments/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]&withcomments=1',
</span><span class="cx" style="display: block; padding: 0 10px"> // 'comments/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]&withcomments=1',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_main_comments_feed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'hello-world' ) );
- $this->factory->comment->create_post_comments( $post_id, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'hello-world' ) );
+ self::$factory->comment->create_post_comments( $post_id, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // check the url as generated by get_post_comments_feed_link()
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_post_comments_feed_link( $post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 'search/(.+)/page/?([0-9]{1,})/?$' => 'index.php?s=$matches[1]&paged=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_search_paged() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 3, array( 'post_title' => 'test' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 3, array( 'post_title' => 'test' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/search/test/page/2/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_search', 'is_paged');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +328,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 'category/(.+?)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?category_name=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> // 'category/(.+?)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?category_name=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_category_feed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->term->create( array( 'name' => 'cat-a', 'taxonomy' => 'category' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->term->create( array( 'name' => 'cat-a', 'taxonomy' => 'category' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // check the long form
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($types as $type) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,14 +347,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 'category/(.+?)/page/?([0-9]{1,})/?$' => 'index.php?category_name=$matches[1]&paged=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_category_paged() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/category/uncategorized/page/2/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_category', 'is_paged');
</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"> // 'category/(.+?)/?$' => 'index.php?category_name=$matches[1]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_category() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->term->create( array( 'name' => 'cat-a', 'taxonomy' => 'category' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->term->create( array( 'name' => 'cat-a', 'taxonomy' => 'category' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/category/cat-a/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_category');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +362,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 'tag/(.+?)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?tag=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> // 'tag/(.+?)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?tag=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_tag_feed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->term->create( array( 'name' => 'tag-a', 'taxonomy' => 'post_tag' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->term->create( array( 'name' => 'tag-a', 'taxonomy' => 'post_tag' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // check the long form
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($types as $type) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,16 +381,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 'tag/(.+?)/page/?([0-9]{1,})/?$' => 'index.php?tag=$matches[1]&paged=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_tag_paged() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ids = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_ids as $post_id )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->term->add_post_terms( $post_id, 'tag-a', 'post_tag' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->term->add_post_terms( $post_id, 'tag-a', 'post_tag' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/tag/tag-a/page/2/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_tag', 'is_paged');
</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"> // 'tag/(.+?)/?$' => 'index.php?tag=$matches[1]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_tag() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id = $this->factory->term->create( array( 'name' => 'Tag Named A', 'slug' => 'tag-a', 'taxonomy' => 'post_tag' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id = self::$factory->term->create( array( 'name' => 'Tag Named A', 'slug' => 'tag-a', 'taxonomy' => 'post_tag' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/tag/tag-a/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_tag');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,7 +409,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 'author/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?author_name=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> // 'author/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?author_name=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_author_feed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create( array( 'user_login' => 'user-a' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->user->create( array( 'user_login' => 'user-a' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // check the long form
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($types as $type) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,22 +428,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 'author/([^/]+)/page/?([0-9]{1,})/?$' => 'index.php?author_name=$matches[1]&paged=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_author_paged() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array( 'user_login' => 'user-a' ) );
- $this->factory->post->create_many( 3, array( 'post_author' => $user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'user_login' => 'user-a' ) );
+ self::$factory->post->create_many( 3, array( 'post_author' => $user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/author/user-a/page/2/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_author', 'is_paged');
</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"> // 'author/([^/]+)/?$' => 'index.php?author_name=$matches[1]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_author() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array( 'user_login' => 'user-a' ) );
- $this->factory->post->create( array( 'post_author' => $user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'user_login' => 'user-a' ) );
+ self::$factory->post->create( array( 'post_author' => $user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/author/user-a/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_author');
</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_author_with_no_posts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array( 'user_login' => 'user-a' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'user_login' => 'user-a' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/author/user-a/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_author');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +451,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&feed=$matches[4]',
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&feed=$matches[4]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_ymd_feed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // check the long form
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($types as $type) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,14 +470,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&paged=$matches[4]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_ymd_paged() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/2007/09/04/page/2/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_day', 'is_date', 'is_paged');
</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"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_ymd() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/2007/09/04/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_day', 'is_date');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&feed=$matches[3]',
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&feed=$matches[3]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_ym_feed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // check the long form
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($types as $type) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,14 +504,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&paged=$matches[3]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_ym_paged() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/2007/09/page/2/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_date', 'is_month', 'is_paged');
</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"> // '([0-9]{4})/([0-9]{1,2})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_ym() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/2007/09/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_date', 'is_month');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,7 +519,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&feed=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_y_feed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // check the long form
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($types as $type) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,21 +538,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&paged=$matches[2]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_y_paged() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/2007/page/2/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_date', 'is_year', 'is_paged');
</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"> // '([0-9]{4})/?$' => 'index.php?year=$matches[1]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_y() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to('/2007/');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_archive', 'is_date', 'is_year');
</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"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/trackback/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&tb=1',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_post_trackback() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to("{$permalink}trackback/");
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_single', 'is_singular', 'is_trackback');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -561,7 +561,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&feed=$matches[5]',
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&feed=$matches[5]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_post_comment_feed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +580,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)(/[0-9]+)?/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&page=$matches[5]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_post_paged_short() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2007-09-04 00:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'a-post-with-multiple-pages',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Page 1 <!--nextpage--> Page 2'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // '[0-9]{4}/[0-9]{1,2}/[0-9]{1,2}/[^/]+/([^/]+)/?$' => 'index.php?attachment=$matches[1]',
</span><span class="cx" style="display: block; padding: 0 10px"> function test_post_attachment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'attachment' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'attachment' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_attachment_link( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to($permalink);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue('is_single', 'is_attachment', 'is_singular');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -629,8 +629,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true
</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">- $tag_id = $this->factory->tag->create( array( 'slug' => 'tag-slug' ) );
- $post_id = $this->factory->post->create( array( 'post_type' => $cpt_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag_id = self::$factory->tag->create( array( 'slug' => 'tag-slug' ) );
+ $post_id = self::$factory->post->create( array( 'post_type' => $cpt_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $post_id, $tag_id, 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/ptawtq/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,7 +663,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_type' => $cpt_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_type' => $cpt_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/$cpt_name/" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_post_type_archive', 'is_archive' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -683,7 +683,7 @@
</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_is_single() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?p=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_queried_object();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -714,12 +714,12 @@
</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"> // Create parent and child posts
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => $post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo'
</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">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => $post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $parent_id
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -750,10 +750,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24674
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_is_single_with_slug_that_begins_with_a_number_that_clashes_with_another_post_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p2_name = $p1 . '-post';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $p2_name,
</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">@@ -768,7 +768,7 @@
</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_is_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?page_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_queried_object();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -788,11 +788,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16802
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_page_with_parent() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $parent_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,7 +818,7 @@
</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_is_attachment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'attachment' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'attachment' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?attachment_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_queried_object();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -839,10 +839,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24674
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_is_attachment_with_slug_that_begins_with_a_number_that_clashes_with_a_page_ID() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_type' => 'attachment' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_type' => 'attachment' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p2_name = $p1 . '-attachment';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => $p2_name,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -861,10 +861,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24674
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_is_author_with_nicename_that_begins_with_a_number_that_clashes_with_another_author_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u1 = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u1 = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $u2_name = $u1 . '_user';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u2 = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u2 = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_nicename' => $u2_name,
</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">@@ -882,10 +882,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24674
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_is_category_with_slug_that_begins_with_a_number_that_clashes_with_another_category_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $c2_name = $c1 . '-category';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c2 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $c2_name,
</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">@@ -903,10 +903,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24674
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_is_tag_with_slug_that_begins_with_a_number_that_clashes_with_another_tag_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->tag->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->tag->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $t2_name = $t1 . '-tag';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->tag->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->tag->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $t2_name,
</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">@@ -924,7 +924,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24674
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_is_page_with_page_id_zero_and_random_page_slug() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?page_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // override post ID to 0 temporarily for testing
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -946,10 +946,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24674
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_is_page_with_page_slug_that_begins_with_a_number_that_clashes_with_a_page_ID() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p2_name = $p1 . '-page';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => $p2_name,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -965,7 +965,7 @@
</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_is_page_template() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta($post_id, '_wp_page_template', 'example.php');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?page_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_page_template( 'example.php' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -975,7 +975,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31271
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_page_template_default() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?page_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_page_template( 'default' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_page_template( array( 'random', 'default' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -985,7 +985,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31271
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_page_template_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta($post_id, '_wp_page_template', 'example.php');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?page_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_page_template( array( 'test.php' ) ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsquerydateQueryphp"></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/query/dateQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/dateQuery.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/query/dateQuery.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,10 +33,10 @@
</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"> public function test_date_query_before_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2008-07-15 07:17:23',) );
- $p4 = $this->factory->post->create( array( 'post_date' => '2009-06-11 07:17:23',) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2008-07-15 07:17:23',) );
+ $p4 = self::$factory->post->create( array( 'post_date' => '2009-06-11 07:17:23',) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,8 +57,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * their minimum values when being used with "before".
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_query_before_array_test_defaulting() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,10 +74,10 @@
</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"> public function test_date_query_before_string() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2008-07-15 07:17:23',) );
- $p4 = $this->factory->post->create( array( 'post_date' => '2009-06-11 07:17:23',) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2008-07-15 07:17:23',) );
+ $p4 = self::$factory->post->create( array( 'post_date' => '2009-06-11 07:17:23',) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,9 +91,9 @@
</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"> public function test_date_query_after_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2009-10-18 10:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2010-06-11 07:17:23', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2009-10-18 10:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2010-06-11 07:17:23', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,8 +115,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * their maximum values when being used with "after".
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_query_after_array_test_defaulting() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2008-12-18 10:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2009-01-18 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2008-12-18 10:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2009-01-18 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,9 +132,9 @@
</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"> public function test_date_query_after_string() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2009-12-18 09:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2009-12-18 09:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,9 +148,9 @@
</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"> public function test_date_query_after_string_inclusive() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2009-12-18 09:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2009-12-18 09:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,11 +168,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26653
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_query_inclusive_between_dates() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2006-12-18 09:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2007-01-18 10:42:29', ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2007-12-19 10:42:29', ) );
- $p4 = $this->factory->post->create( array( 'post_date' => '2008-12-19 10:42:29', ) );
- $p5 = $this->factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2006-12-18 09:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2007-01-18 10:42:29', ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2007-12-19 10:42:29', ) );
+ $p4 = self::$factory->post->create( array( 'post_date' => '2008-12-19 10:42:29', ) );
+ $p5 = self::$factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,10 +195,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29908
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_beforeafter_with_date_string_Y() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 13:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2007-05-07 13:00:00',
</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">@@ -228,10 +228,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29908
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_beforeafter_with_date_string_Y_inclusive() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 13:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2007-05-07 13:00:00',
</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">@@ -263,10 +263,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29908
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_beforeafter_with_date_string_Ym() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 13:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-04-07 13:00:00',
</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">@@ -296,10 +296,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29908
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_beforeafter_with_date_string_Ym_inclusive() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 13:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-04-07 13:00:00',
</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">@@ -331,10 +331,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29908
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_beforeafter_with_date_string_Ymd() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 13:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-05 13:00:00',
</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">@@ -364,10 +364,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29908
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_beforeafter_with_date_string_Ymd_inclusive() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 13:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-05 13:00:00',
</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">@@ -399,10 +399,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29908
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_beforeafter_with_date_string_YmdHi() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 14:05:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 14:04:00',
</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">@@ -432,10 +432,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29908
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_beforeafter_with_date_string_YmdHi_inclusive() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 14:05:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 14:04:00',
</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">@@ -467,10 +467,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29908
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_beforeafter_with_date_string_YmdHis() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 14:05:15',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 14:05:14',
</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">@@ -500,10 +500,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29908
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_beforeafter_with_date_string_YmdHis_inclusive() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 14:04:15',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 14:04:14',
</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">@@ -535,10 +535,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29908
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_beforeafter_with_date_string_non_parseable() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 14:05:15',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-05-06 14:05:14',
</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">@@ -564,8 +564,8 @@
</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"> public function test_date_query_year() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2010-12-19 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2010-12-19 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,8 +578,8 @@
</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"> public function test_date_query_month() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2010-11-19 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2010-11-19 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,8 +592,8 @@
</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"> public function test_date_query_week() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2009-01-02 10:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2010-03-19 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2009-01-02 10:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2010-03-19 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -606,8 +606,8 @@
</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"> public function test_date_query_day() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2009-01-17 10:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2009-01-18 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2009-01-17 10:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2009-01-18 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,8 +621,8 @@
</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"> public function test_date_query_dayofweek() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2014-10-20 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-20 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,8 +639,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28063
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_query_dayofweek_iso() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2014-10-31 10:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2014-10-30 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-31 10:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-30 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,8 +654,8 @@
</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"> public function test_date_query_hour() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2014-10-21 13:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2014-10-21 12:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-21 13:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-21 12:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -673,8 +673,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_query_hour_should_not_ignore_0() {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2014-10-21 00:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2014-10-21 01:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-21 00:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-21 01:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'year' => 2014,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,8 +688,8 @@
</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"> public function test_date_query_minute() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2014-10-21 10:56:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-21 10:56:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,8 +703,8 @@
</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"> public function test_date_query_second() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2014-10-21 10:42:21', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-21 10:42:21', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -718,11 +718,11 @@
</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"> public function test_date_query_between_two_times() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2005-12-18 08:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2006-12-18 09:00:29', ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2007-12-18 10:42:29', ) );
- $p4 = $this->factory->post->create( array( 'post_date' => '2008-12-18 17:00:29', ) );
- $p5 = $this->factory->post->create( array( 'post_date' => '2009-12-18 18:42:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2005-12-18 08:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2006-12-18 09:00:29', ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2007-12-18 10:42:29', ) );
+ $p4 = self::$factory->post->create( array( 'post_date' => '2008-12-18 17:00:29', ) );
+ $p5 = self::$factory->post->create( array( 'post_date' => '2009-12-18 18:42:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -743,9 +743,9 @@
</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"> public function test_date_query_relation_or() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2006-12-18 14:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2007-01-18 10:42:29', ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2007-12-19 10:34:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2006-12-18 14:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2007-01-18 10:42:29', ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2007-12-19 10:34:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -763,10 +763,10 @@
</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"> public function test_date_query_compare_greater_than_or_equal_to() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2006-12-18 13:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2007-01-18 14:34:29', ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2007-12-19 14:37:29', ) );
- $p4 = $this->factory->post->create( array( 'post_date' => '2007-12-19 15:34:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2006-12-18 13:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2007-01-18 14:34:29', ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2007-12-19 14:37:29', ) );
+ $p4 = self::$factory->post->create( array( 'post_date' => '2007-12-19 15:34:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,9 +784,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_params_monthnum_m_duplicate() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2006-05-18 13:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2007-09-18 14:34:29', ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2007-01-18 14:34:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2006-05-18 13:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2007-09-18 14:34:29', ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2007-01-18 14:34:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,9 +804,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_params_week_w_duplicate() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2014-10-01 13:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2014-10-22 14:34:29', ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '2014-10-15 14:34:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-01 13:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-22 14:34:29', ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '2014-10-15 14:34:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -825,10 +825,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25775
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_query_with_taxonomy_join() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2013-04-27 01:01:01',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2013-03-21 01:01:01',
</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">@@ -857,10 +857,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29822
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_query_one_nested_query() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_date' => '2004-10-01 13:42:29', ) );
- $p2 = $this->factory->post->create( array( 'post_date' => '2004-01-22 14:34:29', ) );
- $p3 = $this->factory->post->create( array( 'post_date' => '1984-10-15 14:34:29', ) );
- $p4 = $this->factory->post->create( array( 'post_date' => '1985-10-15 14:34:29', ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_date' => '2004-10-01 13:42:29', ) );
+ $p2 = self::$factory->post->create( array( 'post_date' => '2004-01-22 14:34:29', ) );
+ $p3 = self::$factory->post->create( array( 'post_date' => '1984-10-15 14:34:29', ) );
+ $p4 = self::$factory->post->create( array( 'post_date' => '1985-10-15 14:34:29', ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->_get_query_result( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'OR',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -886,22 +886,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29822
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_query_one_nested_query_multiple_columns_relation_and() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-03-05 15:30:55',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_post_modified( $p1, '2014-11-03 14:43:00' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-05-05 15:30:55',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_post_modified( $p2, '2014-10-03 14:43:00' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p3 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p3 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2013-05-05 15:30:55',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_post_modified( $p3, '2014-10-03 14:43:00' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p4 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p4 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-02-05 15:30:55',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_post_modified( $p4, '2012-12-03 14:43:00' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,27 +937,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29822
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_query_nested_query_multiple_columns_mixed_relations() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-03-05 15:30:55',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_post_modified( $p1, '2014-11-03 14:43:00' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-05-05 15:30:55',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_post_modified( $p2, '2014-10-03 14:43:00' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p3 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p3 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2013-05-05 15:30:55',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_post_modified( $p3, '2014-10-03 14:43:00' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p4 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p4 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-02-05 15:30:55',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_post_modified( $p4, '2012-12-03 14:43:00' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p5 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p5 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2014-02-05 15:30:55',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_post_modified( $p5, '2013-12-03 14:43:00' );
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryisTermphp"></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/query/isTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/isTerm.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/query/isTerm.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,11 +37,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> flush_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->tag_id = $this->factory->tag->create( array( 'slug' => 'tag-slug' ) );
- $this->cat_id = $this->factory->category->create( array( 'slug' => 'cat-slug' ) );
- $this->tax_id = $this->factory->term->create( array( 'taxonomy' => 'testtax', 'slug' => 'tax-slug' ) );
- $this->tax_id2 = $this->factory->term->create( array( 'taxonomy' => 'testtax', 'slug' => 'tax-slug2' ) );
- $this->post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->tag_id = self::$factory->tag->create( array( 'slug' => 'tag-slug' ) );
+ $this->cat_id = self::$factory->category->create( array( 'slug' => 'cat-slug' ) );
+ $this->tax_id = self::$factory->term->create( array( 'taxonomy' => 'testtax', 'slug' => 'tax-slug' ) );
+ $this->tax_id2 = self::$factory->term->create( array( 'taxonomy' => 'testtax', 'slug' => 'tax-slug2' ) );
+ $this->post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $this->post_id, $this->cat_id, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $this->post_id, array( $this->tax_id, $this->tax_id2 ), 'testtax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_tax_category_tax_query' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'testtax2', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $testtax2_term_id = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $testtax2_term_id = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'testtax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'testtax2-slug',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsquerymetaQueryphp"></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/query/metaQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/metaQuery.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/query/metaQuery.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,9 +6,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Query_MetaQuery extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_no_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p2, 'oof', 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,9 +30,9 @@
</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"> public function test_meta_query_no_value() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p2, 'oof', 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,8 +54,8 @@
</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"> public function test_meta_query_single_query_compare_default() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,8 +76,8 @@
</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"> public function test_meta_query_single_query_compare_equals() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,9 +99,9 @@
</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"> public function test_meta_query_single_query_compare_not_equals() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p2, 'foo', 'baz' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,9 +124,9 @@
</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"> public function test_meta_query_single_query_compare_arithmetic_comparisons() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', '1' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p2, 'foo', '2' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,8 +202,8 @@
</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"> public function test_meta_query_single_query_compare_like() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,9 +225,9 @@
</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"> public function test_meta_query_single_query_compare_not_like() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p2, 'foo', 'rab' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,9 +250,9 @@
</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"> public function test_meta_query_single_query_compare_between_not_between() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', '1' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p2, 'foo', '10' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,8 +294,8 @@
</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"> public function test_meta_query_single_query_compare_regexp_rlike() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p2, 'foo', 'baz' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,8 +335,8 @@
</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"> public function test_meta_query_single_query_compare_not_regexp() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p2, 'foo', 'baz' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,9 +359,9 @@
</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"> public function test_meta_query_relation_default() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'foo value 1' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'bar', 'bar value 1' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,18 +389,18 @@
</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"> public function test_meta_query_relation_or() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'foo', rand_str() );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'foo', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id2, 'bar', 'val2' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id3, 'baz', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id4, 'froo', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id5 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id5 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id5, 'tango', 'val2' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id6 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id6 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id6, 'bar', 'val1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,22 +430,22 @@
</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"> public function test_meta_query_relation_and() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'foo', rand_str() );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'foo', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id2, 'bar', 'val2' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id2, 'foo', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id3, 'baz', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id4, 'froo', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id5 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id5 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id5, 'tango', 'val2' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id6 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id6 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id6, 'bar', 'val1' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id6, 'foo', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id7 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id7 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id7, 'foo', rand_str() );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id7, 'froo', rand_str() );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id7, 'baz', rand_str() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,7 +499,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30681
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_compare_exists() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[2], 'foo', 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,7 +520,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30681
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_compare_exists_with_value_should_convert_to_equals() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[2], 'foo', 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,7 +542,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30681
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_compare_not_exists_should_ignore_value() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[2], 'foo', 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,15 +564,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18158
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_compare_not_exists() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'foo', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id2, 'bar', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id3, 'bar', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id4, 'baz', rand_str() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id5 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id5 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id5, 'foo', rand_str() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,7 +636,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29062
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_compare_not_exists_with_another_condition_relation_or() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $posts[0], 'color', 'orange' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $posts[1], 'color', 'blue' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $posts[1], 'vegetable', 'onion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,7 +672,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24093
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_relation_or_compare_equals() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'color', 'orange' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'color', 'blue' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'vegetable', 'onion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -705,7 +705,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24093
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_relation_or_compare_equals_different_keys() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'color', 'orange' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'color', 'blue' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'vegetable', 'onion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -738,7 +738,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24093
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_relation_or_compare_equals_and_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'color', 'orange' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'color', 'blue' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'vegetable', 'onion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,7 +771,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24093
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_relation_or_compare_equals_and_like() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'color', 'orange' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'color', 'blue' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'vegetable', 'onion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,7 +804,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24093
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_relation_or_compare_equals_and_between() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'number_of_colors', '2' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'number_of_colors', '5' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'vegetable', 'onion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -838,7 +838,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24093
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_relation_and_compare_in_same_keys() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'color', 'orange' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'color', 'blue' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'vegetable', 'onion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -873,7 +873,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24093
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_relation_and_compare_in_different_keys() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'color', 'orange' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'color', 'blue' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'vegetable', 'onion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -908,7 +908,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24093
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_relation_and_compare_not_equals() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'color', 'orange' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'color', 'blue' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'vegetable', 'onion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -942,7 +942,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24093
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_relation_and_compare_not_equals_different_keys() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // !shallot, but orange.
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'color', 'orange' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -983,7 +983,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24093
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_relation_and_compare_not_equals_not_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'color', 'orange' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'color', 'blue' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'vegetable', 'onion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1017,7 +1017,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24093
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_relation_and_compare_not_equals_and_not_like() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'color', 'orange' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'color', 'blue' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'vegetable', 'onion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1051,10 +1051,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23033
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_decimal_results() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_1 = $this->factory->post->create();
- $post_2 = $this->factory->post->create();
- $post_3 = $this->factory->post->create();
- $post_4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_1 = self::$factory->post->create();
+ $post_2 = self::$factory->post->create();
+ $post_3 = self::$factory->post->create();
+ $post_4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_1, 'decimal_value', '-0.3' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_2, 'decimal_value', '0.23409844' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1226,7 +1226,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29604
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_with_orderby_meta_value_relation_or() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $posts[0], 'foo', 5 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $posts[1], 'foo', 6 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $posts[2], 'foo', 4 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1265,7 +1265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29604
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_with_orderby_meta_value_relation_and() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $posts[0], 'foo', 5 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $posts[1], 'foo', 6 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $posts[2], 'foo', 4 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1308,9 +1308,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29642
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_nested() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p2, 'foo2', 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1349,9 +1349,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29642
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query_nested_two_levels_deep() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $p3, 'foo2', 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1394,15 +1394,15 @@
</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"> public function test_meta_between_not_between() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'time', 500 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id2, 'time', 1001 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id3, 'time', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id4, 'time', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id5 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id5 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id5, 'time', 1000 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1443,15 +1443,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_default_compare() {
</span><span class="cx" style="display: block; padding: 0 10px"> // compare should default to IN when meta_value is an array
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'foo', 'bar' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id2, 'bar', 'baz' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id3, 'foo', 'baz' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id4, 'baz', 'bar' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id5 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id5 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id5, 'foo', rand_str() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = get_posts( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1482,12 +1482,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17264
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_duplicate_posts_when_no_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'city', 'Lorem' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'address', '123 Lorem St.' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id2, 'city', 'Lorem' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id3, 'city', 'Loren' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1513,19 +1513,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15292
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_empty_meta_value() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'foo', '0' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'bar', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id2, 'foo', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id3, 'baz', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id4, 'baz', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id5 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id5 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id5, 'baz', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id5, 'bar', '0' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id6 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id6 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id6, 'baz', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query( array( 'meta_key' => 'foo', 'meta_value' => '0' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1577,7 +1577,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31045
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_clause_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'foo', 'aaa' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'foo', 'zzz' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[2], 'foo', 'jjj' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1601,13 +1601,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31045
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_clause_key_as_secondary_sort() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2015-01-28 03:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2015-01-28 05:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p3 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p3 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2015-01-28 03:00:00',
</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">@@ -1636,7 +1636,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31045
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_more_than_one_clause_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[0], 'foo', 'jjj' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $posts[1], 'foo', 'zzz' );
</span></span></pre></div>
<a id="trunktestsphpunittestsquerypostStatusphp"></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/query/postStatus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/postStatus.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/query/postStatus.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_post_with_nonpublic_status_should_not_be_shown_to_logged_out_users() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo_pt' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'foo_ps', array( 'public' => false ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'foo_ps' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'foo_ps' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'p' => $p,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_post_with_nonpublic_and_protected_status_should_not_be_shown_for_user_who_cannot_edit_others_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo_pt' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'foo_ps', array( 'public' => false, 'protected' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,7 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_post_with_nonpublic_and_protected_status_should_be_shown_for_user_who_can_edit_others_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo_pt' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'foo_ps', array( 'public' => false, 'protected' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_post_with_nonpublic_and_private_status_should_not_be_shown_for_user_who_cannot_edit_others_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo_pt' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'foo_ps', array( 'public' => false, 'private' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_post_with_nonpublic_and_private_status_should_be_shown_for_user_who_can_edit_others_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo_pt' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'foo_ps', array( 'public' => false, 'private' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +279,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_post_with_nonpublic_and_protected_status_should_not_be_shown_for_any_user() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo_pt' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'foo_ps', array( 'public' => false ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,8 +294,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29167
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_specific_post_should_be_returned_if_trash_is_one_of_the_requested_post_statuses() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_status' => 'trash' ) );
- $p2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_status' => 'trash' ) );
+ $p2 = self::$factory->post->create( array( 'post_status' => 'publish' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'p' => $p1,
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryresultsphp"></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/query/results.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/results.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/query/results.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,17 +456,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16854
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_query_author_vars() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_1 = $this->factory->user->create( array( 'user_login' => 'admin1', 'user_pass' => rand_str(), 'role' => 'author' ) );
- $post_1 = $this->factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_1, 'post_date' => '2007-01-01 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_1 = self::$factory->user->create( array( 'user_login' => 'admin1', 'user_pass' => rand_str(), 'role' => 'author' ) );
+ $post_1 = self::$factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_1, 'post_date' => '2007-01-01 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_2 = $this->factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
- $post_2 = $this->factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_2, 'post_date' => '2007-01-01 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_2 = self::$factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
+ $post_2 = self::$factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_2, 'post_date' => '2007-01-01 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_3 = $this->factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
- $post_3 = $this->factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_3, 'post_date' => '2007-01-01 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_3 = self::$factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
+ $post_3 = self::$factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_3, 'post_date' => '2007-01-01 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_4 = $this->factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
- $post_4 = $this->factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_4, 'post_date' => '2007-01-01 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_4 = self::$factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
+ $post_4 = self::$factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_4, 'post_date' => '2007-01-01 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'author' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,9 +623,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20308
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_post_password() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $one = (string) $this->factory->post->create( array( 'post_password' => '' ) );
- $two = (string) $this->factory->post->create( array( 'post_password' => 'burrito' ) );
- $three = (string) $this->factory->post->create( array( 'post_password' => 'burrito' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $one = (string) self::$factory->post->create( array( 'post_password' => '' ) );
+ $two = (string) self::$factory->post->create( array( 'post_password' => 'burrito' ) );
+ $three = (string) self::$factory->post->create( array( 'post_password' => 'burrito' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'post__in' => array( $one, $two, $three ), 'fields' => 'ids' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -665,9 +665,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_duplicate_slug_in_hierarchical_post_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'handbook', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_1 = $this->factory->post->create( array( 'post_title' => 'Getting Started', 'post_type' => 'handbook' ) );
- $post_2 = $this->factory->post->create( array( 'post_title' => 'Contributing to the WordPress Codex', 'post_type' => 'handbook' ) );
- $post_3 = $this->factory->post->create( array( 'post_title' => 'Getting Started', 'post_parent' => $post_2, 'post_type' => 'handbook' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_1 = self::$factory->post->create( array( 'post_title' => 'Getting Started', 'post_type' => 'handbook' ) );
+ $post_2 = self::$factory->post->create( array( 'post_title' => 'Contributing to the WordPress Codex', 'post_type' => 'handbook' ) );
+ $post_3 = self::$factory->post->create( array( 'post_title' => 'Getting Started', 'post_parent' => $post_2, 'post_type' => 'handbook' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->q->query( array( 'handbook' => 'getting-started', 'post_type' => 'handbook' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -679,8 +679,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_child_post_in_hierarchical_post_type_with_default_permalinks() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'handbook', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_1 = $this->factory->post->create( array( 'post_title' => 'Contributing to the WordPress Codex', 'post_type' => 'handbook' ) );
- $post_2 = $this->factory->post->create( array( 'post_title' => 'Getting Started', 'post_parent' => $post_1, 'post_type' => 'handbook' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_1 = self::$factory->post->create( array( 'post_title' => 'Contributing to the WordPress Codex', 'post_type' => 'handbook' ) );
+ $post_2 = self::$factory->post->create( array( 'post_title' => 'Getting Started', 'post_parent' => $post_1, 'post_type' => 'handbook' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'contributing-to-the-wordpress-codex/getting-started', get_permalink( $post_2 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,7 +690,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = 'Tacos are Cool';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => $title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish'
</span></span></pre></div>
<a id="trunktestsphpunittestsquerysearchphp"></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/query/search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/search.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/query/search.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,8 +31,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_search_order_title_relevance() {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, 7 ) as $i )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_content' => $i . rand_str() . ' about', 'post_type' => $this->post_type ) );
- $post_id = $this->factory->post->create( array( 'post_title' => 'About', 'post_type' => $this->post_type ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_content' => $i . rand_str() . ' about', 'post_type' => $this->post_type ) );
+ $post_id = self::$factory->post->create( array( 'post_title' => 'About', 'post_type' => $this->post_type ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->get_search_results( 'About' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $post_id, reset( $posts )->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,11 +63,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33988
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_s_should_exclude_term_prefixed_with_dash() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'This post has foo but also bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'This post has only foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,11 +84,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33988
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_s_should_exclude_first_term_if_prefixed_with_dash() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'This post has foo but also bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'This post has only bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,15 +105,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33988
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_s_should_not_exclude_for_dashes_in_the_middle_of_words() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'This post has foo but also bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'This post has only bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p3 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p3 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'This post has only foo-bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsquerysetupPostdataphp"></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/query/setupPostdata.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/setupPostdata.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/query/setupPostdata.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</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"> public function test_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $p );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $p->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30970
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_setup_by_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $p->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $p->ID, $GLOBALS['id'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30970
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_setup_by_postish_object() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = new stdClass();
</span><span class="cx" style="display: block; padding: 0 10px"> $post->ID = $p;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,8 +82,8 @@
</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"> public function test_authordata() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create_and_get();
- $p = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create_and_get();
+ $p = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $u->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $p );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@
</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"> public function test_currentday() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '1980-09-09 06:30:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $p );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@
</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"> public function test_currentmonth() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '1980-09-09 06:30:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $p );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,14 +111,14 @@
</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"> public function test_secondary_query_post_vars() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $users = self::$factory->user->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post1 = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post1 = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $users[0],
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2012-02-02 02:00:00',
</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">- $post2 = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post2 = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $users[1],
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2013-03-03 03:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@
</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"> public function test_single_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Page 0',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,7 +168,7 @@
</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"> public function test_multi_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16746
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_nextpage_at_start_of_content() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => '<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +193,7 @@
</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"> public function test_trim_nextpage_linebreaks() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => "Page 0\n<!--nextpage-->\nPage 1\nhas a line break\n<!--nextpage-->Page 2<!--nextpage-->\n\nPage 3",
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,10 +205,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25349
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_secondary_query_nextpage() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Post 1 Page 1<!--nextpage-->Post 1 Page 2',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Post 2 Page 1<!--nextpage-->Post 2 Page 2',
</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">@@ -237,7 +237,7 @@
</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"> public function test_page_from_wp_query() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</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">@@ -250,7 +250,7 @@
</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"> public function test_page_when_on_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $page ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20904
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_secondary_query_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?page=3' );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 3, $GLOBALS['page'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Secondary loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 4,
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,7 +294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20904
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_more_when_on_setup_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $post ) );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,8 +307,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * $more should not be true when the set-up post is not the same as the current post.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_more_when_on_single() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post1 = $this->factory->post->create_and_get();
- $post2 = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post1 = self::$factory->post->create_and_get();
+ $post2 = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $post1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,8 +321,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * $more should not be true when the set-up post is not the same as the current page.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_more_when_on_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
- $page = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
+ $page = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $page ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,7 +335,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20904
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_more_when_on_feed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?feed=rss' );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +347,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25349
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_secondary_query_more() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $post ) );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,10 +379,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * global $post should use the content of $a_post rather then the global post.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_setup_postdata_loop() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_content' => 'global post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_content' => 'global post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_query']->post = $GLOBALS['post'] = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ids = $this->factory->post->create_many(5);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ids = self::$factory->post->create_many(5);
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $ids as $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $page = get_post( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $page ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsquerytaxQueryphp"></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/query/taxQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/taxQuery.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/query/taxQuery.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,13 +6,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Query_TaxQuery extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_tax_query_single_query_single_term_field_slug() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p1, $t, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,13 +33,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"> public function test_tax_query_single_query_single_term_field_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p1, $t, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,13 +65,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_field_name_should_work_for_names_with_spaces() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,13 +90,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"> public function test_tax_query_single_query_single_term_field_term_taxonomy_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tt_ids = wp_set_post_terms( $p1, $t, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,13 +117,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"> public function test_tax_query_single_query_single_term_field_term_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p1, $t, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,13 +144,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"> public function test_tax_query_single_query_single_term_operator_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p1, $t, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,13 +172,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"> public function test_tax_query_single_query_single_term_operator_not_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p1, $t, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,13 +200,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"> public function test_tax_query_single_query_single_term_operator_and() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p1, $t, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,19 +228,19 @@
</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"> public function test_tax_query_single_query_multiple_terms_operator_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p1, $t1, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p2, $t2, 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,19 +263,19 @@
</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"> public function test_tax_query_single_query_multiple_terms_operator_not_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p1, $t1, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p2, $t2, 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,19 +301,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18105
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_tax_query_single_query_multiple_queries_operator_not_in() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p1, $t1, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $p2, $t2, 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,19 +343,19 @@
</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"> public function test_tax_query_single_query_multiple_terms_operator_and() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, $t1, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $t1, $t2 ), 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,12 +384,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax1', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,12 +416,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax1', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,12 +448,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax1', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -481,12 +481,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax1', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,19 +506,19 @@
</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"> public function test_tax_query_multiple_queries_relation_and() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, $t1, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $t1, $t2 ), 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,19 +546,19 @@
</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"> public function test_tax_query_multiple_queries_relation_or() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, $t1, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $t1, $t2 ), 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,19 +586,19 @@
</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"> public function test_tax_query_multiple_queries_different_taxonomies() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, $t1, 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, $t2, 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,22 +632,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'bar', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $foo_term_1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $foo_term_1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $foo_term_2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $foo_term_2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bar_term_1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bar_term_1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bar_term_2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bar_term_2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'bar',
</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">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, array( $foo_term_1 ), 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, array( $bar_term_1 ), 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -704,22 +704,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'bar', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $foo_term_1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $foo_term_1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $foo_term_2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $foo_term_2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bar_term_1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bar_term_1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bar_term_2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bar_term_2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'bar',
</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">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, array( $foo_term_1 ), 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, array( $bar_term_1 ), 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,23 +768,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'bar', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $foo_term_1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $foo_term_1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $foo_term_2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $foo_term_2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bar_term_1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bar_term_1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bar_term_2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bar_term_2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'bar',
</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">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
- $p4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
+ $p4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, array( $foo_term_1 ), 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, array( $bar_term_1 ), 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -840,7 +840,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_tax_query_relation_or_both_clauses_empty_terms() {
</span><span class="cx" style="display: block; padding: 0 10px"> // An empty tax query should return an empty array, not all posts.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -873,7 +873,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_tax_query_relation_or_one_clause_empty_terms() {
</span><span class="cx" style="display: block; padding: 0 10px"> // An empty tax query should return an empty array, not all posts.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -901,15 +901,15 @@
</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"> public function test_tax_query_include_children() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_a = $this->factory->term->create( array( 'taxonomy' => 'category', 'name' => 'Australia' ) );
- $cat_b = $this->factory->term->create( array( 'taxonomy' => 'category', 'name' => 'Sydney', 'parent' => $cat_a ) );
- $cat_c = $this->factory->term->create( array( 'taxonomy' => 'category', 'name' => 'East Syndney', 'parent' => $cat_b ) );
- $cat_d = $this->factory->term->create( array( 'taxonomy' => 'category', 'name' => 'West Syndney', 'parent' => $cat_b ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_a = self::$factory->term->create( array( 'taxonomy' => 'category', 'name' => 'Australia' ) );
+ $cat_b = self::$factory->term->create( array( 'taxonomy' => 'category', 'name' => 'Sydney', 'parent' => $cat_a ) );
+ $cat_c = self::$factory->term->create( array( 'taxonomy' => 'category', 'name' => 'East Syndney', 'parent' => $cat_b ) );
+ $cat_d = self::$factory->term->create( array( 'taxonomy' => 'category', 'name' => 'West Syndney', 'parent' => $cat_b ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_a = $this->factory->post->create( array( 'post_category' => array( $cat_a ) ) );
- $post_b = $this->factory->post->create( array( 'post_category' => array( $cat_b ) ) );
- $post_c = $this->factory->post->create( array( 'post_category' => array( $cat_c ) ) );
- $post_d = $this->factory->post->create( array( 'post_category' => array( $cat_d ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_a = self::$factory->post->create( array( 'post_category' => array( $cat_a ) ) );
+ $post_b = self::$factory->post->create( array( 'post_category' => array( $cat_b ) ) );
+ $post_c = self::$factory->post->create( array( 'post_category' => array( $cat_c ) ) );
+ $post_d = self::$factory->post->create( array( 'post_category' => array( $cat_d ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = get_posts( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1009,8 +1009,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy_for_object_type( 'post_tag', 'attachment:image' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag_id = $this->factory->term->create( array( 'slug' => rand_str(), 'name' => rand_str() ) );
- $image_id = $this->factory->attachment->create_object( 'image.jpg', 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag_id = self::$factory->term->create( array( 'slug' => rand_str(), 'name' => rand_str() ) );
+ $image_id = self::$factory->attachment->create_object( 'image.jpg', 0, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1035,8 +1035,8 @@
</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"> public function test_tax_query_no_taxonomy() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id = $this->factory->category->create( array( 'name' => 'alpha' ) );
- $this->factory->post->create( array( 'post_title' => 'alpha', 'post_category' => array( $cat_id ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_id = self::$factory->category->create( array( 'name' => 'alpha' ) );
+ self::$factory->post->create( array( 'post_title' => 'alpha', 'post_category' => array( $cat_id ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response1 = new WP_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tax_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1076,7 +1076,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_taxonomy_id_field_no_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 5 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cats = $tags = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1155,10 +1155,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_populate_taxonomy_query_var_from_tax_query() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</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">@@ -1191,7 +1191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_populate_taxonomy_query_var_from_tax_query_taxonomy_already_set() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo1', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</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">@@ -1213,7 +1213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_populate_term_query_var_from_tax_query() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1235,7 +1235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_populate_term_id_query_var_from_tax_query() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1260,10 +1260,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_populate_cat_category_name_query_var_from_tax_query() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1301,10 +1301,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_populate_tag_id_query_var_from_tax_query() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/query.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,8 +14,8 @@
</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_nested_loop_reset_postdata() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
- $nested_post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
+ $nested_post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $first_query = new WP_Query( array( 'post__in' => array( $post_id ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $first_query->have_posts() ) { $first_query->the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25380
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_pre_posts_per_page() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 10 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'pre_get_posts', array( $this, 'filter_posts_per_page' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_tag_queried_object() {
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = 'tag-slug-26627';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->tag->create( array( 'slug' => $slug ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->tag->create( array( 'slug' => $slug ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = get_term_by( 'slug', $slug, 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'pre_get_posts', array( $this, '_tag_queried_object' ), 11 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,11 +94,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't override the args provided below.
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_tax_category_tax_query' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $posts = $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[0], array( $terms[0] ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[1], array( $terms[1] ), 'wptests_tax' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,18 +130,18 @@
</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"> public function test_cat_querystring_single_term() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test1',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c2 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test2',
</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">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, $c1, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $c1, $c2 ), 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,23 +159,23 @@
</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"> public function test_category_querystring_multiple_terms_comma_separated() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test1',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c2 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test2',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test3',
</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">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
- $p4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
+ $p4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, $c1, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $c1, $c2 ), 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,23 +197,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33532
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_category_querystring_multiple_terms_formatted_as_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test1',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c2 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test2',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Category 3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test3',
</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">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
- $p4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
+ $p4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, $c1, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $c1, $c2 ), 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,18 +233,18 @@
</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"> public function test_tag_querystring_single_term() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->tag->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->tag->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Tag 1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test1',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->tag->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->tag->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Tag 2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test2',
</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">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, $t1->slug, 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $t1->slug, $t2->slug ), 'post_tag' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,23 +262,23 @@
</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"> public function test_tag_querystring_multiple_terms_comma_separated() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->tag->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->tag->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Tag 1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test1',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c2 = $this->factory->tag->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->tag->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Tag 2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test2',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->tag->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->tag->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Tag 3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test3',
</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">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
- $p4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
+ $p4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, $c1->slug, 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $c1->slug, $c2->slug ), 'post_tag' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,23 +300,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33532
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_tag_querystring_multiple_terms_formatted_as_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->tag->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->tag->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Tag 1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test1',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c2 = $this->factory->tag->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c2 = self::$factory->tag->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Tag 2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test2',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->tag->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->tag->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Test Tag 3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'test3',
</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">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
- $p4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
+ $p4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, $c1->slug, 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( $c1->slug, $c2->slug ), 'post_tag' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,9 +341,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_insert_term( 'test2', 'test_tax_cat' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_insert_term( 'test3', 'test_tax_cat' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, 'test1', 'test_tax_cat' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( 'test1', 'test2' ), 'test_tax_cat' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,10 +365,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_insert_term( 'test2', 'test_tax_cat' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_insert_term( 'test3', 'test_tax_cat' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
- $p4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
+ $p4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, 'test1', 'test_tax_cat' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( 'test1', 'test2' ), 'test_tax_cat' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,10 +394,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_insert_term( 'test2', 'test_tax_cat' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_insert_term( 'test3', 'test_tax_cat' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create();
- $p2 = $this->factory->post->create();
- $p3 = $this->factory->post->create();
- $p4 = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create();
+ $p2 = self::$factory->post->create();
+ $p3 = self::$factory->post->create();
+ $p4 = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p1, 'test1', 'test_tax_cat' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p2, array( 'test1', 'test2' ), 'test_tax_cat' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +417,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31355
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_pages_dont_404_when_queried_post_id_is_modified() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'A Test Page', 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'A Test Page', 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'parse_query', array( $this, 'filter_parse_query_to_modify_queried_post_id' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,7 +438,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'guide', array( 'name' => 'Guide', 'public' => true, 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rewrite->flush_rules();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_title' => 'A Test Guide', 'post_type' => 'guide' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_title' => 'A Test Guide', 'post_type' => 'guide' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'parse_query', array( $this, 'filter_parse_query_to_modify_queried_post_id' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestserverphp"></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-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-server.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/rest-api/rest-server.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'permission_callback' => '__return_true',
</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">- $editor = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/test-ns/test', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritenumericSlugsphp"></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/rewrite/numericSlugs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/numericSlugs.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/rewrite/numericSlugs.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->author_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->author_id = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Override the post/archive slug collision prevention in `wp_unique_post_slug()`.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_unique_post_slug', array( $this, 'filter_unique_post_slug' ), 10, 6 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_go_to_year_segment_collision_with_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_url_to_postid_year_segment_collision_with_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_go_to_month_segment_collision_without_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_url_to_postid_month_segment_collision_without_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_go_to_month_segment_collision_without_title_no_leading_zero() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_url_to_postid_month_segment_collision_without_title_no_leading_zero() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +170,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_go_to_month_segment_collision_with_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_url_to_postid_month_segment_collision_with_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_go_to_month_segment_collision_with_title_no_leading_zero() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_url_to_postid_month_segment_collision_with_title_no_leading_zero() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +230,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_go_to_day_segment_collision_without_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_url_to_postid_day_segment_collision_without_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +262,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_go_to_day_segment_collision_with_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,7 +278,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_url_to_postid_day_segment_collision_with_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +292,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_numeric_slug_permalink_conflicts_should_only_be_resolved_for_the_main_query() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => rand_str(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,7 +314,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure a post is published in 2013/02, to avoid 404s.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +322,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2013-02-01 01:00:00',
</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">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +342,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure a post is published on 2015/01/01, to avoid 404s.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,7 +350,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2015-01-02 01:00:00',
</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">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,7 +369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_slug_collision_should_distinguish_valid_pagination_from_date() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_slug_collision_should_distinguish_too_high_pagination_from_date() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_slug_collision_should_not_require_pagination_query_var() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,7 +418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_date_slug_collision_should_be_ignored_when_pagination_var_is_present_but_post_does_not_have_multiple_pages() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'This post does not have pagination.',
</span></span></pre></div>
<a id="trunktestsphpunittestsrewriteoldSlugRedirectphp"></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/rewrite/oldSlugRedirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Foo Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'foo-bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_old_slug_redirect_attachment() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_object( $file, $this->post_id, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_object( $file, $this->post_id, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'my-attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritephp"></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/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/rewrite.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,19 +85,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_url_to_postid() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
</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_url_to_postid_set_url_scheme_https_to_http() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'https' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'https' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,11 +109,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'on';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'http' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'http' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = rand_str( 12 );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( $post_type, array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array( 'post_type' => $post_type ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array( 'post_type' => $post_type ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_post_type( $post_type );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,8 +136,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_url_to_postid_hierarchical() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = $this->factory->post->create( array( 'post_title' => 'Parent', 'post_type' => 'page' ) );
- $child_id = $this->factory->post->create( array( 'post_title' => 'Child', 'post_type' => 'page', 'post_parent' => $parent_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_id = self::$factory->post->create( array( 'post_title' => 'Parent', 'post_type' => 'page' ) );
+ $child_id = self::$factory->post->create( array( 'post_title' => 'Child', 'post_type' => 'page', 'post_parent' => $parent_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $parent_id, url_to_postid( get_permalink( $parent_id ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $child_id, url_to_postid( get_permalink( $child_id ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,26 +145,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_url_to_postid_hierarchical_with_matching_leaves() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'parent',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $child_id_1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $child_id_1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'child1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $parent_id,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $child_id_2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $child_id_2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'child2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $parent_id,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $grandchild_id_1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $grandchild_id_1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'grandchild',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $child_id_1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $grandchild_id_2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $grandchild_id_2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'grandchild',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $child_id_2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', home_url( '/example/' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array( 'post_title' => 'Hi', 'post_type' => 'page', 'post_name' => 'examp' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array( 'post_title' => 'Hi', 'post_type' => 'page', 'post_name' => 'examp' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id, url_to_postid( site_url('/example/examp' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id, url_to_postid( '/example/examp/' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +244,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_url_to_postid_dupe_path() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', home_url('/example/') );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->post->create( array( 'post_title' => 'Hi', 'post_type' => 'page', 'post_name' => 'example' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->post->create( array( 'post_title' => 'Hi', 'post_type' => 'page', 'post_name' => 'example' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id, url_to_postid( site_url( '/example/example/' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +258,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_url_to_postid_home_url_collision() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', home_url( '/example' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_title' => 'Collision', 'post_type' => 'page', 'post_name' => 'collision' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_title' => 'Collision', 'post_type' => 'page', 'post_name' => 'collision' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This url should NOT return a post ID
</span><span class="cx" style="display: block; padding: 0 10px"> $badurl = site_url( '/example-collision' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,10 +277,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- $blog_id = $this->factory->blog->create( array( 'path' => '/example' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create( array( 'path' => '/example' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_title' => 'Collision ', 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_title' => 'Collision ', 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This url should NOT return a post ID
</span><span class="cx" style="display: block; padding: 0 10px"> $badurl = network_home_url( '/example-collision' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,7 +294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_is_home_should_be_false_when_visiting_custom_endpoint_without_a_registered_query_var_and_page_on_front_is_set() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_on_front', $page_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,9 +313,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_url_to_postid_with_post_slug_that_clashes_with_a_trashed_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_status' => 'trash' ) );
- $post_id = $this->factory->post->create( array( 'post_title' => get_post( $page_id )->post_title ) );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_status' => 'trash' ) );
+ $post_id = self::$factory->post->create( array( 'post_title' => get_post( $page_id )->post_title ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $post_id, url_to_postid( get_permalink( $post_id ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,9 +327,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_parse_request_with_post_slug_that_clashes_with_a_trashed_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_status' => 'trash' ) );
- $post_id = $this->factory->post->create( array( 'post_title' => get_post( $page_id )->post_title ) );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_status' => 'trash' ) );
+ $post_id = self::$factory->post->create( array( 'post_title' => get_post( $page_id )->post_title ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( get_permalink( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_single() );
</span></span></pre></div>
<a id="trunktestsphpunitteststaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/taxonomy.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,13 +34,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_get_the_taxonomies() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxes = get_the_taxonomies( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $taxes );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( 'category' ), array_keys( $taxes ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->tag->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->tag->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_tags( $post_id, array( $id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxes = get_the_taxonomies( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group 27238
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_the_taxonomies_term_template() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxes = get_the_taxonomies( $post_id, array( 'term_template' => '%2$s' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'Categories: Uncategorized.', $taxes['category'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@
</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_the_taxonomies() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> the_taxonomies( array( 'post' => $post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group 27238
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_the_taxonomies_term_template() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = get_echo( 'the_taxonomies', array( array( 'post' => $post_id, 'term_template' => '%2$s' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'Categories: Uncategorized.', $output );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,25 +262,25 @@
</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"> public function test_get_objects_in_term_should_return_objects_ids() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag_id = $this->factory->tag->create();
- $cat_id = $this->factory->category->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag_id = self::$factory->tag->create();
+ $cat_id = self::$factory->category->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts_with_tag = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_with_category = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 3; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_tags( $post_id, array( $tag_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_with_tag[] = $post_id;
</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"> for ( $i = 0; $i < 3; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_categories( $post_id, array( $cat_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_with_category[] = $post_id;
</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"> for ( $i = 0; $i < 3; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create();
</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"> $posts_with_terms = array_merge( $posts_with_tag, $posts_with_category );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,7 +295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25706
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_in_category() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // in_category() returns false when first parameter is empty()
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( in_category( '', $post ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,7 +346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_ancestors_taxonomy_non_hierarchical() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -358,18 +358,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t2,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t4 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t4 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,7 +380,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_ancestors_post_type_non_hierarchical() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_pt',
</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">@@ -391,18 +391,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_pt',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_pt',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $p1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p3 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p3 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_pt',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $p2,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p4 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p4 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_pt',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $p1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,10 +418,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_conflict', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_conflict',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p2 = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p2 = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_conflict',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $p1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,10 +429,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_conflict', 'post', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_conflict',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_conflict',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,11 +451,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</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">- $t = $this->factory->term->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t->slug, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?wptests_tax=' . $t->slug );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,11 +471,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</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">- $t = $this->factory->term->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t->slug, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/?taxonomy=wptests_tax&term=' . $t->slug );
</span></span></pre></div>
<a id="trunktestsphpunitteststermcachephp"></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/term/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/cache.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/cache.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,15 +15,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_category_children_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Test with only one Parent => Child
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id1 = $this->factory->category->create();
- $term_id1_child = $this->factory->category->create( array( 'parent' => $term_id1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id1 = self::$factory->category->create();
+ $term_id1_child = self::$factory->category->create( array( 'parent' => $term_id1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $hierarchy = _get_term_hierarchy( 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $term_id1 => array( $term_id1_child ) ), $hierarchy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add another Parent => Child
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id2 = $this->factory->category->create();
- $term_id2_child = $this->factory->category->create( array( 'parent' => $term_id2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id2 = self::$factory->category->create();
+ $term_id2_child = self::$factory->category->create( array( 'parent' => $term_id2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $hierarchy = _get_term_hierarchy( 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $term_id1 => array( $term_id1_child ), $term_id2 => array( $term_id2_child ) ), $hierarchy );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,8 +33,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22526
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_category_name_change() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->category->create_and_get( array( 'name' => 'Foo' ) );
- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->category->create_and_get( array( 'name' => 'Foo' ) );
+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_categories( $post_id, $term->term_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -151,7 +151,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -182,7 +182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 5, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 5, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><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="trunktestsphpunitteststermcategoryExistsphp"></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/term/categoryExists.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/categoryExists.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/categoryExists.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,12 +5,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30975
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_category_exists_should_return_only_top_level_categories_when_parent_is_0() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create();
- $c2 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create();
+ $c2 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $c1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</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">@@ -24,12 +24,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_category_exists_should_select_oldest_matching_category_when_no_parent_is_specified_1() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Foo child of c1 is created first.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create();
- $c2 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create();
+ $c2 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $c1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</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">@@ -43,11 +43,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_category_exists_should_select_oldest_matching_category_when_no_parent_is_specified_2() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Top-level Foo is created first.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create();
- $c2 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create();
+ $c2 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $c1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,12 +61,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30975
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_category_exists_should_respect_nonempty_parent() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create();
- $c2 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create();
+ $c2 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $c1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c3 = $this->factory->category->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c3 = self::$factory->category->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><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="trunktestsphpunitteststermgetEditTermLinkphp"></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/term/getEditTermLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getEditTermLink.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/getEditTermLink.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,12 +6,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Term_GetEditTermLink extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</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"> public function test_get_edit_term_link_default() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32786
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_edit_term_link_invalid_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermphp"></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/term/getTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTerm.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/getTerm.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_passing_term_object_should_skip_database_query_when_filter_property_is_empty() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->term->create_and_get( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->term->create_and_get( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> clean_term_cache( $term->term_id, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $num_queries = $wpdb->num_queries;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_cache_should_be_populated_by_successful_fetch() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> clean_term_cache( $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime cache.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,19 +60,19 @@
</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"> public function test_output_object() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'object', get_term( $t, 'wptests_tax', OBJECT ) );
</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"> public function test_output_array_a() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t, 'wptests_tax', ARRAY_A );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $term );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $term['term_id'] ) );
</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"> public function test_output_array_n() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t, 'wptests_tax', ARRAY_N );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $term );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $term['term_id'] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@
</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"> public function test_output_should_fall_back_to_object_for_invalid_input() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'object', get_term( $t, 'wptests_tax', 'foo' ) );
</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">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_numeric_properties_should_be_cast_to_ints() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get raw data from the database.
</span><span class="cx" style="display: block; padding: 0 10px"> $term_data = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms t JOIN $wpdb->term_taxonomy tt ON ( t.term_id = tt.term_id ) WHERE t.term_id = %d", $t ) );
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermByphp"></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/term/getTermBy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTermBy.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/getTermBy.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = 'ńaș';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $new_ttid = $term->term_taxonomy_id + 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermFieldphp"></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/term/getTermField.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTermField.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/getTermField.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34245
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_term_field_should_not_return_error_for_empty_taxonomy() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_term_field( 'taxonomy', $term->term_id, '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $found );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34245
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_term_field_supplying_a_taxonomy() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_term_field( 'taxonomy', $term->term_id, $term->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->taxonomy, $found );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34245
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_term_field_supplying_no_taxonomy() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_term_field( 'taxonomy', $term->term_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->taxonomy, $found );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34245
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_term_field_should_accept_a_WP_Term_object_or_a_term_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Term', $term );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $term->term_id, get_term_field( 'term_id', $term ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34245
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_term_field_invalid_taxonomy_should_return_WP_Error() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_term_field( 'taxonomy', $term, 'foo-taxonomy' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $found );
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermLinkphp"></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/term/getTermLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTermLink.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/getTermLink.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,11 +12,11 @@
</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"> public function test_integer_should_be_interpreted_as_term_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $t1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,11 +28,11 @@
</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"> public function test_numeric_string_should_be_interpreted_as_term_slug() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $t1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</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"> public function test_category_should_use_cat_query_var_with_term_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = $this->factory->category->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::$factory->category->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = get_term_link( $c, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'cat=' . $c, $actual );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => 'foo',
</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">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => false,
</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">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,12 +97,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> flush_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'term1',
</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">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'term2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,12 +126,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> flush_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'term1',
</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">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'term2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermsphp"></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/term/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTerms.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23506
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_terms_should_allow_arbitrary_indexed_taxonomies_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id = $this->factory->tag->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id = self::$factory->tag->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( array( '111' => 'post_tag' ), array( 'hide_empty' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $term_id, reset( $terms )->term_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,8 +114,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 13661
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_terms_fields() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id1 = $this->factory->tag->create( array( 'slug' => 'woo', 'name' => 'WOO!' ) );
- $term_id2 = $this->factory->tag->create( array( 'slug' => 'hoo', 'name' => 'HOO!', 'parent' => $term_id1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id1 = self::$factory->tag->create( array( 'slug' => 'woo', 'name' => 'WOO!' ) );
+ $term_id2 = self::$factory->tag->create( array( 'slug' => 'hoo', 'name' => 'HOO!', 'parent' => $term_id1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_id_parent = get_terms( 'post_tag', array( 'hide_empty' => false, 'fields' => 'id=>parent' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,8 +148,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_terms_include_exclude() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id1 = $this->factory->tag->create();
- $term_id2 = $this->factory->tag->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id1 = self::$factory->tag->create();
+ $term_id2 = self::$factory->tag->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $inc_terms = get_terms( 'post_tag', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => array( $term_id1, $term_id2 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_exclude_with_hierarchical_true_for_non_hierarchical_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -202,10 +202,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id_uncategorized = get_option( 'default_category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id1 = $this->factory->category->create();
- $term_id11 = $this->factory->category->create( array( 'parent' => $term_id1 ) );
- $term_id2 = $this->factory->category->create();
- $term_id22 = $this->factory->category->create( array( 'parent' => $term_id2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id1 = self::$factory->category->create();
+ $term_id11 = self::$factory->category->create( array( 'parent' => $term_id1 ) );
+ $term_id2 = self::$factory->category->create();
+ $term_id22 = self::$factory->category->create( array( 'parent' => $term_id2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( 'category', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => $term_id_uncategorized,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,8 +228,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 13992
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_terms_search() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id1 = $this->factory->tag->create( array( 'slug' => 'burrito' ) );
- $term_id2 = $this->factory->tag->create( array( 'name' => 'Wilbur' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id1 = self::$factory->tag->create( array( 'slug' => 'burrito' ) );
+ $term_id2 = self::$factory->tag->create( array( 'name' => 'Wilbur' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( 'post_tag', array( 'hide_empty' => false, 'search' => 'bur', 'fields' => 'ids' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $term_id1, $term_id2 ), $terms );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,8 +239,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 8214
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_terms_like() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id1 = $this->factory->tag->create( array( 'name' => 'burrito', 'description' => 'This is a burrito.' ) );
- $term_id2 = $this->factory->tag->create( array( 'name' => 'taco', 'description' => 'Burning man.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id1 = self::$factory->tag->create( array( 'name' => 'burrito', 'description' => 'This is a burrito.' ) );
+ $term_id2 = self::$factory->tag->create( array( 'name' => 'taco', 'description' => 'Burning man.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( 'post_tag', array( 'hide_empty' => false, 'name__like' => 'bur', 'fields' => 'ids' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $term_id1 ), $terms );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,43 +274,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = 'food';
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cheese = $this->factory->term->create( array( 'name' => 'Cheese', 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cheese = self::$factory->term->create( array( 'name' => 'Cheese', 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cheddar = $this->factory->term->create( array( 'name' => 'Cheddar', 'parent' => $cheese, 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cheddar = self::$factory->term->create( array( 'name' => 'Cheddar', 'parent' => $cheese, 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ids = $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids = self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_ids as $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $id, $cheddar, $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $cheddar, $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $term->count );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $brie = $this->factory->term->create( array( 'name' => 'Brie', 'parent' => $cheese, 'taxonomy' => $tax ) );
- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $brie = self::$factory->term->create( array( 'name' => 'Brie', 'parent' => $cheese, 'taxonomy' => $tax ) );
+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $post_id, $brie, $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $brie, $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $term->count );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $crackers = $this->factory->term->create( array( 'name' => 'Crackers', 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $crackers = self::$factory->term->create( array( 'name' => 'Crackers', 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $butter = $this->factory->term->create( array( 'name' => 'Butter', 'parent' => $crackers, 'taxonomy' => $tax ) );
- $post_ids = $this->factory->post->create_many( 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $butter = self::$factory->term->create( array( 'name' => 'Butter', 'parent' => $crackers, 'taxonomy' => $tax ) );
+ $post_ids = self::$factory->post->create_many( 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_ids as $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $id, $butter, $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $butter, $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $term->count );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $multigrain = $this->factory->term->create( array( 'name' => 'Multigrain', 'parent' => $crackers, 'taxonomy' => $tax ) );
- $post_ids = $this->factory->post->create_many( 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $multigrain = self::$factory->term->create( array( 'name' => 'Multigrain', 'parent' => $crackers, 'taxonomy' => $tax ) );
+ $post_ids = self::$factory->post->create_many( 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_ids as $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $id, $multigrain, $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $multigrain, $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $term->count );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fruit = $this->factory->term->create( array( 'name' => 'Fruit', 'taxonomy' => $tax ) );
- $cranberries = $this->factory->term->create( array( 'name' => 'Cranberries', 'parent' => $fruit, 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fruit = self::$factory->term->create( array( 'name' => 'Fruit', 'taxonomy' => $tax ) );
+ $cranberries = self::$factory->term->create( array( 'name' => 'Cranberries', 'parent' => $fruit, 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( $tax, array( 'parent' => 0, 'cache_domain' => $tax ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, count( $terms ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,10 +324,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = 'food';
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cheese = $this->factory->term->create( array( 'name' => 'Cheese', 'taxonomy' => $tax ) );
- $cheddar = $this->factory->term->create( array( 'name' => 'Cheddar', 'parent' => $cheese, 'taxonomy' => $tax ) );
- $spread = $this->factory->term->create( array( 'name' => 'Spread', 'parent' => $cheddar, 'taxonomy' => $tax ) );
- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cheese = self::$factory->term->create( array( 'name' => 'Cheese', 'taxonomy' => $tax ) );
+ $cheddar = self::$factory->term->create( array( 'name' => 'Cheddar', 'parent' => $cheese, 'taxonomy' => $tax ) );
+ $spread = self::$factory->term->create( array( 'name' => 'Spread', 'parent' => $cheddar, 'taxonomy' => $tax ) );
+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $post_id, $spread, $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $spread, $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $term->count );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,10 +348,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $t = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, 7 ) as $depth ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t[$depth] = $this->factory->term->create( array( 'name' => 'term' . $depth, 'taxonomy' => $tax, 'parent' => $parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t[$depth] = self::$factory->term->create( array( 'name' => 'term' . $depth, 'taxonomy' => $tax, 'parent' => $parent ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent = $t[$depth];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $post_id, $t[7], $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t[7], $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $term->count );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,8 +367,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27123
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_terms_child_of() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent = $this->factory->category->create();
- $child = $this->factory->category->create( array( 'parent' => $parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent = self::$factory->category->create();
+ $child = self::$factory->category->create( array( 'parent' => $parent ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( 'category', array( 'child_of' => $parent, 'hide_empty' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $terms ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,7 +382,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true, ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $num_queries = $wpdb->num_queries;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,9 +402,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
- $t3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+ $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms( array( 'wptests_tax1', 'wptests_tax2' ), array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,9 +440,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test__get_term_children_handles_cycles() {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create();
- $c2 = $this->factory->category->create( array( 'parent' => $c1 ) );
- $c3 = $this->factory->category->create( array( 'parent' => $c2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create();
+ $c2 = self::$factory->category->create( array( 'parent' => $c1 ) );
+ $c3 = self::$factory->category->create( array( 'parent' => $c2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_term( $c1, 'category', array( 'parent' => $c3 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,9 +459,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test__get_term_children_handles_cycles_when_terms_argument_contains_objects() {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create_and_get();
- $c2 = $this->factory->category->create_and_get( array( 'parent' => $c1->term_id ) );
- $c3 = $this->factory->category->create_and_get( array( 'parent' => $c2->term_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create_and_get();
+ $c2 = self::$factory->category->create_and_get( array( 'parent' => $c1->term_id ) );
+ $c3 = self::$factory->category->create_and_get( array( 'parent' => $c2->term_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_term( $c1->term_id, 'category', array( 'parent' => $c3->term_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,8 +472,8 @@
</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"> public function test_get_terms_by_slug() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->tag->create( array( 'slug' => 'foo' ) );
- $t2 = $this->factory->tag->create( array( 'slug' => 'bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->tag->create( array( 'slug' => 'foo' ) );
+ $t2 = self::$factory->tag->create( array( 'slug' => 'bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms( 'post_tag', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,9 +488,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23636
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_terms_by_multiple_slugs() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->tag->create( array( 'slug' => 'foo' ) );
- $t2 = $this->factory->tag->create( array( 'slug' => 'bar' ) );
- $t3 = $this->factory->tag->create( array( 'slug' => 'barry' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->tag->create( array( 'slug' => 'foo' ) );
+ $t2 = self::$factory->tag->create( array( 'slug' => 'bar' ) );
+ $t3 = self::$factory->tag->create( array( 'slug' => 'barry' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms( 'post_tag', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,8 +505,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30611
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_terms_by_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->tag->create( array( 'name' => 'Foo' ) );
- $t2 = $this->factory->tag->create( array( 'name' => 'Bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->tag->create( array( 'name' => 'Foo' ) );
+ $t2 = self::$factory->tag->create( array( 'name' => 'Bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms( 'post_tag', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,9 +521,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30611
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_terms_by_multiple_names() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->tag->create( array( 'name' => 'Foo' ) );
- $t2 = $this->factory->tag->create( array( 'name' => 'Bar' ) );
- $t3 = $this->factory->tag->create( array( 'name' => 'Barry' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->tag->create( array( 'name' => 'Foo' ) );
+ $t2 = self::$factory->tag->create( array( 'name' => 'Bar' ) );
+ $t3 = self::$factory->tag->create( array( 'name' => 'Barry' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms( 'post_tag', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,7 +540,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_name_should_match_encoded_html_entities() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo & Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo-and-bar',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,9 +569,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If run on a flat hierarchy it should return everything.
</span><span class="cx" style="display: block; padding: 0 10px"> $flat_tax = 'countries';
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $flat_tax, 'post', array( 'hierarchical' => false ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $australia = $this->factory->term->create( array( 'name' => 'Australia', 'taxonomy' => $flat_tax ) );
- $china = $this->factory->term->create( array( 'name' => 'China', 'taxonomy' => $flat_tax ) );
- $tanzania = $this->factory->term->create( array( 'name' => 'Tanzania', 'taxonomy' => $flat_tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $australia = self::$factory->term->create( array( 'name' => 'Australia', 'taxonomy' => $flat_tax ) );
+ $china = self::$factory->term->create( array( 'name' => 'China', 'taxonomy' => $flat_tax ) );
+ $tanzania = self::$factory->term->create( array( 'name' => 'Tanzania', 'taxonomy' => $flat_tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( $flat_tax, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'childless' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -601,20 +601,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> PEI
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> // Level 1
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $canada = $this->factory->term->create( array( 'name' => 'Canada', 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $canada = self::$factory->term->create( array( 'name' => 'Canada', 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Level 2
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ontario = $this->factory->term->create( array( 'name' => 'Ontario', 'parent' => $canada, 'taxonomy' => $tax ) );
- $quebec = $this->factory->term->create( array( 'name' => 'Quebec', 'parent' => $canada, 'taxonomy' => $tax ) );
- $pei = $this->factory->term->create( array( 'name' => 'PEI', 'parent' => $canada, 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ontario = self::$factory->term->create( array( 'name' => 'Ontario', 'parent' => $canada, 'taxonomy' => $tax ) );
+ $quebec = self::$factory->term->create( array( 'name' => 'Quebec', 'parent' => $canada, 'taxonomy' => $tax ) );
+ $pei = self::$factory->term->create( array( 'name' => 'PEI', 'parent' => $canada, 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Level 3
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $toronto = $this->factory->term->create( array( 'name' => 'Toronto', 'parent' => $ontario, 'taxonomy' => $tax ) );
- $ottawa = $this->factory->term->create( array( 'name' => 'Ottawa', 'parent' => $ontario, 'taxonomy' => $tax ) );
- $montreal = $this->factory->term->create( array( 'name' => 'Montreal', 'parent' => $quebec, 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $toronto = self::$factory->term->create( array( 'name' => 'Toronto', 'parent' => $ontario, 'taxonomy' => $tax ) );
+ $ottawa = self::$factory->term->create( array( 'name' => 'Ottawa', 'parent' => $ontario, 'taxonomy' => $tax ) );
+ $montreal = self::$factory->term->create( array( 'name' => 'Montreal', 'parent' => $quebec, 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Level 4
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nepean = $this->factory->term->create( array( 'name' => 'Nepean', 'parent' => $ottawa, 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nepean = self::$factory->term->create( array( 'name' => 'Nepean', 'parent' => $ottawa, 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( $tax, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'childless' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,18 +633,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Level 1
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $canada = $this->factory->term->create( array( 'name' => 'Canada', 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $canada = self::$factory->term->create( array( 'name' => 'Canada', 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Level 2
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ontario = $this->factory->term->create( array( 'name' => 'Ontario', 'parent' => $canada, 'taxonomy' => $tax ) );
- $quebec = $this->factory->term->create( array( 'name' => 'Quebec', 'parent' => $canada, 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ontario = self::$factory->term->create( array( 'name' => 'Ontario', 'parent' => $canada, 'taxonomy' => $tax ) );
+ $quebec = self::$factory->term->create( array( 'name' => 'Quebec', 'parent' => $canada, 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Level 3
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $laval = $this->factory->term->create( array( 'name' => 'Laval', 'parent' => $quebec, 'taxonomy' => $tax ) );
- $montreal = $this->factory->term->create( array( 'name' => 'Montreal', 'parent' => $quebec, 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $laval = self::$factory->term->create( array( 'name' => 'Laval', 'parent' => $quebec, 'taxonomy' => $tax ) );
+ $montreal = self::$factory->term->create( array( 'name' => 'Montreal', 'parent' => $quebec, 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Level 4
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dorval = $this->factory->term->create( array( 'name' => 'Dorval', 'parent' => $montreal, 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dorval = self::$factory->term->create( array( 'name' => 'Dorval', 'parent' => $montreal, 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( $tax, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'childless' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,10 +663,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t1 ) );
- $t3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
- $t4 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t3 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t1 ) );
+ $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+ $t4 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t3 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms( array( 'wptests_tax1', 'wptests_tax2' ), array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1098,15 +1098,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t1 ) );
- $t3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t1 ) );
+ $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t4 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
- $t5 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t4 ) );
- $t6 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t5 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t4 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+ $t5 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t4 ) );
+ $t6 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t5 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t3, 'wptests_tax1' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t6, 'wptests_tax2' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1140,10 +1140,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = 'wptests_tax';
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $tax, 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => $tax ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => $tax ) );
- $t3 = $this->factory->term->create( array( 'taxonomy' => $tax ) );
- $t4 = $this->factory->term->create( array( 'taxonomy' => $tax ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => $tax ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => $tax ) );
+ $t3 = self::$factory->term->create( array( 'taxonomy' => $tax ) );
+ $t4 = self::$factory->term->create( array( 'taxonomy' => $tax ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms( $tax, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1164,10 +1164,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = 'wptests_tax';
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $tax, 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => $tax, 'description' => 'fff' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => $tax, 'description' => 'aaa' ) );
- $t3 = $this->factory->term->create( array( 'taxonomy' => $tax, 'description' => 'zzz' ) );
- $t4 = $this->factory->term->create( array( 'taxonomy' => $tax, 'description' => 'jjj' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => $tax, 'description' => 'fff' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => $tax, 'description' => 'aaa' ) );
+ $t3 = self::$factory->term->create( array( 'taxonomy' => $tax, 'description' => 'zzz' ) );
+ $t4 = self::$factory->term->create( array( 'taxonomy' => $tax, 'description' => 'jjj' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms( $tax, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1185,15 +1185,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_term_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'AAA',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'ZZZ',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'JJJ',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1243,7 +1243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_hierarchical_false_with_child_of_and_direct_child() {
</span><span class="cx" style="display: block; padding: 0 10px"> $initial_terms = $this->create_hierarchical_terms();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> array( $initial_terms['seven_term']['term_id'] ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1323,7 +1323,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true, ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $num_queries = $wpdb->num_queries;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1343,9 +1343,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
- $t3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+ $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms( array( 'wptests_tax1', 'wptests_tax2' ), array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1395,16 +1395,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_pad_counts() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_1', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_1',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t2,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1436,14 +1436,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_pad_counts_should_not_recurse_infinitely_when_term_hierarchy_has_a_loop() {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c1 = $this->factory->category->create();
- $c2 = $this->factory->category->create( array( 'parent' => $c1 ) );
- $c3 = $this->factory->category->create( array( 'parent' => $c2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c1 = self::$factory->category->create();
+ $c2 = self::$factory->category->create( array( 'parent' => $c1 ) );
+ $c3 = self::$factory->category->create( array( 'parent' => $c2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_term( $c1, 'category', array( 'parent' => $c3 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $posts[0], $c1, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $posts[1], $c2, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $posts[2], $c3, 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1466,11 +1466,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
- $t3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+ $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[0], $t1, 'wptests_tax1' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[1], $t2, 'wptests_tax2' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[2], $t3, 'wptests_tax2' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1499,7 +1499,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[1], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[2], 'foo', 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1525,7 +1525,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[1], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[2], 'foo', 'bar' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1550,7 +1550,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 5, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 5, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[1], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[2], 'foo', 'baz' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1575,7 +1575,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_wp_term_objects() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms( 'wptests_tax', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1597,7 +1597,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime the cache.
</span><span class="cx" style="display: block; padding: 0 10px"> get_terms( 'wptests_tax', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1628,7 +1628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_terms( 'wptests_tax', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1644,13 +1644,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function create_hierarchical_terms_and_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms['parent1'] = $this->factory->term->create( array( 'slug' => 'parent-1', 'name' => 'Parent 1', 'taxonomy' => 'hierarchical_fields' ) );
- $terms['parent2'] = $this->factory->term->create( array( 'slug' => 'parent-2', 'name' => 'Parent 2', 'taxonomy' => 'hierarchical_fields' ) );
- $terms['child1'] = $this->factory->term->create( array( 'slug' => 'child-1', 'name' => 'Child 1', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['parent1'] ) );
- $terms['child2'] = $this->factory->term->create( array( 'slug' => 'child-2', 'name' => 'Child 2', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['parent1'] ) );
- $terms['grandchild1'] = $this->factory->term->create( array( 'slug' => 'grandchild-1', 'name' => 'Grandchild 1', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['child1'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms['parent1'] = self::$factory->term->create( array( 'slug' => 'parent-1', 'name' => 'Parent 1', 'taxonomy' => 'hierarchical_fields' ) );
+ $terms['parent2'] = self::$factory->term->create( array( 'slug' => 'parent-2', 'name' => 'Parent 2', 'taxonomy' => 'hierarchical_fields' ) );
+ $terms['child1'] = self::$factory->term->create( array( 'slug' => 'child-1', 'name' => 'Child 1', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['parent1'] ) );
+ $terms['child2'] = self::$factory->term->create( array( 'slug' => 'child-2', 'name' => 'Child 2', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['parent1'] ) );
+ $terms['grandchild1'] = self::$factory->term->create( array( 'slug' => 'grandchild-1', 'name' => 'Grandchild 1', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['child1'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $post_id, $terms['parent2'], 'hierarchical_fields', true );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $post_id, $terms['child1'], 'hierarchical_fields', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1714,8 +1714,8 @@
</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"> // Ensure child terms are not empty
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_post_id = $this->factory->post->create();
- $second_post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_post_id = self::$factory->post->create();
+ $second_post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $first_post_id, array( $three_term['term_id'] ), 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $second_post_id, array( $six_term['term_id'] ), 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1731,7 +1731,7 @@
</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"> protected function set_up_three_posts_and_tags() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3, array( 'post_type' => 'post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3, array( 'post_type' => 'post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $posts as $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $post, rand_str(), 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststermisObjectInTermphp"></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/term/isObjectInTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/isObjectInTerm.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/isObjectInTerm.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,10 +7,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_terms_are_ints() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_object_in_term( $posts[0], 'wptests_tax', array( $t1, $t2 ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,10 +22,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_terms_are_strings_and_match_term_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $t1_str = (string) $t1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,10 +40,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_terms_are_strings_and_match_term_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Foo' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Bar') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Foo' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Bar') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_object_in_term( $posts[0], 'wptests_tax', array( 'Foo', 'Bar' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,10 +55,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_terms_are_strings_and_match_term_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'foo' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'bar') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'foo' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'bar') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_object_in_term( $posts[0], 'wptests_tax', array( 'foo', 'bar' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,10 +70,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_terms_contain_strings_and_ints_and_match_term_id_as_int() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'foo' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'bar') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'foo' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'bar') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_object_in_term( $posts[0], 'wptests_tax', array( $t1, 'bar' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,9 +87,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_not_return_true_if_term_name_begins_with_existing_term_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ID = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ID = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $post_ID, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $int_tax_name = $t . '_term_name';
</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"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $o = 12345;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $o, $terms[0], 'wptests_tax' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $o = 12345;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $o, $terms[0], 'wptests_tax' );
</span></span></pre></div>
<a id="trunktestsphpunitteststermmetaphp"></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/term/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/meta.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/meta.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,33 +12,33 @@
</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"> public function test_add() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( add_term_meta( $t, 'foo', 'bar' ) );
</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"> public function test_add_unique() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( add_term_meta( $t, 'foo', 'bar' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( add_term_meta( $t, 'foo', 'bar', true ) );
</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"> public function test_delete() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( delete_term_meta( $t, 'foo' ) );
</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"> public function test_delete_with_invalid_meta_key_should_return_false() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( delete_term_meta( $t, 'foo' ) );
</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"> public function test_delete_should_respect_meta_value() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo', 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</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"> public function test_get_with_no_key_should_fetch_all_keys() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo1', 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_with_key_should_fetch_all_for_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo', 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo1', 'baz' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@
</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"> public function test_get_should_respect_single_true() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo', 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@
</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"> public function test_update_should_pass_to_add_when_no_value_exists_for_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = update_term_meta( $t, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'int', $actual );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@
</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"> public function test_update_should_return_true_when_updating_existing_value_for_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,17 +109,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_meta_should_be_lazy_loaded_for_all_terms_in_wp_query_loop() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create( array( 'post_status' => 'publish' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create( array( 'post_status' => 'publish' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $terms, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $t ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $t, 'foo', 'bar' );
</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"> // Create another term, which should *not* be lazy loaded because it's unattached.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orphan_term = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orphan_term = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $orphan_term, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Force results to be cached, even when using extended cache.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,9 +154,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_meta_should_be_lazy_loaded_only_for_the_queries_in_which_the_term_has_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3, array( 'post_status' => 'publish' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3, array( 'post_status' => 'publish' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 6, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 6, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[0], array( $terms[0], $terms[1] ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[1], array( $terms[2], $terms[3] ), 'wptests_tax' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +201,7 @@
</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"> public function test_adding_term_meta_should_bust_get_terms_cache() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +236,7 @@
</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"> public function test_updating_term_meta_should_bust_get_terms_cache() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[1], 'foo', 'baz' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@
</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"> public function test_deleting_term_meta_should_bust_get_terms_cache() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[1], 'foo', 'bar' );
</span></span></pre></div>
<a id="trunktestsphpunitteststermqueryphp"></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/term/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/query.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/query.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,9 +125,9 @@
</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"> public function test_transform_query_resulting_field_sanitized() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->category->create( array( 'slug' => 'foo', ) );
- $t2 = $this->factory->category->create( array( 'slug' => 'bar', ) );
- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->category->create( array( 'slug' => 'foo', ) );
+ $t2 = self::$factory->category->create( array( 'slug' => 'bar', ) );
+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_categories( $p, $t1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tq1 = new WP_Tax_Query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,8 +150,8 @@
</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"> public function test_transform_query_field_slug() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->category->create( array( 'slug' => 'foo', ) );
- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->category->create( array( 'slug' => 'foo', ) );
+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $tt_ids = wp_set_post_categories( $p, $t1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tq = new WP_Tax_Query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,8 +168,8 @@
</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"> public function test_transform_query_field_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $tt_ids = wp_set_post_categories( $p, $t1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tq = new WP_Tax_Query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,8 +186,8 @@
</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"> public function test_transform_query_field_term_taxonomy_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $tt_ids = wp_set_post_categories( $p, $t1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tq = new WP_Tax_Query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,8 +204,8 @@
</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"> public function test_transform_query_field_term_taxonomy_default() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $tt_ids = wp_set_post_categories( $p, $t1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tq = new WP_Tax_Query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,13 +240,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sql_relation_or_operator_in() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -284,13 +284,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sql_relation_and_operator_in() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -327,13 +327,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sql_nested_relation_or_operator_in() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><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="trunktestsphpunitteststermslashesphp"></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/term/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/slashes.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/slashes.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Term_Slashes extends WP_Ajax_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->author_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->author_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->old_current_user = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_tag'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomies as $taxonomy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->term->create(array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->term->create(array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $taxonomy
</span><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="trunktestsphpunitteststermtermExistsphp"></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/term/termExists.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/termExists.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/termExists.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</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"> public function test_term_exists_term_int_taxonomy_nonempty_term_exists() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</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">@@ -22,7 +22,7 @@
</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"> public function test_term_exists_term_int_taxonomy_nonempty_wrong_taxonomy() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</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">@@ -30,7 +30,7 @@
</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"> public function test_term_exists_term_int_taxonomy_empty_term_exists() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</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">@@ -43,7 +43,7 @@
</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"> public function test_term_exists_unslash_term() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'I "love" WordPress\'s taxonomy system',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</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"> public function test_term_exists_trim_term() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,11 +84,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</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">- $parent_term = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_term = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</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">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $parent_term,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'child-term',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,11 +110,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</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">- $parent_term = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_term = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</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">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $parent_term,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'child-term',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,11 +132,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</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">- $parent_term = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_term = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</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">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $parent_term,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Child Term',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_exists_taxonomy_nonempty_parent_empty_match_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'kewl-dudez',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_exists_taxonomy_nonempty_parent_empty_match_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Kewl Dudez',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +185,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_exists_taxonomy_empty_parent_empty_match_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'juicy-fruit',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_exists_taxonomy_empty_parent_empty_match_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Juicy Fruit',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpDeleteObjectTermRelationshipsphp"></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/term/wpDeleteObjectTermRelationships.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpDeleteObjectTermRelationships.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/wpDeleteObjectTermRelationships.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,8 +9,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax1', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $object_id = 567;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,9 +33,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax3', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
- $t3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax3' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+ $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax3' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $object_id = 567;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpDeleteTermphp"></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/term/wpDeleteTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpDeleteTerm.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/wpDeleteTerm.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,11 +12,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_count_property_passed_to_filters_should_reflect_pre_deleted_term() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 2, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, array( $terms[0] ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpGenerateTagCloudphp"></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/term/wpGenerateTagCloud.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,6 +3,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_WP_Generate_Tag_Cloud extends WP_UnitTestCase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $terms = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Testing when passed $tags array is empty
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +27,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $args Options for `wp_generate_tag_cloud()`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_empty_tags_list_returned( $expected, $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->term->create_many( 4, array( 'taxonomy' => 'post_tag' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_ids = self::$factory->term->create_many( 4, array( 'taxonomy' => 'post_tag' ) );
+ $this->terms = array();
+ foreach ( $term_ids as $term_id ) {
+ $this->terms[] = get_term( $term_id, 'post_tag' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $tags = $this->retrieve_terms( array( 'number' => 4 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_generate_tag_cloud( $tags, $args ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,116 +70,114 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_hide_empty_false() {
+ $term_id = self::$factory->tag->create();
+ $term = get_term( $term_id, 'post_tag' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Testing the various output for a single link
- * in various formats
- *
- * @dataProvider single_link_data_provider
- *
- * @param int $create How many tags to create.
- * @param array $get_terms_args What args we want to pass to retreve terms.
- * @param mixed $expected Expected output from `wp_generate_tag_cloud()`.
- * @param array $args Options for `wp_generate_tag_cloud()`.
- *
- */
- function test_wp_generate_tag_cloud( $create, $get_terms_args, $expected, $args ) {
- $this->factory->term->create_many( $create, array( 'taxonomy' => 'post_tag' ) );
- $tags = $this->retrieve_terms( $get_terms_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags = $this->retrieve_terms( array(
+ 'number' => 1,
+ 'hide_empty' => false,
+ ) );
+ $expected = "<a href='http://" . WP_TESTS_DOMAIN . "/?tag={$term->slug}' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>{$term->name}</a>";
+ $this->assertEquals( $expected, wp_generate_tag_cloud( $tags, array(
+ 'hide_empty' => false,
+ ) ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $expected, wp_generate_tag_cloud( $tags, $args ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_hide_empty_false_format_array() {
+ $term_id = self::$factory->tag->create();
+ $term = get_term( $term_id, 'post_tag' );
+
+ $tags = $this->retrieve_terms( array(
+ 'number' => 1,
+ 'hide_empty' => false,
+ 'format' => 'array',
+ ) );
+
+ $expected = "<a href='http://" . WP_TESTS_DOMAIN . "/?tag={$term->slug}' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>{$term->name}</a>";
+ $this->assertEquals( $expected, wp_generate_tag_cloud( $tags, array(
+ 'hide_empty' => false,
+ ) ) );
</ins><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">+ function test_hide_empty_false_format_list() {
+ $term_id = self::$factory->tag->create();
+ $term = get_term( $term_id, 'post_tag' );
</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 single_link_data_provider() {
- return array(
- array(
- 1,
- array(
- 'number' => 1,
- 'hide_empty' => false,
- ),
- "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a>",
- array(
- 'hide_empty' => false,
- ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags = $this->retrieve_terms( array(
+ 'number' => 1,
+ 'hide_empty' => false,
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Should return an array of links.
- array(
- 1,
- array(
- 'number' => 1,
- 'hide_empty' => false,
- ),
- array(
- "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a>",
- ),
- array(
- 'hide_empty' => false,
- 'format' => 'array',
- ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<ul class='wp-tag-cloud'>\n\t<li><a href='http://" . WP_TESTS_DOMAIN . "/?tag={$term->slug}' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>{$term->name}</a></li>\n</ul>\n";
+ $this->assertEquals( $expected, wp_generate_tag_cloud( $tags, array(
+ 'hide_empty' => false,
+ 'format' => 'list',
+ ) ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Should return a string containing a <ul> list of links.
- array(
- 1,
- array(
- 'number' => 1,
- 'hide_empty' => false,
- ),
- "<ul class='wp-tag-cloud'>\n\t<li><a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a></li>\n</ul>\n",
- array(
- 'hide_empty' => false,
- 'format' => 'list',
- ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_hide_empty_false_multi() {
+ $term_ids = self::$factory->tag->create_many( 4 );
+ $terms = array();
+ foreach ( $term_ids as $term_id ) {
+ $terms[] = get_term( $term_id, 'post_tag' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array(
- 4,
- array(
- 'number' => 4,
- 'hide_empty' => false,
- ),
- "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a>\n".
- "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-2' class='tag-link-1' title='0 topics' style='font-size: 8pt;'>Term 2</a>\n".
- "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-3' class='tag-link-2' title='0 topics' style='font-size: 8pt;'>Term 3</a>\n".
- "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-4' class='tag-link-3' title='0 topics' style='font-size: 8pt;'>Term 4</a>",
- array(
- 'hide_empty' => false,
- ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags = $this->retrieve_terms( array(
+ 'number' => 4,
+ 'order' => 'id',
+ 'hide_empty' => false,
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array(
- 4,
- array(
- 'number' => 4,
- 'hide_empty' => false,
- ),
- "<ul class='wp-tag-cloud'>\n\t<li>".
- "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-1' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>Term 1</a></li>\n\t<li>".
- "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-2' class='tag-link-1' title='0 topics' style='font-size: 8pt;'>Term 2</a></li>\n\t<li>".
- "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-3' class='tag-link-2' title='0 topics' style='font-size: 8pt;'>Term 3</a></li>\n\t<li>".
- "<a href='http://" . WP_TESTS_DOMAIN . "/?tag=term-4' class='tag-link-3' title='0 topics' style='font-size: 8pt;'>Term 4</a>".
- "</li>\n</ul>\n",
- array(
- 'hide_empty' => false,
- 'format' => 'list',
- ),
- ),
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<a href='http://" . WP_TESTS_DOMAIN . "/?tag={$terms[0]->slug}' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>{$terms[0]->name}</a>\n".
+ "<a href='http://" . WP_TESTS_DOMAIN . "/?tag={$terms[1]->slug}' class='tag-link-1' title='0 topics' style='font-size: 8pt;'>{$terms[1]->name}</a>\n".
+ "<a href='http://" . WP_TESTS_DOMAIN . "/?tag={$terms[2]->slug}' class='tag-link-2' title='0 topics' style='font-size: 8pt;'>{$terms[2]->name}</a>\n".
+ "<a href='http://" . WP_TESTS_DOMAIN . "/?tag={$terms[3]->slug}' class='tag-link-3' title='0 topics' style='font-size: 8pt;'>{$terms[3]->name}</a>";
+ $this->assertEquals( $expected, wp_generate_tag_cloud( $tags, array(
+ 'hide_empty' => false,
+ ) ) );
</ins><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">+ function test_hide_empty_false_multi_format_list() {
+ $term_ids = self::$factory->tag->create_many( 4 );
+ $terms = array();
+ foreach ( $term_ids as $term_id ) {
+ $terms[] = get_term( $term_id, 'post_tag' );
+ }
+
+ $tags = $this->retrieve_terms( array(
+ 'number' => 4,
+ 'orderby' => 'id',
+ 'hide_empty' => false,
+ ) );
+
+ $expected = "<ul class='wp-tag-cloud'>\n\t<li>".
+ "<a href='http://" . WP_TESTS_DOMAIN . "/?tag={$terms[0]->slug}' class='tag-link-0' title='0 topics' style='font-size: 8pt;'>{$terms[0]->name}</a></li>\n\t<li>".
+ "<a href='http://" . WP_TESTS_DOMAIN . "/?tag={$terms[1]->slug}' class='tag-link-1' title='0 topics' style='font-size: 8pt;'>{$terms[1]->name}</a></li>\n\t<li>".
+ "<a href='http://" . WP_TESTS_DOMAIN . "/?tag={$terms[2]->slug}' class='tag-link-2' title='0 topics' style='font-size: 8pt;'>{$terms[2]->name}</a></li>\n\t<li>".
+ "<a href='http://" . WP_TESTS_DOMAIN . "/?tag={$terms[3]->slug}' class='tag-link-3' title='0 topics' style='font-size: 8pt;'>{$terms[3]->name}</a>".
+ "</li>\n</ul>\n";
+
+ $this->assertEquals( $expected, wp_generate_tag_cloud( $tags, array(
+ 'hide_empty' => false,
+ 'format' => 'list',
+ ) ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_topic_count_text() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
- $posts = $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_ids = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+ $this->terms = array();
+ foreach ( $term_ids as $term_id ) {
+ $this->terms[] = get_term( $term_id, 'post_tag' );
+ }
+ $posts = self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_post_terms( $posts[0], $terms, 'wptests_tax' );
- wp_set_post_terms( $posts[1], array( $terms[1] ), 'wptests_tax' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_post_terms( $posts[0], $term_ids, 'wptests_tax' );
+ wp_set_post_terms( $posts[1], array( $term_ids[1] ), 'wptests_tax' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_objects = $this->retrieve_terms( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $terms,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => $term_ids,
</ins><span class="cx" style="display: block; padding: 0 10px"> ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_generate_tag_cloud( $term_objects, array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,14 +196,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_topic_count_text_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
- $posts = $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_ids = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+ $this->terms = array();
+ foreach ( $term_ids as $term_id ) {
+ $this->terms[] = get_term( $term_id, 'post_tag' );
+ }
+ $posts = self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_post_terms( $posts[0], $terms, 'wptests_tax' );
- wp_set_post_terms( $posts[1], array( $terms[1] ), 'wptests_tax' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_post_terms( $posts[0], $term_ids, 'wptests_tax' );
+ wp_set_post_terms( $posts[1], array( $term_ids[1] ), 'wptests_tax' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_objects = $this->retrieve_terms( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $terms,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => $term_ids,
</ins><span class="cx" style="display: block; padding: 0 10px"> ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_generate_tag_cloud( $term_objects, array(
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpGetObjectTermsphp"></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/term/wpGetObjectTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</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"> public function test_get_object_terms_by_slug() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_1 = array('Foo', 'Bar', 'Baz');
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_1_slugs = array('foo', 'bar', 'baz');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,10 +31,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11003
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_not_filter_out_duplicate_terms_associated_with_different_objects() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id1 = $this->factory->post->create();
- $post_id2 = $this->factory->post->create();
- $cat_id = $this->factory->category->create();
- $cat_id2 = $this->factory->category->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id1 = self::$factory->post->create();
+ $post_id2 = self::$factory->post->create();
+ $cat_id = self::$factory->category->create();
+ $cat_id2 = self::$factory->category->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_categories( $post_id1, array( $cat_id, $cat_id2 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_categories( $post_id2, $cat_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17646
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_objects_with_int_properties() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = wp_insert_term( 'one', $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $post_id, $term, $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26339
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_references_should_be_reset_after_wp_get_object_terms_filter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms_1 = array('foo', 'bar', 'baz');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,17 +86,17 @@
</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"> public function test_orderby_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'AAA',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'ZZZ',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'JJJ',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,17 +112,17 @@
</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"> public function test_orderby_count() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'AAA',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'ZZZ',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'JJJ',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,17 +140,17 @@
</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"> public function test_orderby_slug() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'aaa',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'zzz',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'jjj',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,15 +166,15 @@
</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"> public function test_orderby_term_group() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</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">@@ -195,15 +195,15 @@
</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"> public function test_orderby_term_order() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</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">@@ -231,15 +231,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28688
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_parent() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</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">@@ -269,15 +269,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_2', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_3', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_3',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_2',
</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">@@ -297,15 +297,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28688
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_tt_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</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">@@ -330,17 +330,17 @@
</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"> public function test_order_desc() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'AAA',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'ZZZ',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'JJJ',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,22 +360,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15675
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_parent() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t4 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t4 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t2,
</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">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, array( $t1, $t2, $t3, $t3 ), $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,22 +391,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 15675
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_parent_0() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t4 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t4 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t2,
</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">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, array( $t1, $t2, $t3, $t3 ), $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,12 +425,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[1], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[2], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $terms, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms( $p, 'wptests_tax' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,12 +451,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[1], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[2], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $terms, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms( $p, 'wptests_tax', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,13 +477,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_meta_query() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->factory->term->create_many( 5, array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = self::$factory->term->create_many( 5, array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[0], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[1], 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[2], 'foo', 'baz' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_term_meta( $terms[3], 'foob', 'ar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $terms, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms( $p, 'wptests_tax', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,8 +503,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_wp_term_objects_for_fields_all() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms( $p, 'wptests_tax', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,8 +522,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_wp_term_objects_for_fields_all_with_object_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms( $p, 'wptests_tax', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,8 +543,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms( $p, 'wptests_tax', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -561,8 +561,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_object_id_should_not_be_cached_with_term_object() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_get_object_terms( $p, 'wptests_tax', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,9 +585,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax1', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->post->create();
- $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
- $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->post->create();
+ $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t1, 'wptests_tax1' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t2, 'wptests_tax2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -611,8 +611,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_object_id_should_be_set_on_objects_that_share_terms() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $this->factory->post->create_many( 2 );
- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2 );
+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[0], $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[1], $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpInsertTermphp"></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/term/wpInsertTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpInsertTerm.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/wpInsertTerm.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,25 +160,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17689
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_duplicate_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->tag->create_and_get( array( 'name' => 'Bozo' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->tag->create_and_get( array( 'name' => 'Bozo' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $term );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( empty( $term->errors ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test existing term name with unique slug
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term1 = $this->factory->tag->create( array( 'name' => 'Bozo', 'slug' => 'bozo1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term1 = self::$factory->tag->create( array( 'name' => 'Bozo', 'slug' => 'bozo1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $term1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test an existing term name
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term2 = $this->factory->tag->create( array( 'name' => 'Bozo' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term2 = self::$factory->tag->create( array( 'name' => 'Bozo' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_wp_error( $term2 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $term2->errors );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test named terms ending in special characters
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term3 = $this->factory->tag->create( array( 'name' => 'T$' ) );
- $term4 = $this->factory->tag->create( array( 'name' => 'T$$' ) );
- $term5 = $this->factory->tag->create( array( 'name' => 'T$$$' ) );
- $term6 = $this->factory->tag->create( array( 'name' => 'T$$$$' ) );
- $term7 = $this->factory->tag->create( array( 'name' => 'T$$$$' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term3 = self::$factory->tag->create( array( 'name' => 'T$' ) );
+ $term4 = self::$factory->tag->create( array( 'name' => 'T$$' ) );
+ $term5 = self::$factory->tag->create( array( 'name' => 'T$$$' ) );
+ $term6 = self::$factory->tag->create( array( 'name' => 'T$$$$' ) );
+ $term7 = self::$factory->tag->create( array( 'name' => 'T$$$$' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_wp_error( $term7 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $term7->errors );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $term6, $term7->error_data['term_exists'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,11 +187,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 4, array_unique( wp_list_pluck( $terms, 'slug' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test named terms with only special characters
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term8 = $this->factory->tag->create( array( 'name' => '$' ) );
- $term9 = $this->factory->tag->create( array( 'name' => '$$' ) );
- $term10 = $this->factory->tag->create( array( 'name' => '$$$' ) );
- $term11 = $this->factory->tag->create( array( 'name' => '$$$$' ) );
- $term12 = $this->factory->tag->create( array( 'name' => '$$$$' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term8 = self::$factory->tag->create( array( 'name' => '$' ) );
+ $term9 = self::$factory->tag->create( array( 'name' => '$$' ) );
+ $term10 = self::$factory->tag->create( array( 'name' => '$$$' ) );
+ $term11 = self::$factory->tag->create( array( 'name' => '$$$$' ) );
+ $term12 = self::$factory->tag->create( array( 'name' => '$$$$' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_wp_error( $term12 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $term12->errors );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $term11, $term12->error_data['term_exists'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,21 +199,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array_map( 'get_tag', array( $term8, $term9, $term10, $term11 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 4, array_unique( wp_list_pluck( $terms, 'slug' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term13 = $this->factory->tag->create( array( 'name' => 'A' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term13 = self::$factory->tag->create( array( 'name' => 'A' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $term13 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term14 = $this->factory->tag->create( array( 'name' => 'A' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term14 = self::$factory->tag->create( array( 'name' => 'A' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_wp_error( $term14 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term15 = $this->factory->tag->create( array( 'name' => 'A+', 'slug' => 'a' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term15 = self::$factory->tag->create( array( 'name' => 'A+', 'slug' => 'a' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $term15 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term16 = $this->factory->tag->create( array( 'name' => 'A+' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term16 = self::$factory->tag->create( array( 'name' => 'A+' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_wp_error( $term16 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term17 = $this->factory->tag->create( array( 'name' => 'A++' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term17 = self::$factory->tag->create( array( 'name' => 'A++' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $term17 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term18 = $this->factory->tag->create( array( 'name' => 'A-', 'slug' => 'a' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term18 = self::$factory->tag->create( array( 'name' => 'A-', 'slug' => 'a' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $term18 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term19 = $this->factory->tag->create( array( 'name' => 'A-' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term19 = self::$factory->tag->create( array( 'name' => 'A-' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_wp_error( $term19 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term20 = $this->factory->tag->create( array( 'name' => 'A--' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term20 = self::$factory->tag->create( array( 'name' => 'A--' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $term20 );
</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">@@ -222,7 +222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_should_not_allow_duplicate_names_when_slug_is_a_duplicate_of_the_same_term_in_non_hierarchical_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,13 +241,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_should_not_allow_duplicate_names_when_slug_is_a_duplicate_of_a_different_term_in_non_hierarchical_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,7 +266,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_should_allow_duplicate_names_when_a_unique_slug_has_been_provided_in_non_hierarchical_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_should_not_allow_duplicate_names_when_the_slug_is_not_provided_in_non_hierarchical_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_should_not_allow_duplicate_names_when_slug_is_a_duplicate_of_the_same_term_in_hierarchical_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,13 +324,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_should_not_allow_duplicate_names_when_slug_is_a_duplicate_of_a_different_term_at_same_hierarchy_level_in_hierarchical_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,15 +349,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_should_allow_duplicate_names_when_slug_is_a_duplicate_of_a_term_at_different_hierarchy_level_in_hierarchical_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $t2 = $this->factory->term->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,7 +381,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_should_allow_duplicate_names_when_a_unique_slug_has_been_provided_in_hierarchical_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,7 +403,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_should_not_allow_duplicate_names_when_the_slug_is_not_provided_in_hierarchical_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,7 +419,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_duplicate_slug_same_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,7 +443,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_duplicate_slug_different_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_2', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,7 +473,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_2', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,7 +501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_alias_of_no_term_group() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term_1 = get_term( $t1, 'wptests_tax' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,12 +523,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_alias_of_existing_term_group() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term_1 = get_term( $t1, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'alias_of' => $term_1->slug,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -591,7 +591,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</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">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -623,11 +623,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_with_and_without_accents() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foó',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpUniqueTermSlugphp"></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/term/wpUniqueTermSlug.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpUniqueTermSlug.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/wpUniqueTermSlug.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</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"> public function test_unique_slug_should_be_unchanged() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = $this->factory->term->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = self::$factory->term->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,13 +22,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"> public function test_nonunique_slug_in_different_taxonomy_should_be_unchanged() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</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">- $term2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,13 +40,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"> public function test_nonunique_slug_in_same_nonhierarchical_taxonomy_should_be_changed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</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">- $term2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,19 +58,19 @@
</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"> public function test_nonunique_slug_in_same_hierarchical_taxonomy_with_same_parent_should_be_suffixed_with_parent_slug() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'parent-term',
</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">- $term1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $parent,
</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">- $term2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,19 +83,19 @@
</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"> public function test_nonunique_slug_in_same_hierarchical_taxonomy_at_different_level_of_hierarchy_should_be_suffixed_with_number() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'parent-term',
</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">- $term1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $parent,
</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">- $term2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpUpdateTermphp"></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/term/wpUpdateTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpUpdateTerm.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term/wpUpdateTerm.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_unslash_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -36,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_unslash_description() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_name_empty_string() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( term_exists( $fake_term_id, 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_slug_empty_string_while_not_updating_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_slug_empty_string_while_updating_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_slug_set_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -145,13 +145,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_should_not_create_duplicate_slugs_within_the_same_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,13 +172,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_2', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,13 +202,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_2', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,20 +232,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</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">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $t1,
</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">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Bar Child',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'bar-child',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '%d' )
</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">- $posts = $this->factory->post->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts = self::$factory->post->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[0], array( 'Foo' ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $posts[1], array( 'Foo' ), 'wptests_tax_2' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +302,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_alias_of_no_term_group() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term_1 = get_term( $t1, 'wptests_tax' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,12 +323,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_alias_of_existing_term_group() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term_1 = get_term( $t1, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'alias_of' => $term_1->slug,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,7 +359,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_slug_same_as_old_slug() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,11 +377,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_duplicate_slug_generated_due_to_empty_slug_param() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo-bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'not foo bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,14 +402,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo-bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -428,11 +428,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_duplicate_slug_failure() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo-bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'my-old-slug',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +451,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_should_return_term_id_and_term_taxonomy_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_update_term( $t, 'wptests_tax', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,7 +477,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_should_return_int_values_for_term_id_and_term_taxonomy_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_update_term( $t, 'wptests_tax', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,15 +491,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_should_clean_object_term_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_for_post', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_for_page', 'page' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create();
- $page = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create();
+ $page = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</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">- $t_for_post = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t_for_post = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_for_post',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t_for_page = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t_for_page = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_for_page',
</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">@@ -527,10 +527,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</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">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -567,12 +567,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</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">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'parent-term',
</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">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,18 +599,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</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">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'parent-term',
</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"> // Same slug but in a different tax.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax_2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</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">- $t3 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t3 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -630,7 +630,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31954
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_update_term_with_null_get_term() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'category' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'category' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $found = wp_update_term( $t, 'post_tag', array( 'slug' => 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $found );
</span></span></pre></div>
<a id="trunktestsphpunitteststermphp"></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/term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/term.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,11 +23,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</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">- $parent = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">- $child = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $child = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $parent,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,10 +226,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_set_object_terms_append_true() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> $p = self::$post_ids[0];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -247,10 +247,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_set_object_terms_append_false() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> $p = self::$post_ids[0];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -268,10 +268,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_set_object_terms_append_default_to_false() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> $p = self::$post_ids[0];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t1 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t1 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t2 = $this->factory->term->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t2 = self::$factory->term->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax',
</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">@@ -364,7 +364,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_add_remove_object_terms() {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = self::$post_ids;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tags = $this->factory->tag->create_many( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags = self::$factory->tag->create_many( 5 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tt = wp_add_object_terms( $posts[0], $tags[1], 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $tt ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,7 +523,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_object_term_cache_when_term_changes() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_ids[0];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag_id = $this->factory->tag->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag_id = self::$factory->tag->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Amaze Tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'My Amazing Tag'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,7 +553,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_the_terms_should_not_cache_wp_term_objects() {
</span><span class="cx" style="display: block; padding: 0 10px"> $p = self::$post_ids[0];
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime the cache.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,7 +572,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_the_terms_should_return_wp_term_objects_from_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> $p = self::$post_ids[0];
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $p, $t, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prime the cache.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,11 +618,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19205
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_orphan_category() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id1 = $this->factory->category->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_id1 = self::$factory->category->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_category( $cat_id1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_id2 = $this->factory->category->create( array( 'parent' => $cat_id1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_id2 = self::$factory->category->create( array( 'parent' => $cat_id1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $cat_id2 );
</span><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="trunktestsphpunittestsurlphp"></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/url.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/url.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/url.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,8 +272,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_adjacent_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
- $post_id2 = $this->factory->post->create( array( 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
+ $post_id2 = self::$factory->post->create( array( 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $GLOBALS['post'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['post'] = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,13 +305,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30287
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_adjacent_post_should_return_private_posts_belonging_to_the_current_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create( array( 'role' => 'author' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_uid = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_author' => $u, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
- $p2 = $this->factory->post->create( array( 'post_author' => $u, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_author' => $u, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
+ $p2 = self::$factory->post->create( array( 'post_author' => $u, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $GLOBALS['post'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['post'] = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,14 +331,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30287
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_adjacent_post_should_return_private_posts_belonging_to_other_users_if_the_current_user_can_read_private_posts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u1 = $this->factory->user->create( array( 'role' => 'author' ) );
- $u2 = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u1 = self::$factory->user->create( array( 'role' => 'author' ) );
+ $u2 = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_uid = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_author' => $u1, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
- $p2 = $this->factory->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_author' => $u1, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
+ $p2 = self::$factory->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $GLOBALS['post'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['post'] = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,15 +358,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30287
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_adjacent_post_should_not_return_private_posts_belonging_to_other_users_if_the_current_user_cannot_read_private_posts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u1 = $this->factory->user->create( array( 'role' => 'author' ) );
- $u2 = $this->factory->user->create( array( 'role' => 'author' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u1 = self::$factory->user->create( array( 'role' => 'author' ) );
+ $u2 = self::$factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_uid = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p1 = $this->factory->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now - 2 ) ) );
- $p2 = $this->factory->post->create( array( 'post_author' => $u1, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
- $p3 = $this->factory->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p1 = self::$factory->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now - 2 ) ) );
+ $p2 = self::$factory->post->create( array( 'post_author' => $u1, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
+ $p3 = self::$factory->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $GLOBALS['post'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['post'] = null;
</span></span></pre></div>
<a id="trunktestsphpunittestsuserauthorphp"></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/user/author.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/author.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/author.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->author_id = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->author_id = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'test_author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'test_author',
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // insert a post and make sure the ID is ok
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = $this->factory->post->create( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = self::$factory->post->create( $post );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( get_post( $this->post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_the_author_posts_with_custom_post_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cpt_ids = $this->factory->post->create_many( 2, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cpt_ids = self::$factory->post->create_many( 2, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wptests_pt',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30355
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_the_author_posts_link_no_permalinks() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_nicename' => 'bar'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_the_author_posts_link_with_permalinks() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = $this->factory->user->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author = self::$factory->user->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_nicename' => 'bar'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsusercapabilitiesphp"></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/user/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/capabilities.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,11 +222,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // test the default roles and caps
</span><span class="cx" style="display: block; padding: 0 10px"> function test_all_roles_and_caps() {
</span><span class="cx" style="display: block; padding: 0 10px"> $users = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'administrator' => $this->factory->user->create_and_get( array( 'role' => 'administrator' ) ),
- 'editor' => $this->factory->user->create_and_get( array( 'role' => 'editor' ) ),
- 'author' => $this->factory->user->create_and_get( array( 'role' => 'author' ) ),
- 'contributor' => $this->factory->user->create_and_get( array( 'role' => 'contributor' ) ),
- 'subscriber' => $this->factory->user->create_and_get( array( 'role' => 'subscriber' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'administrator' => self::$factory->user->create_and_get( array( 'role' => 'administrator' ) ),
+ 'editor' => self::$factory->user->create_and_get( array( 'role' => 'editor' ) ),
+ 'author' => self::$factory->user->create_and_get( array( 'role' => 'author' ) ),
+ 'contributor' => self::$factory->user->create_and_get( array( 'role' => 'contributor' ) ),
+ 'subscriber' => self::$factory->user->create_and_get( array( 'role' => 'subscriber' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $caps = $this->getCapsAndRoles();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,11 +258,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // special case for the link manager
</span><span class="cx" style="display: block; padding: 0 10px"> function test_link_manager_caps() {
</span><span class="cx" style="display: block; padding: 0 10px"> $users = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'administrator' => $this->factory->user->create_and_get( array( 'role' => 'administrator' ) ),
- 'editor' => $this->factory->user->create_and_get( array( 'role' => 'editor' ) ),
- 'author' => $this->factory->user->create_and_get( array( 'role' => 'author' ) ),
- 'contributor' => $this->factory->user->create_and_get( array( 'role' => 'contributor' ) ),
- 'subscriber' => $this->factory->user->create_and_get( array( 'role' => 'subscriber' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'administrator' => self::$factory->user->create_and_get( array( 'role' => 'administrator' ) ),
+ 'editor' => self::$factory->user->create_and_get( array( 'role' => 'editor' ) ),
+ 'author' => self::$factory->user->create_and_get( array( 'role' => 'author' ) ),
+ 'contributor' => self::$factory->user->create_and_get( array( 'role' => 'contributor' ) ),
+ 'subscriber' => self::$factory->user->create_and_get( array( 'role' => 'subscriber' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $caps = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'manage_links' => array( 'administrator', 'editor' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $caps = $this->getCapsAndRoles();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> grant_super_admin( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_super_admin( $user->ID ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // a role that doesn't exist
</span><span class="cx" style="display: block; padding: 0 10px"> function test_bogus_role() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array( 'role' => 'invalid_role' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array( 'role' => 'invalid_role' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure the user is valid
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->exists(), "User does not exist" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // a user with multiple roles
</span><span class="cx" style="display: block; padding: 0 10px"> function test_user_subscriber_contributor() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array( 'role' => 'subscriber' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array( 'role' => 'subscriber' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure the user is valid
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->exists(), "User does not exist" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,7 +372,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_flush_roles();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $wp_roles->is_role( $role_name ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array( 'role' => $role_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array( 'role' => $role_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure the user is valid
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->exists(), "User does not exist" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,7 +409,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_flush_roles();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $wp_roles->is_role( $role_name ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get( array( 'role' => $role_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create_and_get( array( 'role' => $role_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure the user is valid
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->exists(), "User does not exist" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,7 +446,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $wp_roles->is_role($role_name) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // assign a user to that role
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->user->create( array( 'role' => $role_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->user->create( array( 'role' => $role_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // now add a cap to the role
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_roles->add_cap($role_name, 'sweep_floor');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +484,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $wp_roles->is_role($role_name) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // assign a user to that role
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->user->create( array( 'role' => $role_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->user->create( array( 'role' => $role_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // now remove a cap from the role
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_roles->remove_cap($role_name, 'polish_doorknobs');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,8 +513,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // add an extra capability to a user
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // there are two contributors
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id_1 = $this->factory->user->create( array( 'role' => 'contributor' ) );
- $id_2 = $this->factory->user->create( array( 'role' => 'contributor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id_1 = self::$factory->user->create( array( 'role' => 'contributor' ) );
+ $id_2 = self::$factory->user->create( array( 'role' => 'contributor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // user 1 has an extra capability
</span><span class="cx" style="display: block; padding: 0 10px"> $user_1 = new WP_User($id_1);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,8 +550,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // add an extra capability to a user then remove it
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // there are two contributors
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id_1 = $this->factory->user->create( array( 'role' => 'contributor' ) );
- $id_2 = $this->factory->user->create( array( 'role' => 'contributor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id_1 = self::$factory->user->create( array( 'role' => 'contributor' ) );
+ $id_2 = self::$factory->user->create( array( 'role' => 'contributor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // user 1 has an extra capability
</span><span class="cx" style="display: block; padding: 0 10px"> $user_1 = new WP_User($id_1);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,7 +581,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure the user_level is correctly set and changed with the user's role
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // user starts as an author
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->user->create( array( 'role' => 'author' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User($id);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue($user->exists(), "Problem getting user $id");
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,7 +604,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_user_remove_all_caps() {
</span><span class="cx" style="display: block; padding: 0 10px"> // user starts as an author
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->user->create( array( 'role' => 'author' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User($id);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue($user->exists(), "Problem getting user $id");
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,19 +646,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // simple tests for some common meta capabilities
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make our author
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = new WP_User( $this->factory->user->create( array( 'role' => 'author' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make a post
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create( array( 'post_author' => $author->ID, 'post_type' => 'post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create( array( 'post_author' => $author->ID, 'post_type' => 'post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // the author of the post
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue($author->exists(), "Problem getting user $author->ID");
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // add some other users
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin = new WP_User( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
- $author_2 = new WP_User( $this->factory->user->create( array( 'role' => 'author' ) ) );
- $editor = new WP_User( $this->factory->user->create( array( 'role' => 'editor' ) ) );
- $contributor = new WP_User( $this->factory->user->create( array( 'role' => 'contributor' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+ $author_2 = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
+ $editor = new WP_User( self::$factory->user->create( array( 'role' => 'editor' ) ) );
+ $contributor = new WP_User( self::$factory->user->create( array( 'role' => 'contributor' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // administrators, editors and the post owner can edit it
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue($admin->has_cap('edit_post', $post));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -732,11 +732,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_authorless_post( $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Make a post without an author
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create( array( 'post_author' => 0, 'post_type' => 'post', 'post_status' => $status ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create( array( 'post_author' => 0, 'post_type' => 'post', 'post_status' => $status ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add an editor and contributor
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = $this->factory->user->create_and_get( array( 'role' => 'editor' ) );
- $contributor = $this->factory->user->create_and_get( array( 'role' => 'contributor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor = self::$factory->user->create_and_get( array( 'role' => 'editor' ) );
+ $contributor = self::$factory->user->create_and_get( array( 'role' => 'contributor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // editor can edit, view, and trash
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $editor->has_cap( 'edit_post', $post ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,11 +753,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16714
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_create_posts_caps() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = new WP_User( $this->factory->user->create( array( 'role' => 'author' ) ) );
- $admin = new WP_User( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
- $author_2 = new WP_User( $this->factory->user->create( array( 'role' => 'author' ) ) );
- $editor = new WP_User( $this->factory->user->create( array( 'role' => 'editor' ) ) );
- $contributor = new WP_User( $this->factory->user->create( array( 'role' => 'contributor' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
+ $admin = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+ $author_2 = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
+ $editor = new WP_User( self::$factory->user->create( array( 'role' => 'editor' ) ) );
+ $contributor = new WP_User( self::$factory->user->create( array( 'role' => 'contributor' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create_posts isn't a real cap.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse($admin->has_cap('create_posts'));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,19 +818,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // simple tests for some common meta capabilities
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make our author
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = new WP_User( $this->factory->user->create( array( 'role' => 'author' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make a page
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page = $this->factory->post->create( array( 'post_author' => $author->ID, 'post_type' => 'page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page = self::$factory->post->create( array( 'post_author' => $author->ID, 'post_type' => 'page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // the author of the page
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue($author->exists(), "Problem getting user " . $author->ID);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // add some other users
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin = new WP_User( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
- $author_2 = new WP_User( $this->factory->user->create( array( 'role' => 'author' ) ) );
- $editor = new WP_User( $this->factory->user->create( array( 'role' => 'editor' ) ) );
- $contributor = new WP_User( $this->factory->user->create( array( 'role' => 'contributor' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+ $author_2 = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
+ $editor = new WP_User( self::$factory->user->create( array( 'role' => 'editor' ) ) );
+ $contributor = new WP_User( self::$factory->user->create( array( 'role' => 'contributor' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // administrators, editors and the post owner can edit it
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue($admin->has_cap('edit_page', $page));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -853,7 +853,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21786
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_negative_caps() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = new WP_User( $this->factory->user->create( array( 'role' => 'author' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $author->add_cap( 'foo', false );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue ( isset( $author->caps['foo'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $author->remove_cap( 'foo' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -864,7 +864,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18932
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_set_role_same_role() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = new WP_User( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $caps = $user->caps;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $user->caps );
</span><span class="cx" style="display: block; padding: 0 10px"> $user->set_role( 'administrator' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -875,7 +875,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_current_user_can_for_blog() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = new WP_User( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_uid = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,7 +890,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_user_can_for_blog( 12345, 'edit_posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $suppress );
</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_id = $this->factory->blog->create( array( 'user_id' => $user->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create( array( 'user_id' => $user->ID ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_user_can_for_blog( $blog_id, 'edit_posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_user_can_for_blog( $blog_id, 'foo_the_bar' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -904,7 +904,7 @@
</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"> $orig_blog_id = get_current_blog_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_nullify_current_user();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -932,7 +932,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28374
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_current_user_edit_caps() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = new WP_User( $this->factory->user->create( array( 'role' => 'contributor' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$factory->user->create( array( 'role' => 'contributor' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user->add_cap( 'publish_posts' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -945,10 +945,10 @@
</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_subscriber_cant_edit_posts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = new WP_User( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$factory->user->create( array( 'role' => 'subscriber' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create( array( 'post_author' => 1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create( array( 'post_author' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_user_can( 'edit_post', $post ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_user_can( 'edit_post', $post + 1 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -960,8 +960,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $user = new WP_User( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
- $other_user = new WP_User( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+ $other_user = new WP_User( self::$factory->user->create( array( 'role' => 'subscriber' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -974,7 +974,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $user = new WP_User( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -987,9 +987,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $user = new WP_User( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $user->add_cap( 'manage_network_users' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $other_user = new WP_User( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $other_user = new WP_User( self::$factory->user->create( array( 'role' => 'subscriber' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1002,9 +1002,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $user = new WP_User( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $user->add_cap( 'manage_network_users' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $super_admin = new WP_User( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $super_admin = new WP_User( self::$factory->user->create( array( 'role' => 'subscriber' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> grant_super_admin( $super_admin->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1017,11 +1017,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_require_edit_others_posts_if_post_type_doesnt_exist() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'existed' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => 'existed' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_type' => 'existed' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> _unregister_post_type( 'existed' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subscriber_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
- $editor_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subscriber_id = self::$factory->user->create( array( 'role' => 'subscriber' ) );
+ $editor_id = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->setExpectedIncorrectUsage( 'map_meta_cap' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'delete_post', 'edit_post', 'read_post', 'publish_post' ) as $cap ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1046,10 +1046,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpt = get_post_type_object( 'page_capability' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin = $this->factory->user->create_and_get( array( 'role' => 'administrator' ) );
- $editor = $this->factory->user->create_and_get( array( 'role' => 'editor' ) );
- $author = $this->factory->user->create_and_get( array( 'role' => 'author' ) );
- $contributor = $this->factory->user->create_and_get( array( 'role' => 'contributor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = self::$factory->user->create_and_get( array( 'role' => 'administrator' ) );
+ $editor = self::$factory->user->create_and_get( array( 'role' => 'editor' ) );
+ $author = self::$factory->user->create_and_get( array( 'role' => 'author' ) );
+ $contributor = self::$factory->user->create_and_get( array( 'role' => 'contributor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'edit_pages', $cpt->cap->edit_posts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( $admin->ID, $cpt->cap->edit_posts ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1057,7 +1057,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( $author->ID, $cpt->cap->edit_posts ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( $contributor->ID, $cpt->cap->edit_posts ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin_post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin_post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $admin->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page_capability',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1067,7 +1067,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( $author->ID, 'edit_post', $admin_post->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( $contributor->ID, 'edit_post', $admin_post->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $author->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page_capability',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsusercountUsersphp"></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/user/countUsers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/countUsers.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/countUsers.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,25 +17,25 @@
</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"> // Setup users
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'administrator',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'editor',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $contributor = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $contributor = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'contributor',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subscriber = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subscriber = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'subscriber',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $none = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $none = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nobody = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nobody = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => '',
</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">@@ -67,33 +67,33 @@
</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"> // Setup users
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'administrator',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'editor',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $contributor = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $contributor = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'contributor',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subscriber = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subscriber = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'subscriber',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $none = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $none = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nobody = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nobody = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => '',
</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"> // Setup blogs
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_1 = (int) $this->factory->blog->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_1 = (int) self::$factory->blog->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $editor,
</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_2 = (int) $this->factory->blog->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_2 = (int) self::$factory->blog->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $author,
</span><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="trunktestsphpunittestsuserdateQueryphp"></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/user/dateQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/dateQuery.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/dateQuery.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,10 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27283
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_user_registered() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u1 = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u1 = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => '2012-02-14 05:05:05',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u2 = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u2 = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => '2013-02-14 05:05:05',
</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">@@ -31,13 +31,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27283
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_user_registered_relation_or() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u1 = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u1 = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => '2012-02-14 05:05:05',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u2 = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u2 = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => '2013-02-14 05:05:05',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u3 = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u3 = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => '2014-02-14 05:05:05',
</span><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="trunktestsphpunittestsuserlistAuthorsphp"></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/user/listAuthors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/listAuthors.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/listAuthors.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</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_wp_list_authors_exclude_admin() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => 1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_type' => 'post', 'post_author' => 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected['exclude_admin'] = '<li><a href="' . get_author_posts_url( 1 ) . '" title="Posts by admin">admin</a></li><li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals( $expected['exclude_admin'], wp_list_authors( array( 'echo' => false, 'exclude_admin' => 0 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsusermapMetaCapphp"></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/user/mapMetaCap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/mapMetaCap.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/mapMetaCap.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,8 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->user_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
- $this->author_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+ $this->author_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['super_admins'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->super_admins = $GLOBALS['super_admins'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,8 +248,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27020
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_authorless_posts_capabilties() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_author' => 0, 'post_type' => 'post', 'post_status' => 'publish' ) );
- $editor = $this->factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_author' => 0, 'post_type' => 'post', 'post_status' => 'publish' ) );
+ $editor = self::$factory->user->create( array( 'role' => 'editor' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( 'edit_others_posts', 'edit_published_posts' ), map_meta_cap( 'edit_post', $editor, $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( 'delete_others_posts', 'delete_published_posts' ), map_meta_cap( 'delete_post', $editor, $post_id ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsusermultisitephp"></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/user/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/multisite.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/multisite.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,10 +25,10 @@
</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_remove_user_from_blog() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user1 = $this->factory->user->create_and_get();
- $user2 = $this->factory->user->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user1 = self::$factory->user->create_and_get();
+ $user2 = self::$factory->user->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_author' => $user1->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_author' => $user1->ID ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_user_from_blog( $user1->ID, 1, $user2->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,10 +42,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test the returned data from get_blogs_of_user()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_blogs_of_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user1_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user1_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Maintain a list of 6 total sites and include the primary network site.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_ids = $this->factory->blog->create_many( 5, array( 'user_id' => $user1_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_ids = self::$factory->blog->create_many( 5, array( 'user_id' => $user1_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_ids = array_merge( array( 1 ), $blog_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // All sites are new and not marked as spam, archived, or deleted.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_blog_user() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user1_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user1_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $old_current = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user1_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_ids = array();
</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_ids = $this->factory->blog->create_many( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_ids = self::$factory->blog->create_many( 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $blog_ids as $blog_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'int', $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_blog_user( $blog_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,8 +138,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_user_member_of_blog() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user1_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
- $user2_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user1_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+ $user2_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $old_current = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_user_member_of_blog( $user1_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_user_member_of_blog( $user1_id, $wpdb->blogid ) );
</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_ids = $this->factory->blog->create_many( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_ids = self::$factory->blog->create_many( 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $blog_ids as $blog_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'int', $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,13 +197,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23192
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_user_spammy() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'testuser1',
</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"> $spam_username = (string) $user_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $spam_user_id = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $spam_user_id = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => $spam_username,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,9 +219,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_user_member_of_blog() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->blog->create();
- $user_id = $this->factory->user->create();
- $this->factory->blog->create( array( 'user_id' => $user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->blog->create();
+ $user_id = self::$factory->user->create();
+ self::$factory->blog->create( array( 'user_id' => $user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blogs = get_blogs_of_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $blogs );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +261,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['super_admins'] );
</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">- $user_id = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> grant_super_admin( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> revoke_super_admin( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,7 +278,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['super_admins'] );
</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">- $user_id = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> grant_super_admin( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> revoke_super_admin( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_user( $user_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,7 +297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['super_admins'] );
</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">- $user_id = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> grant_super_admin( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wpmu_delete_user( $user_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,7 +316,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['super_admins'] );
</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">- $user_id = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_super_admin( $user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( revoke_super_admin( $user_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,7 +329,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $GLOBALS['super_admins'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Try with two users.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $second_user = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $second_user = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( grant_super_admin( $user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( grant_super_admin( $second_user ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_super_admin( $second_user ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +343,7 @@
</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"> public function test_numeric_string_user_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $u_string = (string) $u;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wpmu_delete_user( $u_string ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,7 +361,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33800
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_false_for_object_user_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u_obj = $this->factory->user->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u_obj = self::$factory->user->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wpmu_delete_user( $u_obj ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $u_obj->ID, username_exists( $u_obj->user_login ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsuserqueryphp"></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/user/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/query.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/query.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,13 +245,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_clause_key_as_secondary_sort() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u1 = self::$static_factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u1 = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => '2015-01-28 03:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u2 = self::$static_factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u2 = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => '2015-01-28 05:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u3 = self::$static_factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u3 = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => '2015-01-28 03:00:00',
</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">@@ -598,7 +598,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
</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">- $b = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $b, self::$author_ids[0], 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,7 +624,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
</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">- $b = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $b, self::$author_ids[0], 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_User_Query( array(
</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"> $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
</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">- $b = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $b, self::$author_ids[0], 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $b, self::$author_ids[1], 'author' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,7 +675,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
</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">- $b = $this->factory->blog->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b = self::$factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $b, self::$author_ids[0], 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $b, self::$author_ids[1], 'author' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -707,8 +707,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_public', array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_private', array( 'public' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
- $this->factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
+ self::$factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_published_posts' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -727,9 +727,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_public', array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_private', array( 'public' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
- $this->factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
- $this->factory->post->create( array( 'post_author' => self::$author_ids[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
+ self::$factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
+ self::$factory->post->create( array( 'post_author' => self::$author_ids[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_published_posts' => array( 'wptests_pt_private', 'post' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,9 +748,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_public', array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_private', array( 'public' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'draft', 'post_type' => 'wptests_pt_public' ) );
- $this->factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'inherit', 'post_type' => 'wptests_pt_private' ) );
- $this->factory->post->create( array( 'post_author' => self::$author_ids[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'draft', 'post_type' => 'wptests_pt_public' ) );
+ self::$factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'inherit', 'post_type' => 'wptests_pt_private' ) );
+ self::$factory->post->create( array( 'post_author' => self::$author_ids[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_published_posts' => array( 'wptests_pt_public', 'wptests_pt_private', 'post' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -770,7 +770,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
</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">- $blogs = $this->factory->blog->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogs = self::$factory->blog->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $blogs[0], self::$author_ids[0], 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $blogs[0], self::$author_ids[1], 'author' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -778,11 +778,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $blogs[1], self::$author_ids[1], 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blogs[0] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blogs[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -931,7 +931,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_single_role_by_string_which_is_similar() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $another_editor = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $another_editor = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'another-editor',
</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">@@ -1148,7 +1148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
</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">- $sites = self::$static_factory->blog->create_many( 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sites = self::$factory->blog->create_many( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $sites[0], self::$author_ids[0], 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $sites[1], self::$author_ids[1], 'author' );
</span></span></pre></div>
<a id="trunktestsphpunittestsusersessionphp"></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/user/session.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/session.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/session.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> remove_all_filters( 'session_token_manager' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager = WP_Session_Tokens::get_instance( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Session_Tokens', $this->manager );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_User_Meta_Session_Tokens', $this->manager );
</span></span></pre></div>
<a id="trunktestsphpunittestsuserslashesphp"></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/user/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/slashes.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/slashes.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_User_Slashes extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->author_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->author_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->old_current_user = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,7 @@
</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_edit_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = $_GET = $_REQUEST = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['role'] = 'subscriber';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +173,7 @@
</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_wp_update_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = wp_update_user(array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'subscriber',
</span></span></pre></div>
<a id="trunktestsphpunittestsuserupdateUserCachesphp"></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/user/updateUserCaches.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/updateUserCaches.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/updateUserCaches.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_store_entire_database_row_in_users_bucket() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $raw_userdata = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE ID = %d", $u ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_caches( $raw_userdata );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_store_raw_data_in_users_bucket_when_passed_a_wp_user_object() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $raw_userdata = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE ID = %d", $u ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_object = new WP_User( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsuserwpDeleteUserphp"></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/user/wpDeleteUser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpDeleteUser.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/wpDeleteUser.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Logged out users don't have blogs.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array(), get_blogs_of_user( 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">- $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => 'subscriber' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blogs = get_blogs_of_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( 1 ), array_keys( $blogs ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_user_member_of_blog() {
</span><span class="cx" style="display: block; padding: 0 10px"> $old_current = get_current_user_id();
</span><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' => 'subscriber' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => 'subscriber' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_user_member_of_blog() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</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_delete_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,9 +111,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20447
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_delete_user_reassignment_clears_post_caches() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create();
- $reassign = $this->factory->user->create();
- $post_id = $this->factory->post->create( array( 'post_author' => $user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create();
+ $reassign = self::$factory->user->create();
+ $post_id = self::$factory->post->create( array( 'post_author' => $user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_post( $post_id ); // Ensure this post is in the cache.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'wp_delete_user() does not delete user records in Multisite.' );
</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">- $u = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $u_string = (string) $u;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_delete_user( $u_string ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'wp_delete_user() does not delete user records in Multisite.' );
</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">- $u_obj = $this->factory->user->create_and_get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u_obj = self::$factory->user->create_and_get();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_delete_user( $u_obj ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $u_obj->ID, username_exists( $u_obj->user_login ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsuserwpGetUsersWithNoRolephp"></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/user/wpGetUsersWithNoRole.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,16 +15,16 @@
</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"> // Setup users
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'administrator',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'editor',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nobody = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nobody = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nobody_else = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nobody_else = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => '',
</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">@@ -49,18 +49,18 @@
</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"> // Setup users
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'administrator',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'editor',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nobody = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nobody = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => '',
</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"> // Setup blogs
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_1 = (int) $this->factory->blog->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_1 = (int) self::$factory->blog->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $editor,
</span><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="trunktestsphpunittestsuserwpSetCurrentUserphp"></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/user/wpSetCurrentUser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpSetCurrentUser.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user/wpSetCurrentUser.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_User_WpSetCurrentUser extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_set_by_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = wp_set_current_user( $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</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"> public function test_name_should_be_ignored_if_id_is_not_null() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = wp_set_current_user( $u, 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,11 +25,11 @@
</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"> public function test_should_set_by_name_if_id_is_null_and_current_user_is_nonempty() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u1 = $this->factory->user->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u1 = self::$factory->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $u1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $u1, get_current_user_id() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u2 = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u2 = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'foo',
</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">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, get_current_user_id() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'foo',
</span><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="trunktestsphpunittestsuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/user.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // add one of each user role
</span><span class="cx" style="display: block; padding: 0 10px"> $nusers = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array('administrator', 'editor', 'author', 'contributor', 'subscriber' ) as $role ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = self::$static_factory->user->create( array( 'role' => $role ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::$factory->user->create( array( 'role' => $role ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $nusers[ $id ] = $id;
</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">@@ -244,7 +244,7 @@
</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"> foreach ( $roles as $role => $level ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = self::$static_factory->user->create( array( 'role' => $role ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => $role ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $user->user_level ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +292,7 @@
</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_get() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = self::$static_factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'test_wp_user_get',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_pass' => 'password',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +310,7 @@
</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_has_prop() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = self::$static_factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'test_wp_user_has_prop',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_pass' => 'password',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +327,7 @@
</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_update_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = self::$static_factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'test_wp_update_user',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_pass' => 'password',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,7 +383,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_global_userdata() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $userdata, $wpdb;
</span><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 = self::$static_factory->user->create( array( 'role' => 'subscriber' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array( 'role' => 'subscriber' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $userdata );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,11 +497,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21431
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_count_many_users_posts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id_a = self::$static_factory->user->create( array( 'role' => 'author' ) );
- $user_id_b = self::$static_factory->user->create( array( 'role' => 'author' ) );
- $post_id_a = $this->factory->post->create( array( 'post_author' => $user_id_a ) );
- $post_id_b = $this->factory->post->create( array( 'post_author' => $user_id_b ) );
- $post_id_c = $this->factory->post->create( array( 'post_author' => $user_id_b, 'post_status' => 'private' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id_a = self::$factory->user->create( array( 'role' => 'author' ) );
+ $user_id_b = self::$factory->user->create( array( 'role' => 'author' ) );
+ $post_id_a = self::$factory->post->create( array( 'post_author' => $user_id_a ) );
+ $post_id_b = self::$factory->post->create( array( 'post_author' => $user_id_b ) );
+ $post_id_c = self::$factory->post->create( array( 'post_author' => $user_id_b, 'post_status' => 'private' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id_a );
</span><span class="cx" style="display: block; padding: 0 10px"> $counts = count_many_users_posts( array( $user_id_a, $user_id_b), 'post', false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,7 +771,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33793
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_user_should_not_truncate_to_a_duplicate_user_nicename() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u1 = self::$static_factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u1 = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_nicename' => str_repeat( 'a', 50 ),
</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">@@ -792,7 +792,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33793
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_user_should_not_truncate_to_a_duplicate_user_nicename_when_suffix_has_more_than_one_character() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = self::$static_factory->user->create_many( 4, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $users = self::$factory->user->create_many( 4, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_nicename' => str_repeat( 'a', 50 ),
</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">@@ -876,7 +876,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_email_case() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a test user with a lower-case email address.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = self::$static_factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'test@test.com',
</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">@@ -895,7 +895,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_email_change() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a test user.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = self::$static_factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'test@test.com',
</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">@@ -983,7 +983,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated wp_new_user_notification
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_new_user_notification_old_signature_throws_deprecated_warning() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = self::$static_factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'test_wp_new_user_notification',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_pass' => 'password',
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/widgets.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,7 +438,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $widget->is_preview() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = new WP_Customize_Manager();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->start_previewing_theme();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,7 +618,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'before_widget' => '<span class="special %s">', 'after_widget' => '</span>' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = ob_get_clean();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> unregister_widget( 'WP_Widget_Text' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertRegExp( '/<span class="special widget_text">/', $actual );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmtgetRecentPostTitlesphp"></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/xmlrpc/mt/getRecentPostTitles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_no_editable_posts() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = $this->make_user_by_role( 'editor' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_author' => $editor ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create( array( 'post_author' => $editor ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mt_getRecentPostTitles( array( 1, 'author', 'author' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'IXR_Error', $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_date() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $this->myxmlrpcserver->mt_getRecentPostTitles( array( 1, 'author', 'author' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'IXR_Error', $results );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmweditPostphp"></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/xmlrpc/mw/editPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create attachment
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_upload_object( $filename, $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_upload_object( $filename, $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // add post thumbnail to post that does not have one
</span><span class="cx" style="display: block; padding: 0 10px"> $post2 = array( 'wp_post_thumbnail' => $attachment_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $attachment_id, get_post_meta( $post_id, '_thumbnail_id', true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create another attachment
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment2_id = $this->factory->attachment->create_upload_object( $filename, $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment2_id = self::$factory->attachment->create_upload_object( $filename, $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // change the post's post_thumbnail
</span><span class="cx" style="display: block; padding: 0 10px"> $post4 = array( 'wp_post_thumbnail' => $attachment2_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $editor_id
</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">@@ -251,7 +251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_empty_not_null() {
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $editor_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'tags_input' => 'taco'
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmwgetPostphp"></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/xmlrpc/mw/getPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create attachment
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_upload_object( $filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_upload_object( $filename );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_post_thumbnail( $this->post_id, $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmwgetRecentPostsphp"></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/xmlrpc/mw/getRecentPosts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create attachment
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_upload_object( $filename, $this->post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_upload_object( $filename, $this->post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> set_post_thumbnail( $this->post_id, $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $this->myxmlrpcserver->mw_getRecentPosts( array( $this->post_id, 'author', 'author' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmwnewPostphp"></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/xmlrpc/mw/newPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create attachment
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_upload_object( $filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_upload_object( $filename );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array( 'title' => 'Post Thumbnail Test', 'wp_post_thumbnail' => $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->mw_newPost( array( 1, 'author', 'author', $post ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpdeletePostphp"></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/xmlrpc/wp/deletePost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/deletePost.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/deletePost.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_incapable_user() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deletePost( array( 1, 'subscriber', 'subscriber', $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_post_deleted() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deletePost( array( 1, 'editor', 'editor', $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'IXR_Error', $result );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditCommentphp"></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/xmlrpc/wp/editComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_author_can_edit_own_comment() {
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Post test by author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $author_id
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_author_cannot_edit_others_comment() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'author' );
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Post test by editor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $editor_id
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_trash_comment() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'timezone_string', 'America/New_York' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post_id,
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditPostphp"></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/xmlrpc/wp/editPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create attachment
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_upload_object( $filename, $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_upload_object( $filename, $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // add post thumbnail to post that does not have one
</span><span class="cx" style="display: block; padding: 0 10px"> $post2 = array( 'post_thumbnail' => $attachment_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $attachment_id, get_post_meta( $post_id, '_thumbnail_id', true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create another attachment
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment2_id = $this->factory->attachment->create_upload_object( $filename, $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment2_id = self::$factory->attachment->create_upload_object( $filename, $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // change the post's post_thumbnail
</span><span class="cx" style="display: block; padding: 0 10px"> $post4 = array( 'post_thumbnail' => $attachment2_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_capable_unsticky() {
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_author' => $editor_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_author' => $editor_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> stick_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post2 = array( 'sticky' => false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_password_transition_unsticky() {
</span><span class="cx" style="display: block; padding: 0 10px"> // when transitioning to private status or adding a post password, post should be un-stuck
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_author' => $editor_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_author' => $editor_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> stick_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post2 = array( 'post_password' => 'foobar', 'sticky' => false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $yesterday = strtotime( '-1 day' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Post Revision Test',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Not edited',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_edit_attachment() {
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Post Revision Test',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Not edited',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'inherit',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_use_invalid_post_status() {
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Post Revision Test',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Not edited',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $editor_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,9 +302,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_loss_of_categories_on_edit() {
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_author' => $editor_id ) );
- $term_id = $this->factory->category->create();
- $this->factory->term->add_post_terms( $post_id, $term_id, 'category', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_author' => $editor_id ) );
+ $term_id = self::$factory->category->create();
+ self::$factory->term->add_post_terms( $post_id, $term_id, 'category', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_ids = wp_list_pluck( get_the_category( $post_id ), 'term_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( $term_id, $term_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,9 +322,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_clear_categories_on_edit() {
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_author' => $editor_id ) );
- $term_id = $this->factory->category->create();
- $this->factory->term->add_post_terms( $post_id, $term_id, 'category', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array( 'post_author' => $editor_id ) );
+ $term_id = self::$factory->category->create();
+ self::$factory->term->add_post_terms( $post_id, $term_id, 'category', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_ids = wp_list_pluck( get_the_category( $post_id ), 'term_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( $term_id, $term_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +365,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a dummy post
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Post Enclosure Test',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Fake content',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $editor_id,
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetCommentphp"></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/xmlrpc/wp/getComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->parent_comment_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $this->post_id,
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetCommentsphp"></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/xmlrpc/wp/getComments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,8 +21,8 @@
</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_capable_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = $this->factory->post->create();
- $this->factory->comment->create_post_comments( $this->post_id, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = self::$factory->post->create();
+ self::$factory->comment->create_post_comments( $this->post_id, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,8 +36,8 @@
</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_post_filter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = $this->factory->post->create();
- $this->factory->comment->create_post_comments( $this->post_id, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = self::$factory->post->create();
+ self::$factory->comment->create_post_comments( $this->post_id, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,8 +52,8 @@
</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_number_filter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = $this->factory->post->create();
- $this->factory->comment->create_post_comments( $this->post_id, 11 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = self::$factory->post->create();
+ self::$factory->comment->create_post_comments( $this->post_id, 11 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,13 +76,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_contributor_capabilities() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'contributor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish'
</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">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $author_post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => "Commenter 1",
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author_url' => "http://example.com/1/",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,13 +90,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"> $editor_id = $this->make_user_by_role( 'editor' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor_post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor_post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Editor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $editor_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish'
</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">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $editor_post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 'Commenter 2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author_url' => 'http://example.com/2/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,13 +110,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_author_capabilities() {
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish'
</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">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $author_post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 'Commenter 1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author_url' => 'http://example.com/1/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,13 +124,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"> $editor_id = $this->make_user_by_role( 'editor' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor_post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor_post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Editor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $editor_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish'
</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">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $editor_post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 'Commenter 2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author_url' => 'http://example.com/2/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,13 +166,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_editor_capabilities() {
</span><span class="cx" style="display: block; padding: 0 10px"> $author_id = $this->make_user_by_role( 'author' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish'
</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">- $this->factory->comment->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $author_post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 'Commenter 1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author_url' => 'http://example.com/1/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,13 +180,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"> $editor_id = $this->make_user_by_role( 'editor' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor_post_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor_post_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Editor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $editor_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish'
</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">- $this->factory->comment->create(array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create(array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $editor_post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => 'Commenter 2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author_url' => 'http://example.com/2/',
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPostphp"></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/xmlrpc/wp/getPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,8 +122,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_valid_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_page_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
- $child_page_id = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_page_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+ $child_page_id = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $parent_page_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => 2
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPostsphp"></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/xmlrpc/wp/getPosts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $num_posts = 4;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( range( 1, $num_posts ) as $i ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ids[] = $this->factory->post->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids[] = self::$factory->post->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => $cpt_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => date( 'Y-m-d H:i:s', time() + $i )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // add comments to some of the posts
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_ids as $key => $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Larger post IDs will get more comments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->comment->create_post_comments( $post_id, $key );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->comment->create_post_comments( $post_id, $key );
</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"> // get results ordered by comment count
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_fields() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // check default fields
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $this->myxmlrpcserver->wp_getPosts( array( 1, 'editor', 'editor' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,8 +136,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_search() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ids[] = $this->factory->post->create( array( 'post_title' => 'First: ' . rand_str() ) );
- $post_ids[] = $this->factory->post->create( array( 'post_title' => 'Second: ' . rand_str() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids[] = self::$factory->post->create( array( 'post_title' => 'First: ' . rand_str() ) );
+ $post_ids[] = self::$factory->post->create( array( 'post_title' => 'Second: ' . rand_str() ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Search for none of them
</span><span class="cx" style="display: block; padding: 0 10px"> $filter = array( 's' => rand_str() );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetRevisionsphp"></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/xmlrpc/wp/getRevisions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_incapable_user() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getRevisions( array( 1, 'subscriber', 'subscriber', $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_capable_user() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getRevisions( array( 1, 'editor', 'editor', $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'IXR_Error', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_count() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = self::$factory->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_insert_post( array( 'ID' => $post_id, 'post_content' => 'Edit 1' ) ); // Create the initial revision
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getRevisions( array( 1, 'editor', 'editor', $post_id ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetTermsphp"></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/xmlrpc/wp/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,8 +106,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cat1 = wp_create_category( 'wp.getTerms_' . rand_str( 16 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $cat2 = wp_create_category( 'wp.getTerms_' . rand_str( 16 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create_many( 5, array( 'post_category' => array( $cat1 ) ) );
- $this->factory->post->create_many( 3, array( 'post_category' => array( $cat2 ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->post->create_many( 5, array( 'post_category' => array( $cat1 ) ) );
+ self::$factory->post->create_many( 3, array( 'post_category' => array( $cat2 ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filter = array( 'orderby' => 'count', 'order' => 'DESC' );
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $this->myxmlrpcserver->wp_getTerms( array( 1, 'editor', 'editor', 'category', $filter ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetUsersphp"></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/xmlrpc/wp/getUsers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() )
</span><span class="cx" style="display: block; padding: 0 10px"> grant_super_admin( $administrator_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create_many( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$factory->user->create_many( 5 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_ids = get_users( array( 'fields' => 'ID' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpnewCommentphp"></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/xmlrpc/wp/newComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_newComment extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> function test_new_comment_post_closed() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $this->factory->post->create_and_get( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::$factory->post->create_and_get( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_status' => 'closed'
</span><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="trunktestsphpunittestsxmlrpcwpnewPostphp"></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/xmlrpc/wp/newPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // create attachment
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = $this->factory->attachment->create_upload_object( $filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = self::$factory->attachment->create_upload_object( $filename );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array( 'post_title' => 'Post Thumbnail Test', 'post_thumbnail' => $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newPost( array( 1, 'author', 'author', $post ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwprestoreRevisionphp"></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/xmlrpc/wp/restoreRevision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php 2015-10-16 19:51:32 UTC (rev 35224)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php 2015-10-16 21:04:12 UTC (rev 35225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,9 +10,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = $this->factory->post->create( array( 'post_content' => 'edit1' ) ); // Not saved as a revision
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = self::$factory->post->create( array( 'post_content' => 'edit1' ) ); // Not saved as a revision
</ins><span class="cx" style="display: block; padding: 0 10px"> // First saved revision on update, see https://core.trac.wordpress.org/changeset/24650
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_insert_post( array( 'ID' => $this->post_id, 'post_content' => 'edit2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_insert_post( array( 'ID' => $this->post_id, 'post_content' => 'edit2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $this->post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> //$revision = array_shift( $revisions ); // First revision is empty - https://core.trac.wordpress.org/changeset/23842
</span></span></pre>
</div>
</div>
</body>
</html>