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 "Don't check namespace in SpecialWantedtemplates"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
upload
/
UploadStashTest.php
diff --git
a/tests/phpunit/includes/upload/UploadStashTest.php
b/tests/phpunit/includes/upload/UploadStashTest.php
index
da72a9d
..
8f9eabe
100644
(file)
--- a/
tests/phpunit/includes/upload/UploadStashTest.php
+++ b/
tests/phpunit/includes/upload/UploadStashTest.php
@@
-7,7
+7,7
@@
*/
class UploadStashTest extends MediaWikiTestCase {
/**
*/
class UploadStashTest extends MediaWikiTestCase {
/**
- * @var Array of UploadStashTestUser
+ * @var
array
Array of UploadStashTestUser
*/
public static $users;
*/
public static $users;
@@
-20,7
+20,7
@@
class UploadStashTest extends MediaWikiTestCase {
parent::setUp();
// Setup a file for bug 29408
parent::setUp();
// Setup a file for bug 29408
- $this->bug29408File =
__DIR__
. '/bug29408';
+ $this->bug29408File =
wfTempDir()
. '/bug29408';
file_put_contents( $this->bug29408File, "\x00" );
self::$users = array(
file_put_contents( $this->bug29408File, "\x00" );
self::$users = array(
@@
-68,7
+68,7
@@
class UploadStashTest extends MediaWikiTestCase {
$stash->removeFile( $file->getFileKey() );
}
$stash->removeFile( $file->getFileKey() );
}
- public function provideInvalidRequests() {
+ public
static
function provideInvalidRequests() {
return array(
'Check failure on bad wpFileKey' =>
array( new FauxRequest( array( 'wpFileKey' => 'foo' ) ) ),
return array(
'Check failure on bad wpFileKey' =>
array( new FauxRequest( array( 'wpFileKey' => 'foo' ) ) ),
@@
-84,7
+84,7
@@
class UploadStashTest extends MediaWikiTestCase {
$this->assertFalse( UploadFromStash::isValidRequest( $request ) );
}
$this->assertFalse( UploadFromStash::isValidRequest( $request ) );
}
- public function provideValidRequests() {
+ public
static
function provideValidRequests() {
return array(
'Check good wpFileKey' =>
array( new FauxRequest( array( 'wpFileKey' => 'testkey-test.test' ) ) ),
return array(
'Check good wpFileKey' =>
array( new FauxRequest( array( 'wpFileKey' => 'testkey-test.test' ) ) ),