diff --git a/script/lint.js b/script/lint.js index a66423bb0f..5e7489ee8d 100755 --- a/script/lint.js +++ b/script/lint.js @@ -16,7 +16,7 @@ const DEPOT_TOOLS = path.resolve(SOURCE_ROOT, 'third_party', 'depot_tools'); const IGNORELIST = new Set([ ['shell', 'browser', 'resources', 'win', 'resource.h'], ['shell', 'common', 'node_includes.h'], - ['spec', 'static', 'jquery-2.0.3.min.js'], + ['spec-main', 'fixtures', 'pages', 'jquery-3.6.0.min.js'], ['spec', 'ts-smoke', 'electron', 'main.ts'], ['spec', 'ts-smoke', 'electron', 'renderer.ts'], ['spec', 'ts-smoke', 'runner.js'] diff --git a/spec-main/.eslintrc b/spec-main/.eslintrc index a26475e27d..60be8a0dac 100644 --- a/spec-main/.eslintrc +++ b/spec-main/.eslintrc @@ -2,7 +2,6 @@ "env": { "browser": true, "mocha": true, - "jquery": true, "serviceworker": true }, "globals": { diff --git a/spec-main/api-protocol-spec.ts b/spec-main/api-protocol-spec.ts index 71437da6fe..980c289cb1 100644 --- a/spec-main/api-protocol-spec.ts +++ b/spec-main/api-protocol-spec.ts @@ -29,7 +29,7 @@ const unregisterProtocol = protocol.unregisterProtocol; const uninterceptProtocol = protocol.uninterceptProtocol; const text = 'valar morghulis'; -const protocolName = 'sp'; +const protocolName = 'no-cors'; const postData = { name: 'post test', type: 'string' @@ -80,7 +80,7 @@ describe('protocol module', () => { // Note that we need to do navigation every time after a protocol is // registered or unregistered, otherwise the new protocol won't be // recognized by current page when NetworkService is used. - await contents.loadFile(path.join(__dirname, 'fixtures', 'pages', 'jquery.html')); + await contents.loadFile(path.join(__dirname, 'fixtures', 'pages', 'fetch.html')); return contents.executeJavaScript(`ajax("${url}", ${JSON.stringify(options)})`); } @@ -110,7 +110,7 @@ describe('protocol module', () => { it('sends error when callback is called with nothing', async () => { registerBufferProtocol(protocolName, (req, cb: any) => cb()); - await expect(ajax(protocolName + '://fake-host')).to.eventually.be.rejectedWith(Error, '404'); + await expect(ajax(protocolName + '://fake-host')).to.eventually.be.rejected(); }); it('does not crash when callback is called in next tick', async () => { @@ -157,7 +157,7 @@ describe('protocol module', () => { registerStringProtocol(protocolName, (request, callback) => callback(text)); const r = await ajax(protocolName + '://fake-host'); expect(r.data).to.equal(text); - expect(r.headers).to.include('access-control-allow-origin: *'); + expect(r.headers).to.have.property('access-control-allow-origin', '*'); }); it('sends object as response', async () => { @@ -174,7 +174,7 @@ describe('protocol module', () => { it('fails when sending object other than string', async () => { const notAString = () => {}; registerStringProtocol(protocolName, (request, callback) => callback(notAString as any)); - await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejectedWith(Error, '404'); + await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejected(); }); }); @@ -190,7 +190,7 @@ describe('protocol module', () => { registerBufferProtocol(protocolName, (request, callback) => callback(buffer)); const r = await ajax(protocolName + '://fake-host'); expect(r.data).to.equal(text); - expect(r.headers).to.include('access-control-allow-origin: *'); + expect(r.headers).to.have.property('access-control-allow-origin', '*'); }); it('sends object as response', async () => { @@ -206,7 +206,7 @@ describe('protocol module', () => { it('fails when sending string', async () => { registerBufferProtocol(protocolName, (request, callback) => callback(text as any)); - await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejectedWith(Error, '404'); + await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejected(); }); }); @@ -226,7 +226,7 @@ describe('protocol module', () => { registerFileProtocol(protocolName, (request, callback) => callback(filePath)); const r = await ajax(protocolName + '://fake-host'); expect(r.data).to.equal(String(fileContent)); - expect(r.headers).to.include('access-control-allow-origin: *'); + expect(r.headers).to.have.property('access-control-allow-origin', '*'); }); it('sets custom headers', async () => { @@ -236,7 +236,7 @@ describe('protocol module', () => { })); const r = await ajax(protocolName + '://fake-host'); expect(r.data).to.equal(String(fileContent)); - expect(r.headers).to.include('x-great-header: sogreat'); + expect(r.headers).to.have.property('x-great-header', 'sogreat'); }); it.skip('throws an error when custom headers are invalid', (done) => { @@ -247,7 +247,7 @@ describe('protocol module', () => { })).to.throw(Error, 'Value of \'X-Great-Header\' header has to be a string'); done(); }); - ajax(protocolName + '://fake-host'); + ajax(protocolName + '://fake-host').catch(() => {}); }); it('sends object as response', async () => { @@ -265,12 +265,12 @@ describe('protocol module', () => { it('fails when sending unexist-file', async () => { const fakeFilePath = path.join(fixturesPath, 'test.asar', 'a.asar', 'not-exist'); registerFileProtocol(protocolName, (request, callback) => callback(fakeFilePath)); - await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejectedWith(Error, '404'); + await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejected(); }); it('fails when sending unsupported content', async () => { registerFileProtocol(protocolName, (request, callback) => callback(new Date() as any)); - await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejectedWith(Error, '404'); + await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejected(); }); }); @@ -292,12 +292,12 @@ describe('protocol module', () => { it('fails when sending invalid url', async () => { registerHttpProtocol(protocolName, (request, callback) => callback({ url: 'url' })); - await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejectedWith(Error, '404'); + await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejected(); }); it('fails when sending unsupported content', async () => { registerHttpProtocol(protocolName, (request, callback) => callback(new Date() as any)); - await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejectedWith(Error, '404'); + await expect(ajax(protocolName + '://fake-host')).to.be.eventually.rejected(); }); it('works when target URL redirects', async () => { @@ -331,7 +331,7 @@ describe('protocol module', () => { done(e); } }); - ajax(protocolName + '://fake-host'); + ajax(protocolName + '://fake-host').catch(() => {}); }); }); @@ -359,7 +359,7 @@ describe('protocol module', () => { const r = await ajax(protocolName + '://fake-host'); expect(r.data).to.equal(text); expect(r.status).to.equal(200); - expect(r.headers).to.include('x-electron: a, b'); + expect(r.headers).to.have.property('x-electron', 'a, b'); }); it('sends custom status code', async () => { @@ -368,7 +368,7 @@ describe('protocol module', () => { data: null as any })); const r = await ajax(protocolName + '://fake-host'); - expect(r.data).to.be.undefined('data'); + expect(r.data).to.be.empty('data'); expect(r.status).to.equal(204); }); @@ -382,7 +382,7 @@ describe('protocol module', () => { }); }); const r = await ajax(protocolName + '://fake-host', { headers: { 'x-return-headers': 'yes' } }); - expect(r.data['x-return-headers']).to.equal('yes'); + expect(JSON.parse(r.data)['x-return-headers']).to.equal('yes'); }); it('returns response multiple response headers with the same name', async () => { @@ -399,7 +399,8 @@ describe('protocol module', () => { // SUBTLE: when the response headers have multiple values it // separates values by ", ". When the response headers are incorrectly // converting an array to a string it separates values by ",". - expect(r.headers).to.equal('header1: value1, value2\r\nheader2: value3\r\n'); + expect(r.headers).to.have.property('header1', 'value1, value2'); + expect(r.headers).to.have.property('header2', 'value3'); }); it('can handle large responses', async () => { @@ -456,7 +457,7 @@ describe('protocol module', () => { }); }); const hasEndedPromise = emittedOnce(events, 'end'); - ajax(protocolName + '://fake-host'); + ajax(protocolName + '://fake-host').catch(() => {}); await hasEndedPromise; }); @@ -478,9 +479,9 @@ describe('protocol module', () => { const hasRespondedPromise = emittedOnce(events, 'respond'); const hasClosedPromise = emittedOnce(events, 'close'); - ajax(protocolName + '://fake-host'); + ajax(protocolName + '://fake-host').catch(() => {}); await hasRespondedPromise; - await contents.loadFile(path.join(__dirname, 'fixtures', 'pages', 'jquery.html')); + await contents.loadFile(path.join(__dirname, 'fixtures', 'pages', 'fetch.html')); await hasClosedPromise; }); }); @@ -527,7 +528,7 @@ describe('protocol module', () => { it('sends error when callback is called with nothing', async () => { interceptStringProtocol('http', (request, callback: any) => callback()); - await expect(ajax('http://fake-host')).to.be.eventually.rejectedWith(Error, '404'); + await expect(ajax('http://fake-host')).to.be.eventually.rejected(); }); }); @@ -546,8 +547,7 @@ describe('protocol module', () => { }); }); const r = await ajax('http://fake-host'); - expect(r.data).to.be.an('object'); - expect(r.data).to.have.property('value').that.is.equal(1); + expect(JSON.parse(r.data)).to.have.property('value').that.is.equal(1); }); it('can set content-type with charset', async () => { @@ -558,8 +558,7 @@ describe('protocol module', () => { }); }); const r = await ajax('http://fake-host'); - expect(r.data).to.be.an('object'); - expect(r.data).to.have.property('value').that.is.equal(1); + expect(JSON.parse(r.data)).to.have.property('value').that.is.equal(1); }); it('can receive post data', async () => { @@ -567,7 +566,7 @@ describe('protocol module', () => { const uploadData = request.uploadData![0].bytes.toString(); callback({ data: uploadData }); }); - const r = await ajax('http://fake-host', { type: 'POST', data: postData }); + const r = await ajax('http://fake-host', { method: 'POST', body: qs.stringify(postData) }); expect({ ...qs.parse(r.data) }).to.deep.equal(postData); }); }); @@ -584,8 +583,8 @@ describe('protocol module', () => { const uploadData = request.uploadData![0].bytes; callback(uploadData); }); - const r = await ajax('http://fake-host', { type: 'POST', data: postData }); - expect(r.data).to.equal('name=post+test&type=string'); + const r = await ajax('http://fake-host', { method: 'POST', body: qs.stringify(postData) }); + expect(qs.parse(r.data)).to.deep.equal({ name: 'post test', type: 'string' }); }); }); @@ -651,7 +650,7 @@ describe('protocol module', () => { done(e); } }); - ajax('http://fake-host'); + ajax('http://fake-host').catch(() => {}); }); }); @@ -666,7 +665,7 @@ describe('protocol module', () => { interceptStreamProtocol('http', (request, callback) => { callback(getStream(3, request.uploadData![0].bytes.toString())); }); - const r = await ajax('http://fake-host', { type: 'POST', data: postData }); + const r = await ajax('http://fake-host', { method: 'POST', body: qs.stringify(postData) }); expect({ ...qs.parse(r.data) }).to.deep.equal(postData); }); diff --git a/spec-main/api-web-request-spec.ts b/spec-main/api-web-request-spec.ts index ea088b64fa..f939f4af5a 100644 --- a/spec-main/api-web-request-spec.ts +++ b/spec-main/api-web-request-spec.ts @@ -36,7 +36,7 @@ describe('webRequest module', () => { let defaultURL: string; before((done) => { - protocol.registerStringProtocol('neworigin', (req, cb) => cb('')); + protocol.registerStringProtocol('cors', (req, cb) => cb('')); server.listen(0, '127.0.0.1', () => { const port = (server.address() as AddressInfo).port; defaultURL = `http://127.0.0.1:${port}/`; @@ -46,14 +46,14 @@ describe('webRequest module', () => { after(() => { server.close(); - protocol.unregisterProtocol('neworigin'); + protocol.unregisterProtocol('cors'); }); let contents: WebContents = null as unknown as WebContents; // NB. sandbox: true is used because it makes navigations much (~8x) faster. before(async () => { contents = (webContents as any).create({ sandbox: true }); - await contents.loadFile(path.join(fixturesPath, 'pages', 'jquery.html')); + await contents.loadFile(path.join(fixturesPath, 'pages', 'fetch.html')); }); after(() => (contents as any).destroy()); @@ -72,7 +72,7 @@ describe('webRequest module', () => { cancel: true }); }); - await expect(ajax(defaultURL)).to.eventually.be.rejectedWith('404'); + await expect(ajax(defaultURL)).to.eventually.be.rejected(); }); it('can filter URLs', async () => { @@ -82,7 +82,7 @@ describe('webRequest module', () => { }); const { data } = await ajax(`${defaultURL}nofilter/test`); expect(data).to.equal('/nofilter/test'); - await expect(ajax(`${defaultURL}filter/test`)).to.eventually.be.rejectedWith('404'); + await expect(ajax(`${defaultURL}filter/test`)).to.eventually.be.rejected(); }); it('receives details object', async () => { @@ -117,9 +117,9 @@ describe('webRequest module', () => { callback({ cancel: true }); }); await expect(ajax(defaultURL, { - type: 'POST', - data: postData - })).to.eventually.be.rejectedWith('404'); + method: 'POST', + body: qs.stringify(postData) + })).to.eventually.be.rejected(); }); it('can redirect the request', async () => { @@ -151,7 +151,7 @@ describe('webRequest module', () => { protocol: 'file', slashes: true }); - await expect(ajax(fileURL)).to.eventually.be.rejectedWith('404'); + await expect(ajax(fileURL)).to.eventually.be.rejected(); }); }); @@ -182,12 +182,12 @@ describe('webRequest module', () => { }); it('can change the request headers on a custom protocol redirect', async () => { - protocol.registerStringProtocol('custom-scheme', (req, callback) => { - if (req.url === 'custom-scheme://fake-host/redirect') { + protocol.registerStringProtocol('no-cors', (req, callback) => { + if (req.url === 'no-cors://fake-host/redirect') { callback({ statusCode: 302, headers: { - Location: 'custom-scheme://fake-host' + Location: 'no-cors://fake-host' } }); } else { @@ -202,7 +202,7 @@ describe('webRequest module', () => { // Note that we need to do navigation every time after a protocol is // registered or unregistered, otherwise the new protocol won't be // recognized by current page when NetworkService is used. - await contents.loadFile(path.join(__dirname, 'fixtures', 'pages', 'jquery.html')); + await contents.loadFile(path.join(__dirname, 'fixtures', 'pages', 'fetch.html')); try { ses.webRequest.onBeforeSendHeaders((details, callback) => { @@ -210,10 +210,10 @@ describe('webRequest module', () => { requestHeaders.Accept = '*/*;test/header'; callback({ requestHeaders: requestHeaders }); }); - const { data } = await ajax('custom-scheme://fake-host/redirect'); + const { data } = await ajax('no-cors://fake-host/redirect'); expect(data).to.equal('header-received'); } finally { - protocol.unregisterProtocol('custom-scheme'); + protocol.unregisterProtocol('no-cors'); } }); @@ -233,7 +233,7 @@ describe('webRequest module', () => { called = true; callback({ requestHeaders: details.requestHeaders }); }); - await ajax('neworigin://host'); + await ajax('cors://host'); expect(called).to.be.true(); }); @@ -320,7 +320,7 @@ describe('webRequest module', () => { callback({ responseHeaders: responseHeaders }); }); const { headers } = await ajax(defaultURL); - expect(headers).to.match(/^custom: Changed$/m); + expect(headers).to.to.have.property('custom', 'Changed'); }); it('can change response origin', async () => { @@ -330,7 +330,7 @@ describe('webRequest module', () => { callback({ responseHeaders: responseHeaders }); }); const { headers } = await ajax(defaultURL); - expect(headers).to.match(/^access-control-allow-origin: http:\/\/new-origin$/m); + expect(headers).to.to.have.property('access-control-allow-origin', 'http://new-origin'); }); it('can change headers of CORS responses', async () => { @@ -339,8 +339,8 @@ describe('webRequest module', () => { responseHeaders.Custom = ['Changed'] as any; callback({ responseHeaders: responseHeaders }); }); - const { headers } = await ajax('neworigin://host'); - expect(headers).to.match(/^custom: Changed$/m); + const { headers } = await ajax('cors://host'); + expect(headers).to.to.have.property('custom', 'Changed'); }); it('does not change header by default', async () => { @@ -348,7 +348,7 @@ describe('webRequest module', () => { callback({}); }); const { data, headers } = await ajax(defaultURL); - expect(headers).to.match(/^custom: Header$/m); + expect(headers).to.to.have.property('custom', 'Header'); expect(data).to.equal('/'); }); @@ -358,7 +358,7 @@ describe('webRequest module', () => { callback({}); }); const { data, headers } = await ajax(defaultURL + 'contentDisposition'); - expect(headers).to.match(/^content-disposition: attachment; filename=aa%E4%B8%ADaa.txt$/m); + expect(headers).to.to.have.property('content-disposition', 'attachment; filename=aa%E4%B8%ADaa.txt'); expect(data).to.equal('/contentDisposition'); }); @@ -368,7 +368,7 @@ describe('webRequest module', () => { callback({ responseHeaders: responseHeaders }); }); const { headers } = await ajax(defaultURL + 'serverRedirect'); - expect(headers).to.match(/^custom: Header$/m); + expect(headers).to.to.have.property('custom', 'Header'); }); it('can change the header status', async () => { @@ -379,19 +379,8 @@ describe('webRequest module', () => { statusLine: 'HTTP/1.1 404 Not Found' }); }); - const { headers } = await contents.executeJavaScript(`new Promise((resolve, reject) => { - const options = { - ...${JSON.stringify({ url: defaultURL })}, - success: (data, status, request) => { - reject(new Error('expected failure')) - }, - error: (xhr) => { - resolve({ headers: xhr.getAllResponseHeaders() }) - } - } - $.ajax(options) - })`); - expect(headers).to.match(/^custom: Header$/m); + const { headers } = await ajax(defaultURL); + expect(headers).to.to.have.property('custom', 'Header'); }); }); @@ -408,7 +397,7 @@ describe('webRequest module', () => { expect(details.responseHeaders!.Custom).to.deep.equal(['Header']); }); const { data, headers } = await ajax(defaultURL); - expect(headers).to.match(/^custom: Header$/m); + expect(headers).to.to.have.property('custom', 'Header'); expect(data).to.equal('/'); }); }); @@ -468,7 +457,7 @@ describe('webRequest module', () => { ses.webRequest.onErrorOccurred((details) => { expect(details.error).to.equal('net::ERR_BLOCKED_BY_CLIENT'); }); - await expect(ajax(defaultURL)).to.eventually.be.rejectedWith('404'); + await expect(ajax(defaultURL)).to.eventually.be.rejected(); }); }); diff --git a/spec-main/fixtures/pages/fetch.html b/spec-main/fixtures/pages/fetch.html new file mode 100644 index 0000000000..9e2ef64095 --- /dev/null +++ b/spec-main/fixtures/pages/fetch.html @@ -0,0 +1,15 @@ + + + + + diff --git a/spec-main/fixtures/pages/jquery-3.6.0.min.js b/spec-main/fixtures/pages/jquery-3.6.0.min.js new file mode 100644 index 0000000000..c4c6022f29 --- /dev/null +++ b/spec-main/fixtures/pages/jquery-3.6.0.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="
",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0 - + - diff --git a/spec/.eslintrc b/spec/.eslintrc index a26475e27d..60be8a0dac 100644 --- a/spec/.eslintrc +++ b/spec/.eslintrc @@ -2,7 +2,6 @@ "env": { "browser": true, "mocha": true, - "jquery": true, "serviceworker": true }, "globals": { diff --git a/spec/asar-spec.js b/spec/asar-spec.js index 0a432d6bdf..4468bf85e2 100644 --- a/spec/asar-spec.js +++ b/spec/asar-spec.js @@ -1599,67 +1599,42 @@ describe('asar package', function () { }); describe('asar protocol', function () { - it('can request a file in package', function (done) { + it('can request a file in package', async function () { const p = path.resolve(asarDir, 'a.asar', 'file1'); - $.get('file://' + p, function (data) { - try { - expect(data.trim()).to.equal('file1'); - done(); - } catch (e) { - done(e); - } - }); + const response = await fetch('file://' + p); + const data = await response.text(); + expect(data.trim()).to.equal('file1'); }); - it('can request a file in package with unpacked files', function (done) { + it('can request a file in package with unpacked files', async function () { const p = path.resolve(asarDir, 'unpack.asar', 'a.txt'); - $.get('file://' + p, function (data) { - try { - expect(data.trim()).to.equal('a'); - done(); - } catch (e) { - done(e); - } - }); + const response = await fetch('file://' + p); + const data = await response.text(); + expect(data.trim()).to.equal('a'); }); - it('can request a linked file in package', function (done) { + it('can request a linked file in package', async function () { const p = path.resolve(asarDir, 'a.asar', 'link2', 'link1'); - $.get('file://' + p, function (data) { - try { - expect(data.trim()).to.equal('file1'); - done(); - } catch (e) { - done(e); - } - }); + const response = await fetch('file://' + p); + const data = await response.text(); + expect(data.trim()).to.equal('file1'); }); - it('can request a file in filesystem', function (done) { + it('can request a file in filesystem', async function () { const p = path.resolve(asarDir, 'file'); - $.get('file://' + p, function (data) { - try { - expect(data.trim()).to.equal('file'); - done(); - } catch (e) { - done(e); - } - }); + const response = await fetch('file://' + p); + const data = await response.text(); + expect(data.trim()).to.equal('file'); }); - it('gets 404 when file is not found', function (done) { + it('gets error when file is not found', async function () { const p = path.resolve(asarDir, 'a.asar', 'no-exist'); - $.ajax({ - url: 'file://' + p, - error: function (err) { - try { - expect(err.status).to.equal(404); - done(); - } catch (e) { - done(e); - } - } - }); + try { + const response = await fetch('file://' + p); + expect(response.status).to.equal(404); + } catch (error) { + expect(error.message).to.equal('Failed to fetch'); + } }); }); diff --git a/spec/fixtures/pages/basic-auth.html b/spec/fixtures/pages/basic-auth.html index ec9383ca4d..9202396682 100644 --- a/spec/fixtures/pages/basic-auth.html +++ b/spec/fixtures/pages/basic-auth.html @@ -1,22 +1,21 @@ - diff --git a/spec/fixtures/pages/dom-ready.html b/spec/fixtures/pages/dom-ready.html index 541852f9ab..1d409eb9c6 100644 --- a/spec/fixtures/pages/dom-ready.html +++ b/spec/fixtures/pages/dom-ready.html @@ -1,8 +1,8 @@ - diff --git a/spec/static/index.html b/spec/static/index.html index 773d715fe4..7c316a69f1 100644 --- a/spec/static/index.html +++ b/spec/static/index.html @@ -1,5 +1,4 @@ -