Fix more tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
bfaca7fc78
commit
3aa5f105fa
|
@ -172,7 +172,7 @@ class MailSettingsControllerTest extends \Test\TestCase {
|
|||
->method('createEMailTemplate')
|
||||
->willReturn($emailTemplate);
|
||||
$response = $this->mailController->sendTestMail();
|
||||
$this->assertSame(Http::STATUS_OK, $response->getStatus(), $response->getData());
|
||||
$this->assertSame(Http::STATUS_OK, $response->getStatus());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -7,102 +7,7 @@
|
|||
* To regenerate this file run ./occ maintenance:mimetype:update-js
|
||||
*/
|
||||
OC.MimeTypeList={
|
||||
aliases: {
|
||||
"application/coreldraw": "image",
|
||||
"application/epub+zip": "text",
|
||||
"application/font-sfnt": "image",
|
||||
"application/font-woff": "image",
|
||||
"application/gpx+xml": "location",
|
||||
"application/illustrator": "image",
|
||||
"application/javascript": "text/code",
|
||||
"application/json": "text/code",
|
||||
"application/msaccess": "file",
|
||||
"application/msexcel": "x-office/spreadsheet",
|
||||
"application/msonenote": "x-office/document",
|
||||
"application/mspowerpoint": "x-office/presentation",
|
||||
"application/msword": "x-office/document",
|
||||
"application/octet-stream": "file",
|
||||
"application/postscript": "image",
|
||||
"application/rss+xml": "application/xml",
|
||||
"application/vnd.android.package-archive": "package/x-generic",
|
||||
"application/vnd.lotus-wordpro": "x-office/document",
|
||||
"application/vnd.garmin.tcx+xml": "location",
|
||||
"application/vnd.google-earth.kml+xml": "location",
|
||||
"application/vnd.google-earth.kmz": "location",
|
||||
"application/vnd.ms-excel": "x-office/spreadsheet",
|
||||
"application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
|
||||
"application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
|
||||
"application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
|
||||
"application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
|
||||
"application/vnd.ms-fontobject": "image",
|
||||
"application/vnd.ms-powerpoint": "x-office/presentation",
|
||||
"application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
|
||||
"application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
|
||||
"application/vnd.ms-powerpoint.slideshow.macroEnabled.12": "x-office/presentation",
|
||||
"application/vnd.ms-powerpoint.template.macroEnabled.12": "x-office/presentation",
|
||||
"application/vnd.ms-visio.drawing.macroEnabled.12": "application/vnd.visio",
|
||||
"application/vnd.ms-visio.drawing": "application/vnd.visio",
|
||||
"application/vnd.ms-visio.stencil.macroEnabled.12": "application/vnd.visio",
|
||||
"application/vnd.ms-visio.stencil": "application/vnd.visio",
|
||||
"application/vnd.ms-visio.template.macroEnabled.12": "application/vnd.visio",
|
||||
"application/vnd.ms-visio.template": "application/vnd.visio",
|
||||
"application/vnd.ms-word.document.macroEnabled.12": "x-office/document",
|
||||
"application/vnd.ms-word.template.macroEnabled.12": "x-office/document",
|
||||
"application/vnd.oasis.opendocument.presentation": "x-office/presentation",
|
||||
"application/vnd.oasis.opendocument.presentation-template": "x-office/presentation",
|
||||
"application/vnd.oasis.opendocument.spreadsheet": "x-office/spreadsheet",
|
||||
"application/vnd.oasis.opendocument.spreadsheet-template": "x-office/spreadsheet",
|
||||
"application/vnd.oasis.opendocument.text": "x-office/document",
|
||||
"application/vnd.oasis.opendocument.text-master": "x-office/document",
|
||||
"application/vnd.oasis.opendocument.text-template": "x-office/document",
|
||||
"application/vnd.oasis.opendocument.text-web": "x-office/document",
|
||||
"application/vnd.openxmlformats-officedocument.presentationml.presentation": "x-office/presentation",
|
||||
"application/vnd.openxmlformats-officedocument.presentationml.slideshow": "x-office/presentation",
|
||||
"application/vnd.openxmlformats-officedocument.presentationml.template": "x-office/presentation",
|
||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "x-office/spreadsheet",
|
||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.template": "x-office/spreadsheet",
|
||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.document": "x-office/document",
|
||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.template": "x-office/document",
|
||||
"application/vnd.visio": "x-office/document",
|
||||
"application/vnd.wordperfect": "x-office/document",
|
||||
"application/x-7z-compressed": "package/x-generic",
|
||||
"application/x-bzip2": "package/x-generic",
|
||||
"application/x-cbr": "text",
|
||||
"application/x-compressed": "package/x-generic",
|
||||
"application/x-dcraw": "image",
|
||||
"application/x-deb": "package/x-generic",
|
||||
"application/x-fictionbook+xml": "text",
|
||||
"application/x-font": "image",
|
||||
"application/x-gimp": "image",
|
||||
"application/x-gzip": "package/x-generic",
|
||||
"application/x-iwork-keynote-sffkey": "x-office/presentation",
|
||||
"application/x-iwork-numbers-sffnumbers": "x-office/spreadsheet",
|
||||
"application/x-iwork-pages-sffpages": "x-office/document",
|
||||
"application/x-mobipocket-ebook": "text",
|
||||
"application/x-perl": "text/code",
|
||||
"application/x-photoshop": "image",
|
||||
"application/x-php": "text/code",
|
||||
"application/x-rar-compressed": "package/x-generic",
|
||||
"application/x-tar": "package/x-generic",
|
||||
"application/x-tex": "text",
|
||||
"application/xml": "text/html",
|
||||
"application/yaml": "text/code",
|
||||
"application/zip": "package/x-generic",
|
||||
"database": "file",
|
||||
"httpd/unix-directory": "dir",
|
||||
"text/css": "text/code",
|
||||
"text/csv": "x-office/spreadsheet",
|
||||
"text/html": "text/code",
|
||||
"text/x-c": "text/code",
|
||||
"text/x-c++src": "text/code",
|
||||
"text/x-h": "text/code",
|
||||
"text/x-java-source": "text/code",
|
||||
"text/x-ldif": "text/code",
|
||||
"text/x-python": "text/code",
|
||||
"text/x-shellscript": "text/code",
|
||||
"web": "text/code",
|
||||
"application/internet-shortcut": "link"
|
||||
},
|
||||
aliases: [],
|
||||
files: [
|
||||
"application",
|
||||
"application-pdf",
|
||||
|
|
|
@ -414,8 +414,8 @@ class UserPluginTest extends TestCase {
|
|||
$this->groupManager->expects($this->exactly(2))
|
||||
->method('getUserGroupIds')
|
||||
->withConsecutive(
|
||||
$this->user,
|
||||
$singleUser
|
||||
[$this->user],
|
||||
[$singleUser]
|
||||
)
|
||||
->willReturn($groupResponse);
|
||||
} else {
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
namespace Test\Session;
|
||||
|
||||
use OC\Session\CryptoSessionData;
|
||||
use OCP\Security\ICrypto;
|
||||
|
||||
class CryptoSessionDataTest extends Session {
|
||||
/** @var \PHPUnit_Framework_MockObject_MockObject|\OCP\Security\ICrypto */
|
||||
|
@ -34,9 +35,7 @@ class CryptoSessionDataTest extends Session {
|
|||
parent::setUp();
|
||||
|
||||
$this->wrappedSession = new \OC\Session\Memory($this->getUniqueID());
|
||||
$this->crypto = $this->getMockBuilder('OCP\Security\ICrypto')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$this->crypto = $this->createMock(ICrypto::class);
|
||||
$this->crypto->expects($this->any())
|
||||
->method('encrypt')
|
||||
->willReturnCallback(function ($input) {
|
||||
|
@ -45,6 +44,9 @@ class CryptoSessionDataTest extends Session {
|
|||
$this->crypto->expects($this->any())
|
||||
->method('decrypt')
|
||||
->willReturnCallback(function ($input) {
|
||||
if ($input === '') {
|
||||
return '';
|
||||
}
|
||||
return substr($input, 1, -1);
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in New Issue