chore: remove duplicate code in spec/security-warnings-spec.js (#14967)
This commit is contained in:
		
					parent
					
						
							
								7a6d0cd6d2
							
						
					
				
			
			
				commit
				
					
						ae8c0f71b1
					
				
			
		
					 1 changed files with 123 additions and 221 deletions
				
			
		|  | @ -68,28 +68,15 @@ describe('security warnings', () => { | ||||||
|     w.loadURL(`http://127.0.0.1:8881/base-page-security.html`) |     w.loadURL(`http://127.0.0.1:8881/base-page-security.html`) | ||||||
|   }) |   }) | ||||||
| 
 | 
 | ||||||
|  |   const generateSpecs = (description, sandbox) => { | ||||||
|  |     describe(description, () => { | ||||||
|       it('should warn about disabled webSecurity', (done) => { |       it('should warn about disabled webSecurity', (done) => { | ||||||
|         w = new BrowserWindow({ |         w = new BrowserWindow({ | ||||||
|           show: false, |           show: false, | ||||||
|           webPreferences: { |           webPreferences: { | ||||||
|             webSecurity: false, |             webSecurity: false, | ||||||
|         nodeIntegration: false |             nodeIntegration: false, | ||||||
|       } |             sandbox | ||||||
|     }) |  | ||||||
|     w.webContents.once('console-message', (e, level, message) => { |  | ||||||
|       assert(message.includes('Disabled webSecurity'), message) |  | ||||||
|       done() |  | ||||||
|     }) |  | ||||||
| 
 |  | ||||||
|     w.loadURL(`http://127.0.0.1:8881/base-page-security.html`) |  | ||||||
|   }) |  | ||||||
| 
 |  | ||||||
|   it('should warn about disabled webSecurity (sandboxed)', (done) => { |  | ||||||
|     w = new BrowserWindow({ |  | ||||||
|       show: false, |  | ||||||
|       webPreferences: { |  | ||||||
|         webSecurity: false, |  | ||||||
|         sandbox: true |  | ||||||
|           } |           } | ||||||
|         }) |         }) | ||||||
|         w.webContents.once('console-message', (e, level, message) => { |         w.webContents.once('console-message', (e, level, message) => { | ||||||
|  | @ -104,24 +91,8 @@ describe('security warnings', () => { | ||||||
|         w = new BrowserWindow({ |         w = new BrowserWindow({ | ||||||
|           show: false, |           show: false, | ||||||
|           webPreferences: { |           webPreferences: { | ||||||
|         nodeIntegration: false |             nodeIntegration: false, | ||||||
|       } |             sandbox | ||||||
|     }) |  | ||||||
| 
 |  | ||||||
|     w.webContents.once('console-message', (e, level, message) => { |  | ||||||
|       assert(message.includes('Insecure Content-Security-Policy'), message) |  | ||||||
|       done() |  | ||||||
|     }) |  | ||||||
| 
 |  | ||||||
|     useCsp = false |  | ||||||
|     w.loadURL(`http://127.0.0.1:8881/base-page-security.html`) |  | ||||||
|   }) |  | ||||||
| 
 |  | ||||||
|   it('should warn about insecure Content-Security-Policy (sandboxed)', (done) => { |  | ||||||
|     w = new BrowserWindow({ |  | ||||||
|       show: false, |  | ||||||
|       webPreferences: { |  | ||||||
|         sandbox: true |  | ||||||
|           } |           } | ||||||
|         }) |         }) | ||||||
| 
 | 
 | ||||||
|  | @ -139,23 +110,8 @@ describe('security warnings', () => { | ||||||
|           show: false, |           show: false, | ||||||
|           webPreferences: { |           webPreferences: { | ||||||
|             allowRunningInsecureContent: true, |             allowRunningInsecureContent: true, | ||||||
|         nodeIntegration: false |             nodeIntegration: false, | ||||||
|       } |             sandbox | ||||||
|     }) |  | ||||||
|     w.webContents.once('console-message', (e, level, message) => { |  | ||||||
|       assert(message.includes('allowRunningInsecureContent'), message) |  | ||||||
|       done() |  | ||||||
|     }) |  | ||||||
| 
 |  | ||||||
|     w.loadURL(`http://127.0.0.1:8881/base-page-security.html`) |  | ||||||
|   }) |  | ||||||
| 
 |  | ||||||
|   it('should warn about allowRunningInsecureContent (sandboxed)', (done) => { |  | ||||||
|     w = new BrowserWindow({ |  | ||||||
|       show: false, |  | ||||||
|       webPreferences: { |  | ||||||
|         allowRunningInsecureContent: true, |  | ||||||
|         sandbox: true |  | ||||||
|           } |           } | ||||||
|         }) |         }) | ||||||
|         w.webContents.once('console-message', (e, level, message) => { |         w.webContents.once('console-message', (e, level, message) => { | ||||||
|  | @ -171,23 +127,8 @@ describe('security warnings', () => { | ||||||
|           show: false, |           show: false, | ||||||
|           webPreferences: { |           webPreferences: { | ||||||
|             experimentalFeatures: true, |             experimentalFeatures: true, | ||||||
|         nodeIntegration: false |             nodeIntegration: false, | ||||||
|       } |             sandbox | ||||||
|     }) |  | ||||||
|     w.webContents.once('console-message', (e, level, message) => { |  | ||||||
|       assert(message.includes('experimentalFeatures'), message) |  | ||||||
|       done() |  | ||||||
|     }) |  | ||||||
| 
 |  | ||||||
|     w.loadURL(`http://127.0.0.1:8881/base-page-security.html`) |  | ||||||
|   }) |  | ||||||
| 
 |  | ||||||
|   it('should warn about experimentalFeatures (sandboxed)', (done) => { |  | ||||||
|     w = new BrowserWindow({ |  | ||||||
|       show: false, |  | ||||||
|       webPreferences: { |  | ||||||
|         experimentalFeatures: true, |  | ||||||
|         sandbox: true |  | ||||||
|           } |           } | ||||||
|         }) |         }) | ||||||
|         w.webContents.once('console-message', (e, level, message) => { |         w.webContents.once('console-message', (e, level, message) => { | ||||||
|  | @ -203,23 +144,8 @@ describe('security warnings', () => { | ||||||
|           show: false, |           show: false, | ||||||
|           webPreferences: { |           webPreferences: { | ||||||
|             enableBlinkFeatures: ['my-cool-feature'], |             enableBlinkFeatures: ['my-cool-feature'], | ||||||
|         nodeIntegration: false |             nodeIntegration: false, | ||||||
|       } |             sandbox | ||||||
|     }) |  | ||||||
|     w.webContents.once('console-message', (e, level, message) => { |  | ||||||
|       assert(message.includes('enableBlinkFeatures'), message) |  | ||||||
|       done() |  | ||||||
|     }) |  | ||||||
| 
 |  | ||||||
|     w.loadURL(`http://127.0.0.1:8881/base-page-security.html`) |  | ||||||
|   }) |  | ||||||
| 
 |  | ||||||
|   it('should warn about enableBlinkFeatures (sandboxed)', (done) => { |  | ||||||
|     w = new BrowserWindow({ |  | ||||||
|       show: false, |  | ||||||
|       webPreferences: { |  | ||||||
|         enableBlinkFeatures: ['my-cool-feature'], |  | ||||||
|         sandbox: true |  | ||||||
|           } |           } | ||||||
|         }) |         }) | ||||||
|         w.webContents.once('console-message', (e, level, message) => { |         w.webContents.once('console-message', (e, level, message) => { | ||||||
|  | @ -234,22 +160,8 @@ describe('security warnings', () => { | ||||||
|         w = new BrowserWindow({ |         w = new BrowserWindow({ | ||||||
|           show: false, |           show: false, | ||||||
|           webPreferences: { |           webPreferences: { | ||||||
|         nodeIntegration: false |             nodeIntegration: false, | ||||||
|       } |             sandbox | ||||||
|     }) |  | ||||||
|     w.webContents.once('console-message', (e, level, message) => { |  | ||||||
|       assert(message.includes('allowpopups'), message) |  | ||||||
|       done() |  | ||||||
|     }) |  | ||||||
| 
 |  | ||||||
|     w.loadURL(`http://127.0.0.1:8881/webview-allowpopups.html`) |  | ||||||
|   }) |  | ||||||
| 
 |  | ||||||
|   it('should warn about allowpopups (sandboxed)', (done) => { |  | ||||||
|     w = new BrowserWindow({ |  | ||||||
|       show: false, |  | ||||||
|       webPreferences: { |  | ||||||
|         sandbox: true |  | ||||||
|           } |           } | ||||||
|         }) |         }) | ||||||
|         w.webContents.once('console-message', (e, level, message) => { |         w.webContents.once('console-message', (e, level, message) => { | ||||||
|  | @ -264,23 +176,8 @@ describe('security warnings', () => { | ||||||
|         w = new BrowserWindow({ |         w = new BrowserWindow({ | ||||||
|           show: false, |           show: false, | ||||||
|           webPreferences: { |           webPreferences: { | ||||||
|         nodeIntegration: false |             nodeIntegration: false, | ||||||
|       } |             sandbox | ||||||
|     }) |  | ||||||
|     w.webContents.once('console-message', (e, level, message) => { |  | ||||||
|       assert(message.includes('Insecure Resources'), message) |  | ||||||
|       done() |  | ||||||
|     }) |  | ||||||
| 
 |  | ||||||
|     w.loadURL(`http://127.0.0.1:8881/insecure-resources.html`) |  | ||||||
|     w.webContents.openDevTools() |  | ||||||
|   }) |  | ||||||
| 
 |  | ||||||
|   it('should warn about insecure resources (sandboxed)', (done) => { |  | ||||||
|     w = new BrowserWindow({ |  | ||||||
|       show: false, |  | ||||||
|       webPreferences: { |  | ||||||
|         sandbox: true |  | ||||||
|           } |           } | ||||||
|         }) |         }) | ||||||
|         w.webContents.once('console-message', (e, level, message) => { |         w.webContents.once('console-message', (e, level, message) => { | ||||||
|  | @ -292,3 +189,8 @@ describe('security warnings', () => { | ||||||
|         w.webContents.openDevTools() |         w.webContents.openDevTools() | ||||||
|       }) |       }) | ||||||
|     }) |     }) | ||||||
|  |   } | ||||||
|  | 
 | ||||||
|  |   generateSpecs('without sandbox', false) | ||||||
|  |   generateSpecs('with sandbox', true) | ||||||
|  | }) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Milan Burda
				Milan Burda