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

js/apps/system/aardvark/test/specs/router/routerSpec.js

@@ -504,6 +504,7 @@
           "databaseView",
           "databases-menu",
           {
+            users: sessionDummy,
             collection: databaseDummy
           }
         );

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

@@ -39,6 +39,10 @@
             expect(view.colid).toEqual(0);
             expect(view.events).toEqual({
                 "click #saveDocumentButton": "saveDocument",
+                "click #deleteDocumentButton" : "deleteDocumentModal",
+                "click #confirmDeleteDocument" : "deleteDocument",
+                "click #document-from" : "navigateToDocument",
+                "click #document-to" : "navigateToDocument",
                 "dblclick #documentEditor tr" : "addProperty"
             });
         });

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

@@ -69,7 +69,9 @@
           "click #userManagementSearchSubmit"   : "search",
           "click #callEditUserPassword"         : "editUserPassword",
           "click #submitEditUserPassword"       : "submitEditUserPassword",
-          "click #submitEditCurrentUserProfile" : "submitEditCurrentUserProfile"
+          "click #submitEditCurrentUserProfile" : "submitEditCurrentUserProfile",
+          "click .css-label"                    : "checkBoxes",
+          "change #userSortDesc"                : "sorting"
         };
         expect(myEvents).toEqual(myView.events);
       });