Merge pull request #8260 from owncloud/stable6-backport-8183-and-co

Backport of #8183 and #8197

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 4311215795c..97547bc3fa0 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -69,6 +69,18 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
 		$this->assertEquals($result, $expected);
 	}
 
+	function testGetSecureMimeType() {
+		$dir=OC::$SERVERROOT.'/tests/data';
+
+		$result = OC_Helper::getSecureMimeType('image/svg+xml');
+		$expected = 'text/plain';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::getSecureMimeType('image/png');
+		$expected = 'image/png';
+		$this->assertEquals($result, $expected);
+	}
+	
 	function testGetFileNameMimeType() {
 		$this->assertEquals('text/plain', OC_Helper::getFileNameMimeType('foo.txt'));
 		$this->assertEquals('image/png', OC_Helper::getFileNameMimeType('foo.png'));