Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/runtime/action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1633,7 +1633,7 @@ drop.addEventListener('dragover', e=>e.preventDefault()); drop.addEventListener(
const root=document.querySelector('#shadow').attachShadow({{mode:'open'}}); root.innerHTML=`<button id=shadow-button>shadow</button>`;
root.querySelector('button').onclick=()=>window.shadowClicked=true;
</script>
<iframe src='/same'></iframe><iframe src='http://child.test:{child_port}/'></iframe>"#
<iframe src='/same'></iframe><iframe src='http://localhost:{child_port}/'></iframe>"#
);
let parent_server = tokio::spawn(serve_live_locator_fixture(
parent_listener,
Expand All @@ -1649,14 +1649,13 @@ root.querySelector('button').onclick=()=>window.shadowClicked=true;
let runtime = BrowserRuntime::launch(
LaunchOptions::default()
.headless(true)
.arg("--site-per-process")
.arg("--host-resolver-rules=MAP *.test 127.0.0.1"),
.arg("--site-per-process"),
)
.await
.unwrap();
let session = runtime.default_session().await.unwrap();
let page = session
.new_page(format!("http://parent.test:{parent_port}/"))
.new_page(format!("http://127.0.0.1:{parent_port}/"))
.await
.unwrap();
tokio::time::timeout(Duration::from_secs(5), async {
Expand Down
5 changes: 2 additions & 3 deletions src/runtime/artifact.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2793,7 +2793,7 @@ mod tests {
let child_body = "<!doctype html><style>html,body{margin:0;background:#0000ff}#blue{width:34px;height:22px;background:#0000ff}iframe{position:absolute;left:25px;top:0;border:0;width:50px;height:40px}</style><div id=blue></div><iframe id=nested src=/same></iframe>".to_owned();
let nested_body = "<!doctype html><style>html,body{margin:0;background:#ffff00}#yellow{width:26px;height:18px;background:#ffff00}</style><div id=yellow></div>".to_owned();
let parent_body = format!(
r#"<!doctype html><style>html,body{{margin:0;background:white}}#red{{width:40px;height:30px;background:#ff0000}}iframe{{border:0;width:80px;height:60px}}#same{{position:absolute;left:100px;top:20px}}#cross{{position:absolute;left:200px;top:20px}}</style><div id=red></div><div id=host></div><script>const root=document.querySelector('#host').attachShadow({{mode:'open'}});root.innerHTML='<div id=purple style=\"width:36px;height:24px;background:#ff00ff\"></div>';</script><iframe id=same src=/same></iframe><iframe id=cross src="http://child.test:{child_port}/"></iframe>"#
r#"<!doctype html><style>html,body{{margin:0;background:white}}#red{{width:40px;height:30px;background:#ff0000}}iframe{{border:0;width:80px;height:60px}}#same{{position:absolute;left:100px;top:20px}}#cross{{position:absolute;left:200px;top:20px}}</style><div id=red></div><div id=host></div><script>const root=document.querySelector('#host').attachShadow({{mode:'open'}});root.innerHTML='<div id=purple style=\"width:36px;height:24px;background:#ff00ff\"></div>';</script><iframe id=same src=/same></iframe><iframe id=cross src="http://localhost:{child_port}/"></iframe>"#
);
let parent_server = tokio::spawn(serve_artifact_fixture(
parent_listener,
Expand All @@ -2809,7 +2809,6 @@ mod tests {
LaunchOptions::default()
.headless(true)
.arg("--site-per-process")
.arg("--host-resolver-rules=MAP *.test 127.0.0.1")
.arg(explicitly_allowed_ports_arg([
parent_address.port(),
child_address.port(),
Expand All @@ -2823,7 +2822,7 @@ mod tests {
let initial_epoch = initial_main.document_epoch();
let initial_generation = page.generation();
let mut events = page.subscribe_events().await.unwrap();
let target_url = format!("http://parent.test:{parent_port}/");
let target_url = format!("http://127.0.0.1:{parent_port}/");
let navigation = page.goto(target_url.as_str()).await.unwrap();
assert_eq!(navigation.final_url(), target_url);
let committed = tokio::time::timeout(std::time::Duration::from_secs(8), async {
Expand Down
7 changes: 3 additions & 4 deletions src/runtime/evaluate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@ mod tests {
let parent_port = parent_listener.local_addr().unwrap().port();
let parent_body = format!(
r#"<!doctype html><script>globalThis.appGlobal='main';</script>
<iframe src='/same'></iframe><iframe src='http://child.test:{oopif_port}/'></iframe>"#
<iframe src='/same'></iframe><iframe src='http://localhost:{oopif_port}/'></iframe>"#
);
let same_body = "<!doctype html><script>globalThis.appGlobal='same';</script>".to_owned();
let oopif_body = "<!doctype html><script>globalThis.appGlobal='oopif';</script>".to_owned();
Expand All @@ -1313,14 +1313,13 @@ mod tests {
let runtime = BrowserRuntime::launch(
LaunchOptions::default()
.headless(true)
.arg("--site-per-process")
.arg("--host-resolver-rules=MAP *.test 127.0.0.1"),
.arg("--site-per-process"),
)
.await
.unwrap();
let session = runtime.default_session().await.unwrap();
let page = session
.new_page(format!("http://parent.test:{parent_port}/"))
.new_page(format!("http://127.0.0.1:{parent_port}/"))
.await
.unwrap();
let main = page.main_frame().await.unwrap();
Expand Down
9 changes: 4 additions & 5 deletions src/runtime/frame.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6281,7 +6281,7 @@ mod tests {
let child_server = tokio::spawn(serve_fixture(
child_listener,
format!(
r#"<html><body>child<iframe src="http://grandchild.test:{grandchild_port}/"></iframe></body></html>"#
r#"<html><body>child<iframe src="http://127.0.0.1:{grandchild_port}/"></iframe></body></html>"#
),
));
let grandchild_server = tokio::spawn(serve_fixture(
Expand All @@ -6291,21 +6291,20 @@ mod tests {
let parent_server = tokio::spawn(serve_fixture(
parent_listener,
format!(
r#"<html><body><iframe src="http://child.test:{child_port}/"></iframe></body></html>"#
r#"<html><body><iframe src="http://localhost:{child_port}/"></iframe></body></html>"#
),
));

let runtime = BrowserRuntime::launch(
LaunchOptions::default()
.headless(true)
.arg("--site-per-process")
.arg("--host-resolver-rules=MAP *.test 127.0.0.1"),
.arg("--site-per-process"),
)
.await
.expect("launch Chrome");
let session = runtime.default_session().await.expect("default session");
let page = session
.new_page(format!("http://parent.test:{parent_port}/"))
.new_page(format!("http://127.0.0.1:{parent_port}/"))
.await
.expect("open fixture");
let main = page.main_frame().await.expect("main frame");
Expand Down
9 changes: 4 additions & 5 deletions src/runtime/locator/resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,7 @@ pub(crate) mod tests {
closedRoot.innerHTML = `<button id="closed-button">Closed</button>`;
</script>
<iframe src="/same"></iframe>
<iframe src="http://child.test:{oopif_port}/"></iframe>"#
<iframe src="http://localhost:{oopif_port}/"></iframe>"#
);
let parent_server = tokio::spawn(serve_live_locator_fixture(
parent_listener,
Expand All @@ -1290,14 +1290,13 @@ pub(crate) mod tests {
let runtime = BrowserRuntime::launch(
LaunchOptions::default()
.headless(true)
.arg("--site-per-process")
.arg("--host-resolver-rules=MAP *.test 127.0.0.1"),
.arg("--site-per-process"),
)
.await
.expect("launch private Chrome");
let session = runtime.default_session().await.expect("default session");
let page = session
.new_page(format!("http://parent.test:{parent_port}/"))
.new_page(format!("http://127.0.0.1:{parent_port}/"))
.await
.expect("open locator fixture");
let main = page.main_frame().await.expect("main frame");
Expand Down Expand Up @@ -1508,7 +1507,7 @@ pub(crate) mod tests {

let stale_document = page.locator("#text-only");
cdpkit::page::methods::Navigate::new(format!(
"http://parent.test:{parent_port}/?replacement"
"http://127.0.0.1:{parent_port}/?replacement"
))
.send(page.cdp_session())
.await
Expand Down
9 changes: 4 additions & 5 deletions src/runtime/snapshot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1589,24 +1589,23 @@ const shadow = document.querySelector('#shadow').attachShadow({{mode:'open'}});
shadow.innerHTML = '<button id=shadow-button>Shadow action</button>';
document.querySelector('#focused').focus();
</script>
<iframe src=/same></iframe><iframe src="http://child.test:{oopif_port}/"></iframe>"#,
<iframe src=/same></iframe><iframe src="http://localhost:{oopif_port}/"></iframe>"#,
"X".repeat(8_192)
);
let parent_server = tokio::spawn(serve_fixture(parent_listener, parent, child.clone()));
let oopif_server = tokio::spawn(serve_fixture(oopif_listener, child, String::new()));
let runtime = BrowserRuntime::launch(
LaunchOptions::default()
.headless(true)
.arg("--site-per-process")
.arg("--host-resolver-rules=MAP *.test 127.0.0.1"),
.arg("--site-per-process"),
)
.await
.unwrap();
let page = runtime
.default_session()
.await
.unwrap()
.new_page(format!("http://parent.test:{parent_port}/"))
.new_page(format!("http://127.0.0.1:{parent_port}/"))
.await
.unwrap();
tokio::time::timeout(Duration::from_secs(5), async {
Expand Down Expand Up @@ -1756,7 +1755,7 @@ document.querySelector('#focused').focus();
);
}
cdpkit::page::methods::Navigate::new(format!(
"http://parent.test:{parent_port}/?replacement"
"http://127.0.0.1:{parent_port}/?replacement"
))
.send(page.cdp_session())
.await
Expand Down
Loading
Loading