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

js/apps/system/aardvark/frontend/js/views/documentView.js

@@ -27,6 +27,7 @@
       }
       if (result === true) {
         this.fillEditor();
+        return true;
       }
     },
 

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

@@ -93,6 +93,7 @@
   "frontend/js/models/arangoDatabase.js",
   "frontend/js/models/arangoDocument.js",
   "frontend/js/models/arangoLog.js",
+  "frontend/js/models/newArangoLog.js",
   "frontend/js/models/arangoReplication.js",
   "frontend/js/models/arangoSession.js",
   "frontend/js/models/arangoStatistics.js",
@@ -133,6 +134,8 @@
   "clusterFrontend/js/collections/clusterShards.js",
   "clusterFrontend/js/collections/arangoClusterStatisticsCollection.js",
   "frontend/js/collections/notificationCollection.js",
+  "frontend/js/collections/_paginatedCollection.js",
+  "frontend/js/collections/newArangoLogs.js",
 
   "frontend/js/views/modalView.js",
   "frontend/js/views/navigationView.js",
@@ -150,6 +153,7 @@
   "frontend/js/views/documentsView.js",
   "frontend/js/views/documentView.js",
   "frontend/js/views/logsView.js",
+  "frontend/js/views/newLogsView.js",
   "frontend/js/views/applicationsView.js",
   "frontend/js/views/foxxActiveView.js",
   "frontend/js/views/foxxInstalledView.js",
@@ -256,6 +260,7 @@
   "test/specs/views/navigationViewSpec.js",
   "test/specs/views/graphViewSpec.js",
   "test/specs/views/documentsViewSpec.js",
+  "test/specs/views/documentViewSpec.js",
   "test/specs/views/graphManagementViewSpec.js",
   "test/specs/views/addNewGraphViewSpec.js",
   "test/specs/router/routerSpec.js",

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

@@ -18,7 +18,43 @@
       view = new window.DocumentView();
     });
 
-    it("should offer a list view", function() {
+    it("assert the basics", function () {
+      expect(view.colid).toEqual(0);
+      expect(view.colid).toEqual(0);
+      expect(view.editor).toEqual(0);
+      expect(view.events).toEqual({
+        "click #saveDocumentButton" : "saveDocument"
+      });
+    });
+
+    it("check document view type check", function() {
+      var model = new window.arangoDocument({
+        _key: "123",
+        _id: "v/123",
+        _rev: "123",
+        name: "alice"
+      });
+
+      var arangoDocStoreDummy = {
+        getEdge: function () {
+          return true;
+        },
+        getDocument: function () {
+          return true;
+        },
+        first: function () {
+          return model;
+        }
+      };
+
+      //spyOn(window, "arangoDocumentStore").andReturn(arangoDocStoreDummy);
+      //spyOn(window.arangoDocumentStore, "getEdge").andReturn(true);
+
+      view.typeCheck('edge').toEqual(true);
+      view.typeCheck('document').toEqual(true);
+      view.typeCheck('xyz').toEqual(false);
+      view.typeCheck(false).toEqual(false);
+      view.typeCheck(123).toEqual(false);
     });
 
     it("should offer a source view", function() {