refactor: use loadFile when appropriate in tests (#14422)

This commit is contained in:
Milan Burda 2018-09-04 16:50:53 +02:00 committed by Charles Kerr
parent e8782f2c2d
commit c63014c256
13 changed files with 115 additions and 137 deletions

View file

@ -1003,7 +1003,6 @@ describe('asar package', function () {
})
describe('asar protocol', function () {
var url = require('url')
var w = null
afterEach(function () {
@ -1064,16 +1063,11 @@ describe('asar package', function () {
height: 400
})
var p = path.resolve(fixtures, 'asar', 'web.asar', 'index.html')
var u = url.format({
protocol: 'file',
slashed: true,
pathname: p
})
ipcMain.once('dirname', function (event, dirname) {
assert.equal(dirname, path.dirname(p))
done()
})
w.loadURL(u)
w.loadFile(p)
})
it('loads script tag in html', function (done) {
@ -1087,12 +1081,7 @@ describe('asar package', function () {
height: 400
})
var p = path.resolve(fixtures, 'asar', 'script.asar', 'index.html')
var u = url.format({
protocol: 'file',
slashed: true,
pathname: p
})
w.loadURL(u)
w.loadFile(p)
ipcMain.once('ping', function (event, message) {
assert.equal(message, 'pong')
done()
@ -1112,12 +1101,7 @@ describe('asar package', function () {
height: 400
})
var p = path.resolve(fixtures, 'asar', 'video.asar', 'index.html')
var u = url.format({
protocol: 'file',
slashed: true,
pathname: p
})
w.loadURL(u)
w.loadFile(p)
ipcMain.on('asar-video', function (event, message, error) {
if (message === 'ended') {
assert(!error)