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

Merge pull request #435 from yuya-oc/issue401-part3

Browse source 
Show "Add Server" modal when no servers exist in SettingsPage
This commit is contained in:
Yuya Ochiai 2017-02-16 23:38:04 +09:00 committed by GitHub
parent c76797e68e 9d2efeabdd
commit 46b996ac19
3 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/browser/components/SettingsPage.jsx
View file

@ -34,6 +34,9 @@ const SettingsPage = React.createClass({
initialState.showAddTeamForm = false;
initialState.trayWasVisible = remote.getCurrentWindow().trayWasVisible;
initialState.disableClose = initialState.teams.length === 0;
if (initialState.teams.length === 0) {
initialState.showAddTeamForm = true;
}
return initialState;
},
@ -57,6 +60,9 @@ const SettingsPage = React.createClass({
showAddTeamForm: false,
teams
});
if (teams.length === 0) {
this.setState({showAddTeamForm: true});
}
},
handleSave() {
var config = {

3
test/specs/app_test.js
View file

@ -68,7 +68,8 @@ describe('application', function desc() {
return this.app.start().then(() => {
return this.app.client.
waitUntilWindowLoaded().
getUrl().should.eventually.match(/\/settings.html$/);
getUrl().should.eventually.match(/\/settings.html$/).
isExisting('#newServerModal').should.eventually.equal(true);
});
});

16
test/specs/browser/settings_test.js
View file

@ -49,6 +49,22 @@ describe('browser/settings.html', function desc() {
getUrl().should.eventually.match(/\/index.html$/);
});
it('should show NewServerModal after all servers are removed', () => {
const modalTitleSelector = '.modal-title=Remove Server';
env.addClientCommands(this.app.client);
return this.app.client.
loadSettingsPage().
click('=Remove').
waitForVisible(modalTitleSelector).
element('.modal-dialog').click('.btn=Remove').
pause(500).
click('=Remove').
waitForVisible(modalTitleSelector).
element('.modal-dialog').click('.btn=Remove').
pause(500).
isExisting('#newServerModal').should.eventually.equal(true);
});
describe('Options', () => {
describe('Hide Menu Bar', () => {
it('should appear on win32 or linux', () => {