dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix border colour used for textarea"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
content
/
JavaScriptContentTest.php
diff --git
a/tests/phpunit/includes/content/JavaScriptContentTest.php
b/tests/phpunit/includes/content/JavaScriptContentTest.php
index
97e0b1c
..
6656fa4
100644
(file)
--- a/
tests/phpunit/includes/content/JavaScriptContentTest.php
+++ b/
tests/phpunit/includes/content/JavaScriptContentTest.php
@@
-141,16
+141,6
@@
class JavaScriptContentTest extends TextContentTest {
];
}
];
}
- /**
- * @todo Test needs database!
- */
- /*
- public function getUltimateRedirectTarget() {
- $text = $this->getNativeData();
- return Title::newFromRedirectRecurse( $text );
- }
- */
-
public static function dataIsCountable() {
return [
[ '',
public static function dataIsCountable() {
return [
[ '',
@@
-261,19
+251,18
@@
class JavaScriptContentTest extends TextContentTest {
}
public static function provideUpdateRedirect() {
}
public static function provideUpdateRedirect() {
+ // phpcs:disable Generic.Files.LineLength
return [
[
'#REDIRECT [[Someplace]]',
'#REDIRECT [[Someplace]]',
],
return [
[
'#REDIRECT [[Someplace]]',
'#REDIRECT [[Someplace]]',
],
-
- // @codingStandardsIgnoreStart Generic.Files.LineLength
[
'/* #REDIRECT */mw.loader.load("//example.org/w/index.php?title=MediaWiki:MonoBook.js\u0026action=raw\u0026ctype=text/javascript");',
'/* #REDIRECT */mw.loader.load("//example.org/w/index.php?title=TestUpdateRedirect_target\u0026action=raw\u0026ctype=text/javascript");'
]
[
'/* #REDIRECT */mw.loader.load("//example.org/w/index.php?title=MediaWiki:MonoBook.js\u0026action=raw\u0026ctype=text/javascript");',
'/* #REDIRECT */mw.loader.load("//example.org/w/index.php?title=TestUpdateRedirect_target\u0026action=raw\u0026ctype=text/javascript");'
]
- // @codingStandardsIgnoreEnd
];
];
+ // phpcs:enable
}
/**
}
/**
@@
-304,6
+293,7
@@
class JavaScriptContentTest extends TextContentTest {
}
/**
}
/**
+ * @covers JavaScriptContent::getRedirectTarget
* @dataProvider provideGetRedirectTarget
*/
public function testGetRedirectTarget( $title, $text ) {
* @dataProvider provideGetRedirectTarget
*/
public function testGetRedirectTarget( $title, $text ) {
@@
-322,7
+312,7
@@
class JavaScriptContentTest extends TextContentTest {
* Keep this in sync with JavaScriptContentHandlerTest::provideMakeRedirectContent()
*/
public static function provideGetRedirectTarget() {
* Keep this in sync with JavaScriptContentHandlerTest::provideMakeRedirectContent()
*/
public static function provideGetRedirectTarget() {
- //
@codingStandardsIgnoreStart
Generic.Files.LineLength
+ //
phpcs:disable
Generic.Files.LineLength
return [
[
'MediaWiki:MonoBook.js',
return [
[
'MediaWiki:MonoBook.js',
@@
-347,6
+337,6
@@
class JavaScriptContentTest extends TextContentTest {
'/* #REDIRECT */mw.loader.load("//example.com/w/index.php?title=MediaWiki:OtherWiki.js\u0026action=raw\u0026ctype=text/javascript");'
],
];
'/* #REDIRECT */mw.loader.load("//example.com/w/index.php?title=MediaWiki:OtherWiki.js\u0026action=raw\u0026ctype=text/javascript");'
],
];
- //
@codingStandardsIgnoreEnd
+ //
phpcs:enable
}
}
}
}