wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14661 commits 157 branches 562 tags 714 MiB
Commit graph

45 commits

Author SHA1 Message Date
Thomas Müller
582b33bdf1 Merge pull request #4537 from owncloud/no-realpath 
Do not use realpath() on includes.
 2013-08-22 01:50:31 -07:00
Andreas Fischer
83afb46205 Use __DIR__ instead of dirname(__FILE__). 
This is possible because we require PHP 5.3 or higher.
 2013-08-21 11:01:24 +02:00
Andreas Fischer
85ac9572ce Also remove other unnecessary realpath() calls. 2013-08-21 10:53:18 +02:00
Andreas Fischer
9753e44ac2 Do not use realpath() on includes. 
If the file does not exist, realpath() returns false and "include false;"
produces "Failed opening '' for inclusion" which is a useless error message.

'include' works just fine with symlinks, "./" and "../".
 2013-08-21 10:52:22 +02:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Thomas Müller
c458e785a1 fixing typos and PHPDoc 2013-08-08 15:08:58 +02:00
Bjoern Schiessle
023121aed0 adapt tests to the changes in crypt.php 2013-08-08 13:35:01 +02:00
Bjoern Schiessle
aca7fbe2c8 adapt unit tests to the modified stream wrapper 2013-07-30 14:18:01 +02:00
Björn Schießle
7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key 
Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php
 2013-06-13 13:17:35 +02:00
Björn Schießle
2f1005f05f LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed 2013-06-13 10:44:05 +02:00
Björn Schießle
20ddd6e1c7 Merge branch 'master' into files_encryption_check_private_key 
Conflicts:
	apps/files_encryption/tests/crypt.php
 2013-06-11 15:19:02 +02:00
Jörn Friedrich Dreyer
73fb722a9e add timeouts 3/30/90 to phpunit tests 2013-06-10 09:31:22 +02:00
Florin Peter
dc8bcf0688 reformat code 2013-06-03 18:42:13 +02:00
Björn Schießle
1e601cd6f1 use generated private key fro m setUp() 2013-06-03 17:43:06 +02:00
Björn Schießle
35c91ff901 added test for decryptPrivateKey() 2013-06-03 17:34:43 +02:00
Florin Peter
c398fc59ad Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/stream.php
 2013-05-29 09:21:00 +02:00
Florin Peter
6ae7bde788 fixed encryption session namespace to avoid problems 2013-05-28 17:04:35 +02:00
Björn Schießle
2c3c60c1af Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/proxy.php
 2013-05-27 18:09:35 +02:00
Björn Schießle
df22a7c495 make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes 2013-05-27 17:35:28 +02:00
Björn Schießle
710e9c2d14 fix tests, after unused variables are removed 2013-05-27 15:34:57 +02:00
Florin Peter
9dd277576a added users for tests 
reformat code to meet coding guidelines
 2013-05-26 20:44:15 +02:00
Florin Peter
c7981abbc9 improved test 
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
 2013-05-26 03:22:16 +02:00
Florin Peter
afbfa742d7 improved tests 2013-05-22 01:11:55 +02:00
Björn Schießle
64591cf754 move 3rdparty dependencies to app 2013-05-21 10:30:24 +02:00
Florin Peter
f2b1158add improved tests 2013-05-20 23:44:10 +02:00
Florin Peter
1c8e5d6873 added test for failed sharing 2013-05-20 21:46:28 +02:00
Florin Peter
3b850a2524 reformat code added and changed phpdoc 2013-05-20 01:24:36 +02:00
Florin Peter
bdd2127f19 cleanup tests 2013-05-19 22:28:48 +02:00
Florin Peter
80f9c5bb6d removed mockery from tests and changed class names 2013-05-18 21:37:00 +02:00
Florin Peter
41165afa59 improved tests 2013-05-17 22:45:09 +02:00
Florin Peter
b6572cedac added folder move test 2013-05-17 22:16:56 +02:00
Florin Peter
cea9208cec fix broken legacy tests 2013-05-17 21:59:53 +02:00
Björn Schießle
93771f735b gremove unused code 2013-05-17 14:13:05 +02:00
Florin Peter
a4c0eb1756 improved tests 2013-05-17 01:07:26 +02:00
Florin Peter
67a80e1870 improved tests for touch 2013-05-16 00:44:40 +02:00
Florin Peter
0fca2f8f31 added tests for put content, get content, touch and fopen 2013-05-16 00:36:40 +02:00
Florin Peter
b75a0abb6b added test for rename folder 2013-05-15 22:42:22 +02:00
Florin Peter
5fcb5f3aba added test for password change 2013-05-15 21:00:35 +02:00
Florin Peter
3d7534da74 improved files_encryption tests 2013-05-15 10:21:56 +02:00
Florin Peter
7461e9c2b5 improved tests and added new tests for file rename and move 2013-05-15 02:38:08 +02:00
Florin Peter
18a821b1e3 added helper 2013-05-09 23:22:22 +02:00
Florin Peter
04b0843bb4 fixed some tests 2013-05-01 01:43:56 +02:00
Florin Peter
3c100af132 revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
Florin Peter
b08179d406 fixed tests after merge against master 2013-04-30 23:58:53 +02:00
Florin Peter
882a747b47 rename folder to tests 2013-04-30 00:34:05 +02:00
Renamed from apps/files_encryption/test/crypt.php (Browse further)