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 "Disallow css attr() with url type"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
api
/
ApiUploadTest.php
diff --git
a/tests/phpunit/includes/api/ApiUploadTest.php
b/tests/phpunit/includes/api/ApiUploadTest.php
index
bacc061
..
de2b56b
100644
(file)
--- a/
tests/phpunit/includes/api/ApiUploadTest.php
+++ b/
tests/phpunit/includes/api/ApiUploadTest.php
@@
-27,11
+27,13
@@
class ApiUploadTest extends ApiTestCaseUpload {
*/
public function testLogin() {
$user = self::$users['uploader'];
*/
public function testLogin() {
$user = self::$users['uploader'];
+ $userName = $user->getUser()->getName();
+ $password = $user->getPassword();
$params = [
'action' => 'login',
$params = [
'action' => 'login',
- 'lgname' => $user
->usern
ame,
- 'lgpassword' => $
user->
password
+ 'lgname' => $user
N
ame,
+ 'lgpassword' => $password
];
list( $result, , $session ) = $this->doApiRequest( $params );
$this->assertArrayHasKey( "login", $result );
];
list( $result, , $session ) = $this->doApiRequest( $params );
$this->assertArrayHasKey( "login", $result );
@@
-42,8
+44,8
@@
class ApiUploadTest extends ApiTestCaseUpload {
$params = [
'action' => 'login',
'lgtoken' => $token,
$params = [
'action' => 'login',
'lgtoken' => $token,
- 'lgname' => $user
->usern
ame,
- 'lgpassword' => $
user->
password
+ 'lgname' => $user
N
ame,
+ 'lgpassword' => $password
];
list( $result, , $session ) = $this->doApiRequest( $params, $session );
$this->assertArrayHasKey( "login", $result );
];
list( $result, , $session ) = $this->doApiRequest( $params, $session );
$this->assertArrayHasKey( "login", $result );
@@
-137,7
+139,7
@@
class ApiUploadTest extends ApiTestCaseUpload {
$this->assertFalse( $exception );
// clean up
$this->assertFalse( $exception );
// clean up
- $this->deleteFileByFile
n
ame( $fileName );
+ $this->deleteFileByFile
N
ame( $fileName );
}
/**
}
/**
@@
-173,7
+175,7
@@
class ApiUploadTest extends ApiTestCaseUpload {
$this->assertTrue( $exception );
// clean up
$this->assertTrue( $exception );
// clean up
- $this->deleteFileByFile
n
ame( $fileName );
+ $this->deleteFileByFile
N
ame( $fileName );
}
/**
}
/**
@@
-243,7
+245,7
@@
class ApiUploadTest extends ApiTestCaseUpload {
$this->assertFalse( $exception );
// clean up
$this->assertFalse( $exception );
// clean up
- $this->deleteFileByFile
n
ame( $fileName );
+ $this->deleteFileByFile
N
ame( $fileName );
}
/**
}
/**
@@
-322,8
+324,8
@@
class ApiUploadTest extends ApiTestCaseUpload {
$this->assertFalse( $exception );
// clean up
$this->assertFalse( $exception );
// clean up
- $this->deleteFileByFile
n
ame( $fileNames[0] );
- $this->deleteFileByFile
n
ame( $fileNames[1] );
+ $this->deleteFileByFile
N
ame( $fileNames[0] );
+ $this->deleteFileByFile
N
ame( $fileNames[1] );
}
/**
}
/**
@@
-406,7
+408,7
@@
class ApiUploadTest extends ApiTestCaseUpload {
$this->assertFalse( $exception, "No UsageException exception." );
// clean up
$this->assertFalse( $exception, "No UsageException exception." );
// clean up
- $this->deleteFileByFile
n
ame( $fileName );
+ $this->deleteFileByFile
N
ame( $fileName );
}
/**
}
/**
@@
-550,6
+552,6
@@
class ApiUploadTest extends ApiTestCaseUpload {
$this->assertFalse( $exception );
// clean up
$this->assertFalse( $exception );
// clean up
- $this->deleteFileByFile
n
ame( $fileName );
+ $this->deleteFileByFile
N
ame( $fileName );
}
}
}
}