Fix JSUnit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-01-11 17:08:52 +01:00 committed by Lukas Reschke
parent fcfb4205bc
commit 4d7dee5996
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
3 changed files with 13 additions and 1 deletions

1
.gitignore vendored
View File

@ -124,6 +124,7 @@ Vagrantfile
# Tests - auto-generated files
/data-autotest
/tests/coverage*
/tests/css
/tests/karma-coverage
/tests/autoconfig*
/tests/autotest*

View File

@ -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'
}

View File

@ -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',