Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Heiko Kernbach 2014-03-11 15:18:43 +01:00
parent 89f1ea5b8a 306f9674de
commit 89245e0ce3
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/apps/system/aardvark/test/karma/karma.conf.js
View File

@ -155,6 +155,7 @@ module.exports = function(karma) {
// Views
'frontend/js/views/navigationView.js',
'frontend/js/views/notificationView.js',
'frontend/js/views/apiView.js',
'frontend/js/views/footerView.js',
'frontend/js/views/queryView.js',
@ -272,11 +273,11 @@ module.exports = function(karma) {
//Planner
//Router
'test/specs/planner/router/routerSpec.js',
// 'test/specs/planner/router/routerSpec.js',
//View
'test/specs/planner/views/planSymmetricViewSpec.js',
'test/specs/planner/views/planTestViewSpec.js',
'test/specs/planner/views/planScenarioSelectorViewSpec.js',
// 'test/specs/planner/views/planSymmetricViewSpec.js',
// 'test/specs/planner/views/planTestViewSpec.js',
// 'test/specs/planner/views/planScenarioSelectorViewSpec.js',
'test/specJSLint/jsLintSpec.js'
],

2
js/apps/system/aardvark/test/specs/collections/clusterCollectionsSpec.js
View File

@ -1,5 +1,5 @@
/*jslint indent: 2, nomen: true, maxlen: 100, white: true plusplus: true, browser: true*/
/*global describe, beforeEach, afterEach, it, */
/*global describe, beforeEach, afterEach, it, jasmine, */
/*global spyOn, expect*/
/*global _*/
(function() {

2
js/apps/system/aardvark/test/specs/collections/clusterDatabasesSpec.js
View File

@ -1,5 +1,5 @@
/*jslint indent: 2, nomen: true, maxlen: 100, white: true plusplus: true, browser: true*/
/*global describe, beforeEach, afterEach, it, */
/*global describe, beforeEach, afterEach, it, jasmine, */
/*global spyOn, expect*/
/*global _*/
(function() {

2
js/apps/system/aardvark/test/specs/collections/clusterServersSpec.js
View File

@ -1,5 +1,5 @@
/*jslint indent: 2, nomen: true, maxlen: 100, white: true plusplus: true, browser: true*/
/*global describe, beforeEach, afterEach, it, */
/*global describe, beforeEach, afterEach, it, jasmine, */
/*global spyOn, expect*/
/*global templateEngine, $, _, uiMatchers*/
(function() {

2
js/apps/system/aardvark/test/specs/collections/clusterShardsSpec.js
View File

@ -1,5 +1,5 @@
/*jslint indent: 2, nomen: true, maxlen: 100, white: true plusplus: true, browser: true*/
/*global describe, beforeEach, afterEach, it, */
/*global describe, beforeEach, afterEach, it, jasmine, */
/*global spyOn, expect*/
/*global _*/
(function() {

9
js/apps/system/aardvark/test/specs/views/collectionViewSpec.js
View File

@ -7,11 +7,13 @@
describe("Collection View", function() {
var myView;
window.App = function() {};
window.App.navigate = function() {};
var myView, oldRouter;
beforeEach(function() {
oldRouter = window.App;
window.App = function() {};
window.App.navigate = function() {};
$('body').append('<div id="content" class="removeMe"></div>');
myView = new window.CollectionView({
@ -22,6 +24,7 @@
afterEach(function() {
$('.removeMe').remove();
window.App = oldRouter;
});