Merge pull request #15 from OutSystems/rsbo-1286

Added headersFilter in config rules

Author: luisalourenco

lib/httpmock.js

@@ -61,6 +61,7 @@ function normalizeRule(configRule) {
     configRule.status = parseInt(configRule.status || 200);
     configRule.method = configRule.method || "";
     configRule.urlFilter = configRule.urlFilter || "";
+    configRule.headersFilter = configRule.headersFilter || null;
     configRule.response = configRule.response || "";
     configRule.encoding = configRule.encoding || "";
     configRule.ignoredHeaders =
@@ -81,27 +82,42 @@ var defaultRule = {
 };
 normalizeRule(defaultRule);
 
-function getMatchingConfigRule(requestUrl, method) {
-    var requestUrlNoQueryString = requestUrl.split("?")[0];
+function getMatchingConfigRule(requestUrl, method, headers) {
+    var requestUrlNoQueryString = requestUrl.split("?")[0];    
     for (var i = 0; i < configArray.length; i++) {
         var configRule = configArray[i];
+
         // Match method
         if (configRule.method === "" || configRule.method === method) {
             // Match Url
-            if (
-                new RegExp("^/?" + configRule.urlFilter + "$").test(
+            if (new RegExp("^/?" + configRule.urlFilter + "$").test(
                     requestUrlNoQueryString
                 )
             ) {
-                return configRule;
+                trace("configRule.headersFilter: ", configRule.headersFilter)
+                if (configRule.headersFilter === null) {
+                    return configRule 
+                } else {  
+                    var counter = 0;
+                    // Check if all headers in headersFilter are in request's headers for this config rule
+                    for (const header in configRule.headersFilter) {
+                        if (headers[header] === configRule.headersFilter[header]) {
+                            counter++;
+                        }                    
+                    }
+                    // Check if condition abbove was met for this config rule
+                    if (counter == Object.keys(configRule.headersFilter).length) {
+                        return configRule;                    
+                    }                    
+                }
             }
         }
     }
     return defaultRule;
 }
 
-function shouldFilterHeader(headerName, requestUrl, requestMethod) {
-    var matchingRule = getMatchingConfigRule(requestUrl, requestMethod);
+function shouldFilterHeader(headerName, requestUrl, requestMethod, headers) {
+    var matchingRule = getMatchingConfigRule(requestUrl, requestMethod, headers);
     var isToIgnore = !matchingRule.ignoredHeaders.every(function(e) {
         return e != headerName;
     });
@@ -115,11 +131,11 @@ function shouldFilterHeader(headerName, requestUrl, requestMethod) {
 }
 
 function filterHeaders(headers, requestUrl, requestMethod) {
-    var filtered = {};
+    var filtered = {};    
     Object.keys(headers).forEach(function(key) {
         if (
             !(
-                shouldFilterHeader(key, requestUrl, requestMethod) ||
+                shouldFilterHeader(key, requestUrl, requestMethod, headers) ||
                 (key == "content-length" && headers[key] == "0")
             )
         ) {
@@ -221,8 +237,8 @@ var server = http.createServer(function(request, response) {
         console.log(
             jsonutils.sortedStringify(requestDetails, { indent: "  " })
         );
-
-        var matchingRule = getMatchingConfigRule(request.url, request.method);
+        
+        var matchingRule = getMatchingConfigRule(request.url, request.method, request.headers);
         trace("Response rule: " + jsonutils.inspect(matchingRule));
 
         handleResponse(request, response, matchingRule);