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:
Jan Steemann 2014-11-09 00:09:32 +01:00
parent d1f4c6b5fe fc2a4d82d0
commit 8281bda4c4
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/apps/system/aardvark/test/specs/router/routerSpec.js
View File

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

4
js/apps/system/aardvark/test/specs/views/documentViewSpec.js
View File

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

4
js/apps/system/aardvark/test/specs/views/userManagementViewSpec.js
View File

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