diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-11-14 13:59:52 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-04-02 21:08:53 +0200 |
| commit | 6a40dce138cc91a1a2b3dc51572ddb2babf70301 (patch) | |
| tree | 5357de9576d66fd169e45ab3e97ac510d2e8e151 /tests | |
| parent | f31dafe4a8656ddaf5d28d741cc2c62a1c6d5153 (diff) | |
| download | nextcloud-server-6a40dce138cc91a1a2b3dc51572ddb2babf70301.tar.gz nextcloud-server-6a40dce138cc91a1a2b3dc51572ddb2babf70301.zip | |
Initial commit of the bruteforcesettings app
This adds the bruteforce settings app that allows to configure (for now)
subnets that are to be ignored when doing brute force analysis. This can
for example be the LAN since we trust people from there.
* Add app
* Add php tests
* Add js tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/karma.config.js | 13 | ||||
| -rw-r--r-- | tests/phpunit-autotest.xml | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/tests/karma.config.js b/tests/karma.config.js index 91052f62cd2..f965738872f 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -118,6 +118,19 @@ module.exports = function(config) { 'settings/tests/js/appsSpec.js', 'settings/tests/js/users/deleteHandlerSpec.js' ] + }, + { + name: 'bruteforcesettings', + srcFiles: [ + // need to enforce loading order... + 'apps/bruteforcesettings/js/IPWhitelistModel.js', + 'apps/bruteforcesettings/js/IPWhitelistCollection.js', + 'apps/bruteforcesettings/js/IPWhitelistView.js', + 'apps/bruteforcesettings/js/IPWhitelist.js', + ], + testFiles: [ + 'apps/bruteforcesettings/tests/js/IPWhitelistSpec.js' + ] } ]; } diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml index 9a9c9c957e3..40633aff5ae 100644 --- a/tests/phpunit-autotest.xml +++ b/tests/phpunit-autotest.xml @@ -21,6 +21,7 @@ <directory suffix=".php">..</directory> <exclude> <directory suffix=".php">../3rdparty</directory> + <directory suffix=".php">../apps/bruteforcesettings/tests</directory> <directory suffix=".php">../apps/dav/tests</directory> <directory suffix=".php">../apps/encryption/tests</directory> <directory suffix=".php">../apps/federatedfilesharing/tests</directory> |