Skip to content
This repository has been archived by the owner on Nov 7, 2020. It is now read-only.

Commit

Permalink
Clean up several tests for greater consistency (#267)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yourcelf
yourcelf committed Apr 15, 2014
1 parent 34d96ad commit 961563d
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 60 deletions.
9 changes: 8 additions & 1 deletion public/js/event-app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,13 +364,20 @@ $(document).ready(function() {
}, {
done: function() {
el.hide();
// This is introspected by browser tests that need to know
// if we're done loading the about pane for the first time.
window.EVENT_ABOUT_INITIALIZED = true;
}
});

aboutShown = false;
$("#about-nav").removeClass("active");
} else {
el.show().animate({"top":0});
el.show().animate({"top":0}, {
// This is introspected by browser tests that need to know if
// we're done loading the about pane for the first time.
done: function() { window.EVENT_ABOUT_INITIALIZED = true; }
});
aboutShown = true;

$("#about-nav").addClass("active");
Expand Down
19 changes: 16 additions & 3 deletions test/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,21 @@ var buildBrowser = function(callback) {
browser.unMockAuthenticate = function(user) {
return browser.executeScript("document.cookie = 'mock_user=; path=/';");
};
browser.waitForSelector = function(selector) {
// This is sugar to wrap selenium's `wait` with a default timeout. We want
// to throw exceptions rather than waiting for mocha's timeout so that we
// can see a stack trace (mocha's timeous don't provide one).
browser.waitWithTimeout = function(cb, timeout) {
var start = new Date().getTime();
timeout = timeout || 30000;
return browser.wait(function() {
if (new Date().getTime() - start > timeout) {
throw new Error("Browser wait timeout of " + timeout + " exceeded.");
}
return cb();
});
};
browser.waitForSelector = function(selector) {
return browser.waitWithTimeout(function() {
return browser.byCss(selector).then(function(el) {
return el.isDisplayed();
}).then(null, function(err) {
Expand All @@ -55,7 +68,7 @@ var buildBrowser = function(callback) {
});
};
browser.waitForScript = function(exportName) {
return browser.wait(function() {
return browser.waitWithTimeout(function() {
return browser.executeScript("return typeof " + exportName + " !== 'undefined';");
});
};
Expand All @@ -78,7 +91,7 @@ var buildBrowser = function(callback) {
});
};
browser.waitForFunc = function(cb) {
return browser.wait(function() {
return browser.waitWithTimeout(function() {
return browser.then(function() { return cb(); })
})
};
Expand Down
40 changes: 25 additions & 15 deletions test/test.create-event.selenium.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ describe("CREATE EVENT", function() {
expect(url).to.be("http://localhost:7777/event/test-title");
eventId = common.server.db.events.findWhere({shortName: "test-title"}).id
}).then(function() {
var event = common.server.db.events.get(eventId);
browser.get("http://localhost:7777/admin/")
browser.byCss("#events a[href='/event/" + eventId + "']").getText().then(
function(text) {
Expand Down Expand Up @@ -77,20 +78,6 @@ describe("CREATE EVENT", function() {

// View the started event
browser.get("http://localhost:7777/event/" + eventId);
// Expose the 'about' div
browser.waitForScript("$");
browser.byCss("#about-nav a").click();
browser.wait(function() {
return browser.executeScript(
"return $('#about-event').find('.scroll-up').length === 1;"
);
});
browser.executeScript(
"return $('#about-event .about-footer').is(':visible');"
).then(function(res) {
// No longer have footer message.
expect(res).to.be(false);
});

function aboutIsVisible(isVisible) {
return browser.wait(function() {
Expand All @@ -102,6 +89,27 @@ describe("CREATE EVENT", function() {
});
}

browser.waitWithTimeout(function() {
return browser.executeScript("return !!window.EVENT_ABOUT_INITIALIZED");
});

// Show the 'about' pane.
browser.byCss("#about-nav a").click();
aboutIsVisible(true);

// Make sure scroll-up is there.
browser.waitWithTimeout(function() {
return browser.executeScript(
"return $('#about-event').find('.scroll-up').length === 1;"
);
});
// Make sure footer is not there.
browser.executeScript(
"return $('#about-event .about-footer').is(':visible');"
).then(function(res) {
expect(res).to.be(false);
});

// Hide the 'about' div
browser.byCss("#about-nav a").click();
aboutIsVisible(false);
Expand All @@ -112,7 +120,9 @@ describe("CREATE EVENT", function() {
browser.byCss("#about-nav a").click();
aboutIsVisible(true);
browser.waitForSelector("#about-event .scroll-up");
browser.executeScript("$('#about-event .scroll-up')[0].scrollIntoView();");
browser.waitForSelector("#about-event .scroll-up");
// TODO this line fails occasionally with 'ElementNotVisibleError'
// -- timing issue?
browser.byCss("#about-event .scroll-up").click();
aboutIsVisible(false);

Expand Down
94 changes: 53 additions & 41 deletions test/test.session-joining.selenium.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
return sock.promiseClose();
});
// The participant list should clear when the socket closes.
browser.wait(function() {
browser.waitWithTimeout(function() {
return browser.byCsss(participantList + " i.icon-user").then(function(els) {
return els.length === 0;
});
Expand Down Expand Up @@ -119,7 +119,7 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
return sock1.promiseClose();
});
// Have the socket leave the event page, but not the participant list.
browser.wait(function() {
browser.waitWithTimeout(function() {
return browser.byCsss("#presence-gutter .user").then(function(els) {
return els.length == 1;
});
Expand All @@ -134,7 +134,7 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
return sock2.promiseClose();
});
// Now noone should be left
browser.wait(function() {
browser.waitWithTimeout(function() {
return browser.byCsss(participantList + " i.icon-user").then(function(els) {
return els.length == 0;
});
Expand All @@ -146,7 +146,6 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
});

it("Preserves session list position", function(done) {
this.timeout(80000);
// We'll use 3 sockets --- s1, s2, s3 in the session.
var s1, s2, s3;
var session = event.get("sessions").at(0);
Expand All @@ -157,25 +156,22 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
browser.get("http://localhost:7777/");
browser.mockAuthenticate(observer.get("sock-key"));
browser.get("http://localhost:7777" + event.getEventUrl());
browser.waitForScript("$");
browser.then(function() {
return common.authedSock(
u1.getSockKey(), session.getRoomId()
).then(function(sock) { s1 = sock; });
});
browser.then(function() {
return common.authedSock(
u2.getSockKey(), session.getRoomId()
).then(function(sock) { s2 = sock; });
browser.waitWithTimeout(function() {
return browser.executeScript("return !!window.EVENT_ABOUT_INITIALIZED;");
});
browser.then(function() {
return common.authedSock(
u3.getSockKey(), session.getRoomId()
).then(function(sock) { s3 = sock; });
return Promise.all([
common.authedSock(u1.getSockKey(), session.getRoomId())
.then(function(sock) { s1 = sock; }),
common.authedSock(u2.getSockKey(), session.getRoomId())
.then(function(sock) { s2 = sock; }),
common.authedSock(u3.getSockKey(), session.getRoomId())
.then(function(sock) { s3 = sock; })
]);
});
function checkSessionUsers(list) {
var selector ="[data-session-id='" + session.id + "'] ul.hangout-users li";
return browser.wait(function() {
return browser.waitWithTimeout(function() {
return browser.byCsss(selector).then(function(els) {
return Promise.all(_.map(els, function(el, i) {
return new Promise(function(resolve, reject) {
Expand All @@ -195,7 +191,7 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
return false;
});
});
});
}, 45000);
};
checkSessionUsers([u1, u2, u3, null, null, null, null, null, null, null]);
browser.then(function() { return s2.promiseClose(); });
Expand All @@ -219,12 +215,12 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
browser.mockAuthenticate("admin1");
// Visit the session to "start" it.
browser.get("http://localhost:7777/test/hangout/" + session.id + "/");
browser.wait(function() {
browser.waitWithTimeout(function() {
return session.getState() === "started";
});
// Then leave, by going to the event page, where we'll delete it.
browser.get("http://localhost:7777/event/" + event.id);
browser.wait(function() {
browser.waitWithTimeout(function() {
return session.getState() === "stopping";
});
browser.waitForScript("$");
Expand All @@ -251,7 +247,7 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
browser.get("http://localhost:7777/");
browser.mockAuthenticate("regular1");
browser.get("http://localhost:7777/test/hangout/" + session.id + "/");
browser.wait(function() {
browser.waitWithTimeout(function() {
return session.getState() == "started";
});
// leave..
Expand All @@ -270,7 +266,7 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
});

function disconnectionModalShowing(isShowing) {
return browser.wait(function() {
return browser.waitWithTimeout(function() {
return browser.executeScript(
"return window.$ && $('#disconnected-modal').is(':visible')"
).then(function(result) {
Expand All @@ -286,15 +282,15 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {

// Connect the browser and a socket to the event page.
browser.get("http://localhost:7777/event/" + event.id);
browser.wait(function() {
browser.waitWithTimeout(function() {
return event.get("connectedUsers").length === 1;
});
browser.then(function() {
common.authedSock("regular2", event.getRoomId(), function(thesock) {
sock = thesock;
});
});
browser.wait(function() {
browser.waitWithTimeout(function() {
return browser.byCsss("#presence-gutter .user").then(function(els) {
return els.length == 2;
});
Expand All @@ -312,20 +308,26 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
// as it didn't fire reconnection. So we expect to see only one
// user now -- simulating what should happen if someone goes
// away during server down time.
var eventId = event.id;
disconnectionModalShowing(false);
browser.byCsss("#presence-gutter .user").then(function(els) {
expect(els.length).to.be(1);
// Refresh the event now that we've re-populated it.
event = common.server.db.events.get(event.id)
expect(event.get("connectedUsers").length).to.be(1);
browser.waitWithTimeout(function() {
event = common.server.db.events.get(eventId);
return event.get("connectedUsers").length === 1;
});
browser.waitWithTimeout(function() {
return browser.byCsss("#presence-gutter .user").then(function(els) {
return els.length === 1;
})
});
browser.then(function() {
done();
});
});
});

});
function framedDisconnectionModalShowing(isShowing) {
return browser.wait(function() {
return browser.waitWithTimeout(function() {
return browser.executeScript(
// Three frames deep. [[INCEPTION]]
"var val;" +
Expand All @@ -347,15 +349,15 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
var sock;
var session = event.get("sessions").at(0);
browser.get("http://localhost:7777/test/hangout/" + session.id + "/")
browser.wait(function() {
browser.waitWithTimeout(function() {
return session.getNumConnectedParticipants() === 1;
});
browser.then(function() {
return common.authedSock("regular2", session.getRoomId()).then(function(thesock) {
sock = thesock;
});
});
browser.wait(function() {
browser.waitWithTimeout(function() {
return session.get("connectedParticipants").length == 2;
}).then(function() {
common.restartServer(function onStopped(restart) {
Expand All @@ -364,7 +366,7 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
});
}, function onRestarted() {
framedDisconnectionModalShowing(false);
browser.wait(function() {
browser.waitWithTimeout(function() {
// Refresh session from new DB.
event = common.server.db.events.get(event.id);
session = event.get("sessions").get(session.id);
Expand All @@ -386,8 +388,12 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
session.set("hangout-url", "http://example.com/");
});
browser.get("http://localhost:7777/test/hangout/" + session.id + "/");
browser.wait(function() {
return browser.executeScript("return !!" + button + ";");
browser.waitWithTimeout(function() {
return browser.executeScript(
"return !!" + button + ";"
).then(null, function(err) {
return false;
});
});
browser.executeScript("return " + button + ".href").then(function(href) {
expect(href).to.be("http://example.com/");
Expand Down Expand Up @@ -476,7 +482,9 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
browser.get("http://localhost:7777/");
browser.mockAuthenticate(u1.getSockKey());
browser.get("http://localhost:7777/event/" + event.id);
browser.waitForScript("$");
browser.waitWithTimeout(function() {
return browser.executeScript("return !!window.EVENT_ABOUT_INITIALIZED;");
});
browser.then(function() {
return new Promise(function (resolve, reject) {
var url = "http://localhost:7777/session/" + session.get("session-key");
Expand All @@ -498,11 +506,15 @@ describe("SESSION JOINING PARTICIPANT LISTS", function() {
browser.byCsss(".hangout-users li.user.joining").then(function(els) {
expect(els.length).to.be(1);
});
browser.waitTime(models.ServerSession.prototype.JOINING_EXPIRATION_TIMEOUT + 2000);
browser.byCsss(".hangout-users li.user.joining").then(function(els) {
expect(els.length).to.be(0);
browser.waitTime(models.ServerSession.prototype.JOINING_EXPIRATION_TIMEOUT + 5000);
browser.then(function() {
expect(session.get("joiningParticipants").length).to.be(0);
done();
});
browser.waitWithTimeout(function() {
return browser.byCsss(".hangout-users li.user.joining").then(function(els) {
return els.length === 0;
});
});
browser.then(function() { done(); });
});
});

0 comments on commit 961563d

Please sign in to comment.