Skip to content

Commit 19c77a9

Browse files
committed
refs #1979, #1992: workaround for settings.js not served from the root
1 parent 1165f2e commit 19c77a9

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/web/rustdoc.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ pub(crate) async fn rustdoc_redirector_handler(
218218
// This is fixed in rustdoc, but pending a rebuild for
219219
// docs that were affected by this bug.
220220
// https://github.com/rust-lang/docs.rs/issues/1979
221-
if target.starts_with("search-") {
221+
if target.starts_with("search-") || target.starts_with("settings-") {
222222
return try_serve_legacy_toolchain_asset(storage, config, target).await;
223223
} else {
224224
return Err(err.into());
@@ -2595,8 +2595,9 @@ mod test {
25952595
});
25962596
}
25972597

2598-
#[test]
2599-
fn fallback_to_root_storage_for_search_js_assets() {
2598+
#[test_case("search-1234.js")]
2599+
#[test_case("settings-1234.js")]
2600+
fn fallback_to_root_storage_for_some_js_assets(path: &str) {
26002601
// test workaround for https://github.com/rust-lang/docs.rs/issues/1979
26012602
wrapper(|env| {
26022603
env.fake_release()
@@ -2606,8 +2607,7 @@ mod test {
26062607
.create()?;
26072608

26082609
env.storage().store_one("asset.js", *b"content")?;
2609-
env.storage()
2610-
.store_one("search-1234.js", *b"more_content")?;
2610+
env.storage().store_one(path, *b"more_content")?;
26112611

26122612
let web = env.frontend();
26132613

@@ -2617,8 +2617,8 @@ mod test {
26172617
);
26182618
assert!(web.get("/asset.js").send()?.status().is_success());
26192619

2620-
assert!(web.get("/search-1234.js").send()?.status().is_success());
2621-
let response = web.get("/dummy/0.1.0/search-1234.js").send()?;
2620+
assert!(web.get(&format!("/{path}")).send()?.status().is_success());
2621+
let response = web.get(&format!("/dummy/0.1.0/{path}")).send()?;
26222622
assert!(response.status().is_success());
26232623
assert_eq!(response.text()?, "more_content");
26242624

0 commit comments

Comments
 (0)