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

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

Browse Source 
Upgrade Electron
This commit is contained in:
Yuya Ochiai
2018-02-23 00:15:11 +09:00
committed by GitHub
parent 02434ecd7b 054b6e2dd8
commit a5a5393149
5 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.babelrc
View File

@@ -2,8 +2,8 @@
"presets": [
["env", {
"targets": {
"browsers": ["Electron >= 1.7"],
"node": "7.9"
"browsers": ["Electron >= 1.8"],
"node": "8.2"
}
}],
"react"

4
package.json
View File

@@ -47,7 +47,7 @@
"cross-env": "^5.1.3",
"css-loader": "^0.28.9",
"devtron": "^1.4.0",
"electron": "1.7.11",
"electron": "1.8.2",
"electron-builder": "17.4.0",
"electron-builder-squirrel-windows": "17.4.0",
"electron-connect": "^0.6.1",
@@ -57,7 +57,7 @@
"mocha": "^5.0.0",
"mocha-circleci-reporter": "0.0.2",
"npm-run-all": "^4.1.2",
"spectron": "~3.7.3",
"spectron": "~3.8.0",
"style-loader": "^0.20.1",
"url-loader": "^0.6.2",
"webpack": "^3.10.0",

8
test/specs/app_test.js
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(() => {

4
test/specs/browser/settings_test.js
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(\?.+)?$/);

28
yarn.lock
View File

@@ -90,9 +90,9 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"
"@types/node@^7.0.18":
version "7.0.43"
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
"@types/node@^8.0.24":
version "8.9.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.9.4.tgz#dfd327582a06c114eb6e0441fa3d6fab35edad48"
abbrev@1:
version "1.1.0"
@@ -2190,9 +2190,9 @@ electron-builder@17.4.0:
uuid-1345 "^0.99.6"
yargs "^8.0.1"
electron-chromedriver@~1.7.1:
version "1.7.1"
resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-1.7.1.tgz#008c97976007aa4eb18491ee095e94d17ee47610"
electron-chromedriver@~1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-1.8.0.tgz#901714133cf6f6093d365e1f44a52d99624d8241"
dependencies:
electron-download "^4.1.0"
extract-zip "^1.6.5"
@@ -2279,11 +2279,11 @@ electron-to-chromium@^1.3.30:
version "1.3.33"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz#bf00703d62a7c65238136578c352d6c5c042a545"
electron@1.7.11:
version "1.7.11"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.11.tgz#993b6aa79e0e79a7cfcc369f4c813fbd9a0b08d9"
electron@1.8.2:
version "1.8.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.2.tgz#a817cd733c2972b3c7cc4f777caf6e424b88014d"
dependencies:
"@types/node" "^7.0.18"
"@types/node" "^8.0.24"
electron-download "^3.0.1"
extract-zip "^1.0.3"
@@ -5959,12 +5959,12 @@ spdy@^3.4.1:
select-hose "^2.0.0"
spdy-transport "^2.0.18"
spectron@~3.7.3:
version "3.7.3"
resolved "https://registry.yarnpkg.com/spectron/-/spectron-3.7.3.tgz#b096e497a1b4aaa23144ad1f7874cb3b16aa1aa6"
spectron@~3.8.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/spectron/-/spectron-3.8.0.tgz#122c3562fd7e92b7cdf6f94094aa495b150dfa51"
dependencies:
dev-null "^0.1.1"
electron-chromedriver "~1.7.1"
electron-chromedriver "~1.8.0"
request "^2.81.0"
split "^1.0.0"
webdriverio "^4.8.0"