Merge branch 'fix-failing-tests'

src/browser/index.jsx

@@ -28,7 +28,7 @@ const teams = settings.mergeDefaultTeams(AppConfig.data.teams);
 remote.getCurrentWindow().removeAllListeners('focus');
 
 if (teams.length === 0) {
-  window.location = 'settings.html';
+  remote.getCurrentWindow().loadFile('browser/settings.html');
 }
 
 function showBadgeWindows(sessionExpired, unreadCount, mentionCount) {

test/specs/app_test.js

@@ -63,6 +63,7 @@ describe('application', function desc() {
 
   it('should show settings.html when there is no config file', async () => {
     await this.app.client.waitUntilWindowLoaded();
+    await this.app.client.pause(1000);
     const url = await this.app.client.getUrl();
     url.should.match(/\/settings.html$/);