http://www.mediawiki.org/wiki/Special:Code/MediaWiki/83621
Revision: 83621
Author: bawolff
Date: 2011-03-10 00:29:56 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
(follow-up r83433) Fix (or workaround) bug discovered with mode=none having
<pre>'s inserted (root cause is bug 1319)
Fix up the tests I added. Some of them were testing stuff thats not going to
work
(such as the addfirstcategorydate, since the date is going to change from day
to day. d'oh).
Remove the one whitespace before the li on all these tests (for the pre issue).
And add one more test.
Modified Paths:
--------------
trunk/extensions/intersection/DynamicPageList.php
trunk/extensions/intersection/DynamicPageList.tests.txt
Modified: trunk/extensions/intersection/DynamicPageList.php
===================================================================
--- trunk/extensions/intersection/DynamicPageList.php 2011-03-10 00:25:33 UTC
(rev 83620)
+++ trunk/extensions/intersection/DynamicPageList.php 2011-03-10 00:29:56 UTC
(rev 83621)
@@ -642,7 +642,7 @@
if ( $inlineMode ) {
$output .= $wgContLang->commaList( $articleList );
} else {
- $output .= implode( "$endItem \n $startItem",
$articleList );
+ $output .= implode( "$endItem \n$startItem",
$articleList );
}
$output .= $endItem;
$output .= $endList . "\n";
Modified: trunk/extensions/intersection/DynamicPageList.tests.txt
===================================================================
--- trunk/extensions/intersection/DynamicPageList.tests.txt 2011-03-10
00:25:33 UTC (rev 83620)
+++ trunk/extensions/intersection/DynamicPageList.tests.txt 2011-03-10
00:29:56 UTC (rev 83621)
@@ -15,6 +15,7 @@
## varries depending on today's date.
## *gallery stuff (lack of images)
## *some order methods, due to lack of flexibity in page creation
+## googlehack (dpl_id) stuff because page_id changes depending on other tests.
!! article
DPLTest1
@@ -68,8 +69,8 @@
!!result
<ul>
<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
!!end
@@ -84,30 +85,32 @@
!!result
<ul>
<li><a href="/wiki/DPLTest1">DPLTest1</a></li>
- <li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li></ul>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li></ul>
!!end
# Depnds on page id of other pages
# so could break depending on other tests
# if they get different page id
-!!test
-dpl_id
-!!input
-<DynamicPageList>
-category=DPLtest
-googlehack=true
-</DynamicPageList>
-!!result
-<ul>
-<li><a href="/wiki/Yet_another_DPL_test_page!?dpl_id=53">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/Talk:DPLTest2?dpl_id=51">Talk:DPLTest2</a></li>
- <li><a href="/wiki/DPLTest1?dpl_id=50">DPLTest1</a></li></ul>
+#
+# Low and behold that actually does happen. Commenting out.
+#!!test
+#dpl_id
+#!!input
+#<DynamicPageList>
+#category=DPLtest
+#googlehack=true
+#</DynamicPageList>
+#!!result
+#<ul>
+#<li><a href="/wiki/Yet_another_DPL_test_page!?dpl_id=53">Yet another DPL test
page!</a></li>
+#<li><a href="/wiki/Talk:DPLTest2?dpl_id=51">Talk:DPLTest2</a></li>
+#<li><a href="/wiki/DPLTest1?dpl_id=50">DPLTest1</a></li></ul>
+#
+#!!end
-!!end
-
!!test
nofollow
!!input
@@ -118,8 +121,8 @@
!!result
<ul>
<li><a href="/wiki/Yet_another_DPL_test_page!" rel="nofollow">Yet another DPL
test page!</a></li>
- <li><a href="/wiki/Talk:DPLTest2" rel="nofollow">Talk:DPLTest2</a></li>
- <li><a href="/wiki/DPLTest1" rel="nofollow">DPLTest1</a></li></ul>
+<li><a href="/wiki/Talk:DPLTest2" rel="nofollow">Talk:DPLTest2</a></li>
+<li><a href="/wiki/DPLTest1" rel="nofollow">DPLTest1</a></li></ul>
!!end
@@ -237,7 +240,7 @@
!!result
<ul>
<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
!!end
@@ -265,9 +268,9 @@
!!result
<ul>
<li><a href="/wiki/DPLRedir" class="mw-redirect">DPLRedir</a></li>
- <li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
+<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
!!end
@@ -297,8 +300,8 @@
!!result
<ul>
<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
!!end
@@ -312,8 +315,8 @@
!!result
<ul>
<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
!!end
@@ -328,8 +331,8 @@
!!result
<ul>
<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
!!end
!!test
@@ -342,8 +345,8 @@
!!result
<ul>
<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
!!end
@@ -357,8 +360,8 @@
!!result
<ol>
<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/DPLTest1">DPLTest1</a></li></ol>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ol>
!!end
@@ -371,10 +374,10 @@
mode=none
</DynamicPageList>
!!result
-<a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test page!</a><br
/>
+<p><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a><br />
<a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a><br />
<a href="/wiki/DPLTest1">DPLTest1</a><br />
-
+</p>
!!end
!!test
@@ -395,7 +398,6 @@
!!input
<DynamicPageList>
category=DPLtest
-addfirstcategorydate=ymd
imagewidth=70
galleryshowfilesize=yes
galleryshowfilename=yes
@@ -410,7 +412,7 @@
<div style="height: 150px;">Yet another DPL test
page!</div>
<div class="gallerytext">
<p><a href="/wiki/Yet_another_DPL_test_page!" title="Yet another DPL test
page!">Yet another DPL test...</a><br />
-<span class="mw-formatted-date" title="2011-03-07">2011 March 7</span> File
missing<br />
+File missing<br />
</p>
</div>
</div></li>
@@ -418,7 +420,7 @@
<div style="height: 150px;">DPLTest2</div>
<div class="gallerytext">
<p><a href="/wiki/Talk:DPLTest2" title="Talk:DPLTest2">DPLTest2</a><br />
-<span class="mw-formatted-date" title="2011-03-07">2011 March 7</span> File
missing<br />
+File missing<br />
</p>
</div>
</div></li>
@@ -426,7 +428,7 @@
<div style="height: 150px;">DPLTest1</div>
<div class="gallerytext">
<p><a href="/wiki/DPLTest1">DPLTest1</a><br />
-<span class="mw-formatted-date" title="2011-03-07">2011 March 7</span> File
missing<br />
+File missing<br />
</p>
</div>
</div></li>
@@ -555,8 +557,8 @@
!!result
<ul>
<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
!!end
@@ -589,8 +591,8 @@
!!result
<ul>
<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
+<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
!!end
@@ -604,8 +606,8 @@
!!result
<ul>
<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
- <li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
!!end
@@ -621,8 +623,27 @@
!!result
<ul>
<li><a href="/wiki/DPLTest1">DPLTest1</a></li>
- <li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
- <li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li></ul>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li></ul>
!!end
+# Check {{PAGENAME}} in category clause (dates variables are somewhat more
common, but
+# this is easier to check.
+#
+# using {{PAGENAME:DPLtest}} because dpl uses a weird (and probably wrong way)
of
+# expanding {{PAGENAME}} and friends, which doesn't work with parsertests and
+# the title= option.
+!!test
+Magic word in category clause
+!!input
+<DynamicPageList>
+category={{PAGENAME:DPLtest}}
+</DynamicPageList>
+!!result
+<ul>
+<li><a href="/wiki/Yet_another_DPL_test_page!">Yet another DPL test
page!</a></li>
+<li><a href="/wiki/Talk:DPLTest2">Talk:DPLTest2</a></li>
+<li><a href="/wiki/DPLTest1">DPLTest1</a></li></ul>
+
+!!end
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
