@@ -1305,30 +1305,12 @@ mod tests {
1305
1305
platform_links
1306
1306
}
1307
1307
1308
- fn run_check_links (
1309
- env : & TestEnvironment ,
1310
- url_start : & str ,
1311
- url_end : & str ,
1312
- extra : & str ,
1313
- should_contain_redirect : bool ,
1314
- ) {
1315
- run_check_links_redir (
1316
- env,
1317
- url_start,
1318
- url_end,
1319
- extra,
1320
- should_contain_redirect,
1321
- should_contain_redirect,
1322
- )
1323
- }
1324
-
1325
1308
fn run_check_links_redir (
1326
1309
env : & TestEnvironment ,
1327
1310
url_start : & str ,
1328
1311
url_end : & str ,
1329
1312
extra : & str ,
1330
1313
should_contain_redirect : bool ,
1331
- ajax_should_contain_redirect : bool ,
1332
1314
) {
1333
1315
let response = env
1334
1316
. frontend ( )
@@ -1351,18 +1333,8 @@ mod tests {
1351
1333
. send ( )
1352
1334
. unwrap ( ) ;
1353
1335
assert ! ( response. status( ) . is_success( ) ) ;
1354
- let list2 = check_links ( response. text ( ) . unwrap ( ) , true , ajax_should_contain_redirect) ;
1355
- if should_contain_redirect == ajax_should_contain_redirect {
1356
- assert_eq ! ( list1, list2) ;
1357
- } else {
1358
- // If redirects differ, we only check platform names.
1359
- assert ! (
1360
- list1. iter( ) . zip( & list2) . all( |( a, b) | a. 0 == b. 0 ) ,
1361
- "{:?} != {:?}" ,
1362
- list1,
1363
- list2,
1364
- ) ;
1365
- }
1336
+ let list2 = check_links ( response. text ( ) . unwrap ( ) , true , should_contain_redirect) ;
1337
+ assert_eq ! ( list1, list2) ;
1366
1338
}
1367
1339
1368
1340
wrapper ( |env| {
@@ -1379,28 +1351,21 @@ mod tests {
1379
1351
1380
1352
// FIXME: For some reason, there are target-redirects on non-AJAX lists on docs.rs
1381
1353
// crate pages other than the "default" one.
1382
- run_check_links_redir ( env, "/crate/dummy/0.4.0" , "/features" , "" , true , false ) ;
1383
- run_check_links_redir ( env, "/crate/dummy/0.4.0" , "/builds" , "" , true , false ) ;
1384
- run_check_links_redir ( env, "/crate/dummy/0.4.0" , "/source/" , "" , true , false ) ;
1385
- run_check_links_redir (
1386
- env,
1387
- "/crate/dummy/0.4.0" ,
1388
- "/source/README.md" ,
1389
- "" ,
1390
- true ,
1391
- false ,
1392
- ) ;
1354
+ run_check_links_redir ( env, "/crate/dummy/0.4.0" , "/features" , "" , false ) ;
1355
+ run_check_links_redir ( env, "/crate/dummy/0.4.0" , "/builds" , "" , false ) ;
1356
+ run_check_links_redir ( env, "/crate/dummy/0.4.0" , "/source/" , "" , false ) ;
1357
+ run_check_links_redir ( env, "/crate/dummy/0.4.0" , "/source/README.md" , "" , false ) ;
1393
1358
1394
- run_check_links ( env, "/crate/dummy/0.4.0" , "" , "/" , false ) ;
1395
- run_check_links ( env, "/dummy/latest" , "/dummy" , "/" , true ) ;
1396
- run_check_links (
1359
+ run_check_links_redir ( env, "/crate/dummy/0.4.0" , "" , "/" , false ) ;
1360
+ run_check_links_redir ( env, "/dummy/latest" , "/dummy" , "/" , true ) ;
1361
+ run_check_links_redir (
1397
1362
env,
1398
1363
"/dummy/0.4.0" ,
1399
1364
"/x86_64-pc-windows-msvc/dummy" ,
1400
1365
"/" ,
1401
1366
true ,
1402
1367
) ;
1403
- run_check_links (
1368
+ run_check_links_redir (
1404
1369
env,
1405
1370
"/dummy/0.4.0" ,
1406
1371
"/x86_64-pc-windows-msvc/dummy/struct.A.html" ,
0 commit comments