Commit Graph

154 Commits

Author SHA1 Message Date
Thomas Tanghus c127c78df4 Don't use indexes in test data as postgres complains over duplicate keys. 2012-11-12 23:35:42 +01:00
Thomas Tanghus 82e010c51c Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 00:37:40 +01:00
Thomas Tanghus 56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Thomas Tanghus fd709fc021 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-11 20:20:09 +01:00
Bart Visscher 04aa029cd3 Disable loading apps before starting tests
The tests it self should load the app if needed
2012-11-10 21:15:05 +01:00
Thomas Tanghus 73d59bd397 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-06 00:10:45 +01:00
Thomas Mueller f9226f170e fixes #266 2012-11-05 21:26:59 +01:00
Thomas Tanghus 831c2cac1e Remove unused variable. 2012-11-05 16:29:44 +01:00
Thomas Tanghus 1147dc9774 Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
	lib/vcategories.php
2012-11-05 12:06:59 +01:00
Felix Moeller a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Thomas Tanghus 88b91a7304 Swap expected and actual. 2012-11-04 12:33:32 +01:00
Thomas Tanghus e6a7bba095 Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
	lib/vcategories.php
2012-11-04 12:31:06 +01:00
Thomas Tanghus 7c67d2fdd6 VCategories: Swap expected and actual in unit tests. 2012-11-04 12:09:54 +01:00
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller f8d1d7787e Checkstyle fixes for SpaceBeforeOpenBrace 2012-11-04 10:46:32 +01:00
Robin Appelman 4c0c78d15d check for filename blacklist in OC_Filesystem::isValidPath 2012-11-03 00:26:36 +01:00
Robin Appelman 503922ff6c some tests for the file blacklist 2012-11-03 00:26:36 +01:00
Lukas Reschke fd584f446d Merge pull request #220 from fmms/checkstyle02
Checkstyle: many fixes
2012-11-02 14:59:36 -07:00
Robin Appelman 2dbf2c69de fix inlude path for template test 2012-11-02 21:46:27 +01:00
Felix Moeller afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Thomas Tanghus 8509ca257f Switch expectation and result in unit tests. 2012-10-31 21:24:03 +01:00
Thomas Tanghus 8fc0f53a48 Added unit tests for OC_VCategories. 2012-10-31 20:07:28 +01:00
Thomas Tanghus b434c20c18 Added unit test testinsertIfNotExistDontOverwrite. 2012-10-31 16:51:36 +01:00
Thomas Tanghus 5fc0c89a73 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-31 16:09:11 +01:00
Thomas Mueller dca80c55a9 fixing Test_TemplateFunctions 2012-10-31 00:22:26 +01:00
Bernhard Posselt 3ca5927b59 fixed copy paste error. 4th test will now test print_unescaped instead of p 2012-10-30 21:20:21 +01:00
Bernhard Posselt aef3c6010b splitted two tests with two assertions each into four tests with one assertion 2012-10-30 17:30:39 +01:00
Thomas Tanghus 5550cde03b Merge branch 'master' of github.com:owncloud/core into vcategories_db
Fix conflicts:
	core/ajax/vcategories/add.php
	core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
Bernhard Posselt f591382147 assert in proper order 2012-10-29 21:33:43 +01:00
Bernhard Posselt a31c230f22 added tests for p and print_unescaped 2012-10-29 21:22:53 +01:00
Thomas Müller 2248fe9f3e disble breaking test cases for now 2012-10-28 16:33:11 +01:00
Robin Appelman 6695b29053 fix running app tests 2012-10-28 16:03:52 +01:00
Thomas Müller 6f5d0ec9a9 don't enable user_external 2012-10-27 19:44:35 +02:00
Thomas Müller b390da3eba don't enable apps twice 2012-10-27 19:37:10 +02:00
Thomas Müller 0c40a061e4 fix paths in preeseed-config.php 2012-10-27 12:59:28 +02:00
Thomas Müller 74665faec5 exeuting tests now on apps as well - the apps repo shall be cloned into the sub folder apps2 2012-10-27 11:43:24 +02:00
Thomas Tanghus 2ea4fed448 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-19 13:22:27 +02:00
Thomas Tanghus 1c9929d44f Added unit tests for OC_DB::insertIfNotExist() 2012-10-19 13:18:57 +02:00
Thomas Müller 8a03abec0d Filter added to get all files into coderage report 2012-10-19 10:45:51 +03:00
Thomas Müller 59c2414439 Fixing typo 2012-10-18 23:27:49 +03:00
Thomas Müller a707fd639d Fixing expectation - comma was stupid anyhow 2012-10-18 22:22:41 +03:00
Thomas Müller e417ad6b16 Removing strange character 2012-10-18 22:11:41 +03:00
Lukas Reschke 3fc9fbeef7 Expectation should be first parameter 2012-10-18 18:35:19 +03:00
Lukas Reschke 665100b471 Expectation should be first parameter 2012-10-18 18:34:24 +03:00
Bart Visscher 5713dcfd11 Use $SERVERROOT/tests/data for testGetMimeType 2012-10-13 21:02:12 +02:00
Bart Visscher 3fef4564f0 Give share test users a unique prefix 2012-10-13 20:23:02 +02:00
Bart Visscher 730d7c4e7d Disable loading apps before starting tests 2012-10-13 20:23:02 +02:00
Lukas Reschke 41d1494898 Remove not reliable test 2012-10-13 16:53:36 +03:00
Lukas Reschke 0f26228d99 Some tests 2012-10-13 15:51:40 +02:00
Bart Visscher 95c8adba19 Swap values for assertEqual to get better error message, also renamed the function to phpunit name 2012-10-13 15:10:19 +02:00