@artilleryio/int-core 2.0.3 → 2.0.5

package/lib/engine_http.js

@@ -399,6 +399,20 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
         );
         requestParams.headers = templatedHeaders;
 
+        // We compute the url here so that the cookies are set properly afterwards
+        let url = maybePrependBase(
+          template(requestParams.uri || requestParams.url, context),
+          config
+        );
+
+        if (requestParams.uri) {
+          // If a hook function sets requestParams.uri to something, request.js
+          // will pick that over .url, so we need to delete it.
+          delete requestParams.uri;
+        }
+
+        requestParams.url = url;
+
         if (
           typeof requestParams.cookie === 'object' ||
           typeof context._defaultCookie === 'object'
@@ -423,19 +437,6 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
           delete requestParams.auth;
         }
 
-        let url = maybePrependBase(
-          template(requestParams.uri || requestParams.url, context),
-          config
-        );
-
-        if (requestParams.uri) {
-          // If a hook function sets requestParams.uri to something, request.js
-          // will pick that over .url, so we need to delete it.
-          delete requestParams.uri;
-        }
-
-        requestParams.url = url;
-
         // TODO: Bypass proxy if "proxy: false" is set
         requestParams.agent = {
           http: context._httpAgent,
@@ -494,7 +495,7 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
               requestInfo.qs = qs.encode(
                 Object.assign(
                   qs.parse(urlparse(requestParams.url).query),
-                  requestParams.qs
+                  template(requestParams.qs, context)
                 )
               );
             }
@@ -751,6 +752,8 @@ HttpEngine.prototype._handleResponse = function (
     res.on('data', (d) => {
       body += d;
     });
+  } else {
+    res.on('data', () => {});
   }
 
   res.on('end', () => {

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@artilleryio/int-core",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "main": "./index.js",
   "dependencies": {
     "@artilleryio/int-commons": "latest",
     "@artilleryio/sketches-js": "^1.0.4",
-    "@hapi/basic": "^6.0.0",
     "agentkeepalive": "^4.1.0",
     "arrivals": "^2.1.2",
     "async": "^2.6.4",
@@ -19,7 +18,6 @@
     "driftless": "^2.0.3",
     "esprima": "^4.0.0",
     "eventemitter3": "^4.0.4",
-    "express": "^4.16.3",
     "fast-deep-equal": "^3.1.3",
     "filtrex": "^0.5.4",
     "form-data": "^3.0.0",
@@ -27,12 +25,10 @@
     "hpagent": "^0.1.1",
     "https-proxy-agent": "^5.0.0",
     "lodash": "^4.17.19",
-    "nock": "^11.8.2",
     "proxy": "^1.0.2",
     "socket.io": "^3.1.2",
     "socket.io-client": "^4.5.1",
     "socketio-wildcard": "^2.0.0",
-    "tap": "^15.2.3",
     "tough-cookie": "^4.0.0",
     "try-require": "^1.2.1",
     "uuid": "^8.0.0",
@@ -44,8 +40,12 @@
     "test": "tap --no-coverage --timeout=300 test/core/unit/*.test.js && bash test/core/run.sh"
   },
   "devDependencies": {
+    "@hapi/basic": "^6.0.0",
     "@hapi/hapi": "^20.1.3",
+    "express": "^4.16.3",
+    "nock": "^11.8.2",
     "rewiremock": "^3.14.3",
-    "sinon": "^4.5.0"
+    "sinon": "^4.5.0",
+    "tap": "15.2.3"
   }
 }