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 "resourceloader: Use null-objects for 'sources' and 'registry'"
[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
6656fa4
..
9506c36
100644
(file)
--- a/
tests/phpunit/includes/content/JavaScriptContentTest.php
+++ b/
tests/phpunit/includes/content/JavaScriptContentTest.php
@@
-1,5
+1,7
@@
<?php
<?php
+use MediaWiki\MediaWikiServices;
+
/**
* @group ContentHandler
* @group Database
/**
* @group ContentHandler
* @group Database
@@
-153,16
+155,6
@@
class JavaScriptContentTest extends TextContentTest {
'any',
true
],
'any',
true
],
- [ 'Foo',
- null,
- 'comma',
- false
- ],
- [ 'Foo, bar',
- null,
- 'comma',
- false
- ],
[ 'Foo',
null,
'link',
[ 'Foo',
null,
'link',
@@
-188,11
+180,6
@@
class JavaScriptContentTest extends TextContentTest {
'any',
true
],
'any',
true
],
- [ '#REDIRECT [[bar]]',
- true,
- 'comma',
- false
- ],
[ '#REDIRECT [[bar]]',
true,
'link',
[ '#REDIRECT [[bar]]',
true,
'link',
@@
-222,7
+209,7
@@
class JavaScriptContentTest extends TextContentTest {
* @covers JavaScriptContent::matchMagicWord
*/
public function testMatchMagicWord() {
* @covers JavaScriptContent::matchMagicWord
*/
public function testMatchMagicWord() {
- $mw = M
agicWord::
get( "staticredirect" );
+ $mw = M
ediaWikiServices::getInstance()->getMagicWordFactory()->
get( "staticredirect" );
$content = $this->newContent( "#REDIRECT [[FOO]]\n__STATICREDIRECT__" );
$this->assertFalse(
$content = $this->newContent( "#REDIRECT [[FOO]]\n__STATICREDIRECT__" );
$this->assertFalse(