Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions lib/egg.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const { performance } = require('perf_hooks');
const path = require('path');
const querystring = require('querystring');
const fs = require('fs');
const ms = require('ms');
const http = require('http');
Expand Down Expand Up @@ -588,6 +589,16 @@ class EggApplication extends EggCore {
}
}
}
// Koa reads querystring from req.url, so normalize mocked query values.
if (req && Object.prototype.hasOwnProperty.call(req, 'url')) {
// An explicitly supplied URL takes precedence.
} else if (request.querystring) {
const requestPath = request.path || '/';
const separator = requestPath.includes('?') ? '&' : '?';
request.url = `${requestPath}${separator}${request.querystring}`;
} else if (req && req.query && Object.keys(req.query).length) {
request.url = `${request.path || '/'}?${querystring.stringify(req.query)}`;
}
const response = new http.ServerResponse(request);
return this.createContext(request, response);
}
Expand Down
16 changes: 16 additions & 0 deletions test/lib/egg.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,22 @@ describe('test/lib/egg.test.js', () => {
ctx = app.agent.createAnonymousContext();
assert(ctx);
});

it('should apply mocked querystring and query', () => {
let ctx = app.createAnonymousContext({ querystring: 'page=1&size=10' });
assert(ctx.url === '/?page=1&size=10');
assert.deepEqual(ctx.query, { page: '1', size: '10' });

ctx = app.createAnonymousContext({ query: { page: 1 } });
assert(ctx.url === '/?page=1');
assert.deepEqual(ctx.query, { page: '1' });
});

it('should keep an explicitly supplied URL', () => {
const ctx = app.createAnonymousContext({ url: '/users?from=url', query: { page: 1 } });
assert(ctx.url === '/users?from=url');
assert.deepEqual(ctx.query, { from: 'url' });
});
});
});

Expand Down