aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Add test for failed to load URL

Browse source
This commit is contained in:
Yuya Ochiai 2016-03-05 20:52:27 +09:00
parent 1fad30aed7
commit 1ccb7cebce
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/browser/index.jsx
View file

@ -306,7 +306,7 @@ var MattermostView = React.createClass({
if (this.state.did_fail_load === null) {
return (<webview id={ this.props.id } className="mattermostView" style={ this.props.style } preload="webview/mattermost.js" src={ this.props.src } ref="webview"></webview>);
} else {
return (<ErrorView errorInfo={ this.state.did_fail_load } style={ this.props.style }></ErrorView>)
return (<ErrorView id={ this.props.id + '-fail' } className="errorView" errorInfo={ this.state.did_fail_load } style={ this.props.style }></ErrorView>)
}
}
});
@ -316,7 +316,7 @@ var MattermostView = React.createClass({
var ErrorView = React.createClass({
render: function() {
return (
<Grid fluid style={ this.props.style }>
<Grid id={ this.props.id } style={ this.props.style }>
<h1>Failed to load the URL</h1>
<p>
{ 'URL: ' }

15
test/browser_test.js
View file

@ -166,6 +166,21 @@ describe('electron-mattermost', function() {
})
.end();
});
it('should show error when using incorrect URL', function() {
this.timeout(30000)
fs.writeFileSync(config_file_path, JSON.stringify({
version: 1,
teams: [{
name: 'error_1',
url: 'http://false'
}]
}));
return client
.init()
.waitForVisible('#mattermostView0-fail', 20000)
.end();
});
});
describe('settings.html', function() {