aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-05-29 12:15:02 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-05-29 12:15:02 +0200
commitc700f42b68f430e9c89ce97b92ea91323c9f6ed5 (patch)
treea53da8461636e293c871c080b10c4c5421852dc1 /tests/lib
parent1152f8b444d4889e624ca7421d8b20561b2a153d (diff)
parent9194603c3198c1b62e52f40f00b2d773cfa0ed5a (diff)
downloadnextcloud-server-c700f42b68f430e9c89ce97b92ea91323c9f6ed5.tar.gz
nextcloud-server-c700f42b68f430e9c89ce97b92ea91323c9f6ed5.zip
Merge pull request #16517 from owncloud/remove-logo-wide
replace logo-wide on share page as well with better icon + text
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/files/storage/storage.php12
-rw-r--r--tests/lib/helper.php4
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index e8602b6b24a..62fba4c1716 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -153,13 +153,13 @@ abstract class Storage extends \Test\TestCase {
$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile, 'r'));
$this->assertEquals('text/plain', $this->instance->getMimeType('/lorem.txt'));
- $pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png';
- $this->instance->file_put_contents('/logo-wide.png', file_get_contents($pngFile, 'r'));
- $this->assertEquals('image/png', $this->instance->getMimeType('/logo-wide.png'));
+ $pngFile = \OC::$SERVERROOT . '/tests/data/desktopapp.png';
+ $this->instance->file_put_contents('/desktopapp.png', file_get_contents($pngFile, 'r'));
+ $this->assertEquals('image/png', $this->instance->getMimeType('/desktopapp.png'));
- $svgFile = \OC::$SERVERROOT . '/tests/data/logo-wide.svg';
- $this->instance->file_put_contents('/logo-wide.svg', file_get_contents($svgFile, 'r'));
- $this->assertEquals('image/svg+xml', $this->instance->getMimeType('/logo-wide.svg'));
+ $svgFile = \OC::$SERVERROOT . '/tests/data/desktopapp.svg';
+ $this->instance->file_put_contents('/desktopapp.svg', file_get_contents($svgFile, 'r'));
+ $this->assertEquals('image/svg+xml', $this->instance->getMimeType('/desktopapp.svg'));
}
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index b7aa185f4e3..03c6dacde64 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -85,11 +85,11 @@ class Test_Helper extends \Test\TestCase {
$expected = 'application/zip';
$this->assertEquals($result, $expected);
- $result = OC_Helper::getMimeType($dir."/logo-wide.svg");
+ $result = OC_Helper::getMimeType($dir."/desktopapp.svg");
$expected = 'image/svg+xml';
$this->assertEquals($result, $expected);
- $result = OC_Helper::getMimeType($dir."/logo-wide.png");
+ $result = OC_Helper::getMimeType($dir."/desktopapp.png");
$expected = 'image/png';
$this->assertEquals($result, $expected);
}