aboutsummaryrefslogtreecommitdiffstats
path: root/tests/Settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-07-07 11:29:46 +0200
committerMorris Jobke <hey@morrisjobke.de>2016-07-07 11:29:46 +0200
commitba16fd0d337fa26114f55086198979d147a298c1 (patch)
tree39111cec77d17d5eeb60bd1b609e7a8419310459 /tests/Settings
parent5ace43f43895cba4b398367e10731f92450d7da2 (diff)
parented28885d73181e61c06802639910014e8a265e42 (diff)
downloadnextcloud-server-ba16fd0d337fa26114f55086198979d147a298c1.tar.gz
nextcloud-server-ba16fd0d337fa26114f55086198979d147a298c1.zip
Merge branch 'master' into sync-master
Diffstat (limited to 'tests/Settings')
-rw-r--r--tests/Settings/Controller/LogSettingsControllerTest.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Settings/Controller/LogSettingsControllerTest.php b/tests/Settings/Controller/LogSettingsControllerTest.php
index 1660369fafe..f296df9903c 100644
--- a/tests/Settings/Controller/LogSettingsControllerTest.php
+++ b/tests/Settings/Controller/LogSettingsControllerTest.php
@@ -12,6 +12,7 @@ namespace Tests\Settings\Controller;
use \OC\Settings\Application;
use OC\Settings\Controller\LogSettingsController;
+use OCP\AppFramework\Http\StreamResponse;
/**
* @package Tests\Settings\Controller
@@ -73,6 +74,6 @@ class LogSettingsControllerTest extends \Test\TestCase {
$this->assertInstanceOf('\OCP\AppFramework\Http\StreamResponse', $response);
$headers = $response->getHeaders();
$this->assertEquals('application/octet-stream', $headers['Content-Type']);
- $this->assertEquals('attachment; filename="owncloud.log"', $headers['Content-Disposition']);
+ $this->assertEquals('attachment; filename="nextcloud.log"', $headers['Content-Disposition']);
}
}