Lukas Reschke
9d3b639ce6
Remove uneeded newline
2014-04-22 20:11:34 +02:00
Lukas Reschke
589c74e176
Fix indentation
2014-04-22 20:10:46 +02:00
Lukas Reschke
f07180639c
Add unit tests for arrays and "
...
OC_Util::sanitizeHTML() also supports array but we actually had no unit test for it. Additionally this commit introduces a test for escaping " into "
2014-04-22 20:09:55 +02:00
Robin Appelman
3821a09689
merge master into webdav-injection
2014-04-22 12:25:49 +02:00
Bernhard Posselt
7e447f4f42
make download and redirectresponse public
2014-04-20 16:12:46 +02:00
Bernhard Posselt
309aa3bcd2
fix phpdoc for entities
2014-04-20 02:55:59 +02:00
Bernhard Posselt
4a7e0561ca
move db into iservercontainer
2014-04-19 19:30:12 +02:00
Bernhard Posselt
0fe4db0992
remove unusued variable
2014-04-19 16:02:15 +02:00
Bernhard Posselt
f4bc5ee863
remove unusued variable
2014-04-19 16:00:19 +02:00
Bernhard Posselt
93237d87ec
fix scrutinizer issues
2014-04-19 15:25:36 +02:00
Bernhard Posselt
f260951825
port database layer from appframework to core
2014-04-19 14:56:16 +02:00
Morris Jobke
5a1a056c6d
Merge pull request #8183 from owncloud/move-security-headers
...
Move security headers
2014-04-16 23:46:20 +02:00
Thomas Tanghus
df9d9ac958
Remove unused var
2014-04-16 14:34:13 +02:00
Thomas Tanghus
dd36d4b894
Add tests for linkTo, linkToPublic, linkToRemote, linkToRemoteBase
2014-04-16 14:32:08 +02:00
Robin Appelman
295b75cca9
merge master into webdav-injection
2014-04-15 20:05:43 +02:00
Robin Appelman
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
Lukas Reschke
ffab31e3ee
Merge pull request #8197 from owncloud/secure_mimetypes
...
White-list known secure mime types. Refs. #8184
2014-04-15 19:50:33 +02:00
Arthur Schiwon
450de0091a
adjust tests accordingly
2014-04-15 17:53:57 +02:00
Lukas Reschke
340089f270
Merge pull request #8059 from owncloud/countUsersInGroup
...
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
Lukas Reschke
9046f7b2f8
Merge pull request #8178 from owncloud/fix-request-parameters
...
Correctly process request parameters other than GET or POST, dont use gl...
2014-04-14 20:42:26 +02:00
Thomas Tanghus
51e47319ef
White-list known secure mime types. Refs. #8184
2014-04-14 17:17:50 +02:00
Thomas Müller
8df19c4379
Merge pull request #8019 from owncloud/thumbnail_fixes
...
Thumbnail fixes
2014-04-14 16:23:03 +02:00
Lukas Reschke
b04d95b116
Remove uneeded usages of nosniff
2014-04-13 12:48:16 +02:00
Bernhard Posselt
62cce982bb
default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
2014-04-12 16:17:49 +02:00
Vincent Petry
e92fe47d2a
Remove annoying karma 404 warnings for images
...
Karma now serves images from core to avoid polluting the logs with a lot
of 404 warnings.
This also makes it easier to read the test errors during development.
2014-04-11 15:25:40 +02:00
Thomas Müller
7325aefbd1
Merge pull request #8112 from owncloud/karma-enableautowatch
...
Enable autowatch for karma
2014-04-10 16:57:28 +02:00
Thomas Müller
26a89e369e
Merge pull request #8137 from owncloud/routeing-requirements
...
add requirements to routing
2014-04-10 16:23:01 +02:00
Vincent Petry
6cc578d1a7
Merge pull request #8018 from owncloud/ocs_result_success_is_100
...
OC_OCS_Result Class, Only accept 100 code as success
2014-04-10 13:03:10 +02:00
Bernhard Posselt
70c88027db
add requirements to routing
2014-04-09 21:57:32 +02:00
Thomas Müller
73ac3d0fcd
Merge pull request #7643 from owncloud/chainable_response
...
Chainable Response in AppFramework
2014-04-08 22:42:43 +02:00
Vincent Petry
bfb1e0867f
Enable autowatch for karma
...
This way unit tests can be run in multiple browsers with the command
line and tests will re-run automatically when files are changed.
2014-04-08 17:21:11 +02:00
Thomas Müller
a4fc92b05b
class Test_Config is already declared
2014-04-08 14:15:33 +02:00
Arthur Schiwon
9597f41904
add group tests
2014-04-08 12:32:30 +02:00
Thomas Müller
240d1ae6b9
unit test testSetAppValueIfSetToNull() added
2014-04-07 20:56:43 +02:00
Fabian Henze
1245ff8f31
Add unit tests for OC_Helper::phpFileSize function
2014-04-07 15:31:34 +02:00
Thomas Müller
ccf1287fbf
adding unit test for cache mechanism
2014-04-04 16:21:50 +02:00
Thomas Müller
f029312e5b
fixing typos/spellings
2014-04-04 11:37:47 +02:00
Thomas Müller
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
tomneedham
b00592ade5
Fix test case for api response code
2014-04-03 14:47:55 +00:00
Thomas Müller
a2efdb8722
Merge pull request #7970 from owncloud/webdav-upload-hash
...
Fix uploading files containing a # in the path for webdav
2014-04-03 16:09:44 +02:00
Vincent Petry
4cc70ec39d
Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop
...
Correctly read the full stream in file_get_contents
2014-04-02 10:55:50 +02:00
Thomas Müller
82d1ea240e
Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available
...
idn_to_ascii is only used if available
2014-04-01 22:51:23 +02:00
Vincent Petry
d6ce45fe61
Correctly read the full stream in file_get_contents
...
When using user-defined stream wrappers, PHP will
return a maximum of 8192 bytes even if more was
requested.
This fix uses stream_get_contents to make sure the full stream is read
and not only the first 8 KB.
Added unit test with a bigger test file to cover this case.
2014-04-01 10:07:16 +02:00
Bart Visscher
6b061c236d
Merge branch 'master' into type-hinting
...
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Robin Appelman
76c63a5760
Fix uploading files containing a # in the path for webdav
2014-03-31 17:00:32 +02:00
Thomas Müller
70db348475
Merge pull request #7824 from owncloud/hash-parameter-order
...
Fix parameter order for Storage\Local::hash
2014-03-28 13:06:07 +01:00
Vincent Petry
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
Vincent Petry
5068c57845
Merge pull request #7613 from owncloud/fix_urlGenerator2
...
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
2014-03-28 12:12:49 +01:00
Vincent Petry
040f430f0c
Merge pull request #7829 from owncloud/cachefolderlocation
...
Cache folder is now configurable
2014-03-28 12:08:38 +01:00
Vincent Petry
ef2c176eef
Merge pull request #7678 from owncloud/test-bootstrap-fileproxy-cleanup
...
Cleanup the fileproxy proxies on test bootstrap
2014-03-28 11:33:57 +01:00
Robin Appelman
371a924c92
merge master into webdav-injection
2014-03-26 14:26:07 +01:00
Thomas Müller
83b4bcfdbf
idn_to_ascii is only used if available
2014-03-26 11:17:23 +01:00
Thomas Müller
1ae10b9da3
Merge pull request #7420 from owncloud/cachehooks-first
...
Manually triger the filecache update hooks before any other hook
2014-03-25 22:41:09 +01:00
Thomas Müller
bbc2e37259
Merge pull request #7477 from owncloud/foldersize-reuse
...
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
Bjoern Schiessle
bc0292c16d
always return an array
2014-03-25 17:47:24 +01:00
Thomas Müller
531c9564b3
Merge pull request #7861 from owncloud/idn-domains-support-on-emails-master
...
idn have to be converted before being used
2014-03-25 12:38:32 +01:00
Vincent Petry
1e39719926
Added unit tests for external cache folder
2014-03-24 14:32:04 +01:00
Thomas Müller
fb7f3008d3
idn have to be converted before being used
2014-03-24 13:46:31 +01:00
icewind1991
4c8a83e82f
Merge pull request #7714 from owncloud/phpunit-config
...
Allow setting the config dir to use as enviroment variable for phpunit
2014-03-24 13:01:37 +01:00
Robin Appelman
fffe330bbc
Fix parameter order for Storage\Local::hash
2014-03-20 15:32:12 +01:00
Vincent Petry
316a22b463
Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown
...
Still return quota value when free space is unknown
2014-03-20 15:29:14 +01:00
Vincent Petry
36c0f08ec0
Merge pull request #7732 from owncloud/datafolderexistence
...
Added .ocdata file to check for data folder validity
2014-03-20 11:31:28 +01:00
Vincent Petry
66bc0f0848
Still return quota value when free space is unknown
...
Fixed the quota storage wrapper to correctly return the quota value when
the free space is not known (which usually happens when the disk_free_space
function is disabled)
2014-03-19 19:07:11 +01:00
Thomas Müller
153eadd753
Merge branch 'master' into close-session-faster-master
2014-03-17 21:57:48 +01:00
Thomas Müller
6bbbf8536f
introduce reopen() method to be used for unit test execution only - right after a unit test has been executed the session will be reopened
2014-03-17 21:57:10 +01:00
Thomas Müller
756bbe8786
Merge pull request #7649 from owncloud/routing-public
...
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
icewind1991
5c72b526a3
Merge pull request #7760 from owncloud/core-roundbytes
...
Correctly round bytes when converted from human readable format
2014-03-17 15:21:57 +01:00
Vincent Petry
145db370d1
Correctly round bytes when converted from human readable format
...
Instead of leave two decimal places which is confusing, round the byte
values correctly to the closest byte.
2014-03-17 12:15:12 +01:00
Thomas Müller
cd038604d3
unit tests for specific image type output added
2014-03-17 08:40:59 +01:00
Thomas Müller
fe05c0c81b
move session reset to endTest() - necessary because we need a valid session in the next unit tests setUp() call
2014-03-14 18:16:20 +01:00
Vincent Petry
3c46dcd7dd
Added .ocdata file to check for data folder validity
...
In environments where the data folder is mount from another partition,
it is important to check that the data folder we see is actually the
real one. If the mount failed for some reasons, this fix will make
ownCloud temporarily unavailable instead of causing unpredictable
behavior.
2014-03-14 15:36:35 +01:00
Thomas Müller
fc697c7298
adding StartSessionListener which initializes the session before each test case execution
2014-03-13 16:19:17 +01:00
Robin Appelman
eabeedb306
Merge branch 'master' into cachehooks-first
2014-03-13 15:22:00 +01:00
Robin Appelman
a8eb7a5092
Allow setting the config dir to use as enviroment variable for phpunit
2014-03-13 13:33:09 +01:00
Bart Visscher
d798169037
Cleanup the fileproxy proxies on test bootstrap
2014-03-11 21:03:29 +01:00
Robin Appelman
d55c7223a9
Merge branch 'master' into foldersize-reuse
...
Conflicts:
lib/private/files/cache/homecache.php
2014-03-11 13:04:20 +01:00
Vincent Petry
c1cb9ee9b0
Merge pull request #7650 from owncloud/quota-totalspace
...
Fixed total space display when data size exceeds quota
2014-03-11 12:40:59 +01:00
Vincent Petry
010eef95c0
Fixed total space display when data size exceeds quota
...
The total space display in the personal page now shows the quota value
instead of used space when used space exceeds the quota (soft quota).
2014-03-10 17:59:14 +01:00
Robin Appelman
8ab7d18a6a
Move the router classes to a namespace and expose it with a public interface
2014-03-10 14:04:58 +01:00
Vincent Petry
26513bc17b
Merge pull request #7624 from owncloud/enc-encryptedusedspacefix
...
[master] Fixed used space to be based on unencrypted size
2014-03-10 09:38:24 +01:00
Thomas Tanghus
8f6ea900f2
Chainable Response in AppFramework
2014-03-09 23:01:16 +01:00
Vincent Petry
48d63a6278
Return unencrypted_size of folder when queried
...
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
2014-03-07 14:59:09 +01:00
Thomas Tanghus
ada8d4e0c9
Fix unit tests
2014-03-07 02:44:34 +01:00
Robin Appelman
84cf40ed82
merge master into webdav-injection
2014-03-06 13:35:06 +01:00
Vincent Petry
c7e204bd36
Added unit tests for serverHost and other related functions
2014-03-06 11:51:17 +01:00
Thomas Tanghus
b54b0b2153
Yet another cleanup
2014-03-05 00:26:06 +01:00
Robin Appelman
5211566205
update test case
2014-03-04 16:36:03 +01:00
Robin Appelman
bb8a7a2230
Remove assert since the root size of the home storage is no longer calculated
2014-03-03 16:48:06 +01:00
Robin Appelman
331fc55e2d
Update unit tests to use the new injection
2014-03-03 14:27:24 +01:00
Bart Visscher
35a8dfb2fa
More PHPDoc fixes, using scrutinizer patches as hints
2014-02-28 13:53:41 +01:00
Thomas Müller
93b8aba3a1
Merge pull request #7439 from owncloud/unit-test-for-7430
...
adding test for migrations on columns using keywords
2014-02-27 21:52:46 +01:00
Bart Visscher
3116bede68
Add unit tests for getUserGroups with addUser and removeUser
2014-02-27 21:04:44 +01:00
Jörn Friedrich Dreyer
2ba6cd4e2b
initialize etags of temporary storage
2014-02-27 12:44:07 +01:00
Jörn Friedrich Dreyer
131c12ad8d
use assertInternalType for typechecking
2014-02-27 09:51:26 +01:00
Jörn Friedrich Dreyer
39f2f564a9
use assertSame and assertNotSame for etag checks
2014-02-27 09:39:34 +01:00
Thomas Müller
230e5e3788
let's name the column 'select' because this is a keyword on all platforms
2014-02-26 20:47:07 +01:00
Thomas Müller
459b5086d5
adding test for migrations on columns using keywords
2014-02-26 20:42:45 +01:00
Robin Appelman
bc49c6be04
Manually triger the filecache update hooks before any other hook
2014-02-26 14:29:13 +01:00
Björn Schießle
6bde602c09
Merge pull request #7292 from owncloud/sharing_tests
...
fix sharing unit tests
2014-02-21 14:24:51 +01:00
Björn Schießle
9f0fc30251
Merge pull request #7337 from owncloud/test_for_6935
...
add unit test for \OC\URLGenerator::getAbsoluteURL
2014-02-21 13:45:49 +01:00