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

feat: migrate protocol module to NetworkService (Part 5) (#18170)

Browse source 
* fix: always have head.headers available

* fix: use StringDataPipeProducer to write string

It can handle large strings correctly.

* fix: override RegisterNonNetworkSubresourceURLLoaderFactories

* fix: add dummy uninterceptProtocol implementation

* fix: jquery error handler can pass empty string

For some errors jquery would pass empty string in the error handler,
which makes tests pass when they should fail.

* chore: fix cpplint warnings

* fix: guard RegisterNonNetworkSubresourceURLLoaderFactories call

It may be called even when NetworkService is not enabled.

* test: disable protocol.interceptHttpProtocol test
This commit is contained in:
Cheng Zhao 2019-05-07 11:33:05 +09:00 • committed by GitHub
parent a96b6e2c96
commit 237f74a01f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 107 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

51
spec/api-protocol-spec.js
View file

@ -86,7 +86,7 @@ describe('protocol module', () => {
assert.strictEqual(data, text)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -119,7 +119,7 @@ describe('protocol module', () => {
assert.strictEqual(data, text)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -146,7 +146,7 @@ describe('protocol module', () => {
assert.strictEqual(data, text)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -163,7 +163,7 @@ describe('protocol module', () => {
assert.strictEqual(request.getResponseHeader('Access-Control-Allow-Origin'), '*')
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -184,7 +184,7 @@ describe('protocol module', () => {
assert.strictEqual(data, text)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -219,7 +219,7 @@ describe('protocol module', () => {
assert.strictEqual(data, text)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -236,7 +236,7 @@ describe('protocol module', () => {
assert.strictEqual(request.getResponseHeader('Access-Control-Allow-Origin'), '*')
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -257,7 +257,7 @@ describe('protocol module', () => {
assert.strictEqual(data, text)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -296,7 +296,7 @@ describe('protocol module', () => {
assert.strictEqual(data, String(fileContent))
return done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -313,9 +313,7 @@ describe('protocol module', () => {
assert.strictEqual(request.getResponseHeader('Access-Control-Allow-Origin'), '*')
done()
},
error: (xhr, errorType, error) => {
done(error)
}
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -335,9 +333,7 @@ describe('protocol module', () => {
assert.strictEqual(request.getResponseHeader('X-Great-Header'), 'sogreat')
done()
},
error: (xhr, errorType, error) => {
done(error)
}
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -353,7 +349,7 @@ describe('protocol module', () => {
assert.strictEqual(data, String(fileContent))
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -369,7 +365,7 @@ describe('protocol module', () => {
assert.strictEqual(data, String(normalContent))
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -428,7 +424,7 @@ describe('protocol module', () => {
assert.strictEqual(data, text)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -757,7 +753,7 @@ describe('protocol module', () => {
assert.strictEqual(data, text)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -790,7 +786,7 @@ describe('protocol module', () => {
assert.strictEqual(data, text)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -812,7 +808,7 @@ describe('protocol module', () => {
assert.strictEqual(data.value, 1)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -833,7 +829,7 @@ describe('protocol module', () => {
assert.deepStrictEqual({ ...qs.parse(data) }, postData)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -851,7 +847,7 @@ describe('protocol module', () => {
assert.strictEqual(data, text)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
@ -872,14 +868,17 @@ describe('protocol module', () => {
assert.strictEqual(data, $.param(postData))
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})
})
describe('protocol.interceptHttpProtocol', () => {
it('can send POST request', (done) => {
// FIXME(zcbenz): This test was passing because the test itself was wrong,
// I don't know whether it ever passed before and we should take a look at
// it in future.
xit('can send POST request', (done) => {
const server = http.createServer((req, res) => {
let body = ''
req.on('data', (chunk) => {
@ -916,7 +915,7 @@ describe('protocol module', () => {
assert.deepStrictEqual({ ...qs.parse(data) }, postData)
done()
},
error: (xhr, errorType, error) => done(error)
error: (xhr, errorType, error) => done(new Error(error))
})
})
})