-
diff --git a/js/apps/system/aardvark/test/specs/router/routerSpec.js b/js/apps/system/aardvark/test/specs/router/routerSpec.js
index d30686e9b3..17af29a7c5 100644
--- a/js/apps/system/aardvark/test/specs/router/routerSpec.js
+++ b/js/apps/system/aardvark/test/specs/router/routerSpec.js
@@ -15,7 +15,6 @@
footerDummy,
documentDummy,
documentsDummy,
- databaseDummy,
sessionDummy,
graphDummy,
logsDummy;
@@ -32,7 +31,6 @@
};
documentDummy = {};
documentsDummy = {};
- databaseDummy = {};
graphDummy = {
handleResize: function() {}
};
@@ -48,7 +46,6 @@
spyOn(storeDummy, "fetch");
spyOn(window, "arangoCollections").andReturn(storeDummy);
spyOn(window, "ArangoSession").andReturn(sessionDummy);
- spyOn(window, "ArangoDatabase").andReturn(databaseDummy);
spyOn(window, "arangoDocuments").andReturn(documentsDummy);
spyOn(window, "arangoDocument").andReturn(documentDummy);
spyOn(window, "CollectionsView");
@@ -91,7 +88,7 @@
spyOn(window, "DBSelectionView");
});
- describe("Initialisation", function() {
+ describe("initialisation", function() {
var r;
@@ -135,13 +132,6 @@
});
});
- it("should create the dbSelectionView", function() {
- expect(window.DBSelectionView).toHaveBeenCalledWith({
- collection: databaseDummy,
- current: fakeDB
- });
- });
-
it("should fetch the collectionsStore", function() {
expect(storeDummy.fetch).toHaveBeenCalled();
});
diff --git a/js/apps/system/aardvark/test/specs/views/dbSelectionViewSpec.js b/js/apps/system/aardvark/test/specs/views/dbSelectionViewSpec.js
index 984ade352f..c09f8aafc8 100644
--- a/js/apps/system/aardvark/test/specs/views/dbSelectionViewSpec.js
+++ b/js/apps/system/aardvark/test/specs/views/dbSelectionViewSpec.js
@@ -25,13 +25,16 @@
dbCollection.add({name: n});
});
fetched = false;
- spyOn(dbCollection, "fetch").andCallFake(function(opt) {
- fetched = true;
- opt.success();
- });
+ spyOn(dbCollection, "fetch");
div = document.createElement("div");
div.id = "dbSelect";
document.body.appendChild(div);
+ view = new DBSelectionView(
+ {
+ collection: dbCollection,
+ current: current
+ }
+ );
});
afterEach(function() {
@@ -39,114 +42,48 @@
});
it("should display all databases ordered", function() {
-
- runs(function() {
- view = new DBSelectionView(
- {
- collection: dbCollection,
- current: current
- }
- );
- });
-
- waitsFor(function() {
- return fetched;
- }, 1000);
-
- runs(function() {
- var select = $(div).children()[0],
- childs;
- expect(div.childElementCount).toEqual(1);
- childs = $(select).children();
- expect(childs.length).toEqual(3);
- expect(childs[0].id).toEqual(list[0]);
- expect(childs[1].id).toEqual(list[2]);
- expect(childs[2].id).toEqual(list[1]);
- });
+ view.render($(div));
+ var select = $(div).children()[0],
+ childs;
+ expect(div.childElementCount).toEqual(1);
+ childs = $(select).children();
+ expect(childs.length).toEqual(3);
+ expect(childs[0].id).toEqual(list[0]);
+ expect(childs[1].id).toEqual(list[2]);
+ expect(childs[2].id).toEqual(list[1]);
});
it("should select the current db", function() {
- runs(function() {
- view = new DBSelectionView(
- {
- collection: dbCollection,
- current: current
- }
- );
- });
-
- waitsFor(function() {
- return fetched;
- }, 1000);
-
- runs(function() {
- expect($(div).find(":selected").attr("id")).toEqual(current.get("name"));
- });
+ view.render($(div));
+ expect($(div).find(":selected").attr("id")).toEqual(current.get("name"));
});
it("should trigger fetch on collection", function() {
- runs(function() {
- view = new DBSelectionView(
- {
- collection: dbCollection,
- current: current
- }
- );
- });
-
- waitsFor(function() {
- return fetched;
- }, 1000);
-
- runs(function() {
- expect(dbCollection.fetch).toHaveBeenCalled();
- });
+ view.render($(div));
+ expect(dbCollection.fetch).toHaveBeenCalled();
});
it("should trigger a database switch on click", function() {
- runs(function() {
- view = new DBSelectionView(
- {
- collection: dbCollection,
- current: current
- }
- );
- });
-
- waitsFor(function() {
- return fetched;
- }, 1000);
-
- runs(function() {
- spyOn(dbCollection, "createDatabaseURL").andReturn("switchURL");
- spyOn(location, "replace");
- $("#dbSelectionList").val("second").trigger("change");
- expect(dbCollection.createDatabaseURL).toHaveBeenCalledWith("second");
- expect(location.replace).toHaveBeenCalledWith("switchURL");
- });
+ view.render($(div));
+ spyOn(dbCollection, "createDatabaseURL").andReturn("switchURL");
+ spyOn(location, "replace");
+ $("#dbSelectionList").val("second").trigger("change");
+ expect(dbCollection.createDatabaseURL).toHaveBeenCalledWith("second");
+ expect(location.replace).toHaveBeenCalledWith("switchURL");
});
- it("should not render if the list has only one element", function() {
- runs(function() {
- var oneCollection = new window.ArangoDatabase();
- oneCollection.add({name: current});
- spyOn(oneCollection, "fetch").andCallFake(function(opts) {
- fetched = true;
- opts.success();
- });
- view = new DBSelectionView({
+ it("should not render the selection if the list has only one element", function() {
+ var oneCollection = new window.ArangoDatabase();
+ oneCollection.add({name: current});
+ spyOn(oneCollection, "fetch");
+ view = new DBSelectionView(
+ {
collection: oneCollection,
current: current
- });
- });
-
- waitsFor(function() {
- return fetched;
- }, 1000);
-
- runs(function() {
- expect($(div).text().trim()).toEqual("");
- });
+ }
+ );
+ view.render($(div));
+ expect($(div).text().trim()).toEqual("first");
});
});
}());