Commit graph

824 commits

Author SHA1 Message Date
Thomas Müller
28180485d9 Merge pull request #6244 from owncloud/memcached-connectivity-tests
Only run memcached tests if server is available.
2013-12-10 12:14:36 -08:00
Andreas Fischer
67310b60f7 Ensure memcached extension is there before attempting to create an instance. 2013-12-09 14:33:26 +01:00
Andreas Fischer
a67c737848 Only run memcached tests if server is available. 2013-12-09 01:02:42 +01:00
Morris Jobke
67957294c2 fix wrong test data in l10n 2013-12-07 13:29:14 +01:00
blizzz
6a747106db Merge pull request #6150 from owncloud/backgroundjob-log-exception
Remove background jobs that are giving errors
2013-12-06 11:56:53 -08:00
Robin Appelman
e888bdda30 get rid of failing test that don't cause additional downloads 2013-12-06 18:26:38 +01:00
Robin Appelman
cf9b7e343a extend test case for etag preservation 2013-12-06 13:00:58 +01:00
Robin Appelman
01ab15a2b0 reuse etags when doing a background scan 2013-12-05 15:23:34 +01:00
Robin Appelman
2ff1bdaba3 add test case for removing background jobs that are throwing exceptions 2013-12-05 13:29:35 +01:00
Robin Appelman
3fa11bd426 Dont use exceptions for the backgroundjob test cases 2013-12-04 16:28:27 +01:00
Vincent Petry
6cf9844e9c Added unit test for the test() method
This is to make sure that method isn't broken
2013-12-03 14:35:53 +01:00
Thomas Müller
832be7c908 Merge pull request #6052 from owncloud/datetime-doctrine
Get rid of date strings for DB. Completely use Doctrine and DateTime.
2013-12-01 01:29:35 -08:00
Vincent Petry
d69243ee51 Fixed FTP and SMB to use rmdir() when deleting folders
Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.
2013-11-29 13:01:01 +01:00
Vincent Petry
43b1cf7988 Redetect mime type whenever extension is renamed 2013-11-27 21:34:51 +01:00
blizzz
4f15282bc9 Merge pull request #6058 from owncloud/ldap2avatar
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
Björn Schießle
1fef97f6a5 Merge pull request #6060 from owncloud/fix-6050-oc6
fixing getRawPathInfo() once more
2013-11-26 10:13:58 -08:00
Vincent Petry
2653d914d9 Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefix
Fixed SMB rename function to overwrite target file
2013-11-26 06:42:36 -08:00
Thomas Müller
2a93720f3f fixes #6050 2013-11-26 14:13:33 +01:00
Vincent Petry
712b47757a Updated unit tests for SMB
- coverage for touch return value
- fixed directory provider to exclude unsupported cases
2013-11-26 12:53:03 +01:00
Andreas Fischer
06df3822a0 Timestamp test is no longer necessary as we rely on Doctrine and DateTime. 2013-11-26 12:22:08 +01:00
Vincent Petry
c3e34676ba Improved unit test for "overwrite on move"
Now using a different content to make sure the file was overwritten.
2013-11-25 18:54:58 +01:00
Vincent Petry
af7118aa5d Added unit test for "overwrite file on rename/move"
Also fixed "rename" unit test that was ready the result out of the wrong
file.
2013-11-25 18:52:14 +01:00
Thomas Müller
b9fed935b4 in case uri and script name don't match we better throw an exception 2013-11-25 14:42:34 +01:00
Thomas Müller
a0a665ea45 handle duplicate slashes in case of reverse proxy configuration 2013-11-25 14:21:51 +01:00
Thomas Mueller
229630f14c adding simple unit test to test scriptName() under overwrite condition 2013-11-24 21:19:06 +01:00
Arthur Schiwon
8ccac86c98 Enable user backends to provide avatar images 2013-11-22 13:25:20 +01:00
blizzz
2f73db12bb Merge pull request #5040 from owncloud/public_api_avatar_master
Add public API for \OC\Avatar
2013-11-22 03:42:28 -08:00
Arthur Schiwon
00071401d7 Round out Avatar Public API 2013-11-21 23:40:25 +01:00
Vincent Petry
356eef0739 Quota storage wrapper is now used for all users in sharing mode
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.

This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
2013-11-21 12:04:54 +01:00
Vincent Petry
5b6d1d79d0 Fixed SMB file deletion success detection
Since unlink() smb4php doesn't return true on deletion success, we need
to check whether the file was deleted to confirm success.

Fixes #5866
2013-11-19 15:05:11 +01:00
Morris Jobke
4a0d295e4a Merge pull request #5927 from owncloud/quota-excludeextstorage
External storage space is now not counted in total space
2013-11-18 14:42:40 -08:00
Vincent Petry
3e2fd9942b Root size for home storage is now size of "files" subdir
Fixes #4593
2013-11-18 18:17:25 +01:00
Vincent Petry
614e4d485c External storage space is now not counted in total space
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.

Fixes #5924
2013-11-18 18:09:01 +01:00
Bart Visscher
630e46f60a Merge pull request #5789 from ogasser/db_fix_default_for_numeric
DB: Set correct default value for numeric types
2013-11-15 04:19:33 -08:00
Thomas Müller
49e9f771ff Merge pull request #5813 from owncloud/fix-4736-master
Don't set a default value when there isn't a default specified
2013-11-15 01:06:38 -08:00
Thomas Müller
2bb4c266a6 Merge pull request #5862 from owncloud/files-singledotdirs
Files singledotdirs
2013-11-14 11:40:21 -08:00
Thomas Müller
7e63722534 make use of data providers 2013-11-14 15:37:30 +01:00
Vincent Petry
d9ab964ff9 Added missing test with leading backslash 2013-11-14 15:36:03 +01:00
Vincent Petry
c06d8bb007 Fixed normalizePath() to strip out single dot dirs
Now removing "/./" and trailing "/." from the paths when normalizing.
2013-11-14 13:15:03 +01:00
tomneedham
5a2d700866 Fix type in unit test 2013-11-14 01:11:22 +00:00
tomneedham
00944a376a Merge branch 'master' into oc_api_tests 2013-11-14 00:40:57 +00:00
tomneedham
959513fdc8 Add tests for OC_API::mergeResponses() 2013-11-14 00:40:09 +00:00
Vincent Petry
34c92f6656 Now using HomeStorage for legacy home storage ids
Legacy home storage ids with the format "local://path/to/datadir/user1"
are now also wrapped by the HomeStorage.
2013-11-12 18:01:02 +01:00
Robin Appelman
32a703ab36 Do not use -1 as the size for the root folder of the home storage 2013-11-12 16:15:43 +01:00
Morris Jobke
9c1c8d57f0 fix DB schema test - no default value 2013-11-12 13:45:28 +01:00
Oliver Gasser
95b3eb2c75 Add DB tests for default numeric
Add a table with a numeric column and an empty default directive.
2013-11-12 11:27:57 +01:00
Morris Jobke
da20fb7922 Merge pull request #5707 from owncloud/fixwrongfilesizeintests
Fixed filesize issue in watchr test
2013-11-11 06:26:38 -08:00
Vincent Petry
7ff6a642b4 Fixed filesize issue in watchr test
Added clearstatcache to make sure we get the correct file size after
re-writing into the same file.

This failed on openSUSE 12.3 x86_64
2013-11-05 17:01:02 +01:00
Thomas Müller
f91fe8d595 Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master
Oc6 windows server mssql master
2013-11-05 00:41:11 -08:00
Thomas Mueller
665b7571f4 adding test for binary file to test \OC_Helper::streamCopy() 2013-11-04 17:19:04 +01:00
Andreas Fischer
8872b881cc Add tests for OCP\Share::unshareAll(). 2013-11-03 12:31:53 +01:00
Thomas Mueller
998211f7a3 WIN: fixing unit test for testStreamCopy() 2013-11-02 20:31:29 +01:00
Thomas Müller
d25c8b43e6 Merge pull request #5652 from owncloud/front-port-5647-master
[WIP] extend unit test to directories starting or ending in whitespace
2013-11-01 23:11:33 -07:00
Jörn Friedrich Dreyer
ae469b67a0 Merge pull request #5637 from owncloud/fix_privatedata
Fix privatedata
2013-10-31 10:26:47 -07:00
Jörn Friedrich Dreyer
10b2d649af extend unit test to directories starting or ending in whitespace 2013-10-31 14:24:43 +01:00
Thomas Müller
43d71aada8 testing update and delete 2013-10-31 11:09:52 +01:00
Thomas Müller
bd5663bc3d adding unit tests for delete 2013-10-31 10:21:42 +01:00
Thomas Müller
8362afa94d unit tests for set added 2013-10-31 10:14:31 +01:00
Thomas Müller
7f64d858dd first two tests 2013-10-31 10:01:04 +01:00
Thomas Müller
261cd87efa Merge branch 'master' into home-storage 2013-10-30 22:11:19 +01:00
Jörn Friedrich Dreyer
7ba803919b Merge pull request #5625 from owncloud/fix-test-master
fix failing preview test on master
2013-10-30 09:07:07 -07:00
Morris Jobke
b65b7965ae fix failing preview test on master 2013-10-30 15:39:55 +01:00
Robin Appelman
c9f3f2874f Merge branch 'master' into update-parent-storage-mtime
Conflicts:
	lib/private/files/cache/updater.php
2013-10-30 13:41:10 +01:00
Bjoern Schiessle
fcfac51aa1 backport of https://github.com/owncloud/core/pull/5513 2013-10-29 15:08:12 +01:00
Robin Appelman
654b0daf01 update touch tests for updated behaviour 2013-10-29 14:22:13 +01:00
Robin Appelman
b3626f34cd Update the parent folders storage_mtime on write and delete to prevent rescans 2013-10-29 14:18:57 +01:00
Thomas Müller
aaefb64306 Merge pull request #5493 from owncloud/fix-language-detection
Fix HTTP language detection
2013-10-28 16:37:12 -07:00
Robin Appelman
f1e6e80eb1 add specialized storage backend for home folders 2013-10-29 00:14:23 +01:00
Vincent Petry
c8df27de73 Fixed quota stream to not wrap read-only fopen calls 2013-10-25 12:33:16 +02:00
Vincent Petry
d8b245490b Fixed quota stream's fseek method
- Added missing return statement
- Added missing support for SEEK_END
- Fixes #5524
2013-10-25 12:09:46 +02:00
Thomas Müller
66813e9df6 Merge branch 'master' into fix-language-detection 2013-10-24 19:27:33 +02:00
Thomas Müller
caa3a8d784 Merge pull request #5464 from owncloud/fixing-5456-master
Fixing 5456 master
2013-10-23 10:50:36 -07:00
Andreas Fischer
8166aaf82c Some tests for OC_L10N::findLanguage() 2013-10-23 15:41:15 +02:00
Thomas Tanghus
ad017285e1 Fix namespace for OCP\Appframework\Http
To avoid having to use OCP\Appframework\Http\Http in the public - and stable
- API OCP\Appframework\Http is now both a class and a namespace.
2013-10-23 05:57:34 +02:00
Thomas Müller
f62c4eafa5 test cases added for create/remove Shared folder and file 2013-10-22 11:22:06 +02:00
Arthur Schiwon
adbaaf85ea Test that dispayNamesInGroup(s) always returns uid as key in the result array 2013-10-20 20:56:25 +02:00
Thomas Müller
b70d67d49a Merge pull request #5237 from owncloud/coverage-on-windows-master
PHP Code Coverage on windows master
2013-10-17 02:23:15 -07:00
Thomas Müller
cdaa1db0d1 re-enable test in SecurityMiddlewareTest 2013-10-16 16:33:56 +02:00
Thomas Müller
fdeef5e874 Merge branch 'master' into fixing-appframework-master
Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
Thomas Müller
c3f7d22adc Merge pull request #5067 from owncloud/urlParams_fix
Get urlParams registered before Request is instantiated
2013-10-16 06:42:09 -07:00
kondou
e2cc7e7bf9 Fix avatar unittest 2013-10-15 17:23:47 +02:00
Bjoern Schiessle
25320f19df Merge branch 'master' into avater_with_encryption 2013-10-15 11:53:51 +02:00
Bjoern Schiessle
0b8273c768 test should work now 2013-10-15 11:53:32 +02:00
Thomas Müller
7caf011b9a fixing syntax for openssl config 2013-10-15 00:44:55 +02:00
Thomas Müller
bf99d9233c on windows we supply an openssl.cnf file in order to execute the unit tests properly 2013-10-15 00:29:47 +02:00
Thomas Müller
86f6f0ca92 Merge branch 'master' into coverage-on-windows-master 2013-10-15 00:09:00 +02:00
Thomas Müller
6df5c7ebd5 streamCopy() should return proper structure.
Callers of streamCopy() expect an array to be returned containing count and result.
2013-10-14 21:33:23 +02:00
Thomas Tanghus
d75d80ba13 OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller 2013-10-11 10:07:57 +02:00
VicDeo
26c0007a5f Merge pull request #5263 from owncloud/fixing-5255-master
Proper behavior of resolvePath()
2013-10-10 09:27:45 -07:00
Thomas Müller
bc6e352ccd the path need to be normalized before putting it into resolvePath()
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
2013-10-10 16:06:26 +02:00
Robin Appelman
1378af838c merge master into hooks-view-same-start 2013-10-10 11:34:30 +02:00
Robin Appelman
7f8eeb0474 ensure the view's root is a subfolder of the the default root, not only starting the same 2013-10-09 20:46:43 +02:00
Robin Appelman
38c563dcdc don't trigger the create hooks when if the file already exists for file_put_contents 2013-10-09 20:34:18 +02:00
Thomas Müller
44ece73c23 win32-phpunit.php is no longer required 2013-10-09 16:54:41 +02:00
Andreas Fischer
fe64f7b900 Merge pull request #5032 from owncloud/fixing-5006-master
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.

* owncloud/fixing-5006-master:
  Use strict comparison === instead of ==.
  Adjust return value tests for checkPassword() to what OC_User_Example says.
  Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
  Use parent:: in Test_User_Database::getUser().
  Test_User_Backend::getUser() does not return an array, it returns a string.
  Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
2013-10-08 23:17:51 +02:00
Thomas Müller
24e99016a9 Merge pull request #5188 from owncloud/master-delete-user
User::delete should return bool
2013-10-08 13:28:19 -07:00
Andreas Fischer
114e9d4403 Adjust return value tests for checkPassword() to what OC_User_Example says. 2013-10-08 19:57:37 +02:00
Andreas Fischer
1f11dc7200 Use parent:: in Test_User_Database::getUser(). 2013-10-08 19:36:37 +02:00
Andreas Fischer
46cd3082b0 Test_User_Backend::getUser() does not return an array, it returns a string. 2013-10-08 19:36:37 +02:00
Andreas Fischer
00a0588807 Test OC_User_Database in Test_User_Database instead of OC_User_Dummy. 2013-10-08 19:36:37 +02:00