ELECTRON-651 (Assign focused window to the screen picker) [Windows] (#468)

* ELECTRON-651 - Assign focused window to the screen picker

which disables user interaction with the content below

* ELECTRON-651 - Fix jest-html-reporter's path in jest config

* ELECTRON-651 - Fix unit tests
This commit is contained in:
Kiran Niranjan
2018-08-20 17:35:40 +05:30
committed by Vishwas Shashidhar
parent 9dba7521fc
commit 5a0576402c
4 changed files with 12 additions and 8 deletions

View File

@@ -70,11 +70,11 @@ const ipcRenderer = {
};
module.exports = {
require: jest.genMockFunction(),
match: jest.genMockFunction(),
app: jest.genMockFunction(),
require: jest.fn(),
match: jest.fn(),
app: jest.fn(),
ipcMain: ipcMain,
ipcRenderer: ipcRenderer,
remote: jest.genMockFunction(),
dialog: jest.genMockFunction()
remote: jest.fn(),
dialog: jest.fn()
};

View File

@@ -270,7 +270,7 @@ describe('read/write config tests', function() {
return updateConfigField('url2', 'hello world')
.catch(function (err) {
expect(err).toThrow(err);
expect(err.message).toBe('Path must be a string. Received null');
});
});
@@ -309,7 +309,7 @@ describe('read/write config tests', function() {
return saveUserConfig('url2', 'hello world')
.catch(function (err) {
expect(err).toThrow(err);
expect(err.message).toBe('Path must be a string. Received null');
});
});

View File

@@ -1,6 +1,6 @@
{
"testMatch": ["**/*.test.js"],
"verbose": true,
"testResultsProcessor": "./node_modules/jest-html-reporter"
"testResultsProcessor": "../node_modules/jest-html-reporter"
}