Fix invalid release link generation

rust-lang · Feb 16, 2024 · da730e1 · da730e1
1 parent 5f05b27
commit da730e1
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 6 deletions.
diff --git a/...e72a4609ebfb0390708f5a61f7ab66db8808.json → ...d0839fd63d13b08546c1506e7163bd363c19.json b/...e72a4609ebfb0390708f5a61f7ab66db8808.json → ...d0839fd63d13b08546c1506e7163bd363c19.json
diff --git a/src/web/crate_details.rs b/src/web/crate_details.rs
@@ -469,7 +469,8 @@ pub(crate) async fn get_all_releases(
     let row = sqlx::query!(
         "SELECT
             crates.id AS crate_id,
-            releases.doc_targets
+            releases.doc_targets,
+            releases.target_name
         FROM crates
         INNER JOIN releases on crates.id = releases.crate_id
         WHERE crates.name = $1 and releases.version = $2;",
@@ -504,9 +505,9 @@ pub(crate) async fn get_all_releases(
         (target, inner.trim_end_matches('/'))
     };
     let inner_path = if inner_path.is_empty() {
-        format!("{}/index.html", params.name)
+        format!("{}/index.html", row.target_name)
     } else {
-        format!("{}/{inner_path}", params.name)
+        format!("{}/{inner_path}", row.target_name)
     };
 
     let target = if target.is_empty() {
@@ -517,7 +518,7 @@ pub(crate) async fn get_all_releases(
 
     let res = ReleaseList {
         releases,
-        target: target.to_string(),
+        target,
         inner_path,
         crate_name: params.name,
     };
@@ -1484,6 +1485,64 @@ mod tests {
         });
     }
 
+    #[test]
+    fn check_crate_name_in_redirect() {
+        fn check_links(env: &TestEnvironment, url: &str, links: Vec<String>) {
+            let response = env.frontend().get(url).send().unwrap();
+            assert!(response.status().is_success());
+
+            let platform_links: Vec<String> = kuchikiki::parse_html()
+                .one(response.text().unwrap())
+                .select("li a")
+                .expect("invalid selector")
+                .map(|el| {
+                    let attributes = el.attributes.borrow();
+                    let url = attributes.get("href").expect("href").to_string();
+                    url
+                })
+                .collect();
+
+            assert_eq!(platform_links, links,);
+        }
+
+        wrapper(|env| {
+            env.fake_release()
+                .name("dummy-ba")
+                .version("0.4.0")
+                .rustdoc_file("dummy-ba/index.html")
+                .rustdoc_file("x86_64-unknown-linux-gnu/dummy-ba/index.html")
+                .add_target("x86_64-unknown-linux-gnu")
+                .create()?;
+            env.fake_release()
+                .name("dummy-ba")
+                .version("0.5.0")
+                .rustdoc_file("dummy-ba/index.html")
+                .rustdoc_file("x86_64-unknown-linux-gnu/dummy-ba/index.html")
+                .add_target("x86_64-unknown-linux-gnu")
+                .create()?;
+
+            check_links(
+                env,
+                "/crate/dummy-ba/latest/menus/releases/dummy_ba/index.html",
+                vec![
+                    "/crate/dummy-ba/0.5.0/target-redirect/dummy_ba/index.html".to_string(),
+                    "/crate/dummy-ba/0.4.0/target-redirect/dummy_ba/index.html".to_string(),
+                ],
+            );
+
+            check_links(
+                env,
+                "/crate/dummy-ba/latest/menus/releases/x86_64-unknown-linux-gnu/dummy_ba/index.html",
+                vec![
+                    "/crate/dummy-ba/0.5.0/target-redirect/x86_64-unknown-linux-gnu/dummy_ba/index.html".to_string(),
+                    "/crate/dummy-ba/0.4.0/target-redirect/x86_64-unknown-linux-gnu/dummy_ba/index.html".to_string(),
+                ],
+            );
+
+            Ok(())
+        });
+    }
+
     // Ensure that if there are more than a given number of targets, it will not generate them in
     // the HTML directly (they will be loaded by AJAX if the user opens the menu).
     #[test]