summaryrefslogtreecommitdiffstats
path: root/apps/encryption/tests/controller
diff options
context:
space:
mode:
authorClark Tomlinson <fallen013@gmail.com>2015-04-24 09:42:02 -0400
committerClark Tomlinson <fallen013@gmail.com>2015-04-24 09:42:02 -0400
commit8c0856779bccb41014f677c5ebdec79aec0a5602 (patch)
treee17bdbc11d96209864fd4b1a7f68d8cad5c42e7c /apps/encryption/tests/controller
parent29168665cb8acb3296ba734500a869a70313abdc (diff)
downloadnextcloud-server-8c0856779bccb41014f677c5ebdec79aec0a5602.tar.gz
nextcloud-server-8c0856779bccb41014f677c5ebdec79aec0a5602.zip
change error codes to 400
Diffstat (limited to 'apps/encryption/tests/controller')
-rw-r--r--apps/encryption/tests/controller/RecoveryControllerTest.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/encryption/tests/controller/RecoveryControllerTest.php b/apps/encryption/tests/controller/RecoveryControllerTest.php
index 0ac76774c5f..89b541e7bd6 100644
--- a/apps/encryption/tests/controller/RecoveryControllerTest.php
+++ b/apps/encryption/tests/controller/RecoveryControllerTest.php
@@ -40,9 +40,9 @@ class RecoveryControllerTest extends TestCase {
public function adminRecoveryProvider() {
return [
['test', 'test', '1', 'Recovery key successfully enabled', HTTP::STATUS_OK],
- ['', 'test', '1', 'Missing recovery key password', HTTP::STATUS_INTERNAL_SERVER_ERROR],
- ['test', '', '1', 'Please repeat the recovery key password', HTTP::STATUS_INTERNAL_SERVER_ERROR],
- ['test', 'soimething that doesn\'t match', '1', 'Repeated recovery key password does not match the provided recovery key password', HTTP::STATUS_INTERNAL_SERVER_ERROR],
+ ['', 'test', '1', 'Missing recovery key password', HTTP::STATUS_BAD_REQUEST],
+ ['test', '', '1', 'Please repeat the recovery key password', HTTP::STATUS_BAD_REQUEST],
+ ['test', 'soimething that doesn\'t match', '1', 'Repeated recovery key password does not match the provided recovery key password', HTTP::STATUS_BAD_REQUEST],
['test', 'test', '0', 'Recovery key successfully disabled', HTTP::STATUS_OK],
];
}
@@ -79,11 +79,11 @@ class RecoveryControllerTest extends TestCase {
public function changeRecoveryPasswordProvider() {
return [
- ['test', 'test', 'oldtestFail', 'Could not change the password. Maybe the old password was not correct.', HTTP::STATUS_INTERNAL_SERVER_ERROR],
+ ['test', 'test', 'oldtestFail', 'Could not change the password. Maybe the old password was not correct.', HTTP::STATUS_BAD_REQUEST],
['test', 'test', 'oldtest', 'Password successfully changed.', HTTP::STATUS_OK],
- ['test', 'notmatch', 'oldtest', 'Repeated recovery key password does not match the provided recovery key password', HTTP::STATUS_INTERNAL_SERVER_ERROR],
- ['', 'test', 'oldtest', 'Please provide a new recovery password', HTTP::STATUS_INTERNAL_SERVER_ERROR],
- ['test', 'test', '', 'Please provide the old recovery password', HTTP::STATUS_INTERNAL_SERVER_ERROR]
+ ['test', 'notmatch', 'oldtest', 'Repeated recovery key password does not match the provided recovery key password', HTTP::STATUS_BAD_REQUEST],
+ ['', 'test', 'oldtest', 'Please provide a new recovery password', HTTP::STATUS_BAD_REQUEST],
+ ['test', 'test', '', 'Please provide the old recovery password', HTTP::STATUS_BAD_REQUEST]
];
}
@@ -117,7 +117,7 @@ class RecoveryControllerTest extends TestCase {
public function userSetRecoveryProvider() {
return [
['1', 'Recovery Key enabled', Http::STATUS_OK],
- ['0', 'Could not enable the recovery key, please try again or contact your administrator', Http::STATUS_INTERNAL_SERVER_ERROR]
+ ['0', 'Could not enable the recovery key, please try again or contact your administrator', Http::STATUS_BAD_REQUEST]
];
}