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

Improve the way to skip tests on specific condition

Browse source
This commit is contained in:
Yuya Ochiai 2016-06-25 17:05:51 +09:00
parent 580bebdc66
commit 08aca0f235
2 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
test/modules/environment.js
View file

@ -35,12 +35,11 @@ module.exports = {
chaiAsPromised.transferPromiseness = app.transferPromiseness
return app;
},
shouldTestForPlatforms: function(testCase, platforms) {
if (platforms.indexOf(process.platform) !== -1) {
return;
}
else {
testCase.skip();
}
// execute the test only when `condition` is true
shouldTest: function(it, condition) {
return condition ? it : it.skip;
},
isOneOf(platforms) {
return (platforms.indexOf(process.platform) !== -1);
}
}

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

@ -68,33 +68,33 @@ describe('browser/settings.html', function() {
});
[true, false].forEach(function(v) {
it(`should be saved and loaded: ${v}`, function() {
env.shouldTestForPlatforms(this, ['win32', 'linux']);
addClientCommands(this.app.client);
return this.app.client
.loadSettingsPage()
.isSelected('#inputHideMenuBar input').then((isSelected) => {
if (isSelected !== v) {
return this.app.client.click('#inputHideMenuBar input')
}
})
.click('#btnSave')
.pause(1000).then(() => {
const saved_config = JSON.parse(fs.readFileSync(env.configFilePath, 'utf8'));
saved_config.hideMenuBar.should.equal(v);
})
// confirm actual behavior
.browserWindow.isMenuBarAutoHide().should.eventually.equal(v).then(() => {
return this.app.restart();
}).then(() => {
addClientCommands(this.app.client);
return this.app.client
// confirm actual behavior
.browserWindow.isMenuBarAutoHide().should.eventually.equal(v)
.loadSettingsPage()
.isSelected('#inputHideMenuBar input').should.eventually.equal(v);
});
});
env.shouldTest(it, env.isOneOf(['win32', 'linux']))
(`should be saved and loaded: ${v}`, function() {
addClientCommands(this.app.client);
return this.app.client
.loadSettingsPage()
.isSelected('#inputHideMenuBar input').then((isSelected) => {
if (isSelected !== v) {
return this.app.client.click('#inputHideMenuBar input')
}
})
.click('#btnSave')
.pause(1000).then(() => {
const saved_config = JSON.parse(fs.readFileSync(env.configFilePath, 'utf8'));
saved_config.hideMenuBar.should.equal(v);
})
// confirm actual behavior
.browserWindow.isMenuBarAutoHide().should.eventually.equal(v).then(() => {
return this.app.restart();
}).then(() => {
addClientCommands(this.app.client);
return this.app.client
// confirm actual behavior
.browserWindow.isMenuBarAutoHide().should.eventually.equal(v)
.loadSettingsPage()
.isSelected('#inputHideMenuBar input').should.eventually.equal(v);
});
});
});
});