Merge "Allow setting default thumb size in parser tests"

[lhc/web/wiklou.git] / tests / parser / parserTests.txt

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 9a0b3fb..1e0f78d 100644 (file)
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -21,8 +21,10 @@
 # language=XXX  set content language to XXX for this test
 # variant=XXX   set the variant of language for this test (eg zh-tw)
 # disabled      do not run test
-# parsoid       parsoid-only test (not run by PHP parser)
-# php           php-only test (not run by the parsoid parser)
+# parsoid       parsoid-specific options (not run by PHP parser unless
+#                 the test includes an html/php section)
+# php           php-only test (not run by the parsoid parser unless
+#                 the test includes an html/parsoid section)
 # showtitle     make the first line the title
 # comment       run through Linker::formatComment() instead of main parser
 # local         format section links in edit comment text as local links
@@ -9663,7 +9665,7 @@ Special:Foobar_nonexistent
 ### Images
 ###
 ### For Parsoid-specific tests, see
-#### http://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Images
+#### https://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Images
 
 !! test
 Simple image
@@ -10638,7 +10640,7 @@ wgEnableUploads=0
 !! end
 
 # Parsoid-specific testing for images
-# http://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Images
+# https://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Images
 # Currently imperfect due to a flaw in the Parsoid testrunner
 # Work in progress
 # THESE TESTS SHOULD BE MOVED UP and merged with the php-specific