From 95acf63ea38eae6762fb8c7d3ac672661f711dfd Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 22 Sep 2014 16:50:12 +0100 Subject: Add working protractor e2e test. This uses the ignoreSynchronization flag because of the longpoll on the event stream. It would be better to use $interval, but couldn't get that to *reliably* work when testing. I suspect that $interval won't help us here, since there is genuinely an open $http connection, as we're doing a long poll. https://github.com/angular/protractor/issues/49 for more info. --- webclient/test/e2e/home.spec.js | 16 ++++++++++++++++ webclient/test/e2e/user.spec.js | 6 ------ 2 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 webclient/test/e2e/home.spec.js delete mode 100644 webclient/test/e2e/user.spec.js (limited to 'webclient/test/e2e') diff --git a/webclient/test/e2e/home.spec.js b/webclient/test/e2e/home.spec.js new file mode 100644 index 0000000000..470237d557 --- /dev/null +++ b/webclient/test/e2e/home.spec.js @@ -0,0 +1,16 @@ +var env = require("../environment-protractor.js"); + +describe("home page", function() { + + beforeEach(function() { + ptor = protractor.getInstance(); + // FIXME we use longpoll on the event stream, and I can't get $interval + // playing nicely with it. Patches welcome to fix this. + ptor.ignoreSynchronization = true; + }); + + it("should have a title", function() { + browser.get(env.baseUrl); + expect(browser.getTitle()).toEqual("[matrix]"); + }); +}); diff --git a/webclient/test/e2e/user.spec.js b/webclient/test/e2e/user.spec.js deleted file mode 100644 index bbac53899b..0000000000 --- a/webclient/test/e2e/user.spec.js +++ /dev/null @@ -1,6 +0,0 @@ -describe("user page", function() { - it("should have a title", function() { - browser.get("http://matrix.org/alpha/#/login"); - expect(browser.getTitle()).toEqual("[matrix]"); - }); -}); -- cgit 1.5.1