PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4314 from vector-im/rav/remove_onload_simulator

Browse source 
Remove onload simulator from loading test
This commit is contained in:
Richard van der Hoff 2017-06-15 14:52:00 +01:00 committed by GitHub
commit 2c8c26a16f
1 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
test/app-tests/loading.js
View file

@ -99,21 +99,14 @@ describe('loading:', function () {
toString: function() { return this.search + this.hash; }, toString: function() { return this.search + this.hash; },
}; };
let lastLoadedScreen = null;
let appLoaded = false;
let loadCompleteDefer = q.defer(); let loadCompleteDefer = q.defer();
loadCompletePromise = loadCompleteDefer.promise; loadCompletePromise = loadCompleteDefer.promise;
function onNewScreen(screen) { function onNewScreen(screen) {
console.log(Date.now() + " newscreen "+screen); console.log(Date.now() + " newscreen "+screen);
if (!appLoaded) { var hash = '#/' + screen;
lastLoadedScreen = screen; windowLocation.hash = hash;
} else { console.log(Date.now() + " browser URI now "+ windowLocation);
var hash = '#/' + screen;
windowLocation.hash = hash;
console.log(Date.now() + " browser URI now "+ windowLocation);
}
} }
// Parse the given window.location and return parameters that can be used when calling // Parse the given window.location and return parameters that can be used when calling
@ -126,13 +119,6 @@ describe('loading:', function () {
} }
} }
function routeUrl(location, matrixChat) {
console.log(Date.now() + ` routing URL '${location}'`);
const s = getScreenFromLocation(location);
console.log("Showing screen ", s);
matrixChat.showScreen(s.screen, s.params);
}
const MatrixChat = sdk.getComponent('structures.MatrixChat'); const MatrixChat = sdk.getComponent('structures.MatrixChat');
const fragParts = parseQsFromFragment(windowLocation); const fragParts = parseQsFromFragment(windowLocation);
var params = parseQs(windowLocation); var params = parseQs(windowLocation);
@ -151,17 +137,6 @@ describe('loading:', function () {
makeRegistrationUrl={() => {throw new Error('Not implemented');}} makeRegistrationUrl={() => {throw new Error('Not implemented');}}
/>, parentDiv />, parentDiv
); );
// pause for a cycle, then simulate the window.onload handler
window.setTimeout(() => {
console.log(Date.now() + " simulating window.onload");
routeUrl(windowLocation, matrixChat);
appLoaded = true;
if (lastLoadedScreen) {
onNewScreen(lastLoadedScreen);
lastLoadedScreen = null;
}
}, 0);
} }
// set an expectation that we will get a call to /sync, then flush // set an expectation that we will get a call to /sync, then flush