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

Fix tests

Browse Source
This commit is contained in:
Yuya Ochiai
2017-03-06 21:31:17 +09:00
parent 5b26c9cf69
commit d8abb4b9c7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintignore
View File

@@ -1,4 +1,4 @@
dist/ **/*_bundle.js
node_modules/ node_modules/
release/ release/
src/node_modules/ src/node_modules/

2
src/main.js
View File

@@ -481,7 +481,7 @@ app.on('ready', () => {
} }
// and load the index.html of the app. // and load the index.html of the app.
if (isDev) { if (isDev && !argv.testMode) {
mainWindow.loadURL('http://localhost:8080/browser/index.html'); mainWindow.loadURL('http://localhost:8080/browser/index.html');
} else { } else {
mainWindow.loadURL('file://' + __dirname + '/browser/index.html'); mainWindow.loadURL('file://' + __dirname + '/browser/index.html');

4
test/modules/environment.js
View File

@@ -44,7 +44,7 @@ module.exports = {
getSpectronApp() { getSpectronApp() {
const app = new Application({ const app = new Application({
path: electronBinaryPath, path: electronBinaryPath,
args: [`${path.join(sourceRootDir, 'dist')}`, `--data-dir=${userDataDir}`] args: [`${path.join(sourceRootDir, 'src')}`, `--data-dir=${userDataDir}`, '--test-mode']
}); });
chaiAsPromised.transferPromiseness = app.transferPromiseness; chaiAsPromised.transferPromiseness = app.transferPromiseness;
return app; return app;
@@ -52,7 +52,7 @@ module.exports = {
addClientCommands(client) { addClientCommands(client) {
client.addCommand('loadSettingsPage', function async() { client.addCommand('loadSettingsPage', function async() {
return this.url('file://' + path.join(sourceRootDir, 'dist/browser/settings.html')).waitUntilWindowLoaded(); return this.url('file://' + path.join(sourceRootDir, 'src/browser/settings.html')).waitUntilWindowLoaded();
}); });
client.addCommand('isNodeEnabled', function async() { client.addCommand('isNodeEnabled', function async() {
return this.execute(() => { return this.execute(() => {