Skip to content

Commit

Permalink
Corrects window position and cleans up logs
Browse files Browse the repository at this point in the history
  • Loading branch information
wolovim committed Nov 30, 2017
1 parent 7dadcc3 commit b22e819
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions modules/windows.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ class GenericWindow extends EventEmitter {
}
}
this.window.setSize(options.electronOptions.width, options.electronOptions.height);
this.window.setAlwaysOnTop(true, 'floating', 1);
this.send('uiAction_switchTemplate', type);
this.show();
store.dispatch(reuseGenericWindow(type));
Expand Down
6 changes: 2 additions & 4 deletions tests/_base.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ exports.mocha = (_module, options) => {
quitTimeout: 10000,
path: appPath,
args: [
'--loglevel', 'trace',
'--loglevel', 'debug',
'--logfile', mistLogFile,
'--node-datadir', this.geth.dataDir,
'--rpc', ipcProviderPath,
Expand Down Expand Up @@ -173,7 +173,7 @@ exports.mocha = (_module, options) => {
// Loop over windows trying to select Main Window
const app = this;
const selectMainWindow = function* (mainWindowSearch, retries = 20) {
console.log(`∆∆∆ retries remaining: ${retries}`);
console.log(`selectMainWindow retries remaining: ${retries}`);
let windowHandles = (yield app.client.windowHandles()).value;

for (let handle in windowHandles) {
Expand All @@ -191,12 +191,10 @@ exports.mocha = (_module, options) => {
};

const mainWindowSearch = (options.app === 'wallet') ? /^file:\/\/\/$/ : /interface\/index\.html$/;
console.log('∆∆∆ mainWindowSearch', mainWindowSearch);
yield selectMainWindow(mainWindowSearch);
console.log('Main window selected');

this.mainWindowHandle = (yield this.client.windowHandle()).value;
console.log(`mainWindowHandle: ${this.mainWindowHandle}`);
},

* beforeEach() {
Expand Down

0 comments on commit b22e819

Please sign in to comment.