summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17189 from owncloud/files-straypartfilesonexceptionMorris Jobke2015-06-302-29/+347
|\ | | | | Cleanup part file after upload exception
| * Unlock first path on rename if second path is lockedVincent Petry2015-06-291-0/+33
| |
| * Cleanup part file after upload exceptionVincent Petry2015-06-291-29/+314
| | | | | | | | | | | | | | | | | | | | | | | | Added unit tests for checking for stray part files. Convert exception to sabre exception in upload put method. Also added unit test for exception mapping, which also indirectly tests that the part file is being deleted on exception. This applies to both chunking and non-chunking mode. Added some unit tests for chunk upload.
* | Merge pull request #17249 from owncloud/file-cache-is-a-icacheJoas Schilling2015-06-301-0/+1
|\ \ | | | | | | Fixing "ImportController::__construct() must implement interface OCP\…
| * | Fixing "ImportController::__construct() must implement interface ↵Thomas Müller2015-06-291-0/+1
| |/ | | | | | | OCP\\ICache, instance of OC\\Cache\\File given"
* / Do not rely on actual time in unit testsLukas Reschke2015-06-291-5/+5
|/ | | | Ref https://github.com/owncloud/core/pull/17238#issuecomment-116724055
* Merge pull request #17229 from owncloud/maintenance-plugin-testJoas Schilling2015-06-291-0/+73
|\ | | | | Unit tests added for MaintenancePlugin
| * Unit tests added for MaintenancePluginThomas Müller2015-06-291-0/+73
| |
* | Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-storeLukas Reschke2015-06-291-20/+30
|\ \ | |/ |/| Send OC version to appstore so it can reply with the right links
| * Send OC version to appstore so it can reply with the right linksJoas Schilling2015-06-291-20/+30
| |
* | Merge pull request #17030 from owncloud/lock-posthooksJoas Schilling2015-06-294-4/+685
|\ \ | | | | | | Keep shared lock for post-hooks
| * | Remove test-specific method to make Bjoern and Joas happyVincent Petry2015-06-261-1/+1
| | |
| * | Release locks after class in testsVincent Petry2015-06-251-0/+8
| | |
| * | Keep shared locks in post hooksVincent Petry2015-06-254-4/+677
| | | | | | | | | | | | | | | | | | | | | | | | Instead of unlocking after the file operation, change exclusive locks back to shared locks during post hooks, and unlock after that. Also added unit tests to test locking in pre-hooks, during operation and post-hooks.
* | | Merge pull request #17050 from owncloud/request-status-from-ocsLukas Reschke2015-06-291-0/+2
|\ \ \ | | | | | | | | Request approved state for disabled apps with ocsid
| * | | Request approved state for disabled apps with ocsidLukas Reschke2015-06-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git. With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided. Fixes https://github.com/owncloud/core/issues/17003
* | | | Build base URLLukas Reschke2015-06-281-5/+13
| | | |
* | | | Use new updater URL + add unit testsLukas Reschke2015-06-281-73/+305
| |_|/ |/| | | | | | | | Uses the new updater url "https://updates.owncloud.com/server/"
* | | Add endpoint with list of OCS providersLukas Reschke2015-06-273-0/+172
| | | | | | | | | | | | | | | | | | | | | | | | This adds a OCS provider list at `ocs-provider/` to enable a somewhat autodiscovery of services. In the moment it is not possible for applications to add own entries and it is basically hard-coded in the controller. I'm aware that this is not an optimal solution and I'm happy for any pragmatic input that won't pollute our public API too much. (and is not a big super hack, this is already hacky enough ;-)) That said, I'd consider it as a first step also feasible to go with this somewhat hard-coded list and see if this gets adopted...
* | | Merge pull request #17191 from owncloud/issue-17188-group-share-part-fileThomas Müller2015-06-261-8/+18
|\ \ \ | | | | | | | | Correctly check if the real file exists, otherwise try the part file
| * | | Correctly check if the real file exists, otherwise try the part fileJoas Schilling2015-06-261-8/+18
| | |/ | |/|
* | | Merge pull request #17008 from owncloud/fix-17006Björn Schießle2015-06-262-26/+76
|\ \ \ | |/ / |/| | Improve splitting of username and remote adress when username contains an `@`
| * | Use \OC\HintException and translate the hintJoas Schilling2015-06-222-1/+30
| | |
| * | Merge spliteUserRemote with fixRemoteUrlInShareWithJoas Schilling2015-06-221-49/+31
| | |
| * | make sure that we split username and server address at the first '@' from ↵Bjoern Schiessle2015-06-221-0/+39
| | | | | | | | | | | | the right to allow usernames containing '@'
* | | Merge pull request #17070 from owncloud/lock-movemountbugVincent Petry2015-06-241-0/+91
|\ \ \ | | | | | | | | Lock correct paths when moving mount
| * | | Fix locked paths in the moveMount caseVincent Petry2015-06-241-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When moving a mount point directly, the lock must be applied on the local mount point path instead of the attached storage root. Other operations will still lock the attached storage root.
* | | | Merge pull request #17045 from owncloud/enc_improvementsBjörn Schießle2015-06-231-3/+60
|\ \ \ \ | | | | | | | | | | encryption improvements
| * | | | make sure that we always read the header from the original fileBjoern Schiessle2015-06-231-3/+60
| | |_|/ | |/| |
* | | | Make an assertion in risky test testGetNodeForPathRootJoas Schilling2015-06-221-1/+2
| |_|/ |/| |
* | | Merge pull request #12546 from oparoz/patch-1Björn Schießle2015-06-221-0/+20
|\ \ \ | |_|/ |/| | Send the mime icon if we can't generate a preview
| * | Remove unneeded returns from private cropping methodsOlivier Paroz2015-06-191-4/+3
| | |
| * | Move media type icon preview creation to its own methodOlivier Paroz2015-06-181-0/+21
| | |
* | | Merge pull request #16657 from owncloud/view-emit-pathThomas Müller2015-06-221-0/+29
|\ \ \ | | | | | | | | emit hooks from a view as long as the path is inside the default root
| * | | emit hooks from a view as long as the path is inside the default rootRobin Appelman2015-06-021-0/+29
| | | |
* | | | Merge pull request #17056 from owncloud/appframework-type-castBernhard Posselt2015-06-221-0/+14
|\ \ \ \ | | | | | | | | | | Allow multiple whitespace in type hints in AppFramework
| * | | | AppFramework annotation whitespace unit testRobin McCorkell2015-06-211-0/+14
| | |_|/ | |/| |
* | | | Merge pull request #17025 from owncloud/sftp-rmdir-emptydirRobin McCorkell2015-06-211-0/+7
|\ \ \ \ | |/ / / |/| | | Workaround for empty dir deletion for SFTP
| * | | Workaround for empty dir deletion for SFTPVincent Petry2015-06-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly clear the stat cache after deleting an empty folder to make sure it is properly detected as deleted in subsequent requests. This works around a problem with phpseclib where the folder is properly deleted remotely but the stat cache was not updated.
* | | | Merge pull request #16889 from owncloud/group-sorting-fixesJoas Schilling2015-06-191-1/+95
|\ \ \ \ | |/ / / |/| | | Only sort by group name when LDAP is involved
| * | | Only sort by group name when LDAP is involvedJoas Schilling2015-06-161-1/+95
| | | |
* | | | Fix testLukas Reschke2015-06-171-1/+1
| | | |
* | | | Normalize path in View's lock methodsVincent Petry2015-06-161-0/+22
| | | |
* | | | Merge pull request #16892 from owncloud/lock-returnfullpathVincent Petry2015-06-161-0/+39
|\ \ \ \ | |/ / / |/| | | Rethrow LockedException with full path
| * | | Rethrow LockedException with full pathVincent Petry2015-06-161-0/+39
| | | | | | | | | | | | | | | | | | | | Because the path is converted to md5 from the original exception, rethrow the exception with the correct full path
* | | | Merge pull request #16832 from owncloud/memcache-failJoas Schilling2015-06-161-22/+42
|\ \ \ \ | | | | | | | | | | Throw exception if memcache misconfigured or missing
| * | | | Throw exception if memcache misconfigured or missingVincent Petry2015-06-121-22/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of falling back to null memcache, throw exceptions. Also throw file locking specific exceptions in case the class is not available.
* | | | | Merge pull request #16943 from owncloud/sabre-convertinvalidpathJoas Schilling2015-06-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Convert invalid path exception to sabre exception on MOVE
| * | | | | Convert invalid path exception to sabre exception on MOVEVincent Petry2015-06-151-1/+1
| | |/ / / | |/| | |
* | | | | Adjust NullCache testsLukas Reschke2015-06-151-3/+1
| | | | |