mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

make security-warnings tests more robust (#12757)

Browse source
This commit is contained in:
Cheng Zhao 2018-05-01 14:28:55 +09:00 • committed by GitHub
parent 55a7f6f0ce
commit d46aa92f0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

38
spec/security-warnings-spec.js
View file

@ -14,7 +14,7 @@ describe('security warnings', () => {
let w = null let w = null
let useCsp = true let useCsp = true
before(() => { before((done) => {
// Create HTTP Server // Create HTTP Server
server = http.createServer((request, response) => { server = http.createServer((request, response) => {
const uri = url.parse(request.url).pathname const uri = url.parse(request.url).pathname
@ -44,7 +44,7 @@ describe('security warnings', () => {
response.end() response.end()
}) })
}) })
}).listen(8881) }).listen(8881, () => done())
}) })
after(() => { after(() => {
@ -60,8 +60,8 @@ describe('security warnings', () => {
it('should warn about Node.js integration with remote content', (done) => { it('should warn about Node.js integration with remote content', (done) => {
w = new BrowserWindow({ show: false }) w = new BrowserWindow({ show: false })
w.webContents.on('console-message', (e, level, message) => { w.webContents.once('console-message', (e, level, message) => {
assert(message.includes('Node.js Integration with Remote Content')) assert(message.includes('Node.js Integration with Remote Content'), message)
done() done()
}) })
@ -76,8 +76,8 @@ describe('security warnings', () => {
nodeIntegration: false nodeIntegration: false
} }
}) })
w.webContents.on('console-message', (e, level, message) => { w.webContents.once('console-message', (e, level, message) => {
assert(message.includes('Disabled webSecurity')) assert(message.includes('Disabled webSecurity'), message)
done() done()
}) })
@ -92,8 +92,8 @@ describe('security warnings', () => {
} }
}) })
w.webContents.on('console-message', (e, level, message) => { w.webContents.once('console-message', (e, level, message) => {
assert(message.includes('Insecure Content-Security-Policy')) assert(message.includes('Insecure Content-Security-Policy'), message)
done() done()
}) })
@ -109,8 +109,8 @@ describe('security warnings', () => {
nodeIntegration: false nodeIntegration: false
} }
}) })
w.webContents.on('console-message', (e, level, message) => { w.webContents.once('console-message', (e, level, message) => {
assert(message.includes('allowRunningInsecureContent')) assert(message.includes('allowRunningInsecureContent'), message)
done() done()
}) })
@ -125,8 +125,8 @@ describe('security warnings', () => {
nodeIntegration: false nodeIntegration: false
} }
}) })
w.webContents.on('console-message', (e, level, message) => { w.webContents.once('console-message', (e, level, message) => {
assert(message.includes('experimentalFeatures')) assert(message.includes('experimentalFeatures'), message)
done() done()
}) })
@ -141,8 +141,8 @@ describe('security warnings', () => {
nodeIntegration: false nodeIntegration: false
} }
}) })
w.webContents.on('console-message', (e, level, message) => { w.webContents.once('console-message', (e, level, message) => {
assert(message.includes('blinkFeatures')) assert(message.includes('blinkFeatures'), message)
done() done()
}) })
@ -156,9 +156,8 @@ describe('security warnings', () => {
nodeIntegration: false nodeIntegration: false
} }
}) })
w.webContents.on('console-message', (e, level, message) => { w.webContents.once('console-message', (e, level, message) => {
console.log(message) assert(message.includes('allowpopups'), message)
assert(message.includes('allowpopups'))
done() done()
}) })
@ -172,9 +171,8 @@ describe('security warnings', () => {
nodeIntegration: false nodeIntegration: false
} }
}) })
w.webContents.on('console-message', (e, level, message) => { w.webContents.once('console-message', (e, level, message) => {
console.log(message) assert(message.includes('Insecure Resources'), message)
assert(message.includes('Insecure Resources'))
done() done()
}) })