]> source.dussan.org Git - jquery.git/commitdiff
Tests: Recognize callbacks with dots in the Node.js mock server
authorMichał Gołębiowski-Owczarek <m.goleb@gmail.com>
Wed, 2 Sep 2020 16:42:52 +0000 (18:42 +0200)
committerMichał Gołębiowski-Owczarek <m.goleb@gmail.com>
Wed, 2 Sep 2020 16:46:56 +0000 (18:46 +0200)
This aligns the Node.js server with the previous PHP one in sending `mock.php`
as a callback if there's no `callback` parameter in the query string which is
triggered by a recently added test. This prevents the request crashing on that
Node.js server and printing a JS error:
```
TypeError: Cannot read property '1' of null
```

Closes gh-4764
Ref gh-4754

(cherry picked from commit df6858df2ed3fc5c424591a5e09b900eb4ce0417)

test/middleware-mockserver.js

index 06bf3b9c688ee898334531e5504998978f57f88d..bb31eabfa602c153d798327e7eeec2d55437525b 100644 (file)
@@ -98,7 +98,7 @@ var mocks = {
                } else if ( req.query.callback ) {
                        callback = Promise.resolve( req.query.callback );
                } else if ( req.method === "GET" ) {
-                       callback = Promise.resolve( req.url.match( /^.+\/([^\/?.]+)\?.+$/ )[ 1 ] );
+                       callback = Promise.resolve( req.url.match( /^.+\/([^\/?]+)\?.+$/ )[ 1 ] );
                } else {
                        callback = getBody( req ).then( function( body ) {
                                return body.trim().replace( "callback=", "" );