Skip to content

GitLab

T
tangled
Commit 062bbdc1 authored by Robbie Gibson's avatar Robbie Gibson Committed by Commit Bot
Browse files
Options

[iOS] Reenable flaky test with another possible solution 

The last time I changed this line, the CSS was incorrect, so it didn't
do anything. Now, it's the correct CSS syntax.

I ran this test on the device bot 8 times (5 on upstream bot), and
each time, the test in question passed.

Fixed: 1041873
Change-Id: I2291330fc8af189322e42ec033097104b26c7faf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2003850
Commit-Queue: Robbie Gibson <rkgibson@google.com>
Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733607}
parent 6a7f5512
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 8 deletions
ios/chrome/browser/web/font_size_js_unittest.mm
View file @ 062bbdc1
...@@ -41,7 +41,7 @@ class FontSizeJsTest : public web::WebJsTest<web::WebTestWithWebState> { ...@@ -41,7 +41,7 @@ class FontSizeJsTest : public web::WebJsTest<web::WebTestWithWebState> {
void LoadHtml(NSString* html) { void LoadHtml(NSString* html) {
LoadHtmlAndInject( LoadHtmlAndInject(
[NSString stringWithFormat:@"<html><style>" [NSString stringWithFormat:@"<html><style>"
@"html { -webkit-text-size-adjust=none }" @"html { -webkit-text-size-adjust: none }"
@"</style><meta name='viewport' " @"</style><meta name='viewport' "
@"content='initial-scale=1.0'>%@</html>", @"content='initial-scale=1.0'>%@</html>",
html]); html]);
...@@ -255,13 +255,6 @@ TEST_F(FontSizeJsTest, TestAdjustFontSizeForUnit) { ...@@ -255,13 +255,6 @@ TEST_F(FontSizeJsTest, TestAdjustFontSizeForUnit) {
// Tests that __gCrWeb.accessibility.adjustFontSize works for nested elements. // Tests that __gCrWeb.accessibility.adjustFontSize works for nested elements.
TEST_F(FontSizeJsTest, TestAdjustFontSizeForNestedElements) { TEST_F(FontSizeJsTest, TestAdjustFontSizeForNestedElements) {
// TODO(crbug.com/1041873): Re-enable this test on device.
#if !TARGET_IPHONE_SIMULATOR
if (ui::GetDeviceFormFactor() != ui::DEVICE_FORM_FACTOR_TABLET) {
return;
}
#endif // TARGET_IPHONE_SIMULATOR
// TODO(crbug.com/983776): This test fails on ipad since beta5 due to a // TODO(crbug.com/983776): This test fails on ipad since beta5 due to a
// simulator bug. Re-enable this once the bug is fixed. // simulator bug. Re-enable this once the bug is fixed.
if (base::ios::IsRunningOnIOS13OrLater() && if (base::ios::IsRunningOnIOS13OrLater() &&
......
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