Skip to content

Commit 6b2abbd

Browse files
mgolmgol
committed
Build: Migrate middleware-mockserver to modern JS
The `test/middleware-mockserver.js` file used to have the same ESLint settings applied as other test files that are directly run in tested browsers. Now it shares settings of other Node.js files. The file is now also written using modern JS, leveraging ES2018. Closes gh-5196 (cherry picked from commit ce90a48)
1 parent e062f9c commit 6b2abbd

File tree

2 files changed

+65
-49
lines changed

2 files changed

+65
-49
lines changed

‎test/.eslintrc.json

+8
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@
5757
},
5858

5959
"overrides": [
60+
{
61+
"files": [
62+
"middleware-mockserver.js"
63+
],
64+
65+
"extends": "../.eslintrc-node.json"
66+
},
67+
6068
{
6169
"files": [
6270
"data/core/jquery-iterability-transpiled-es6.js",

‎test/middleware-mockserver.js

+57-49
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
1-
/* eslint-env node */
2-
var url = require( "url" );
3-
var fs = require( "fs" );
4-
var getRawBody = require( "raw-body" );
1+
"use strict";
2+
3+
const url = require( "url" );
4+
const fs = require( "fs" );
5+
const getRawBody = require( "raw-body" );
6+
7+
let cspLog = "";
58

6-
var cspLog = "";
79
/**
810
* Keep in sync with /test/mock.php
911
*/
1012
function cleanCallback( callback ) {
1113
return callback.replace( /[^a-z0-9_]/gi, "" );
1214
}
1315

14-
var mocks = {
16+
const mocks = {
1517
contentType: function( req, resp ) {
1618
resp.writeHead( 200, {
1719
"content-type": req.query.contentType
1820
} );
1921
resp.end( req.query.response );
2022
},
2123
wait: function( req, resp ) {
22-
var wait = Number( req.query.wait ) * 1000;
24+
const wait = Number( req.query.wait ) * 1000;
2325
setTimeout( function() {
2426
if ( req.query.script ) {
2527
resp.writeHead( 200, { "content-type": "text/javascript" } );
@@ -44,7 +46,7 @@ var mocks = {
4446
}, next );
4547
},
4648
xml: function( req, resp, next ) {
47-
var content = "<math><calculation>5-2</calculation><result>3</result></math>";
49+
const content = "<math><calculation>5-2</calculation><result>3</result></math>";
4850
resp.writeHead( 200, { "content-type": "text/xml" } );
4951

5052
if ( req.query.cal === "5-2" ) {
@@ -59,7 +61,7 @@ var mocks = {
5961
}
6062
}, next );
6163
},
62-
atom: function( req, resp, next ) {
64+
atom: function( _req, resp ) {
6365
resp.writeHead( 200, { "content-type": "atom+xml" } );
6466
resp.end( "<root><element /></root>" );
6567
},
@@ -73,7 +75,7 @@ var mocks = {
7375
}
7476
resp.end( "QUnit.assert.ok( true, \"mock executed\" );" );
7577
},
76-
testbar: function( req, resp ) {
78+
testbar: function( _req, resp ) {
7779
resp.writeHead( 200 );
7880
resp.end(
7981
"this.testBar = 'bar'; " +
@@ -96,7 +98,7 @@ var mocks = {
9698
}
9799
},
98100
jsonp: function( req, resp, next ) {
99-
var callback;
101+
let callback;
100102
if ( Array.isArray( req.query.callback ) ) {
101103
callback = Promise.resolve( req.query.callback[ req.query.callback.length - 1 ] );
102104
} else if ( req.query.callback ) {
@@ -108,22 +110,22 @@ var mocks = {
108110
return body.trim().replace( "callback=", "" );
109111
} );
110112
}
111-
var json = req.query.array ?
113+
const json = req.query.array ?
112114
JSON.stringify(
113115
[ { name: "John", age: 21 }, { name: "Peter", age: 25 } ]
114116
) :
115117
JSON.stringify(
116118
{ data: { lang: "en", length: 25 } }
117119
);
118120
callback.then( function( cb ) {
119-
resp.end( cleanCallback( cb ) + "(" + json + ")" );
121+
resp.end( `${ cleanCallback( cb ) }(${ json })` );
120122
}, next );
121123
},
122124
xmlOverJsonp: function( req, resp ) {
123-
var callback = req.query.callback;
124-
var body = fs.readFileSync( __dirname + "/data/with_fries.xml" ).toString();
125+
const callback = req.query.callback;
126+
const body = fs.readFileSync( `${ __dirname }/data/with_fries.xml` ).toString();
125127
resp.writeHead( 200 );
126-
resp.end( cleanCallback( callback ) + "(" + JSON.stringify( body ) + ")\n" );
128+
resp.end( `${ cleanCallback( callback ) }(${ JSON.stringify( body ) })\n` );
127129
},
128130
error: function( req, resp ) {
129131
if ( req.query.json ) {
@@ -144,8 +146,8 @@ var mocks = {
144146
"constructor": "prototype collision (constructor)"
145147
} );
146148
req.query.keys.split( "|" ).forEach( function( key ) {
147-
if ( req.headers[ key.toLowerCase() ] ) {
148-
resp.write( key + ": " + req.headers[ key.toLowerCase() ] + "\n" );
149+
if ( key.toLowerCase() in req.headers ) {
150+
resp.write( `${ key }: ${ req.headers[ key.toLowerCase() ] }\n` );
149151
}
150152
} );
151153
resp.end();
@@ -163,16 +165,16 @@ var mocks = {
163165
},
164166
echoHtml: function( req, resp, next ) {
165167
resp.writeHead( 200, { "Content-Type": "text/html" } );
166-
resp.write( "<div id='method'>" + req.method + "</div>" );
167-
resp.write( "<div id='query'>" + req.parsed.search.slice( 1 ) + "</div>" );
168+
resp.write( `<div id='method'>${ req.method }</div>` );
169+
resp.write( `<div id='query'>${ req.parsed.search.slice( 1 ) }</div>` );
168170
getBody( req ).then( function( body ) {
169-
resp.write( "<div id='data'>" + body + "</div>" );
171+
resp.write( `<div id='data'>${ body }</div>` );
170172
resp.end( body );
171173
}, next );
172174
},
173175
etag: function( req, resp ) {
174-
var hash = Number( req.query.ts ).toString( 36 );
175-
var etag = "W/\"" + hash + "\"";
176+
const hash = Number( req.query.ts ).toString( 36 );
177+
const etag = `W/"${ hash }"`;
176178
if ( req.headers[ "if-none-match" ] === etag ) {
177179
resp.writeHead( 304 );
178180
resp.end();
@@ -183,8 +185,8 @@ var mocks = {
183185
} );
184186
resp.end();
185187
},
186-
ims: function( req, resp, next ) {
187-
var ts = req.query.ts;
188+
ims: function( req, resp ) {
189+
const ts = req.query.ts;
188190
if ( req.headers[ "if-modified-since" ] === ts ) {
189191
resp.writeHead( 304 );
190192
resp.end();
@@ -195,40 +197,44 @@ var mocks = {
195197
} );
196198
resp.end();
197199
},
198-
status: function( req, resp, next ) {
200+
status: function( req, resp ) {
199201
resp.writeHead( Number( req.query.code ) );
200202
resp.end();
201203
},
202204
testHTML: function( req, resp ) {
203205
resp.writeHead( 200, { "Content-Type": "text/html" } );
204-
var body = fs.readFileSync( __dirname + "/data/test.include.html" ).toString();
205-
body = body.replace( /{{baseURL}}/g, req.query.baseURL );
206+
const body = fs
207+
.readFileSync( `${ __dirname }/data/test.include.html` )
208+
.toString()
209+
.replace( /{{baseURL}}/g, req.query.baseURL );
206210
resp.end( body );
207211
},
208-
cspFrame: function( req, resp ) {
212+
cspFrame: function( _req, resp ) {
209213
resp.writeHead( 200, {
210214
"Content-Type": "text/html",
211-
"Content-Security-Policy": "default-src 'self'; report-uri /base/test/data/mock.php?action=cspLog"
215+
"Content-Security-Policy": "default-src 'self'; " +
216+
"report-uri /base/test/data/mock.php?action=cspLog"
212217
} );
213-
var body = fs.readFileSync( __dirname + "/data/csp.include.html" ).toString();
218+
const body = fs.readFileSync( `${ __dirname }/data/csp.include.html` ).toString();
214219
resp.end( body );
215220
},
216221
cspNonce: function( req, resp ) {
217-
var testParam = req.query.test ? "-" + req.query.test : "";
222+
const testParam = req.query.test ? `-${ req.query.test }` : "";
218223
resp.writeHead( 200, {
219224
"Content-Type": "text/html",
220-
"Content-Security-Policy": "script-src 'nonce-jquery+hardcoded+nonce'; report-uri /base/test/data/mock.php?action=cspLog"
225+
"Content-Security-Policy": "script-src 'nonce-jquery+hardcoded+nonce'; " +
226+
"report-uri /base/test/data/mock.php?action=cspLog"
221227
} );
222-
var body = fs.readFileSync(
223-
__dirname + "/data/csp-nonce" + testParam + ".html" ).toString();
228+
const body = fs.readFileSync(
229+
`${ __dirname }/data/csp-nonce${ testParam }.html` ).toString();
224230
resp.end( body );
225231
},
226-
cspLog: function( req, resp ) {
232+
cspLog: function( _req, resp ) {
227233
cspLog = "error";
228234
resp.writeHead( 200 );
229235
resp.end();
230236
},
231-
cspClean: function( req, resp ) {
237+
cspClean: function( _req, resp ) {
232238
cspLog = "";
233239
resp.writeHead( 200 );
234240
resp.end();
@@ -240,14 +246,14 @@ var mocks = {
240246
resp.writeHead( 404, { "Content-Type": "text/html; charset=UTF-8" } );
241247
}
242248
if ( req.query.callback ) {
243-
resp.end( cleanCallback( req.query.callback ) +
244-
"( {\"status\": 404, \"msg\": \"Not Found\"} )" );
249+
resp.end( `${ cleanCallback( req.query.callback )
250+
}( {"status": 404, "msg": "Not Found"} )` );
245251
} else {
246252
resp.end( "QUnit.assert.ok( false, \"Mock return erroneously executed\" );" );
247253
}
248254
}
249255
};
250-
var handlers = {
256+
const handlers = {
251257
"test/data/mock.php": function( req, resp, next ) {
252258
if ( !mocks[ req.query.action ] ) {
253259
resp.writeHead( 400 );
@@ -257,11 +263,11 @@ var handlers = {
257263
}
258264
mocks[ req.query.action ]( req, resp, next );
259265
},
260-
"test/data/support/csp.log": function( req, resp ) {
266+
"test/data/support/csp.log": function( _req, resp ) {
261267
resp.writeHead( 200 );
262268
resp.end( cspLog );
263269
},
264-
"test/data/404.txt": function( req, resp ) {
270+
"test/data/404.txt": function( _req, resp ) {
265271
resp.writeHead( 404 );
266272
resp.end( "" );
267273
}
@@ -276,21 +282,23 @@ var handlers = {
276282
* Express versions of these (e.g. no req.path, req.query, resp.set).
277283
*/
278284
function MockserverMiddlewareFactory() {
285+
279286
/**
280287
* @param {http.IncomingMessage} req
281288
* @param {http.ServerResponse} resp
282289
* @param {Function} next Continue request handling
283290
*/
284291
return function( req, resp, next ) {
285-
var parsed = url.parse( req.url, /* parseQuery */ true ),
286-
path = parsed.pathname.replace( /^\/base\//, "" ),
287-
query = parsed.query,
288-
subReq = Object.assign( Object.create( req ), {
289-
query: query,
290-
parsed: parsed
291-
} );
292+
const parsed = url.parse( req.url, /* parseQuery */ true );
293+
let path = parsed.pathname.replace( /^\/base\//, "" );
294+
const query = parsed.query;
295+
const subReq = Object.assign( Object.create( req ), {
296+
query: query,
297+
parsed: parsed
298+
} );
292299

293300
if ( /^test\/data\/mock.php\//.test( path ) ) {
301+
294302
// Support REST-like Apache PathInfo
295303
path = "test\/data\/mock.php";
296304
}

0 commit comments

Comments
 (0)