Commit feb634e9 authored by zhaoyangli's avatar zhaoyangli Committed by Commit Bot

[iOS] Disable EG2 tests failing on iPhone SE since EG2 roll on 06/24.

These tests fail on an internal builder.

Bug: 1101099
Change-Id: I93d08ee2c6fd5206fc4f026a94a262876d8a1cdb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2276709
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Reviewed-by: default avatarMike Dougherty <michaeldo@chromium.org>
Reviewed-by: default avataredchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784490}
parent d43b7ee7
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import <XCTest/XCTest.h> #import <XCTest/XCTest.h>
#import "base/ios/ios_util.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#import "ios/chrome/browser/ui/settings/block_popups_app_interface.h" #import "ios/chrome/browser/ui/settings/block_popups_app_interface.h"
#include "ios/chrome/grit/ios_strings.h" #include "ios/chrome/grit/ios_strings.h"
...@@ -89,6 +90,10 @@ class ScopedBlockPopupsException { ...@@ -89,6 +90,10 @@ class ScopedBlockPopupsException {
// Opens the block popups settings page and verifies that accessibility is set // Opens the block popups settings page and verifies that accessibility is set
// up properly. // up properly.
- (void)testAccessibilityOfBlockPopupSettings { - (void)testAccessibilityOfBlockPopupSettings {
// TODO(crbug.com/1101099): Test fails on iOS 13 iPhone SE from EG2 roll.
if (base::ios::IsRunningOnIOS13OrLater() && ![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 13 and upper on iPhones.");
}
[ChromeEarlGreyUI openSettingsMenu]; [ChromeEarlGreyUI openSettingsMenu];
[ChromeEarlGreyUI tapSettingsMenuButton:ContentSettingsButton()]; [ChromeEarlGreyUI tapSettingsMenuButton:ContentSettingsButton()];
[[EarlGrey selectElementWithMatcher:BlockPopupsSettingsButton()] [[EarlGrey selectElementWithMatcher:BlockPopupsSettingsButton()]
...@@ -177,6 +182,10 @@ class ScopedBlockPopupsException { ...@@ -177,6 +182,10 @@ class ScopedBlockPopupsException {
// Tests that the "exceptions" section on the settings page is hidden and // Tests that the "exceptions" section on the settings page is hidden and
// revealed properly when the preference switch is toggled. // revealed properly when the preference switch is toggled.
- (void)testSettingsPageWithExceptions { - (void)testSettingsPageWithExceptions {
// TODO(crbug.com/1101099): Test fails on iOS 13 iPhone SE from EG2 roll.
if (base::ios::IsRunningOnIOS13OrLater() && ![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 13 and upper on iPhones.");
}
std::string allowedPattern = "[*.]example.com"; std::string allowedPattern = "[*.]example.com";
ScopedBlockPopupsPref prefSetter(CONTENT_SETTING_BLOCK); ScopedBlockPopupsPref prefSetter(CONTENT_SETTING_BLOCK);
ScopedBlockPopupsException exceptionSetter(allowedPattern); ScopedBlockPopupsException exceptionSetter(allowedPattern);
......
...@@ -39,6 +39,10 @@ using chrome_test_util::SettingsMenuPrivacyButton; ...@@ -39,6 +39,10 @@ using chrome_test_util::SettingsMenuPrivacyButton;
// Test that opening the clear browsing data dialog does not crash. // Test that opening the clear browsing data dialog does not crash.
- (void)testOpenClearBrowsingDataDialogUI { - (void)testOpenClearBrowsingDataDialogUI {
// TODO(crbug.com/1101099): Test fails on iOS 13 iPhone SE from EG2 roll.
if (base::ios::IsRunningOnIOS13OrLater() && ![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 13 and upper on iPhones.");
}
[self openClearBrowsingDataDialog]; [self openClearBrowsingDataDialog];
[[EarlGrey selectElementWithMatcher:SettingsDoneButton()] [[EarlGrey selectElementWithMatcher:SettingsDoneButton()]
performAction:grey_tap()]; performAction:grey_tap()];
...@@ -49,6 +53,10 @@ using chrome_test_util::SettingsMenuPrivacyButton; ...@@ -49,6 +53,10 @@ using chrome_test_util::SettingsMenuPrivacyButton;
if (!base::ios::IsRunningOnOrLater(13, 0, 0)) { if (!base::ios::IsRunningOnOrLater(13, 0, 0)) {
EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 12 and lower."); EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 12 and lower.");
} }
// TODO(crbug.com/1101099): Test fails on iOS 13 iPhone SE from EG2 roll.
if (base::ios::IsRunningOnIOS13OrLater() && ![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 13 and upper on iPhones.");
}
[self openClearBrowsingDataDialog]; [self openClearBrowsingDataDialog];
// Check that CBD is presented. // Check that CBD is presented.
......
...@@ -157,6 +157,10 @@ id<GREYMatcher> BandwidthSettingsButton() { ...@@ -157,6 +157,10 @@ id<GREYMatcher> BandwidthSettingsButton() {
// Verifies the UI elements are accessible on the Content Settings page. // Verifies the UI elements are accessible on the Content Settings page.
- (void)testAccessibilityOnContentSettingsPage { - (void)testAccessibilityOnContentSettingsPage {
// TODO(crbug.com/1101099): Test fails on iOS 13 iPhone SE from EG2 roll.
if (base::ios::IsRunningOnIOS13OrLater() && ![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 13 and upper on iPhones.");
}
[ChromeEarlGreyUI openSettingsMenu]; [ChromeEarlGreyUI openSettingsMenu];
[ChromeEarlGreyUI tapSettingsMenuButton:ContentSettingsButton()]; [ChromeEarlGreyUI tapSettingsMenuButton:ContentSettingsButton()];
[ChromeEarlGrey verifyAccessibilityForCurrentScreen]; [ChromeEarlGrey verifyAccessibilityForCurrentScreen];
...@@ -166,6 +170,10 @@ id<GREYMatcher> BandwidthSettingsButton() { ...@@ -166,6 +170,10 @@ id<GREYMatcher> BandwidthSettingsButton() {
// Verifies the UI elements are accessible on the Content Settings // Verifies the UI elements are accessible on the Content Settings
// Block Popups page. // Block Popups page.
- (void)testAccessibilityOnContentSettingsBlockPopupsPage { - (void)testAccessibilityOnContentSettingsBlockPopupsPage {
// TODO(crbug.com/1101099): Test fails on iOS 13 iPhone SE from EG2 roll.
if (base::ios::IsRunningOnIOS13OrLater() && ![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 13 and upper on iPhones.");
}
[ChromeEarlGreyUI openSettingsMenu]; [ChromeEarlGreyUI openSettingsMenu];
[ChromeEarlGreyUI tapSettingsMenuButton:ContentSettingsButton()]; [ChromeEarlGreyUI tapSettingsMenuButton:ContentSettingsButton()];
[[EarlGrey selectElementWithMatcher:BlockPopupsButton()] [[EarlGrey selectElementWithMatcher:BlockPopupsButton()]
...@@ -176,6 +184,10 @@ id<GREYMatcher> BandwidthSettingsButton() { ...@@ -176,6 +184,10 @@ id<GREYMatcher> BandwidthSettingsButton() {
// Verifies the UI elements are accessible on the Privacy Settings page. // Verifies the UI elements are accessible on the Privacy Settings page.
- (void)testAccessibilityOnPrivacySettingsPage { - (void)testAccessibilityOnPrivacySettingsPage {
// TODO(crbug.com/1101099): Test fails on iOS 13 iPhone SE from EG2 roll.
if (base::ios::IsRunningOnIOS13OrLater() && ![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 13 and upper on iPhones.");
}
[ChromeEarlGreyUI openSettingsMenu]; [ChromeEarlGreyUI openSettingsMenu];
[ChromeEarlGreyUI tapSettingsMenuButton:SettingsMenuPrivacyButton()]; [ChromeEarlGreyUI tapSettingsMenuButton:SettingsMenuPrivacyButton()];
[ChromeEarlGrey verifyAccessibilityForCurrentScreen]; [ChromeEarlGrey verifyAccessibilityForCurrentScreen];
...@@ -185,6 +197,10 @@ id<GREYMatcher> BandwidthSettingsButton() { ...@@ -185,6 +197,10 @@ id<GREYMatcher> BandwidthSettingsButton() {
// Verifies the UI elements are accessible on the Privacy Handoff Settings // Verifies the UI elements are accessible on the Privacy Handoff Settings
// page. // page.
- (void)testAccessibilityOnPrivacyHandoffSettingsPage { - (void)testAccessibilityOnPrivacyHandoffSettingsPage {
// TODO(crbug.com/1101099): Test fails on iOS 13 iPhone SE from EG2 roll.
if (base::ios::IsRunningOnIOS13OrLater() && ![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 13 and upper on iPhones.");
}
[ChromeEarlGreyUI openSettingsMenu]; [ChromeEarlGreyUI openSettingsMenu];
[ChromeEarlGreyUI tapSettingsMenuButton:SettingsMenuPrivacyButton()]; [ChromeEarlGreyUI tapSettingsMenuButton:SettingsMenuPrivacyButton()];
[[EarlGrey selectElementWithMatcher:PrivacyHandoffButton()] [[EarlGrey selectElementWithMatcher:PrivacyHandoffButton()]
...@@ -196,6 +212,10 @@ id<GREYMatcher> BandwidthSettingsButton() { ...@@ -196,6 +212,10 @@ id<GREYMatcher> BandwidthSettingsButton() {
// Verifies the UI elements are accessible on the Privacy Clear Browsing Data // Verifies the UI elements are accessible on the Privacy Clear Browsing Data
// Settings page. // Settings page.
- (void)testAccessibilityOnPrivacyClearBrowsingHistoryPage { - (void)testAccessibilityOnPrivacyClearBrowsingHistoryPage {
// TODO(crbug.com/1101099): Test fails on iOS 13 iPhone SE from EG2 roll.
if (base::ios::IsRunningOnIOS13OrLater() && ![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 13 and upper on iPhones.");
}
[ChromeEarlGreyUI openSettingsMenu]; [ChromeEarlGreyUI openSettingsMenu];
[ChromeEarlGreyUI tapSettingsMenuButton:SettingsMenuPrivacyButton()]; [ChromeEarlGreyUI tapSettingsMenuButton:SettingsMenuPrivacyButton()];
[ChromeEarlGreyUI tapPrivacyMenuButton:ClearBrowsingDataCell()]; [ChromeEarlGreyUI tapPrivacyMenuButton:ClearBrowsingDataCell()];
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#import "base/ios/ios_util.h"
#include "base/mac/foundation_util.h" #include "base/mac/foundation_util.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "build/branding_buildflags.h" #include "build/branding_buildflags.h"
...@@ -353,6 +354,10 @@ id<GREYMatcher> ClearBrowsingDataCell() { ...@@ -353,6 +354,10 @@ id<GREYMatcher> ClearBrowsingDataCell() {
// local server to navigate to a page that sets then tests a cookie, and then // local server to navigate to a page that sets then tests a cookie, and then
// clears the cookie and tests it is not set. // clears the cookie and tests it is not set.
- (void)testClearCookies { - (void)testClearCookies {
// TODO(crbug.com/1101099): Test fails on iOS 13 iPhone SE from EG2 roll.
if (base::ios::IsRunningOnIOS13OrLater() && ![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_SKIPPED(@"Test disabled on iOS 13 and upper on iPhones.");
}
// Creates a map of canned responses and set up the test HTML server. // Creates a map of canned responses and set up the test HTML server.
std::map<GURL, std::pair<std::string, std::string>> response; std::map<GURL, std::pair<std::string, std::string>> response;
......
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