{throw new Error("unimplemented");}}
+ />
+ );
matrixChat = ReactDOM.render(mc, parentDiv);
// switch to the Directory
@@ -94,10 +97,24 @@ describe('joining a room', function () {
var roomView;
- // wait for /sync to happen
- return q.delay(1).then(() => {
- return httpBackend.flush();
- }).then(() => {
+ // wait for /sync to happen. This may take some time, as the client
+ // has to initialise indexeddb.
+ console.log("waiting for /sync");
+ let syncDone = false;
+ httpBackend.when('GET', '/sync')
+ .check((r) => {syncDone = true;})
+ .respond(200, {});
+ function awaitSync(attempts) {
+ if (syncDone) {
+ return q();
+ }
+ if (!attempts) {
+ throw new Error("Gave up waiting for /sync")
+ }
+ return httpBackend.flush().then(() => awaitSync(attempts-1));
+ }
+
+ return awaitSync(10).then(() => {
// wait for the directory requests
httpBackend.when('POST', '/publicRooms').respond(200, {chunk: []});
httpBackend.when('GET', '/thirdparty/protocols').respond(200, {});
diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index 22daa3950..d3844522b 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -115,9 +115,9 @@ describe('loading:', function () {
}
function routeUrl(location, matrixChat) {
- console.log(Date.now() + "Routing URL " + location);
+ console.log(Date.now() + ` routing URL '${location}'`);
const s = getScreenFromLocation(location);
- console.log("Showing screen", s);
+ console.log("Showing screen "+ s);
matrixChat.showScreen(s.screen, s.params);
}
@@ -136,6 +136,7 @@ describe('loading:', function () {
enableGuest={true}
onLoadCompleted={loadCompleteDefer.resolve}
initialScreenAfterLogin={getScreenFromLocation(windowLocation)}
+ makeRegistrationUrl={() => {throw new Error('Not implemented');}}
/>, parentDiv
);
@@ -151,6 +152,27 @@ describe('loading:', function () {
}, 0);
}
+ // set an expectation that we will get a call to /sync, then flush
+ // http requests until we do.
+ //
+ // returns a promise resolving to the received request
+ async function expectAndAwaitSync(response) {
+ response = response || {};
+ let syncRequest = null;
+ httpBackend.when('GET', '/sync')
+ .check((r) => {syncRequest = r;})
+ .respond(200, response);
+
+ console.log("waiting for /sync");
+ for (let attempts = 10; attempts > 0; attempts--) {
+ if (syncRequest) {
+ return syncRequest;
+ }
+ await httpBackend.flush();
+ }
+ throw new Error("Gave up waiting for /sync");
+ }
+
describe("Clean load with no stored credentials:", function() {
it('gives a login panel by default', function (done) {
loadApp();
@@ -221,8 +243,7 @@ describe('loading:', function () {
httpBackend.when('GET', '/pushrules').respond(200, {});
httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
- httpBackend.when('GET', '/sync').respond(200, {});
- return httpBackend.flush();
+ return expectAndAwaitSync();
}).then(() => {
// once the sync completes, we should have a room view
return awaitRoomView(matrixChat);
@@ -250,13 +271,12 @@ describe('loading:', function () {
it('shows a directory by default if we have no joined rooms', function(done) {
httpBackend.when('GET', '/pushrules').respond(200, {});
httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
- httpBackend.when('GET', '/sync').respond(200, {});
loadApp();
return awaitSyncingSpinner(matrixChat).then(() => {
// we got a sync spinner - let the sync complete
- return httpBackend.flush();
+ return expectAndAwaitSync();
}).then(() => {
// once the sync completes, we should have a directory
httpBackend.verifyNoOutstandingExpectation();
@@ -269,7 +289,6 @@ describe('loading:', function () {
it('shows a room view if we followed a room link', function(done) {
httpBackend.when('GET', '/pushrules').respond(200, {});
httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
- httpBackend.when('GET', '/sync').respond(200, {});
loadApp({
uriFragment: "#/room/!room:id",
@@ -277,7 +296,7 @@ describe('loading:', function () {
return awaitSyncingSpinner(matrixChat).then(() => {
// we got a sync spinner - let the sync complete
- return httpBackend.flush();
+ return expectAndAwaitSync();
}).then(() => {
// once the sync completes, we should have a room view
return awaitRoomView(matrixChat);
@@ -310,8 +329,7 @@ describe('loading:', function () {
return awaitSyncingSpinner(matrixChat);
}).then(() => {
// we got a sync spinner - let the sync complete
- httpBackend.when('GET', '/sync').respond(200, {});
- return httpBackend.flush();
+ return expectAndAwaitSync();
}).then(() => {
// once the sync completes, we should have a directory
httpBackend.verifyNoOutstandingExpectation();
@@ -344,11 +362,10 @@ describe('loading:', function () {
}).then(() => {
return awaitSyncingSpinner(matrixChat);
}).then(() => {
- httpBackend.when('GET', '/sync').check(function(req) {
- expect(req.path).toMatch(new RegExp("^https://homeserver/"));
- }).respond(200, {});
- return httpBackend.flush();
- }).then(() => {
+ return expectAndAwaitSync();
+ }).then((req) => {
+ expect(req.path).toMatch(new RegExp("^https://homeserver/"));
+
// once the sync completes, we should have a directory
httpBackend.verifyNoOutstandingExpectation();
ReactTestUtils.findRenderedComponentWithType(
@@ -379,8 +396,7 @@ describe('loading:', function () {
}).then(() => {
return awaitSyncingSpinner(matrixChat);
}).then(() => {
- httpBackend.when('GET', '/sync').respond(200, {});
- return httpBackend.flush();
+ return expectAndAwaitSync();
}).then(() => {
// once the sync completes, we should have a room view
return awaitRoomView(matrixChat);
@@ -450,7 +466,7 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
retryCount = 0;
}
- if (matrixChat.state.loading) {
+ if (matrixChat.state.loading || matrixChat.state.loggingIn) {
console.log(Date.now() + " Awaiting sync spinner: still loading.");
if (retryCount >= retryLimit) {
throw new Error("MatrixChat still not loaded after " +
diff --git a/test/mock-request.js b/test/mock-request.js
index 8510ad545..0ebabb038 100644
--- a/test/mock-request.js
+++ b/test/mock-request.js
@@ -1,6 +1,6 @@
"use strict";
-var q = require("q");
-var expect = require('expect');
+const q = require("q");
+import expect from 'expect';
/**
* Construct a mock HTTP backend, heavily inspired by Angular.js.
@@ -9,23 +9,25 @@ var expect = require('expect');
function HttpBackend() {
this.requests = [];
this.expectedRequests = [];
- var self = this;
+ const self = this;
// the request function dependency that the SDK needs.
this.requestFn = function(opts, callback) {
- var realReq = new Request(opts.method, opts.uri, opts.body, opts.qs);
- realReq.callback = callback;
- console.log("HTTP backend received request: %s %s", opts.method, opts.uri);
- self.requests.push(realReq);
+ const req = new Request(opts, callback);
+ console.log("HTTP backend received request: " + req);
+ self.requests.push(req);
- var abort = function() {
- var idx = self.requests.indexOf(realReq);
+ const abort = function() {
+ const idx = self.requests.indexOf(req);
if (idx >= 0) {
- console.log("Aborting HTTP request: %s %s", opts.method, opts.uri);
+ console.log("Aborting HTTP request: %s %s", opts.method,
+ opts.uri);
self.requests.splice(idx, 1);
+ req.callback("aborted");
}
- }
+ };
+
return {
- abort: abort
+ abort: abort,
};
};
}
@@ -34,43 +36,61 @@ HttpBackend.prototype = {
* Respond to all of the requests (flush the queue).
* @param {string} path The path to flush (optional) default: all.
* @param {integer} numToFlush The number of things to flush (optional), default: all.
- * @return {Promise} resolved when there is nothing left to flush.
+ * @param {integer=} waitTime The time (in ms) to wait for a request to happen.
+ * default: 5
+ *
+ * @return {Promise} resolves when there is nothing left to flush, with the
+ * number of requests flushed
*/
- flush: function(path, numToFlush) {
- var defer = q.defer();
- var self = this;
- var flushed = 0;
- var triedWaiting = false;
+ flush: function(path, numToFlush, waitTime) {
+ const defer = q.defer();
+ const self = this;
+ let flushed = 0;
+ let triedWaiting = false;
+ if (waitTime === undefined) {
+ waitTime = 5;
+ }
console.log(
- "HTTP backend flushing... (path=%s numToFlush=%s)", path, numToFlush
+ "HTTP backend flushing... (path=" + path
+ + " numToFlush=" + numToFlush
+ + " waitTime=" + waitTime
+ + ")",
);
- var tryFlush = function() {
+ const tryFlush = function() {
// if there's more real requests and more expected requests, flush 'em.
console.log(
- " trying to flush queue => reqs=%s expected=%s [%s]",
- self.requests.length, self.expectedRequests.length, path
+ " trying to flush queue => reqs=[" + self.requests
+ + "] expected=[" + self.expectedRequests
+ + "]",
);
if (self._takeFromQueue(path)) {
// try again on the next tick.
- console.log(" flushed. Trying for more. [%s]", path);
flushed += 1;
if (numToFlush && flushed === numToFlush) {
- console.log(" [%s] Flushed assigned amount: %s", path, numToFlush);
- defer.resolve();
- }
- else {
+ console.log(" Flushed assigned amount:", numToFlush);
+ defer.resolve(flushed);
+ } else {
+ console.log(" flushed. Trying for more.");
setTimeout(tryFlush, 0);
}
- }
- else if (flushed === 0 && !triedWaiting) {
+ } else if (flushed === 0 && !triedWaiting) {
// we may not have made the request yet, wait a generous amount of
// time before giving up.
- setTimeout(tryFlush, 5);
+ console.log(
+ " nothing to flush yet; waiting " + waitTime +
+ "ms for requests.")
+ setTimeout(tryFlush, waitTime);
triedWaiting = true;
- }
- else {
- console.log(" no more flushes. [%s]", path);
- defer.resolve();
+ } else {
+ if (flushed === 0) {
+ console.log(" nothing to flush; giving up");
+ } else {
+ console.log(
+ " no more flushes after flushing", flushed,
+ "requests",
+ );
+ }
+ defer.resolve(flushed);
}
};
@@ -85,14 +105,19 @@ HttpBackend.prototype = {
* @return {boolean} true if something was resolved.
*/
_takeFromQueue: function(path) {
- var req = null;
- var i, j;
- var matchingReq, expectedReq, testResponse = null;
+ let req = null;
+ let i;
+ let j;
+ let matchingReq = null;
+ let expectedReq = null;
+ let testResponse = null;
for (i = 0; i < this.requests.length; i++) {
req = this.requests[i];
for (j = 0; j < this.expectedRequests.length; j++) {
expectedReq = this.expectedRequests[j];
- if (path && path !== expectedReq.path) { continue; }
+ if (path && path !== expectedReq.path) {
+ continue;
+ }
if (expectedReq.method === req.method &&
req.path.indexOf(expectedReq.path) !== -1) {
if (!expectedReq.data || (JSON.stringify(expectedReq.data) ===
@@ -114,12 +139,12 @@ HttpBackend.prototype = {
}
testResponse = matchingReq.response;
console.log(" responding to %s", matchingReq.path);
- var body = testResponse.body;
+ let body = testResponse.body;
if (Object.prototype.toString.call(body) == "[object Function]") {
body = body(req.path, req.data);
}
req.callback(
- testResponse.err, testResponse.response, body
+ testResponse.err, testResponse.response, body,
);
matchingReq = null;
}
@@ -134,10 +159,10 @@ HttpBackend.prototype = {
* Makes sure that the SDK hasn't sent any more requests to the backend.
*/
verifyNoOutstandingRequests: function() {
- var firstOutstandingReq = this.requests[0] || {};
+ const firstOutstandingReq = this.requests[0] || {};
expect(this.requests.length).toEqual(0,
"Expected no more HTTP requests but received request to " +
- firstOutstandingReq.path
+ firstOutstandingReq.path,
);
},
@@ -145,12 +170,9 @@ HttpBackend.prototype = {
* Makes sure that the test doesn't have any unresolved requests.
*/
verifyNoOutstandingExpectation: function() {
- var firstOutstandingExpectation = this.expectedRequests[0] || {};
- expect(this.expectedRequests.length).toEqual(
- 0,
- "Expected to see HTTP request for "
- + firstOutstandingExpectation.method
- + " " + firstOutstandingExpectation.path
+ const firstOutstandingExpectation = this.expectedRequests[0] || {};
+ expect(this.expectedRequests.length).toEqual(0,
+ "Expected to see HTTP request for " + firstOutstandingExpectation.path,
);
},
@@ -162,22 +184,36 @@ HttpBackend.prototype = {
* @return {Request} An expected request.
*/
when: function(method, path, data) {
- var pendingReq = new Request(method, path, data);
+ const pendingReq = new ExpectedRequest(method, path, data);
this.expectedRequests.push(pendingReq);
return pendingReq;
- }
+ },
};
-function Request(method, path, data, queryParams) {
+/**
+ * Represents the expectation of a request.
+ *
+ * Includes the conditions to be matched against, the checks to be made,
+ * and the response to be returned.
+ *
+ * @constructor
+ * @param {string} method
+ * @param {string} path
+ * @param {object?} data
+ */
+function ExpectedRequest(method, path, data) {
this.method = method;
this.path = path;
this.data = data;
- this.queryParams = queryParams;
- this.callback = null;
this.response = null;
this.checks = [];
}
-Request.prototype = {
+
+ExpectedRequest.prototype = {
+ toString: function() {
+ return this.method + " " + this.path
+ },
+
/**
* Execute a check when this request has been satisfied.
* @param {Function} fn The function to execute.
@@ -198,10 +234,10 @@ Request.prototype = {
this.response = {
response: {
statusCode: code,
- headers: {}
+ headers: {},
},
body: data,
- err: null
+ err: null,
};
},
@@ -214,14 +250,62 @@ Request.prototype = {
this.response = {
response: {
statusCode: code,
- headers: {}
+ headers: {},
},
body: null,
- err: err
+ err: err,
};
},
};
+/**
+ * Represents a request made by the app.
+ *
+ * @constructor
+ * @param {object} opts opts passed to request()
+ * @param {function} callback
+ */
+function Request(opts, callback) {
+ this.opts = opts;
+ this.callback = callback;
+
+ Object.defineProperty(this, 'method', {
+ get: function() {
+ return opts.method;
+ },
+ });
+
+ Object.defineProperty(this, 'path', {
+ get: function() {
+ return opts.uri;
+ },
+ });
+
+ Object.defineProperty(this, 'data', {
+ get: function() {
+ return opts.body;
+ },
+ });
+
+ Object.defineProperty(this, 'queryParams', {
+ get: function() {
+ return opts.qs;
+ },
+ });
+
+ Object.defineProperty(this, 'headers', {
+ get: function() {
+ return opts.headers || {};
+ },
+ });
+}
+
+Request.prototype = {
+ toString: function() {
+ return this.method + " " + this.path;
+ },
+};
+
/**
* The HttpBackend class.
*/