diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | settings/tests/js/appsSpec.js | 10 | ||||
| -rw-r--r-- | tests/karma.config.js | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index fa49588fad4..d8669fed074 100644 --- a/.gitignore +++ b/.gitignore @@ -124,6 +124,7 @@ Vagrantfile # Tests - auto-generated files /data-autotest /tests/coverage* +/tests/css /tests/karma-coverage /tests/autoconfig* /tests/autotest* diff --git a/settings/tests/js/appsSpec.js b/settings/tests/js/appsSpec.js index aa785a6768e..4b917b425c1 100644 --- a/settings/tests/js/appsSpec.js +++ b/settings/tests/js/appsSpec.js @@ -185,23 +185,27 @@ describe('OC.Settings.Apps tests', function() { { id: 'foo', name: 'Foo app', + description: 'Hello', level: 0, author: 'foo' }, { id: 'alpha', name: 'Alpha app', + description: 'Hello', level: 300, author: ['alpha', 'beta'] }, { id: 'nolevel', name: 'No level', + description: 'Hello', author: 'bar' }, { id: 'zork', name: 'Some famous adventure game', + description: 'Hello', level: 200, author: 'baz' @@ -209,6 +213,7 @@ describe('OC.Settings.Apps tests', function() { { id: 'delta', name: 'Mathematical symbol', + description: 'Hello', level: 200, author: 'foobar' } @@ -223,29 +228,34 @@ describe('OC.Settings.Apps tests', function() { 'foo': { id: 'foo', name: 'Foo app', + description: 'Hello', level: 0, author: 'foo' }, 'alpha': { id: 'alpha', name: 'Alpha app', + description: 'Hello', level: 300, author: ['alpha', 'beta'] }, 'nolevel': { id: 'nolevel', name: 'No level', + description: 'Hello', author: 'bar' }, 'zork': { id: 'zork', name: 'Some famous adventure game', + description: 'Hello', level: 200, author: 'baz', }, 'delta': { id: 'delta', name: 'Mathematical symbol', + description: 'Hello', level: 200, author: 'foobar' } diff --git a/tests/karma.config.js b/tests/karma.config.js index c499451c7dc..8a41f0162b5 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -110,7 +110,8 @@ module.exports = function(config) { name: 'settings', srcFiles: [ 'settings/js/apps.js', - 'settings/js/users/deleteHandler.js' + 'settings/js/users/deleteHandler.js', + 'core/vendor/marked/marked.min.js' ], testFiles: [ 'settings/tests/js/appsSpec.js', |