Merge pull request #711 from yuya-oc/upgrade-electron

Upgrade Electron
This commit is contained in:
Yuya Ochiai
2018-02-23 00:15:11 +09:00
committed by GitHub
5 changed files with 26 additions and 22 deletions

View File

@@ -83,7 +83,9 @@ describe('application', function desc() {
url: env.mattermostURL,
}));
return this.app.restart().then(() => {
return this.app.client.waitUntilWindowLoaded().getUrl();
return this.app.client.waitUntilWindowLoaded();
}).then(() => {
return this.app.client.getUrl();
}).then((url) => {
url.should.match(/\/index.html$/);
});
@@ -95,7 +97,9 @@ describe('application', function desc() {
url: env.mattermostURL,
}));
return this.app.restart().then(() => {
return this.app.client.waitUntilWindowLoaded().getUrl();
return this.app.client.waitUntilWindowLoaded();
}).then(() => {
return this.app.client.getUrl();
}).then((url) => {
url.should.match(/\/index.html$/);
}).then(() => {

View File

@@ -95,7 +95,7 @@ describe('browser/settings.html', function desc() {
return this.app.client.
loadSettingsPage().
click('h4=example').
pause(100).
pause(1000).
waitUntilWindowLoaded().
getUrl().then((url) => {
url.should.match(/\/index.html(\?.+)?$/);
@@ -109,7 +109,7 @@ describe('browser/settings.html', function desc() {
loadSettingsPage().
click('h4=github').
pause(100).
pause(1000).
waitUntilWindowLoaded().
getUrl().then((url) => {
url.should.match(/\/index.html(\?.+)?$/);