diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2017-04-02 21:41:14 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-04-04 10:29:12 +0200 |
| commit | aee2d6318fef503528c94947596bafeb43594ed3 (patch) | |
| tree | d177e5690f10c091a1ca1a76be5d8c7099f899f5 /tests | |
| parent | e09c386f700ba7dd8d7366f924fbbcb4bf39b366 (diff) | |
| download | nextcloud-server-aee2d6318fef503528c94947596bafeb43594ed3.tar.gz nextcloud-server-aee2d6318fef503528c94947596bafeb43594ed3.zip | |
Fix 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/lib/App/AppManagerTest.php | 2 | ||||
| -rw-r--r-- | tests/phpunit-autotest.xml | 1 |
3 files changed, 0 insertions, 16 deletions
diff --git a/tests/karma.config.js b/tests/karma.config.js index f965738872f..91052f62cd2 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -118,19 +118,6 @@ 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/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php index 26489cb5b0f..bfb2893955f 100644 --- a/tests/lib/App/AppManagerTest.php +++ b/tests/lib/App/AppManagerTest.php @@ -329,7 +329,6 @@ class AppManagerTest extends TestCase { $this->appConfig->setValue('test2', 'enabled', 'no'); $this->appConfig->setValue('test3', 'enabled', '["foo"]'); $apps = [ - 'bruteforcesettings', 'dav', 'federatedfilesharing', 'files', @@ -355,7 +354,6 @@ class AppManagerTest extends TestCase { $this->appConfig->setValue('test3', 'enabled', '["foo"]'); $this->appConfig->setValue('test4', 'enabled', '["asd"]'); $enabled = [ - 'bruteforcesettings', 'dav', 'federatedfilesharing', 'files', diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml index 40633aff5ae..9a9c9c957e3 100644 --- a/tests/phpunit-autotest.xml +++ b/tests/phpunit-autotest.xml @@ -21,7 +21,6 @@ <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> |