From 4a01919a6d10253b6fd158fc48fe988d5f1b259a Mon Sep 17 00:00:00 2001 From: Ronald Holshausen Date: Thu, 27 Jul 2023 10:24:00 +1000 Subject: [PATCH] chore: Upgrade pact_models to 1.1.9 --- rust/pact_cli/Cargo.toml | 2 +- rust/pact_consumer/Cargo.toml | 2 +- rust/pact_ffi/Cargo.toml | 2 +- rust/pact_ffi/src/mock_server/bodies.rs | 8 ++++---- rust/pact_matching/Cargo.toml | 2 +- rust/pact_mock_server/Cargo.toml | 2 +- rust/pact_mock_server_cli/Cargo.toml | 2 +- rust/pact_verifier/Cargo.toml | 2 +- rust/pact_verifier_cli/Cargo.toml | 2 +- rust/pact_wasm/Cargo.toml | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/rust/pact_cli/Cargo.toml b/rust/pact_cli/Cargo.toml index 01e2497bf..57c4c573c 100644 --- a/rust/pact_cli/Cargo.toml +++ b/rust/pact_cli/Cargo.toml @@ -17,7 +17,7 @@ exclude = [ clap = "2.31.2" serde_json = "1.0" serde = "1.0" -pact_models = "~1.1.8" +pact_models = "~1.1.9" pact_matching = { version = "~1.1.3", path = "../pact_matching" } anyhow = "1.0.40" log = "0.4.14" diff --git a/rust/pact_consumer/Cargo.toml b/rust/pact_consumer/Cargo.toml index 8a46682e3..9c81b5270 100644 --- a/rust/pact_consumer/Cargo.toml +++ b/rust/pact_consumer/Cargo.toml @@ -31,7 +31,7 @@ lazy_static = "1.4.0" maplit = "1.0.2" pact_matching = { version = "~1.1.3", path = "../pact_matching", default-features = false } pact_mock_server = { version = "~1.2.1", path = "../pact_mock_server", default-features = false } -pact_models = { version = "~1.1.8", default-features = false } +pact_models = { version = "~1.1.9", default-features = false } pact-plugin-driver = { version = "~0.4.5", optional = true, default-features = false } regex = "1.7.3" serde_json = "1.0.95" diff --git a/rust/pact_ffi/Cargo.toml b/rust/pact_ffi/Cargo.toml index c47c6fa63..cdc7f57a4 100644 --- a/rust/pact_ffi/Cargo.toml +++ b/rust/pact_ffi/Cargo.toml @@ -17,7 +17,7 @@ exclude = [ ansi_term = "0.12.1" anyhow = "1.0.70" pact_matching = { version = "~1.1.3", path = "../pact_matching" } -pact_models = "~1.1.8" +pact_models = "~1.1.9" pact_mock_server = { version = "~1.2.1", path = "../pact_mock_server" } pact_verifier = { version = "~1.0.1", path = "../pact_verifier" } libc = "0.2.141" diff --git a/rust/pact_ffi/src/mock_server/bodies.rs b/rust/pact_ffi/src/mock_server/bodies.rs index 1a9bed673..933a57bc7 100644 --- a/rust/pact_ffi/src/mock_server/bodies.rs +++ b/rust/pact_ffi/src/mock_server/bodies.rs @@ -574,25 +574,25 @@ mod test { expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "max", "max": 100 }).as_object().unwrap())) .to(be_some().value(MatchingRule::MaxType(100))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "timestamp" }).as_object().unwrap())) - .to(be_none()); + .to(be_some().value(MatchingRule::Timestamp("".to_string()))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "timestamp", "format": "yyyy-MM-dd" }).as_object().unwrap())) .to(be_some().value(MatchingRule::Timestamp("yyyy-MM-dd".to_string()))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "timestamp", "timestamp": "yyyy-MM-dd" }).as_object().unwrap())) .to(be_some().value(MatchingRule::Timestamp("yyyy-MM-dd".to_string()))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "datetime" }).as_object().unwrap())) - .to(be_none()); + .to(be_some().value(MatchingRule::Timestamp("".to_string()))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "datetime", "format": "yyyy-MM-dd" }).as_object().unwrap())) .to(be_some().value(MatchingRule::Timestamp("yyyy-MM-dd".to_string()))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "datetime", "datetime": "yyyy-MM-dd" }).as_object().unwrap())) .to(be_some().value(MatchingRule::Timestamp("yyyy-MM-dd".to_string()))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "date" }).as_object().unwrap())) - .to(be_none()); + .to(be_some().value(MatchingRule::Date("".to_string()))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "date", "format": "yyyy-MM-dd" }).as_object().unwrap())) .to(be_some().value(MatchingRule::Date("yyyy-MM-dd".to_string()))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "date", "date": "yyyy-MM-dd" }).as_object().unwrap())) .to(be_some().value(MatchingRule::Date("yyyy-MM-dd".to_string()))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "time" }).as_object().unwrap())) - .to(be_none()); + .to(be_some().value(MatchingRule::Time("".to_string()))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "time", "format": "yyyy-MM-dd" }).as_object().unwrap())) .to(be_some().value(MatchingRule::Time("yyyy-MM-dd".to_string()))); expect!(matcher_from_integration_json(&json!({ "pact:matcher:type": "time", "time": "yyyy-MM-dd" }).as_object().unwrap())) diff --git a/rust/pact_matching/Cargo.toml b/rust/pact_matching/Cargo.toml index 7b9882cd8..6afa17bc0 100644 --- a/rust/pact_matching/Cargo.toml +++ b/rust/pact_matching/Cargo.toml @@ -40,7 +40,7 @@ mime = "0.3.17" multer = { version = "2.1.0", features = ["all"], optional = true } nom = "7.1.3" onig = { version = "6.4.0", default-features = false } -pact_models = { version = "~1.1.8", default-features = false } +pact_models = { version = "~1.1.9", default-features = false } pact-plugin-driver = { version = "~0.4.5", optional = true, default-features = false } rand = "0.8.5" semver = "1.0.17" diff --git a/rust/pact_mock_server/Cargo.toml b/rust/pact_mock_server/Cargo.toml index f630386ce..0df23a05b 100644 --- a/rust/pact_mock_server/Cargo.toml +++ b/rust/pact_mock_server/Cargo.toml @@ -31,7 +31,7 @@ itertools = "0.10.5" lazy_static = "1.4.0" maplit = "1.0.2" pact_matching = { version = "~1.1.3", path = "../pact_matching", default-features = false } -pact_models = { version = "~1.1.8", default-features = false } +pact_models = { version = "~1.1.9", default-features = false } pact-plugin-driver = { version = "~0.4.5", optional = true, default-features = false } rustls = { version = "0.21.0", optional = true } rustls-pemfile = { version = "1.0.2", optional = true } diff --git a/rust/pact_mock_server_cli/Cargo.toml b/rust/pact_mock_server_cli/Cargo.toml index 5953bbc30..106ae3126 100644 --- a/rust/pact_mock_server_cli/Cargo.toml +++ b/rust/pact_mock_server_cli/Cargo.toml @@ -33,7 +33,7 @@ log = "0.4.18" lazy_static = "1.4.0" pact_matching = { version = "~1.1.3", path = "../pact_matching", default-features = false } pact_mock_server = { version = "~1.2.1", path = "../pact_mock_server", default-features = false } -pact_models = { version = "~1.1.8", default-features = false } +pact_models = { version = "~1.1.9", default-features = false } rand = "0.8.5" regex = "1.8.4" reqwest = { version = "0.11.18", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } diff --git a/rust/pact_verifier/Cargo.toml b/rust/pact_verifier/Cargo.toml index 3c26d028f..c88aad1c3 100644 --- a/rust/pact_verifier/Cargo.toml +++ b/rust/pact_verifier/Cargo.toml @@ -36,7 +36,7 @@ lazy_static = "1.4.0" maplit = "1.0.2" mime = "0.3.16" pact_matching = { version = "~1.1.3", path = "../pact_matching", default-features = false } -pact_models = { version = "~1.1.8", default-features = false } +pact_models = { version = "~1.1.9", default-features = false } pact-plugin-driver = { version = "~0.4.5", optional = true, default-features = false } regex = "1.7.0" serde = "1.0.147" diff --git a/rust/pact_verifier_cli/Cargo.toml b/rust/pact_verifier_cli/Cargo.toml index c97674b75..ec96e20aa 100644 --- a/rust/pact_verifier_cli/Cargo.toml +++ b/rust/pact_verifier_cli/Cargo.toml @@ -29,7 +29,7 @@ env_logger = "0.10.0" junit-report = { version = "0.8.2", optional = true } log = "0.4.17" maplit = "1.0.2" -pact_models = { version = "~1.1.8", default-features = false } +pact_models = { version = "~1.1.9", default-features = false } pact_verifier = { version = "~1.0.1", path = "../pact_verifier", default-features = false } regex = "1.7.3" reqwest = { version = "0.11.16", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } diff --git a/rust/pact_wasm/Cargo.toml b/rust/pact_wasm/Cargo.toml index 44fffc7d1..f11127aff 100644 --- a/rust/pact_wasm/Cargo.toml +++ b/rust/pact_wasm/Cargo.toml @@ -18,7 +18,7 @@ exclude = [ crate-type = ["cdylib", "rlib"] [dependencies] -pact_models = "~1.1.8" +pact_models = "~1.1.9" wasm-bindgen = "0.2.79" console_error_panic_hook = "0.1.7" console_log = { version = "0.2.0", features = ["color"] }