mirror of
https://github.com/meteor/meteor.git
synced 2026-05-02 03:01:46 -04:00
Add direct access to request module from http
This commit is contained in:
@@ -2,6 +2,15 @@ var path = Npm.require('path');
|
||||
var request = Npm.require('request');
|
||||
var url_util = Npm.require('url');
|
||||
|
||||
HTTPInternals = {
|
||||
NpmModules: {
|
||||
request: {
|
||||
version: Npm.require('request/package.json').version,
|
||||
module: request
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// _call always runs asynchronously; HTTP.call, defined below,
|
||||
// wraps _call and runs synchronously when no callback is provided.
|
||||
var _call = function(method, url, options, callback) {
|
||||
|
||||
@@ -490,6 +490,13 @@ if (Meteor.isServer) {
|
||||
]);
|
||||
}
|
||||
|
||||
Meteor.isServer && Tinytest.add("httpcall - npm modules", function (test) {
|
||||
// Make sure the version number looks like a version number. (All published
|
||||
// request version numbers end in ".0".)
|
||||
test.matches(HTTPInternals.NpmModules.request.version, /^2\.(\d+)\.0/);
|
||||
test.equal(typeof(HTTPInternals.NpmModules.request.module), 'function');
|
||||
test.isTrue(HTTPInternals.NpmModules.request.module.get);
|
||||
});
|
||||
|
||||
// TO TEST/ADD:
|
||||
// - https
|
||||
|
||||
@@ -9,6 +9,7 @@ Package.onUse(function (api) {
|
||||
api.use('underscore');
|
||||
api.use('url');
|
||||
api.export('HTTP');
|
||||
api.export('HTTPInternals', 'server');
|
||||
api.addFiles('httpcall_common.js', ['client', 'server']);
|
||||
api.addFiles('httpcall_client.js', 'client');
|
||||
api.addFiles('httpcall_server.js', 'server');
|
||||
@@ -21,6 +22,7 @@ Package.onTest(function (api) {
|
||||
api.use('random');
|
||||
api.use('jquery', 'client');
|
||||
api.use('http', ['client', 'server']);
|
||||
api.use('tinytest');
|
||||
api.use('test-helpers', ['client', 'server']);
|
||||
|
||||
api.addFiles('test_responder.js', 'server');
|
||||
|
||||
Reference in New Issue
Block a user