summaryrefslogtreecommitdiffstats
path: root/tests/lib/image.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-10 11:01:43 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-17 10:48:06 +0100
commita3a064fe967865fe2df37944ecb3447cf91bfb7a (patch)
treec093ec2e8fd7e526621a30faaa821498fc5d026a /tests/lib/image.php
parenta9c2e5a08e4a909a94f441c96a3ea000e9420ca3 (diff)
downloadnextcloud-server-a3a064fe967865fe2df37944ecb3447cf91bfb7a.tar.gz
nextcloud-server-a3a064fe967865fe2df37944ecb3447cf91bfb7a.zip
Skip some more tests on Windows which just can not work at all
Diffstat (limited to 'tests/lib/image.php')
-rw-r--r--tests/lib/image.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/lib/image.php b/tests/lib/image.php
index 795bc464159..a683c3d2c8b 100644
--- a/tests/lib/image.php
+++ b/tests/lib/image.php
@@ -62,14 +62,18 @@ class Test_Image extends PHPUnit_Framework_TestCase {
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
$this->assertEquals('image/png', $img->mimeType());
+ $img = new \OC_Image(null);
+ $this->assertEquals('', $img->mimeType());
+
+ if (\OC_Util::runningOnWindows()) {
+ $this->markTestSkipped('[Windows] Images created with imagecreate() are pngs on windows');
+ }
+
$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
$this->assertEquals('image/jpeg', $img->mimeType());
$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
$this->assertEquals('image/gif', $img->mimeType());
-
- $img = new \OC_Image(null);
- $this->assertEquals('', $img->mimeType());
}
public function testWidth() {