]> source.dussan.org Git - nextcloud-server.git/commitdiff
Added encryption test when moving file as non-owner
authorVincent Petry <pvince81@owncloud.com>
Wed, 29 Oct 2014 11:57:12 +0000 (12:57 +0100)
committerVincent Petry <pvince81@owncloud.com>
Wed, 29 Oct 2014 11:57:12 +0000 (12:57 +0100)
apps/files_encryption/tests/share.php

index f4ce94b7ee92b4092de3f1853496ae9997b626ff..4a0f10b13fb1b629c8fdff2bde388ba4d1be38cf 100755 (executable)
@@ -1074,8 +1074,19 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
                \OC\Files\Filesystem::unlink('/newfolder');
        }
 
-       function testMoveFileToFolder() {
+       function usersProvider() {
+               return array(
+                       // test as owner
+                       array(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1),
+                       // test as share receiver
+                       array(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2),
+               );
+       }
 
+       /**
+        * @dataProvider usersProvider
+        */
+       function testMoveFileToFolder($userId) {
                $view = new \OC\Files\View('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
                $filename = '/tmp-' . uniqid();
@@ -1108,8 +1119,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
                $this->assertTrue($view->file_exists('files_encryption/share-keys' . $folder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
                $this->assertTrue($view->file_exists('files_encryption/share-keys' . $folder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
-               // move the file into the subfolder
+               // move the file into the subfolder as the test user
+               \Test_Encryption_Util::loginHelper($userId);
                \OC\Files\Filesystem::rename($folder . $filename, $subFolder . $filename);
+               \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
                // Get file decrypted contents
                $newDecrypt = \OC\Files\Filesystem::file_get_contents($subFolder . $filename);