Merge pull request #11431 from rust-lang/renovate/googletest-0.x

Update Rust crate googletest to v0.14.2

Author: Turbo87

Cargo.lock

@@ -148,7 +148,7 @@ crates_io_test_db = { path = "crates/crates_io_test_db" }
 crates_io_trustpub = { path = "crates/crates_io_trustpub", features = ["test-helpers"] }
 claims = "=0.8.0"
 diesel = { version = "=2.2.11", features = ["r2d2"] }
-googletest = "=0.14.1"
+googletest = "=0.14.2"
 insta = { version = "=1.43.1", features = ["glob", "json", "redactions"] }
 jsonwebtoken = "=9.3.1"
 quoted_printable = "=0.5.1"

Cargo.toml

@@ -31,6 +31,6 @@ utoipa = { version = "=5.4.0", features = ["chrono"] }
 claims = "=0.8.0"
 crates_io_test_db = { path = "../crates_io_test_db" }
 diesel-async = { version = "=0.5.2", features = ["postgres"] }
-googletest = "=0.14.1"
+googletest = "=0.14.2"
 insta = "=1.43.1"
 tokio = { version = "=1.45.1", features = ["macros", "rt"] }

crates/crates_io_database/Cargo.toml

@@ -152,7 +152,7 @@ async fn github_secret_alert_revokes_token() {
             .load(&mut conn)
             .await
     );
-    assert_that!(tokens, empty());
+    assert_that!(tokens, is_empty());
 
     let tokens: Vec<ApiToken> = assert_ok!(
         ApiToken::belonging_to(user.as_model())
@@ -216,7 +216,7 @@ async fn github_secret_alert_for_revoked_token() {
             .load(&mut conn)
             .await
     );
-    assert_that!(tokens, empty());
+    assert_that!(tokens, is_empty());
 
     let tokens: Vec<ApiToken> = assert_ok!(
         ApiToken::belonging_to(user.as_model())

src/tests/github_secret_scanning.rs

@@ -91,7 +91,7 @@ async fn test_following() {
     assert_that!(user.search("").await.crates, len(eq(1)));
     // see https://github.com/jplatte/serde_html_form/issues/13
     assert_that!(user.search("following").await.crates, len(eq(1)));
-    assert_that!(user.search("following=1").await.crates, empty());
+    assert_that!(user.search("following=1").await.crates, is_empty());
 
     // Unfollow the crate again and check that this call is also idempotent.
     unfollow(CRATE_NAME, &user).await;

src/tests/krate/following.rs

@@ -28,8 +28,8 @@ async fn new_wrong_token() {
     let response = token.publish_crate(crate_to_publish).await;
     assert_snapshot!(response.status(), @"403 Forbidden");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"authentication failed"}]}"#);
-    assert_that!(app.stored_files().await, empty());
-    assert_that!(app.emails().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
+    assert_that!(app.emails().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -51,8 +51,8 @@ async fn new_krate_wrong_user() {
     assert_snapshot!(response.status(), @"403 Forbidden");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"this crate exists but you don't seem to be an owner. If you believe this is a mistake, perhaps you need to accept an invitation to be an owner before publishing."}]}"#);
 
-    assert_that!(app.stored_files().await, empty());
-    assert_that!(app.emails().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
+    assert_that!(app.emails().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]

src/tests/krate/publish/auth.rs

@@ -158,7 +158,7 @@ async fn new_krate_duplicate_version() {
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"crate version `1.0.0` is already uploaded"}]}"#);
 
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]

src/tests/krate/publish/basics.rs

@@ -54,5 +54,5 @@ async fn too_many_categories() {
         .await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"expected at most 5 categories per crate"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }

src/tests/krate/publish/categories.rs

@@ -32,7 +32,7 @@ async fn test_recently_deleted_crate_with_same_name() -> anyhow::Result<()> {
     let response = token.publish_crate(crate_to_publish).await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"A crate with the name `actix_web` was recently deleted. Reuse of this name will be available after 2099-12-25T12:34:56Z."}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 
     Ok(())
 }

src/tests/krate/publish/deleted_crates.rs

@@ -12,7 +12,7 @@ async fn invalid_dependency_name() {
         .await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"invalid character `🦀` in dependency name: `🦀`, the first character must be an ASCII character"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -52,7 +52,7 @@ async fn invalid_dependency_rename() {
         .await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"invalid character `💩` in dependency name: `💩`, the first character must be an ASCII character, or `_`"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -73,7 +73,7 @@ async fn invalid_dependency_name_starts_with_digit() {
         .await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"the name `1-foo` cannot be used as a dependency name, the name cannot start with a digit"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -94,7 +94,7 @@ async fn invalid_dependency_name_contains_unicode_chars() {
         .await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"invalid character `🦀` in dependency name: `foo-🦀-bar`, characters must be an ASCII alphanumeric characters, `-`, or `_`"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -115,7 +115,7 @@ async fn invalid_too_long_dependency_name() {
         .await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"the dependency name `fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff` is too long (max 64 characters)"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -136,7 +136,7 @@ async fn empty_dependency_name() {
         .await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"dependency name cannot be empty"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -212,7 +212,7 @@ async fn new_krate_with_broken_dependency_requirement() {
     let response = token.publish_crate(crate_to_publish).await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"\"broken\" is an invalid version requirement"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -232,7 +232,7 @@ async fn reject_new_krate_with_non_exact_dependency() {
     let response = token.publish_crate(crate_to_publish).await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"no known crate named `foo_dep`"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -261,7 +261,7 @@ async fn reject_new_crate_with_alternative_registry_dependency() {
     let response = token.publish_crate(crate_to_publish).await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"Dependency `dep` is hosted on another registry. Cross-registry dependencies are not permitted on crates.io."}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -281,7 +281,7 @@ async fn new_krate_with_wildcard_dependency() {
     let response = token.publish_crate(crate_to_publish).await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"wildcard (`*`) dependency constraints are not allowed on crates.io. Crate with this problem: `foo_wild` See https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies for more information"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -313,7 +313,7 @@ async fn new_krate_with_patch() {
     let response = token.publish_crate(crate_to_publish).await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"failed to parse `Cargo.toml` manifest file\n\ncrates cannot be published with `[patch]` tables"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -328,7 +328,7 @@ async fn new_krate_dependency_missing() {
     let response = token.publish_crate(crate_to_publish).await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"no known crate named `bar_missing`"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -369,7 +369,7 @@ async fn invalid_feature_name() {
         .await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"invalid character `🍺` in feature `🍺`, the first character must be a Unicode XID start character or digit (most letters or `_` or `0` to `9`)"}]}"#);
-    assert_that!(app.stored_files().await, empty());
+    assert_that!(app.stored_files().await, is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]