Skip to content

F
Front-End
Unverified Commit 1223e87f authored by Zachary Anderson's avatar Zachary Anderson Committed by GitHub
Browse files
Options

Revert "[web] roll Chromium dep to 96.2 (#99725)" (#99949) 

This reverts commit 0d4b73b2.
parent 305496b3
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 65 deletions
.ci.yaml
View file @ 1223e87f
...@@ -163,7 +163,7 @@ platform_properties: ...@@ -163,7 +163,7 @@ platform_properties:
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "certs"}, {"dependency": "certs"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
os: Windows-10 os: Windows-10
...@@ -192,7 +192,7 @@ targets: ...@@ -192,7 +192,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -211,7 +211,7 @@ targets: ...@@ -211,7 +211,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "clang"}, {"dependency": "clang"},
...@@ -231,7 +231,7 @@ targets: ...@@ -231,7 +231,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "clang"}, {"dependency": "clang"},
...@@ -462,7 +462,7 @@ targets: ...@@ -462,7 +462,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -484,7 +484,7 @@ targets: ...@@ -484,7 +484,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -506,7 +506,7 @@ targets: ...@@ -506,7 +506,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -528,7 +528,7 @@ targets: ...@@ -528,7 +528,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -550,7 +550,7 @@ targets: ...@@ -550,7 +550,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -572,7 +572,7 @@ targets: ...@@ -572,7 +572,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -595,7 +595,7 @@ targets: ...@@ -595,7 +595,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -618,7 +618,7 @@ targets: ...@@ -618,7 +618,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -641,7 +641,7 @@ targets: ...@@ -641,7 +641,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -664,7 +664,7 @@ targets: ...@@ -664,7 +664,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -707,7 +707,7 @@ targets: ...@@ -707,7 +707,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -734,7 +734,7 @@ targets: ...@@ -734,7 +734,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
...@@ -759,7 +759,7 @@ targets: ...@@ -759,7 +759,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
...@@ -784,7 +784,7 @@ targets: ...@@ -784,7 +784,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
...@@ -809,7 +809,7 @@ targets: ...@@ -809,7 +809,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
...@@ -880,7 +880,7 @@ targets: ...@@ -880,7 +880,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -898,7 +898,7 @@ targets: ...@@ -898,7 +898,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
["devicelab"] ["devicelab"]
...@@ -916,7 +916,7 @@ targets: ...@@ -916,7 +916,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_long_running_tests shard: web_long_running_tests
...@@ -937,7 +937,7 @@ targets: ...@@ -937,7 +937,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_long_running_tests shard: web_long_running_tests
...@@ -958,7 +958,7 @@ targets: ...@@ -958,7 +958,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_long_running_tests shard: web_long_running_tests
...@@ -979,7 +979,7 @@ targets: ...@@ -979,7 +979,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_long_running_tests shard: web_long_running_tests
...@@ -1000,7 +1000,7 @@ targets: ...@@ -1000,7 +1000,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_long_running_tests shard: web_long_running_tests
...@@ -1021,7 +1021,7 @@ targets: ...@@ -1021,7 +1021,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1042,7 +1042,7 @@ targets: ...@@ -1042,7 +1042,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1063,7 +1063,7 @@ targets: ...@@ -1063,7 +1063,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1084,7 +1084,7 @@ targets: ...@@ -1084,7 +1084,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1105,7 +1105,7 @@ targets: ...@@ -1105,7 +1105,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1126,7 +1126,7 @@ targets: ...@@ -1126,7 +1126,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1147,7 +1147,7 @@ targets: ...@@ -1147,7 +1147,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1168,7 +1168,7 @@ targets: ...@@ -1168,7 +1168,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1349,7 +1349,7 @@ targets: ...@@ -1349,7 +1349,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -3732,7 +3732,7 @@ targets: ...@@ -3732,7 +3732,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -3753,7 +3753,7 @@ targets: ...@@ -3753,7 +3753,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -3772,7 +3772,7 @@ targets: ...@@ -3772,7 +3772,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -3791,7 +3791,7 @@ targets: ...@@ -3791,7 +3791,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -3905,7 +3905,7 @@ targets: ...@@ -3905,7 +3905,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -3929,7 +3929,7 @@ targets: ...@@ -3929,7 +3929,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -3949,7 +3949,7 @@ targets: ...@@ -3949,7 +3949,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -3987,7 +3987,7 @@ targets: ...@@ -3987,7 +3987,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -4011,7 +4011,7 @@ targets: ...@@ -4011,7 +4011,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -4036,7 +4036,7 @@ targets: ...@@ -4036,7 +4036,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -4060,7 +4060,7 @@ targets: ...@@ -4060,7 +4060,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -4084,7 +4084,7 @@ targets: ...@@ -4084,7 +4084,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -4105,7 +4105,7 @@ targets: ...@@ -4105,7 +4105,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4130,7 +4130,7 @@ targets: ...@@ -4130,7 +4130,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4155,7 +4155,7 @@ targets: ...@@ -4155,7 +4155,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4180,7 +4180,7 @@ targets: ...@@ -4180,7 +4180,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4205,7 +4205,7 @@ targets: ...@@ -4205,7 +4205,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4230,7 +4230,7 @@ targets: ...@@ -4230,7 +4230,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4296,7 +4296,7 @@ targets: ...@@ -4296,7 +4296,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
......
examples/hello_world/test_driver/smoke_web_engine_test.dart
View file @ 1223e87f
...@@ -38,11 +38,25 @@ void main() { ...@@ -38,11 +38,25 @@ void main() {
// TODO(ianh): this delay violates our style guide. We should instead wait for a triggering event. // TODO(ianh): this delay violates our style guide. We should instead wait for a triggering event.
await Future<void>.delayed(const Duration(seconds: 2)); await Future<void>.delayed(const Duration(seconds: 2));
final WebElement? fltSemantics = await driver.webDriver.execute( // A flutter web app may be rendered directly on the body of the page, or
'return document.querySelector("flt-glass-pane")?.shadowRoot.querySelector("flt-semantics")', // inside the shadow root of the flt-glass-pane (after Flutter 2.4). To
// make this test backwards compatible, we first need to locate the correct
// root for the app.
//
// It's either the shadowRoot within flt-glass-pane, or [driver.webDriver].
final SearchContext appRoot = await driver.webDriver.execute(
'return document.querySelector("flt-glass-pane")?.shadowRoot;',
<dynamic>[], <dynamic>[],
) as WebElement?; ) as SearchContext? ?? driver.webDriver;
expect(fltSemantics, isNotNull);
// Elements with tag "flt-semantics" would show up after enabling
// accessibility.
//
// The tag used here is based on
// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/src/engine/semantics/semantics.dart#L534
final WebElement element = await appRoot.findElement(const By.cssSelector('flt-semantics'));
expect(element, isNotNull);
}); });
}); });
} }
packages/flutter/test/cupertino/dialog_test.dart
View file @ 1223e87f
...@@ -10,7 +10,6 @@ import 'dart:math'; ...@@ -10,7 +10,6 @@ import 'dart:math';
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
...@@ -325,12 +324,7 @@ void main() { ...@@ -325,12 +324,7 @@ void main() {
// Visually the "Cancel" button and "OK" button are the same height when using the // Visually the "Cancel" button and "OK" button are the same height when using the
// regular font. However, when using the test font, "Cancel" becomes 2 lines which // regular font. However, when using the test font, "Cancel" becomes 2 lines which
// is why the height we're verifying for "Cancel" is larger than "OK". // is why the height we're verifying for "Cancel" is larger than "OK".
expect(tester.getSize(find.text('The Title')), equals(const Size(270.0, 132.0)));
// TODO(yjbanov): https://github.com/flutter/flutter/issues/99933
// A bug in the HTML renderer and/or Chrome 96+ causes a
// discrepancy in the paragraph height.
const bool hasIssue99933 = kIsWeb && !bool.fromEnvironment('FLUTTER_WEB_USE_SKIA');
expect(tester.getSize(find.text('The Title')), equals(const Size(270.0, hasIssue99933 ? 133 : 132.0)));
expect(tester.getTopLeft(find.text('The Title')), equals(const Offset(265.0, 80.0 + 24.0))); expect(tester.getTopLeft(find.text('The Title')), equals(const Offset(265.0, 80.0 + 24.0)));
expect(tester.getSize(find.widgetWithText(CupertinoDialogAction, 'Cancel')), equals(const Size(310.0, 148.0))); expect(tester.getSize(find.widgetWithText(CupertinoDialogAction, 'Cancel')), equals(const Size(310.0, 148.0)));
expect(tester.getSize(find.widgetWithText(CupertinoDialogAction, 'OK')), equals(const Size(310.0, 98.0))); expect(tester.getSize(find.widgetWithText(CupertinoDialogAction, 'OK')), equals(const Size(310.0, 98.0)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab