Fixed all karma tests

js/apps/system/aardvark/frontend/js/config/newDygraphConfig.js

@@ -1,5 +1,5 @@
 /*jslint indent: 2, nomen: true, maxlen: 120, vars: true, white: true, plusplus: true, continue: true, regexp: true */
-/*global require, _, Dygraph, window */
+/*global require, _, Dygraph, window, document */
 
 (function () {
     "use strict";
@@ -161,7 +161,7 @@
                 if (self.figureDependedOptions[k].div || all) {
                     result.push(k);
                 }
-            })
+            });
             return result;
         },
 

js/apps/system/aardvark/test/karma/files.json

@@ -111,6 +111,7 @@
   "clusterFrontend/js/models/clusterType.js",
 
   "frontend/js/config/dygraphConfig.js",
+  "frontend/js/config/newDygraphConfig.js",
 
   "frontend/js/collections/_paginatedCollection.js",
   "frontend/js/collections/arangoCollections.js",
@@ -145,6 +146,7 @@
   "frontend/js/views/queryView.js",
   "frontend/js/views/shellView.js",
   "frontend/js/views/dashboardView.js",
+  "frontend/js/views/newDashboardView.js",
   "frontend/js/views/collectionsView.js",
   "frontend/js/views/collectionView.js",
   "frontend/js/views/collectionsItemView.js",
@@ -184,6 +186,7 @@
 
   "clusterFrontend/js/views/showClusterView.js",
 
+  "frontend/js/routers/versionCheck.js",
   "frontend/js/routers/router.js",
   "clusterFrontend/js/routers/clusterRouter.js",
 

js/apps/system/aardvark/test/specs/views/appDocumentationViewSpec.js

@@ -1,6 +1,6 @@
 /*jslint indent: 2, nomen: true, maxlen: 100, white: true  plusplus: true*/
 /*global describe, beforeEach, afterEach, it, spyOn, expect, jasmine*/
-/*global window, document, hljs, $, internal*/
+/*global window, document, hljs, $, require*/
 
 (function() {
   "use strict";
@@ -20,7 +20,9 @@
 
     it("should define the swagger UI on create", function() {
       var fakeURL = "/fake/url",
-          fakeKey = "fakeKey", view;
+          fakeKey = "fakeKey",
+          view,
+          internal = require("internal");
       spyOn(internal.arango, "databasePrefix").andReturn(fakeURL);
       spyOn(window, "SwaggerUi");
       view = new window.AppDocumentationView({

js/apps/system/aardvark/test/specs/views/documentViewSpec.js

@@ -1,5 +1,6 @@
 /*jslint indent: 2, nomen: true, maxlen: 100, white: true  plusplus: true, browser: true*/
 /*global describe, beforeEach, afterEach, it, spyOn, expect*/
+/*global arangoHelper*/
 
 (function() {
   "use strict";
@@ -81,11 +82,12 @@
       spyOn(view, "fillEditor");
 
       spyOn(view.collection, "getEdge").andReturn(true);
+      spyOn(view.collection, "getDocument").andReturn(true);
       var result = view.typeCheck('edge');
       expect(result).toEqual(true);
-
-      spyOn(view.collection, "getDocument").andReturn(true);
-      var result2 = view.typeCheck('document');
+      expect(view.collection.getEdge).toHaveBeenCalled();
+      result = view.typeCheck('document');
+      expect(view.collection.getDocument).toHaveBeenCalled();
       expect(result).toEqual(true);
     });
 
@@ -96,10 +98,10 @@
       var result = view.typeCheck('easddge');
       expect(result).not.toEqual(true);
 
-      var result2 = view.typeCheck(false);
+      result = view.typeCheck(false);
       expect(result).not.toEqual(true);
 
-      var result3 = view.typeCheck(123);
+      result = view.typeCheck(123);
       expect(result).not.toEqual(true);
     });
 

js/apps/system/aardvark/test/specs/views/graphManagementViewSpec.js

@@ -1,7 +1,7 @@
 /*jslint indent: 2, nomen: true, maxlen: 100, white: true  plusplus: true, browser: true*/
 /*global describe, beforeEach, afterEach, it, */
 /*global spyOn, runs, expect, waitsFor*/
-/*global GraphManagementView, _, jasmine$*/
+/*global GraphManagementView, _, jasmine, $*/
 
 (function() {
   "use strict";
@@ -111,7 +111,7 @@
               }));
             });
             $("#modalButton1").click();
-            expect($.ajax).toHaveBeenCalled()
+            expect($.ajax).toHaveBeenCalled();
           });
         });
 

js/apps/system/aardvark/test/specs/views/newLogsViewSpec.js

@@ -7,7 +7,7 @@
 
   describe("The new logs view", function() {
 
-    var view, allLogs, debugLogs, infoLogs, warnLogs, errLogs, div, fakeCall, model;
+    var view, allLogs, debugLogs, infoLogs, warnLogs, errLogs, div, fakeCall;
 
     beforeEach(function() {
       div = document.createElement("div");
@@ -29,7 +29,8 @@
         {loglevel: 1}
       );
 
-      fakeCall = function(options) {
+      fakeCall = function() {
+        return;
       };
 
       spyOn(allLogs, "fetch").andCallFake(function(options) {
@@ -44,15 +45,6 @@
         logerror: errLogs
       });
 
-      model = {defaults: {
-        lid: "1",
-        level: "1",
-        timestamp: "12312323",
-        text: "Hallo",
-        totalAmount: "20"
-        }
-      },
-
       expect(allLogs.fetch).toHaveBeenCalled();
       view.render();
     });
@@ -91,7 +83,7 @@
         currentTarget: {
           id: "logdebug"
         }
-      }
+      };
       spyOn(view, "convertModelToJSON");
       view.setActiveLoglevel(button);
       expect(view.convertModelToJSON).toHaveBeenCalled();
@@ -103,7 +95,7 @@
         currentTarget: {
           id: "logall"
         }
-      }
+      };
       spyOn(view, "convertModelToJSON");
       view.setActiveLoglevel(button);
       expect(view.convertModelToJSON).not.toHaveBeenCalled();