diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c25a9c68dc..aaefd92d38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -125,7 +125,7 @@ jobs: - { name: windows, target: x86_64-pc-windows-msvc, - os: warp-windows-2025-x64-8x, + os: windows-2025, cross: false, command: "test", args: "--all --tests", diff --git a/.github/workflows/wpt.yml b/.github/workflows/wpt.yml index 9183f4776c..8fa5f4a19f 100644 --- a/.github/workflows/wpt.yml +++ b/.github/workflows/wpt.yml @@ -23,8 +23,8 @@ permissions: jobs: wpt: name: "Run WPT Tests" - runs-on: warp-ubuntu-latest-arm64-16x - timeout-minutes: 15 + runs-on: ubuntu-24.04-arm + timeout-minutes: 60 steps: - uses: actions/checkout@v5 - uses: dtolnay/rust-toolchain@stable @@ -33,7 +33,6 @@ jobs: key: "blitz-wpt-linux" cache-all-crates: "true" cache-workspace-crates: "true" - cache-provider: "warpbuild" save-if: ${{ github.ref == 'refs/heads/main' }} # fonts-tlwg-loma-otf provides a Thai font; some WPT reftests (e.g. # css/css-text/i18n/css3-text-line-break-opclns-201.html) depend on Thai glyphs diff --git a/tests/blitz-tests/tests/accessibility_hidden.rs b/tests/blitz-tests/tests/accessibility_hidden.rs index 4f13d4eb41..21872e1313 100644 --- a/tests/blitz-tests/tests/accessibility_hidden.rs +++ b/tests/blitz-tests/tests/accessibility_hidden.rs @@ -38,7 +38,7 @@ fn excludes_div_with_hidden_attribute() -> TestResult<()> { not(contains(( anything(), matches_pattern!(AccessKitNode { - role(): eq(Role::GenericContainer) + html_tag(): eq(Some("div")) }) ))) ) @@ -59,7 +59,7 @@ fn excludes_div_with_display_none() -> TestResult<()> { not(contains(( anything(), matches_pattern!(AccessKitNode { - role(): eq(Role::GenericContainer) + html_tag(): eq(Some("div")) }) ))) ) @@ -80,7 +80,7 @@ fn excludes_div_with_visibility_hidden() -> TestResult<()> { not(contains(( anything(), matches_pattern!(AccessKitNode { - role(): eq(Role::GenericContainer) + html_tag(): eq(Some("div")) }) ))) ) diff --git a/tests/blitz-tests/tests/accessibility_label.rs b/tests/blitz-tests/tests/accessibility_label.rs index 21b57910e6..0fb2f0e734 100644 --- a/tests/blitz-tests/tests/accessibility_label.rs +++ b/tests/blitz-tests/tests/accessibility_label.rs @@ -43,7 +43,7 @@ fn includes_aria_labelledby_as_labelled_by_for_one_node() -> TestResult<()> { let (label_node_id, _) = tree_update .nodes .iter() - .find(|(_, node)| node.role() == Role::Label) + .find(|(_, node)| node.html_tag() == Some("label")) .expect("Label must be present in accessibility tree"); verify_that!( tree_update.nodes, @@ -87,7 +87,7 @@ fn includes_aria_labelledby_as_labelled_by_for_two_nodes() -> TestResult<()> { tree_update .nodes .iter() - .find(|(_, node)| node.role() == Role::Label) + .find(|(_, node)| node.html_tag() == Some("label")) .expect("Expected to find label another-element in the tree") .0, ); diff --git a/tests/blitz-tests/tests/accessibility_roles.rs b/tests/blitz-tests/tests/accessibility_roles.rs index 24de01cf7c..af2a799338 100644 --- a/tests/blitz-tests/tests/accessibility_roles.rs +++ b/tests/blitz-tests/tests/accessibility_roles.rs @@ -192,7 +192,7 @@ fn a_semantic_page_has_no_unknown_elements() { "##; - // and have no roles of their own. Everything else in - // this document should map to something an assistive technology can use. - assert_eq!(unknown_tags(html), vec!["body", "html"]); + // Every element maps to something an assistive technology can use; + // and , with no roles of their own, are generic containers. + assert_eq!(unknown_tags(html), Vec::::new()); }