Bart Visscher
5965f3ecea
Split locating JS and CSS files to their own class
2013-07-21 21:36:15 +02:00
Morris Jobke
8f93490ac4
fix failing master branch - Test_Config::testWriteData
2013-07-21 11:13:29 +02:00
Bart Visscher
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
Thomas Müller
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
Robin Appelman
b2bcc9774b
memcache: make base testcase abstract
2013-07-16 23:11:22 +02:00
icewind1991
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
Bart Visscher
285f288cf3
Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
...
Fix renaming using parenthesis
2013-07-16 12:06:53 -07:00
Robin Appelman
504089940d
mamcache: implement the ArrayAccess interface
2013-07-16 16:06:00 +02:00
Robin Appelman
8ad148feaf
memcache: some additional unit tests
2013-07-16 15:46:27 +02:00
Robin Appelman
0ae8eb4f5e
Merge branch 'master' into cache
2013-07-16 15:22:47 +02:00
Thomas Mueller
7ba4269c26
<<<EOL seems not to use proper end of lines on windows
2013-07-15 10:28:14 +02:00
Bart Visscher
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
icewind1991
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
icewind1991
d134ba9a82
Merge pull request #3978 from owncloud/forwarding-emitter
...
add forwarding emitter for agregating multiple emitters
2013-07-10 10:38:28 -07:00
Victor Dubiniuk
c0b210f0d5
Add unit test
2013-07-09 17:46:11 +03:00
Bart Visscher
52553c64ed
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
2013-07-08 17:59:50 +02:00
Robin Appelman
4a4e139c83
forward previously registerd hooks
2013-07-08 16:54:26 +02:00
Robin Appelman
925d09cb0e
add forwarding emitter for agregating multiple emitters
2013-07-08 16:45:19 +02:00
Thomas Müller
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
Bart Visscher
22c29eb64b
Fix renaming using parenthesis
2013-07-05 15:38:09 +02:00
Robin Appelman
492a35737c
fix \OC\Config test cases when debug mode is enabled
2013-07-05 15:26:39 +02:00
Robin Appelman
f29dd1c784
fix test case whitespace
2013-07-05 15:25:53 +02:00
Robin Appelman
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
Jörn Friedrich Dreyer
00987feda1
fix insertIfNotExist return value, update doc and corresponding test
2013-07-05 14:05:42 +02:00
Bart Visscher
424ec94680
Make buildNotExistingFileName testable and write unittests
2013-07-05 13:03:01 +02:00
Thomas Mueller
32d69f6889
Merge branch 'master' into convert-oc_config
2013-07-03 17:03:47 +02:00
Michael Gapczynski
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
Thomas Müller
e789e05675
on unit test use @expectedException
...
some phpdoc added
2013-07-02 00:15:42 +02:00
Thomas Müller
bb07dde988
Merge branch 'master' into convert-oc_config
2013-07-01 23:43:00 +02:00
Thomas Müller
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
Thomas Müller
b4f7a88788
rename can cause mtime change - invalid assert
2013-07-01 22:02:21 +02:00
Thomas Müller
8beec2015a
Merge pull request #3763 from owncloud/recursive-rmdir
...
Make rmdir recursive for local storage
2013-06-30 09:16:32 -07:00
Bart Visscher
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
Morris Jobke
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
Morris Jobke
67ed48d4c9
Merge pull request #3884 from owncloud/fixing-unittests-master
...
Fixing unittests master
2013-06-28 13:38:44 -07:00
icewind1991
30a403e327
Merge pull request #3892 from owncloud/static-streamwrapper
...
Improvements for the static:// streamwrapper
2013-06-28 12:24:33 -07:00
Bart Visscher
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
Jörn Friedrich Dreyer
4bbdd67a22
remove wrong check here
2013-06-28 20:16:01 +02:00
Jörn Friedrich Dreyer
7b6fcddbc5
use executeAudited, add table name to assert message, skip schema changing test on oracle
2013-06-28 20:13:48 +02:00
Robin Appelman
a0d8377109
better unit tests for static stream wrapper
2013-06-28 19:59:04 +02:00
Robin Appelman
a7c70915d5
fix storage wrapper namespaces
2013-06-28 18:18:12 +02:00
Bart Visscher
b1a2ddd149
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
...
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
Thomas Mueller
de66861ef1
make phpunit happy - adding asserts
2013-06-28 15:13:57 +02:00
Thomas Mueller
3abeb252d8
make PHPUnit happy and add asserts
2013-06-28 14:37:52 +02:00
Thomas Mueller
42cb77b982
TimedJob: make PhpUnit happy with asserts
2013-06-28 13:24:24 +02:00
Bart Visscher
7f3ddd4341
Skip Test_Archive_TAR in php 5.5 for now
2013-06-28 11:30:47 +02:00
Bart Visscher
12976fb2e1
Set debugMode after reading the config file
2013-06-27 22:50:28 +02:00
Bart Visscher
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
Bart Visscher
c6bbccc776
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
lib/setup.php
2013-06-27 17:54:17 +02:00
Andreas Fischer
121e4ca395
PHPUnit: Allow developers to use their own custom phpunit.xml file.
...
The order of precedence of configuration files for PHPUnit is:
- phpunit.xml (allowing custom user defined configuration)
- phpunit.xml.dist (configuration distributed with the software)
2013-06-27 16:31:31 +02:00