thunderstrike/puppeteer
thunderstrike/puppeteer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Request): convert resourceType to all small-caps (#990)

Browse Source 
This patch moves resourceType to be all small-caps. This aligns
with our convention that all string constants should be smallcaps.

BREAKING CHANGE: this patch changes the constants of the
request.resourceType to be all small-caps.
This commit is contained in:
Andrey Lushnikov 2017-10-10 10:53:37 -07:00 committed by GitHub
parent 7e28dbafb5
commit c3fb367148
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/api.md
View File

@ -1696,7 +1696,7 @@ Contains the request's post body, if any.
- <[string]> - <[string]>
Contains the request's resource type as it was perceived by the rendering engine. Contains the request's resource type as it was perceived by the rendering engine.
ResourceType will be one of the following: `Document`, `Stylesheet`, `Image`, `Media`, `Font`, `Script`, `TextTrack`, `XHR`, `Fetch`, `EventSource`, `WebSocket`, `Manifest`, `Other`. ResourceType will be one of the following: `document`, `stylesheet`, `image`, `media`, `font`, `script`, `texttrack`, `xhr`, `fetch`, `eventsource`, `websocket`, `manifest`, `other`.
#### request.response() #### request.response()
- returns: <[Response]> A matching [Response] object, or `null` if the response has not been received yet. - returns: <[Response]> A matching [Response] object, or `null` if the response has not been received yet.

2
examples/block-images.js
View File

@ -24,7 +24,7 @@ const browser = await puppeteer.launch();
const page = await browser.newPage(); const page = await browser.newPage();
await page.setRequestInterceptionEnabled(true); await page.setRequestInterceptionEnabled(true);
page.on('request', request => { page.on('request', request => {
if (request.resourceType === 'Image') if (request.resourceType === 'image')
request.abort(); request.abort();
else else
request.continue(); request.continue();

2
lib/NetworkManager.js
View File

@ -271,7 +271,7 @@ class Request {
}); });
this.url = url; this.url = url;
this.resourceType = resourceType; this.resourceType = resourceType.toLowerCase();
this.method = payload.method; this.method = payload.method;
this.postData = payload.postData; this.postData = payload.postData;
this.headers = {}; this.headers = {};

8
test/test.js
View File

@ -1008,7 +1008,7 @@ describe('Page', function() {
expect(request.headers['user-agent']).toBeTruthy(); expect(request.headers['user-agent']).toBeTruthy();
expect(request.method).toBe('GET'); expect(request.method).toBe('GET');
expect(request.postData).toBe(undefined); expect(request.postData).toBe(undefined);
expect(request.resourceType).toBe('Document'); expect(request.resourceType).toBe('document');
request.continue(); request.continue();
}); });
const response = await page.goto(EMPTY_PAGE); const response = await page.goto(EMPTY_PAGE);
@ -1077,7 +1077,7 @@ describe('Page', function() {
expect(response.status).toBe(200); expect(response.status).toBe(200);
expect(response.url).toContain('empty.html'); expect(response.url).toContain('empty.html');
expect(requests.length).toBe(5); expect(requests.length).toBe(5);
expect(requests[2].resourceType).toBe('Document'); expect(requests[2].resourceType).toBe('document');
})); }));
it('should be able to abort redirects', SX(async function() { it('should be able to abort redirects', SX(async function() {
await page.setRequestInterceptionEnabled(true); await page.setRequestInterceptionEnabled(true);
@ -1866,7 +1866,7 @@ describe('Page', function() {
await page.goto(EMPTY_PAGE); await page.goto(EMPTY_PAGE);
expect(requests.length).toBe(1); expect(requests.length).toBe(1);
expect(requests[0].url).toBe(EMPTY_PAGE); expect(requests[0].url).toBe(EMPTY_PAGE);
expect(requests[0].resourceType).toBe('Document'); expect(requests[0].resourceType).toBe('document');
expect(requests[0].method).toBe('GET'); expect(requests[0].method).toBe('GET');
expect(requests[0].response()).toBeTruthy(); expect(requests[0].response()).toBeTruthy();
})); }));
@ -1942,7 +1942,7 @@ describe('Page', function() {
expect(failedRequests.length).toBe(1); expect(failedRequests.length).toBe(1);
expect(failedRequests[0].url).toContain('one-style.css'); expect(failedRequests[0].url).toContain('one-style.css');
expect(failedRequests[0].response()).toBe(null); expect(failedRequests[0].response()).toBe(null);
expect(failedRequests[0].resourceType).toBe('Stylesheet'); expect(failedRequests[0].resourceType).toBe('stylesheet');
})); }));
it('Page.Events.RequestFinished', SX(async function() { it('Page.Events.RequestFinished', SX(async function() {
const requests = []; const requests = [];