Skip to content
Snippets Groups Projects
Unverified Commit 8dc79012 authored by Christoph Wurst's avatar Christoph Wurst
Browse files

sync karma require config with runtime require config

parent ce4c5f95
No related branches found
No related tags found
No related merge requests found
/* global OC */
/**
* ownCloud - Mail
*
......@@ -13,6 +11,6 @@
define(function() {
'use strict';
return OC;
return window.OC || {};
});
/**
* ownCloud - Mail
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
*
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
* @copyright Christoph Wurst 2015
*/
define(['models/account'], function(Account) {
describe('test tests', function() {
it('should pass', function() {
expect(1).toEqual(1);
});
it('should also pass', function() {
expect(2).toEqual(2);
});
});
});
......@@ -16,14 +16,28 @@ require.config({
// Karma serves files under /base, which is the basePath from your config file
baseUrl: '/base/js',
paths: {
/**
* Libraries
*/
backbone: 'vendor/backbone/backbone',
domready: 'vendor/domready/ready.min',
'backbone.radio': 'vendor/backbone.radio/build/backbone.radio',
davclient: 'vendor/davclient.js/lib/client',
domready: 'vendor/domReady/domReady',
'es6-promise': 'vendor/es6-promise/es6-promise.min',
handlebars: 'vendor/handlebars/handlebars',
ical: 'vendor/ical.js/build/ical.min',
marionette: 'vendor/backbone.marionette/lib/backbone.marionette',
underscore: 'vendor/underscore/underscore',
OC: 'tests/mocks/OC',
text: 'vendor/text/text'
},
shim: {
davclient: {
exports: 'dav'
},
ical: {
exports: 'ICAL'
}
},
// dynamically load all test files
deps: allTestFiles,
// we have to kickoff jasmine, as it is asynchronous
......
......@@ -15,6 +15,7 @@ module.exports = function(config) {
{pattern: 'js/templates/*.html', included: false},
{pattern: 'js/vendor/backbone/backbone.js', included: false},
{pattern: 'js/vendor/backbone.marionette/lib/backbone.marionette.js', included: false},
{pattern: 'js/vendor/backbone.radio/build/backbone.radio.js', included: false},
{pattern: 'js/vendor/jquery/dist/jquery.js', included: false},
{pattern: 'js/vendor/handlebars/handlebars.js', included: false},
{pattern: 'js/vendor/text/text.js', included: false},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment