mockserver-client
Advanced tools
Comparing version 5.4.1 to 5.5.0
@@ -9,4 +9,4 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1" | ||
"mockserver-client": "5.5.0" | ||
} | ||
} |
@@ -9,4 +9,4 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1" | ||
"mockserver-client": "5.5.0" | ||
} | ||
} |
@@ -9,4 +9,4 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1" | ||
"mockserver-client": "5.5.0" | ||
} | ||
} |
@@ -9,4 +9,4 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1" | ||
"mockserver-client": "5.5.0" | ||
} | ||
} |
@@ -9,4 +9,4 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1" | ||
"mockserver-client": "5.5.0" | ||
} | ||
} |
@@ -9,4 +9,4 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1" | ||
"mockserver-client": "5.5.0" | ||
} | ||
} |
@@ -9,4 +9,4 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1" | ||
"mockserver-client": "5.5.0" | ||
} | ||
} |
@@ -9,4 +9,4 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1" | ||
"mockserver-client": "5.5.0" | ||
} | ||
} |
@@ -9,4 +9,4 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1" | ||
"mockserver-client": "5.5.0" | ||
} | ||
} |
@@ -9,4 +9,4 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1" | ||
"mockserver-client": "5.5.0" | ||
} | ||
} |
@@ -9,5 +9,5 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1", | ||
"mockserver-node": "5.4.1" | ||
"mockserver-client": "5.5.0", | ||
"mockserver-node": "5.5.0" | ||
} | ||
} |
@@ -9,5 +9,5 @@ { | ||
"dependencies": { | ||
"mockserver-client": "5.4.1", | ||
"mockserver-node": "5.4.1" | ||
"mockserver-client": "5.5.0", | ||
"mockserver-node": "5.5.0" | ||
} | ||
} |
@@ -195,6 +195,6 @@ /* | ||
socket.onopen = function (event) { | ||
console.log("foo"); | ||
}; | ||
socket.onclose = function (event) { | ||
console.log("foo"); | ||
}; | ||
@@ -392,7 +392,11 @@ } | ||
expectation[i].httpRequest = addDefaultRequestMatcherHeaders(expectation[i].httpRequest); | ||
expectation[i].httpResponse = addDefaultResponseMatcherHeaders(expectation[i].httpResponse); | ||
if(!expectation[i].httpResponseTemplate && !expectation[i].httpResponseClassCallback && !expectation[i].httpResponseObjectCallback && !expectation[i].httpForward && !expectation[i].httpForwardTemplate && !expectation[i].httpForwardClassCallback && !expectation[i].httpForwardObjectCallback && !expectation[i].httpOverrideForwardedRequest && !expectation[i].httpError) { | ||
expectation[i].httpResponse = addDefaultResponseMatcherHeaders(expectation[i].httpResponse); | ||
} | ||
} | ||
} else { | ||
expectation.httpRequest = addDefaultRequestMatcherHeaders(expectation.httpRequest); | ||
expectation.httpResponse = addDefaultResponseMatcherHeaders(expectation.httpResponse); | ||
if(!expectation.httpResponseTemplate && !expectation.httpResponseClassCallback && !expectation.httpResponseObjectCallback && !expectation.httpForward && !expectation.httpForwardTemplate && !expectation.httpForwardClassCallback && !expectation.httpForwardObjectCallback && !expectation.httpOverrideForwardedRequest && !expectation.httpError) { | ||
expectation.httpResponse = addDefaultResponseMatcherHeaders(expectation.httpResponse); | ||
} | ||
} | ||
@@ -412,8 +416,8 @@ return expectation; | ||
* @param request the http request that must be matched for this verification to pass | ||
* @param count the number of times this request must be matched | ||
* @param exact true if the count is matched as "equal to" or false if the count is matched as "greater than or equal to" | ||
* @param atLeast the minimum number of times this request must be matched | ||
* @param atMost the maximum number of times this request must be matched | ||
*/ | ||
var verify = function (request, count, exact) { | ||
if (count === undefined) { | ||
count = 1; | ||
var verify = function (request, atLeast, atMost) { | ||
if (atLeast === undefined && atMost === undefined) { | ||
atLeast = 1; | ||
} | ||
@@ -426,4 +430,4 @@ return { | ||
"times": { | ||
"count": count, | ||
"exact": exact | ||
"atLeast": atLeast, | ||
"atMost": atMost | ||
} | ||
@@ -430,0 +434,0 @@ }).then( |
{ | ||
"name": "mockserver-client", | ||
"description": "A node client for the MockServer", | ||
"version": "5.4.1", | ||
"version": "5.5.0", | ||
"homepage": "https://github.com/jamesdbloom/mockserver", | ||
@@ -38,3 +38,3 @@ "author": { | ||
"karma-xvfb-chrome-launcher": "0.0.1", | ||
"mockserver-node": "5.4.1", | ||
"mockserver-node": "5.5.0", | ||
"nodeunit": "^0.11.3" | ||
@@ -41,0 +41,0 @@ }, |
@@ -179,2 +179,3 @@ # mockserver-client-node | ||
2018-11-04 | v5.4.1 | Upgrading MockServer to 5.4.1 | ||
2018-11-16 | v5.5.0 | Upgrading MockServer to 5.5.0 | ||
@@ -181,0 +182,0 @@ --- |
@@ -16,3 +16,5 @@ /* | ||
var defer = function () { | ||
var promise = (global.protractor ? protractor.promise : Q); | ||
var promise = (global.protractor && protractor.promise.USE_PROMISE_MANAGER !== false) | ||
? protractor.promise | ||
: Q; | ||
var deferred = promise.defer(); | ||
@@ -19,0 +21,0 @@ |
@@ -42,3 +42,3 @@ /* | ||
connection.sendUTF(JSON.stringify(response)); | ||
} else if (payload.type === "org.mockserver.client.serialization.model.WebSocketClientIdDTO") { | ||
} else if (payload.type === "org.mockserver.serialization.model.WebSocketClientIdDTO") { | ||
var registration = JSON.parse(payload.value); | ||
@@ -45,0 +45,0 @@ if (registration.clientId) { |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
692420
13436
186