phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'fix-failing-tests'

Browse Source
This commit is contained in:
Yuya Ochiai
2019-02-05 00:20:10 +09:00
parent 847f215b6f 596f3a8721
commit a1b0a28261
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/browser/index.jsx
View File

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

1
test/specs/app_test.js
View File

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