summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-05-21 15:30:19 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-05-21 15:30:19 +0200
commit5cd14425f9cc4ff122bd3c324ce9f3be80844e91 (patch)
tree60c626e5bcf04af9c50dc7d3e58ab6d3202453cf /tests
parent9d324db05481620fd9a6883c1315e0b31fc21c45 (diff)
parentafdad5c74da5c163b01f43046224b376a23f4e60 (diff)
downloadnextcloud-server-5cd14425f9cc4ff122bd3c324ce9f3be80844e91.tar.gz
nextcloud-server-5cd14425f9cc4ff122bd3c324ce9f3be80844e91.zip
Merge branch 'master' into files_encryption
Conflicts: apps/files_trashbin/l10n/nn_NO.php
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/vcategories.php11
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/lib/vcategories.php b/tests/lib/vcategories.php
index e79dd49870c..df5f600f20d 100644
--- a/tests/lib/vcategories.php
+++ b/tests/lib/vcategories.php
@@ -81,6 +81,17 @@ class Test_VCategories extends PHPUnit_Framework_TestCase {
}
+ public function testrenameCategory() {
+ $defcategories = array('Friends', 'Family', 'Wrok', 'Other');
+ $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories);
+
+ $this->assertTrue($catmgr->rename('Wrok', 'Work'));
+ $this->assertTrue($catmgr->hasCategory('Work'));
+ $this->assertFalse($catmgr->hasCategory('Wrok'));
+ $this->assertFalse($catmgr->rename('Wrok', 'Work'));
+
+ }
+
public function testAddToCategory() {
$objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9);