aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/tests
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-10-30 22:11:19 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2013-10-30 22:11:19 +0100
commit261cd87efa5623b51bbfa466f94d243bb7b49336 (patch)
tree25dd1d72e0a1e7563dc4bb6deabc937afd7946ec /apps/files/tests
parent0e92a4896df11d6fd3ee4ed73dfa1cb121d66895 (diff)
parentc1730d241c52b5e5c1719b6086d05cb30783e665 (diff)
downloadnextcloud-server-261cd87efa5623b51bbfa466f94d243bb7b49336.tar.gz
nextcloud-server-261cd87efa5623b51bbfa466f94d243bb7b49336.zip
Merge branch 'master' into home-storage
Diffstat (limited to 'apps/files/tests')
-rw-r--r--apps/files/tests/ajax_rename.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 8eff978cde0..e654255c407 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -88,7 +88,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
$result = $this->files->rename($dir, $oldname, $newname);
$expected = array(
'success' => false,
- 'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
+ 'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved.")
);
$this->assertEquals($expected, $result);