fix: compatibility-suite was failing after upgrading pact_matching to 2.0.1

rholshausen · rholshausen · commit e2d2ca33b1b9 · 2025-08-20T10:32:37.000+10:00
diff --git a/compatibility-suite/Cargo.toml b/compatibility-suite/Cargo.toml
@@ -9,16 +9,14 @@ async-trait = "0.1.74"
 base64 = "0.22.0"
 bytes = "1.5.0"
 cucumber = "0.21.1"
-futures = "0.3.29"
 itertools = "0.14.0"
 lazy_static = "1.4.0"
 maplit = "1.0.2"
 pact_models = { version = "~1.3.6" }
-pact_matching = { version = "2.0.0-beta.3" }
-pact_mock_server = { version = "=2.1.2" }
+pact_matching = { version = "~2.0.1" }
+pact_mock_server = { version = "~2.1.2" }
 pact_verifier = { version = "~1.3.2" }
 pact_consumer = { version = "~1.4.1" }
-pretty_assertions = "1.4.0"
 regex = "1.10.2"
 reqwest = { version = "0.12.3", default-features = false, features = ["rustls-tls-native-roots", "json"] }
 rocket = { version = "0.5.0", features = ["json"] }
@@ -31,7 +29,8 @@ tracing-subscriber = { version = "0.3.19", features = ["env-filter", "tracing-lo
 uuid = { version = "1.5.0", features = ["v4"] }
 
 [patch.crates-io]
-pact_matching = { version = "2.0.0-beta.3", git = "http://github.com/pact-foundation/pact-reference", tag = "libpact_matching-v2.0.0-beta.3" }
+pact_models = { version = "1.3.6", path = "../rust/pact_models" }
+pact_matching = { version = "2.0.1", path = "../rust/pact_matching" }
 
 [[test]]
 name = "v1_consumer"
diff --git a/compatibility-suite/tests/v4_steps/http_matching.rs b/compatibility-suite/tests/v4_steps/http_matching.rs
@@ -1,5 +1,6 @@
 use std::fs::File;
 use std::io::BufReader;
+
 use anyhow::anyhow;
 use cucumber::gherkin::Step;
 use cucumber::{given, then, when};
@@ -11,8 +12,8 @@ use pact_models::v4::http_parts::{HttpRequest, HttpResponse};
 use pact_models::v4::synch_http::SynchronousHttp;
 use serde_json::{json, Value};
 use pact_matching::{match_request, match_response, Mismatch};
-use crate::shared_steps::setup_body;
 
+use crate::shared_steps::setup_body;
 use crate::v4_steps::V4World;
 
 #[given("an expected response configured with the following:")]
@@ -58,11 +59,13 @@ fn a_status_response_is_received(world: &mut V4World, status: u16) {
 }
 
 #[when("the response is compared to the expected one")]
-async fn the_response_is_compared_to_the_expected_one(world: &mut V4World) {
-    world.response_results.extend(match_response(world.expected_response.clone(),
-      world.received_responses.first().unwrap().clone(), &world.pact.boxed(), &SynchronousHttp::default().boxed())
-      .await
-    )
+async fn the_response_is_compared_to_the_expected_one(world: &mut V4World) -> anyhow::Result<()> {
+  world.response_results.extend(match_response(world.expected_response.clone(),
+    world.received_responses.first().unwrap().clone(), &world.pact.boxed(),
+    &SynchronousHttp::default().boxed())
+    .await?
+  );
+  Ok(())
 }
 
 #[then("the response comparison should be OK")]
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/pact_matching/src/json.rs b/rust/pact_matching/src/json.rs
@@ -271,7 +271,7 @@ impl DoMatch<&Value> for MatchingRule {
         _ => Err(anyhow!("Expected {} ({}) to match a boolean", value_of(actual_value), type_of(actual_value)))
       }
       MatchingRule::NotEmpty => match actual_value {
-        Value::Null => Err(anyhow!("Expected non-empty but got a NULL")),
+        Value::Null => Err(anyhow!("Expected non-empty value but got a NULL")),
         Value::String(s) => if s.is_empty() {
           Err(anyhow!("Expected '' (String) to not be empty"))
         } else {
diff --git a/rust/pact_matching/src/matchingrules.rs b/rust/pact_matching/src/matchingrules.rs
@@ -1463,7 +1463,7 @@ pub fn compare_lists_with_matchingrule<T: Display + Debug + PartialEq + Clone +
         result.extend(match_list_contents(path, expected, actual, context.as_ref(), callback));
       }
       _ => {
-        if let Err(mismatch) = expected.matches_with(actual, rule, cascaded) {
+        if let Err(mismatch) = rule.match_value(expected, actual, cascaded, true) {
           result.push(CommonMismatch {
             path: path.to_string(),
             expected: expected.for_mismatch(),

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ impl DoMatch<&Value> for MatchingRule {`
`271`	`271`	`_ => Err(anyhow!("Expected {} ({}) to match a boolean", value_of(actual_value), type_of(actual_value)))`
`272`	`272`	`}`
`273`	`273`	`MatchingRule::NotEmpty => match actual_value {`
`274`		`- Value::Null => Err(anyhow!("Expected non-empty but got a NULL")),`
	`274`	`+ Value::Null => Err(anyhow!("Expected non-empty value but got a NULL")),`
`275`	`275`	`Value::String(s) => if s.is_empty() {`
`276`	`276`	`Err(anyhow!("Expected '' (String) to not be empty"))`
`277`	`277`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -1463,7 +1463,7 @@ pub fn compare_lists_with_matchingrule<T: Display + Debug + PartialEq + Clone +`
`1463`	`1463`	`result.extend(match_list_contents(path, expected, actual, context.as_ref(), callback));`
`1464`	`1464`	`}`
`1465`	`1465`	`_ => {`
`1466`		`- if let Err(mismatch) = expected.matches_with(actual, rule, cascaded) {`
	`1466`	`+ if let Err(mismatch) = rule.match_value(expected, actual, cascaded, true) {`
`1467`	`1467`	`result.push(CommonMismatch {`
`1468`	`1468`	`path: path.to_string(),`
`1469`	`1469`	`expected: expected.for_mismatch(),`