811f680457
Merge pull request #4623 from owncloud/convert-oc_preferences
...
Convert OC_Preference to object interface
2013-09-22 10:45:56 -07:00
a1d4eb1f95
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
2013-09-22 01:24:12 +02:00
de2e6e137b
Do not convert boolean to integer in tests. put() already does this.
2013-09-21 00:12:13 +02:00
d84d548618
when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy
2013-09-20 20:34:17 +02:00
445d34a2a9
Convert OC_Preference to object interface
2013-09-19 18:13:06 +02:00
1274d6116d
updating php docs
2013-09-18 22:22:51 +02:00
dd62ccdb4e
Merge branch 'appframework-master' into public_cache
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-18 13:20:07 +02:00
8b4f4a79e2
Still some session leftovers.
2013-09-17 19:46:08 +02:00
fe86182dac
OC_Cache namespace changes and add UserCache to server container.
...
Refs #4863
2013-09-17 17:46:33 +02:00
4cd0ee47a8
Merge branch 'master' into appframework-master
2013-09-17 09:39:45 +02:00
c8f9efeb94
etag changes are now propagated up the file tree
2013-09-16 23:32:17 +02:00
07714d9a72
Tests whether expired/valid link share is still accessible.
2013-09-16 21:24:16 +02:00
9d18e16c77
Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle
...
Fix Sharing "Expiration Date" on Oracle
2013-09-16 12:16:44 -07:00
3c026b7cf6
recreate an etag within the scanner if the cache contains an empty etag
2013-09-16 12:09:15 +02:00
ad82a56f79
Merge branch 'master' into appframework-master
2013-09-15 21:18:59 +02:00
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
4480b0b164
Merge branch 'master' into appframework-master
2013-09-13 23:31:59 +02:00
6ff07f7681
Merge pull request #4712 from owncloud/fileapi-foreward
...
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-13 14:31:11 -07:00
6eeb4d165c
- giving the user a new id for each test run in order to prevent reuse of e.g. permissions data in the database
...
- setting the current user id because \OC\FilesView relies on \OC_User::getUser()
2013-09-13 21:44:31 +02:00
5b3388c7c4
Merge branch 'master' into appframework-master
2013-09-13 20:56:49 +02:00
8c9add4d32
adding TB and GB to OC_Helper::humanFileSize
2013-09-13 17:22:45 +02:00
294f3632e0
Calculate dateInPast and dateInFuture.
2013-09-12 23:43:21 +02:00
20b799b2b4
Compare objects directly. Also use $expected and $actual.
2013-09-12 23:43:21 +02:00
bd1163b7d5
Add database tests for INSERT/SELECT date format.
2013-09-12 23:43:21 +02:00
261766fe49
Add comment explaining how $dateInFuture was picked.
2013-09-12 23:43:20 +02:00
f567bd1b8a
Coding style: { for methods start are supposed to be on the same line.
2013-09-12 23:43:20 +02:00
fb650deaf7
Expiration tests for sharing with groups.
2013-09-12 23:43:20 +02:00
cf97eac401
Do not repeat shareUserOneTestFileWithUserTwo() code.
2013-09-12 23:43:20 +02:00
e4b334c3f1
Make dates test class properties.
2013-09-12 23:43:20 +02:00
924a7046dd
Try to make Oracle happy by also specifying seconds.
2013-09-12 23:43:20 +02:00
1358b0078a
Test whether a still-valid user share is still accessible.
2013-09-12 23:43:20 +02:00
05c970095d
Test whether an expired user share is still accessible.
2013-09-12 23:43:20 +02:00
c9d2663159
Merge branch 'master' into fileapi-foreward
2013-09-12 21:43:35 +02:00
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
b9167196fb
adjust test cases to namespace changes
2013-09-10 22:21:49 +02:00
1832eb8872
Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
2013-09-09 16:57:46 +02:00
fbedd643f7
Merge pull request #4477 from owncloud/hooks-view
...
also emit hooks for views that are a subfolder of the user folder
2013-09-04 16:09:22 -07:00
820fd42161
Merge branch 'master' into oc_avatars
2013-09-04 12:56:40 +02:00
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
a22f9ff301
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-01 19:47:48 +02:00
ab70b8c26e
Merge branch 'master' into oc_avatars
2013-09-01 17:52:13 +02:00
2d6a400381
Check for $this->fileInfo and @depend on testData()
2013-09-01 15:50:58 +02:00
235638e5ab
Merge branch 'master' into fix_4258
...
Conflicts:
lib/image.php
2013-08-31 23:48:23 +02:00
5d653753bd
Merge branch 'master' into oc_avatars
2013-08-31 12:56:36 +02:00
a9d6b59307
Merge branch 'master' into appframework-master
2013-08-31 01:38:44 +02:00
0869f9b655
Fix #4258 , clean up \OC_Image and improve its unittest
2013-08-30 21:08:37 +02:00
ecf187393b
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
2013-08-30 09:00:37 +02:00
bf9045f585
test case for hooks send from a non-default view
2013-08-29 15:25:38 +02:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
67c5be9f19
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 16:44:11 +02:00
8d8a57de7f
Continue work on cropper
2013-08-28 16:39:00 +02:00
13514fd1ad
Merge pull request #4348 from owncloud/fixing-4343-master
...
fixes #4343
2013-08-27 04:26:51 -07:00
163269805a
Merge pull request #4507 from owncloud/existingusersfromgroup
...
return only existing users in group
2013-08-27 03:47:56 -07:00
a995e81686
Merge branch 'master' into appframework-master
2013-08-26 21:31:15 +02:00
1f5a55ddff
consolidate validity check for users in group class
2013-08-26 17:46:31 +02:00
29c28a45ca
Merge pull request #4292 from owncloud/add_appconfig_unittest
...
Add \OC_Appconfig Unittest
2013-08-26 04:07:18 -07:00
f19f8d1088
Fix avatar-unittest
2013-08-25 21:06:02 +02:00
5eb17aadb3
Fix spacing, have remove() and return JSON for custom-default-avatars
2013-08-25 21:06:02 +02:00
81cadd5ea3
Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff
2013-08-25 21:06:02 +02:00
960262bbb4
Fix testDefaultAvatar
2013-08-25 21:06:01 +02:00
4521b54c67
Have /avatar.php as a central avatar-point
2013-08-25 21:04:49 +02:00
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
2bfe662235
Add unittests & check filetype in setLocalAvatar()
...
TODO: Fix OC_Image->mimetype(), it always returns "image/png"
2013-08-25 21:04:09 +02:00
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
9e1016f7d2
Merge branch 'master' into fixing-4343-master
...
Conflicts:
lib/connector/sabre/quotaplugin.php
2013-08-22 17:59:39 +02:00
aa979f5dff
cleanup of tests
2013-08-21 00:44:39 +02:00
33db8a3089
kill superfluent classloader from tests - this approach might be of interest within the apps
2013-08-21 00:41:20 +02:00
395deacc67
reducing controller annotations to:
...
@PublicPage - No user logon is expected
@NoAdminRequired - the login user requires no admin rights
@NoCSRFRequired - the incoming request will not check for CSRF token
2013-08-20 21:21:21 +02:00
93194bb396
Introducing IContainer into public api
2013-08-20 17:21:14 +02:00
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
0fa8f38076
fixing broken test
2013-08-20 16:51:12 +02:00
72e1a8d83b
fixing require to Pimple
2013-08-20 12:47:23 +02:00
d7dde3cfbc
Merge pull request #4467 from owncloud/storage-wrapper-quota
...
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 -07:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
fde9cabe97
initial import of appframework
2013-08-17 11:16:48 +02:00
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
1877a42a0d
Scanner: additional tests for reusing etags during scanning
2013-08-12 15:37:15 +02:00
0e3dea7111
adding test case for a numeric value
2013-08-09 23:36:23 +02:00
b6b1bc5d09
Add datetime test for numeric string.
2013-08-09 22:32:38 +02:00
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 -07:00
e38025ba67
Merge pull request #4151 from owncloud/doctrine-object
...
Move dbtype depending logic into object per type
2013-08-08 08:46:30 -07:00
fed1792510
adding unit tests for quota checks
2013-08-08 13:33:00 +02:00
d3a69bf4c6
adding unit tests to determine length
2013-08-08 11:04:40 +02:00
6c78152564
Proper WHERE – the table is called userid not user
2013-08-06 17:31:50 +02:00
d70a4a960d
Use setUpBeforeClass() and tearDownAfterClass()
2013-08-06 17:30:58 +02:00
b8bfebe51e
Use setUpBeforeClass() and tearDownAfterClass()
2013-08-06 17:26:12 +02:00
b560bb21f0
Clean up DB, after we're done with testing
2013-08-06 17:01:01 +02:00
3e7a86c6ec
remove deleted files while scanning
2013-08-06 15:59:06 +02:00
95a959b10b
merge master into doctrine-object
2013-08-06 15:43:58 +02:00
057d7aa108
Merge pull request #4321 from owncloud/add_unittests_kondou
...
Add unittests
2013-08-06 04:39:20 -07:00
87ad677151
Remove pointless unittest (search/result)
2013-08-05 19:38:52 +02:00
a51af39595
Add unittests
...
Unittests for:
- search/result
- util
- preferences
2013-08-05 14:47:14 +02:00
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
19e3780ef2
remove unneeded vars from unit test
2013-08-05 10:21:51 +02:00
e04bf0aaeb
unit tests for plural translations added
2013-08-02 23:08:41 +02:00
56549dafce
Revert "Add null and emptystring tests to check NOT NULL"
...
This reverts commit c74f3d0b90
2013-08-02 21:27:33 +02:00
ed054e67d6
DB: remove invalid asserts
2013-08-02 20:10:26 +02:00
c74f3d0b90
Add null and emptystring tests to check NOT NULL
2013-08-02 15:59:33 +02:00
de0dc30d89
Update skipped tests messages
2013-08-02 15:00:12 +02:00
670242c731
Add \OC_Appconfig Unittest
2013-08-02 13:22:12 +02:00
20b688d4be
Optimize image and skip mimetype test
2013-08-01 20:17:43 +02:00
415e38fc50
Cover more cases
...
Use file_get_contents() and base64_encode(file_get_contents()),
to load from data and base64, to cover more cases
2013-08-01 20:17:43 +02:00
71f43c5fa1
Add OC_Image Unit Test
...
data() somehow does not return, what file_get_contents() returns,
so I skipped related tests.
2013-08-01 20:17:43 +02:00
eed63ae512
Merge pull request #4221 from owncloud/fix-3698
...
Fix calculating size for empty folders
2013-08-01 08:05:19 -07:00
30963d60bc
Merge pull request #4155 from owncloud/mdb2schemareader-booleans
...
Fix boolean support for xml schema definitions
2013-08-01 02:09:01 -07:00
50101a85a6
Merge pull request #3982 from owncloud/test_lastinsertid
...
test lastinsertid
2013-07-31 00:03:29 -07:00
409268f322
adding test case with no /
2013-07-30 08:54:39 +02:00
f658852276
Merge branch 'master' into fixing-testGetById-master
2013-07-30 00:37:05 +02:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
085fdfec2f
adding unit tests for OC_Util::basename
2013-07-29 23:32:03 +02:00
a4df982dc3
add tests for MDB2SchemaReader
2013-07-29 16:33:27 +02:00
afff750011
Add test for calculating size of newly empty folder
2013-07-29 10:23:14 -04:00
b8bd1e5a81
check type, assertgreaterthan
2013-07-29 02:17:09 +02:00
7e5ae8d780
test lastinsertid
2013-07-29 01:57:30 +02:00
e4132a61c9
Merge pull request #4093 from owncloud/storage-test-cleanup
...
Remove outdated unit tests for storage backend
2013-07-26 03:18:39 -07:00
cd8f0c21ce
add quota storage wrapper
2013-07-25 00:31:51 +02:00
a853968f7d
move storage wrapper test to new namespace
2013-07-25 00:31:51 +02:00
10d3e63ce5
add quota streamwrapper that limits the amount of data that can be written to a stream
2013-07-25 00:31:51 +02:00
25003fb213
Add ACPu memory cache
2013-07-24 21:50:15 +02:00
98858e6f00
Merge pull request #3995 from owncloud/groups
...
Refactoring of group management code
2013-07-24 06:13:05 -07:00
2622839fcf
Merge pull request #4171 from owncloud/fix-config
...
Fix config
2013-07-24 00:48:43 -07:00
60ce492fac
Merge branch 'master' into groups
2013-07-24 01:11:12 +02:00
c517c845f6
Merge branch 'master' into storage-test-cleanup
...
Conflicts:
tests/lib/files/storage/storage.php
2013-07-24 01:01:36 +02:00
5fc0535f1b
Merge pull request #4090 from owncloud/cleanup-some-template-functions
...
Cleanup some template functions
2013-07-23 15:53:43 -07:00
fb40d9e1e6
Merge branch 'master' into groups
2013-07-23 22:06:03 +02:00
5caa7576d4
Revert "fix failing master branch - Test_Config::testWriteData"
...
This reverts commit 8f93490ac4
2013-07-23 17:36:08 +02:00
a2cdf8b91e
Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
...
reworking of \OC\Files\Storage\AmazonS3
2013-07-22 02:19:27 -07:00
5965f3ecea
Split locating JS and CSS files to their own class
2013-07-21 21:36:15 +02:00
8f93490ac4
fix failing master branch - Test_Config::testWriteData
2013-07-21 11:13:29 +02:00
084cf0c202
Merge pull request #2221 from owncloud/doctrine
...
OC6: Implement Doctrine as the backend for OC_DB
2013-07-18 14:24:27 -07:00
e3ea3ed3c5
group: only pass backends that hold that specific group to the group constructor
2013-07-18 12:15:34 +02:00
a3ff771567
Merge pull request #4067 from owncloud/fixing-tests-win32-master
...
<<<EOL seems not to use proper end of lines on windows
2013-07-17 00:37:02 -07:00
b2bcc9774b
memcache: make base testcase abstract
2013-07-16 23:11:22 +02:00
cfac7fcd53
Storage: remove some unneeded strict tests of mtime behaviour
2013-07-16 23:07:35 +02:00
97f0bc1c4a
Storage: remove tests for search
2013-07-16 23:05:23 +02:00
e09ffb6f57
Merge pull request #2395 from owncloud/cache
...
Seperate the memory based cache and file based cache in OC_Cache
2013-07-16 13:25:07 -07:00
285f288cf3
Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
...
Fix renaming using parenthesis
2013-07-16 12:06:53 -07:00
504089940d
mamcache: implement the ArrayAccess interface
2013-07-16 16:06:00 +02:00
8ad148feaf
memcache: some additional unit tests
2013-07-16 15:46:27 +02:00
0ae8eb4f5e
Merge branch 'master' into cache
2013-07-16 15:22:47 +02:00
7ba4269c26
<<<EOL seems not to use proper end of lines on windows
2013-07-15 10:28:14 +02:00
5549c77ec5
Merge branch 'master' into doctrine
...
Conflicts:
3rdparty
lib/db.php
lib/setup.php
tests/lib/db.php
tests/lib/dbschema.php
2013-07-13 12:01:14 +02:00
3abe68176f
Merge pull request #3270 from owncloud/convert-oc_config
...
Convert OC_Config to object so it can be used for DI
2013-07-11 18:21:08 -07:00
7f3dbb6936
remove debug code ...
2013-07-11 13:41:09 +02:00
89554bd917
it's setValue not getValue, damn type
2013-07-11 13:39:10 +02:00
d134ba9a82
Merge pull request #3978 from owncloud/forwarding-emitter
...
add forwarding emitter for agregating multiple emitters
2013-07-10 10:38:28 -07:00
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
065bc96b02
more consistent naming
2013-07-10 02:17:24 +02:00
2d9be541ea
add test case for getting group after deleting it
2013-07-10 02:00:14 +02:00
912b151561
use new group api as backend for the old api
2013-07-10 00:07:46 +02:00
a735105a22
update group management
2013-07-10 00:06:22 +02:00
c0b210f0d5
Add unit test
2013-07-09 17:46:11 +03:00
52553c64ed
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
2013-07-08 17:59:50 +02:00
4a4e139c83
forward previously registerd hooks
2013-07-08 16:54:26 +02:00
925d09cb0e
add forwarding emitter for agregating multiple emitters
2013-07-08 16:45:19 +02:00
02d2e41e04
Merge pull request #3954 from owncloud/update_insertifnotexist_and_test
...
fix insertIfNotExist return value, update doc and corresponding test
2013-07-08 07:17:45 -07:00
8c9e6db1b1
increasing allowed time difference
2013-07-08 15:03:55 +02:00
22c29eb64b
Fix renaming using parenthesis
2013-07-05 15:38:09 +02:00
492a35737c
fix \OC\Config test cases when debug mode is enabled
2013-07-05 15:26:39 +02:00
f29dd1c784
fix test case whitespace
2013-07-05 15:25:53 +02:00
3f5eb762b6
Scanner test: ensure mtime in the cache is the same as on the storage to prevent random failures
2013-07-05 14:51:22 +02:00
00987feda1
fix insertIfNotExist return value, update doc and corresponding test
2013-07-05 14:05:42 +02:00
424ec94680
Make buildNotExistingFileName testable and write unittests
2013-07-05 13:03:01 +02:00
92e7392852
revoking additional tests
2013-07-04 09:01:36 +02:00
37254744b5
remove tests from the wrong test method
2013-07-03 18:41:14 +02:00
818e2a364a
test moving and copying of subdirectories
2013-07-03 18:38:34 +02:00
407753f594
move new tests into the correct test method
2013-07-03 18:34:33 +02:00
0a5e18335e
test working with files in subdirectories
2013-07-03 18:23:09 +02:00
e556b7ab55
test working with subdirectories
2013-07-03 18:16:50 +02:00
81acfc9498
test copying and moving files in subdirectories
2013-07-03 18:11:54 +02:00
21601fd784
increasing difference for modifcation time tests
...
one second is sometimes not enough when using a slow storage connection,
three seconds is working better (at least when testing against S3)
2013-07-03 18:08:19 +02:00
32d69f6889
Merge branch 'master' into convert-oc_config
2013-07-03 17:03:47 +02:00
33e1ced53c
Merge pull request #3911 from owncloud/fixing-unittests-master
...
rename can cause mtime change - invalid assert
2013-07-03 06:19:56 -07:00
e789e05675
on unit test use @expectedException
...
some phpdoc added
2013-07-02 00:15:42 +02:00
bb07dde988
Merge branch 'master' into convert-oc_config
2013-07-01 23:43:00 +02:00
c777026506
Merge pull request #3775 from owncloud/test_fixes_for_dbschema
...
use executeAudited, add table name to assert message, skip schema changi...
2013-07-01 14:38:28 -07:00
b4f7a88788
rename can cause mtime change - invalid assert
2013-07-01 22:02:21 +02:00
8beec2015a
Merge pull request #3763 from owncloud/recursive-rmdir
...
Make rmdir recursive for local storage
2013-06-30 09:16:32 -07:00
d699ee9845
Merge pull request #3635 from owncloud/storage-wrapper
...
Give apps the option to wrap storage backends
2013-06-29 04:00:03 -07:00
c2ac0fb4df
Merge pull request #3881 from owncloud/archive_tar_php5.5
...
Skip Test_Archive_TAR in php 5.5 for now
2013-06-28 13:41:18 -07:00
67ed48d4c9
Merge pull request #3884 from owncloud/fixing-unittests-master
...
Fixing unittests master
2013-06-28 13:38:44 -07:00
30a403e327
Merge pull request #3892 from owncloud/static-streamwrapper
...
Improvements for the static:// streamwrapper
2013-06-28 12:24:33 -07:00
c80e76720f
Going from text to clob is not something we do.
...
Also Oracle DB has problems with this, see
http://abhijitbashetti.blogspot.de/2011/10/converting-varchar2-to-clob-and-clob-to.html
2013-06-28 20:16:01 +02:00
4bbdd67a22
remove wrong check here
2013-06-28 20:16:01 +02:00
7b6fcddbc5
use executeAudited, add table name to assert message, skip schema changing test on oracle
2013-06-28 20:13:48 +02:00
a0d8377109
better unit tests for static stream wrapper
2013-06-28 19:59:04 +02:00
a7c70915d5
fix storage wrapper namespaces
2013-06-28 18:18:12 +02:00
de66861ef1
make phpunit happy - adding asserts
2013-06-28 15:13:57 +02:00
3abeb252d8
make PHPUnit happy and add asserts
2013-06-28 14:37:52 +02:00
42cb77b982
TimedJob: make PhpUnit happy with asserts
2013-06-28 13:24:24 +02:00
7f3ddd4341
Skip Test_Archive_TAR in php 5.5 for now
2013-06-28 11:30:47 +02:00
12976fb2e1
Set debugMode after reading the config file
2013-06-27 22:50:28 +02:00
194b61b4c5
Revert "Can't determine if debug mode is defined until we read the config"
...
This reverts commit 969e43c87b
2013-06-27 22:24:17 +02:00
c6bbccc776
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
lib/setup.php
2013-06-27 17:54:17 +02:00
0c680b46cd
View test needs a dummy user
2013-06-26 20:48:54 +02:00
c7fdf00e84
add unit tests for preview lib to make @DeepDiver1975 happy
2013-06-26 11:18:53 +02:00
769212a9a0
numRows doesn't work with Oracle
2013-06-24 22:38:19 +02:00
Bart Visscher
Robin Appelman
Andreas Fischer
Thomas Müller
Thomas Tanghus
Bernhard Posselt
kondou
Georg Ehrke
Jörn Friedrich Dreyer
blizzz
icewind1991
Owen Winkler
Morris Jobke
Michael Gapczynski
Victor Dubiniuk
Christian Berendt
Georg Ehrke