Fix eslint errors

This commit is contained in:
Yuya Ochiai
2016-09-25 23:14:01 +09:00
parent 16a18e64e6
commit 16788b5a6f
21 changed files with 1282 additions and 1078 deletions

View File

@@ -1,81 +1,86 @@
'use strict';
const path = require('path');
const fs = require('fs');
const env = require('../modules/environment');
describe('application', function() {
describe('application', function desc() {
this.timeout(10000);
beforeEach(function(done) {
beforeEach((done) => {
this.app = env.getSpectronApp();
fs.unlink(env.configFilePath, () => {
done();
});
});
afterEach(function() {
afterEach(() => {
if (this.app && this.app.isRunning()) {
return this.app.stop()
return this.app.stop();
}
return true;
});
it('should show a window', function() {
it('should show a window', () => {
return this.app.start().then(() => {
return this.app.client.waitUntilWindowLoaded()
.getWindowCount().should.eventually.equal(1)
.browserWindow.isDevToolsOpened().should.eventually.be.false
.browserWindow.isVisible().should.eventually.be.true
return this.app.client.
waitUntilWindowLoaded().
getWindowCount().should.eventually.equal(1).
browserWindow.isDevToolsOpened().should.eventually.be.false.
browserWindow.isVisible().should.eventually.be.true;
});
});
it('should show settings.html when there is no config file', function() {
it('should show settings.html when there is no config file', () => {
return this.app.start().then(() => {
return this.app.client.waitUntilWindowLoaded()
.getUrl().should.eventually.match(/\/settings.html$/)
return this.app.client.
waitUntilWindowLoaded().
getUrl().should.eventually.match(/\/settings.html$/);
});
});
it('should show index.html when there is config file', function() {
it('should show index.html when there is config file', () => {
fs.writeFileSync(env.configFilePath, JSON.stringify({
url: env.mattermostURL
}));
return this.app.start().then(() => {
return this.app.client.waitUntilWindowLoaded()
.getUrl().should.eventually.match(/\/index.html$/)
return this.app.client.
waitUntilWindowLoaded().
getUrl().should.eventually.match(/\/index.html$/);
});
});
it('should upgrade v0 config file', function() {
it('should upgrade v0 config file', () => {
const settings = require('../../src/common/settings');
fs.writeFileSync(env.configFilePath, JSON.stringify({
url: env.mattermostURL
}));
return this.app.start().then(() => {
return this.app.client.waitUntilWindowLoaded()
.getUrl().should.eventually.match(/\/index.html$/)
}).then(function() {
return this.app.client.
waitUntilWindowLoaded().
getUrl().should.eventually.match(/\/index.html$/);
}).then(() => {
var str = fs.readFileSync(env.configFilePath, 'utf8');
var config = JSON.parse(str);
config.version.should.equal(settings.version);
});
});
it.skip('should be stopped when the app instance already exists', function(done) {
it.skip('should be stopped when the app instance already exists', (done) => {
this.app.start().then(() => {
const secondApp = env.getSpectronApp();
// In the correct case, 'start().then' is not called.
// So need to use setTimeout in order to finish this test.
const timer = setTimeout(() => {
done();
}, 3000);
secondApp.start().then(() => {
clearTimeout(timer);
return secondApp.stop();
}).then(() => {
done(new Error('Second app instance exists'));
});
// In the correct case, 'start().then' is not called.
// So need to use setTimeout in order to finish this test.
const timer = setTimeout(() => {
done();
}, 3000);
});
});
});