Commit c27e5a26 authored by Gauthier Ambard's avatar Gauthier Ambard Committed by Commit Bot

Revert "[iOS] Disable failing NTP tests"

This reverts commit 1d0d9774.

Reason for revert: It was probably failing because of the landscape device

Original change's description:
> [iOS] Disable failing NTP tests
>
> Disables failing tests on iphone-device:
>
> NTPHomeTestCase/testOmniboxPinnedWidthRotation
> NTPHomeTestCase/testTapFakeOmniboxScrollScrolled
> NTPHomeTestCase/testOmniboxWidthRotation
> NTPHomeTestCase/testFavicons
> NTPHomeTestCase/testTapOmniboxSearchButtonLogsCorrectly
> NTPHomeTestCase/testCollectionShortcuts
> NTPHomeTestCase/testTapSearchButtonFakeOmniboxScrolled
> NTPHomeTestCase/testOmniboxWidthRotationBehindSettings
>
> TBR=gambard@chromium.org
>
> Bug: 1046253
> Change-Id: I7fd7a7b0f524ad9614f0f83fac0a4426ac28f7c4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2023527
> Reviewed-by: Javier Ernesto Flores Robles <javierrobles@chromium.org>
> Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#735813}

TBR=gambard@chromium.org,javierrobles@chromium.org

Change-Id: Ie438801555ee67537c0b991a5f9edb75900da518
Bug: 1046253
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2027450
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736364}
parent 2dd77539
...@@ -153,13 +153,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) { ...@@ -153,13 +153,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) {
// Tests that the collections shortcut are displayed and working. // Tests that the collections shortcut are displayed and working.
- (void)testCollectionShortcuts { - (void)testCollectionShortcuts {
// TODO(crbug.com/1046253): fix for iphone-device and reenable.
#if !TARGET_IPHONE_SIMULATOR
if (![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_DISABLED(@"Test disabled on iPhone devices.");
}
#endif
// Check the Bookmarks. // Check the Bookmarks.
[[EarlGrey [[EarlGrey
selectElementWithMatcher:chrome_test_util::ButtonWithAccessibilityLabelId( selectElementWithMatcher:chrome_test_util::ButtonWithAccessibilityLabelId(
...@@ -220,14 +213,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) { ...@@ -220,14 +213,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) {
if ([ChromeEarlGrey isIPadIdiom]) { if ([ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_DISABLED(@"Disabled for iPad due to device rotation bug."); EARL_GREY_TEST_DISABLED(@"Disabled for iPad due to device rotation bug.");
} }
// TODO(crbug.com/1046253): fix for iphone-device and reenable.
#if !TARGET_IPHONE_SIMULATOR
if (![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_DISABLED(@"Test disabled on iPhone devices.");
}
#endif
[[GREYUIThreadExecutor sharedInstance] drainUntilIdle]; [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
UIEdgeInsets safeArea = UIEdgeInsets safeArea =
[ContentSuggestionsAppInterface collectionView].safeAreaInsets; [ContentSuggestionsAppInterface collectionView].safeAreaInsets;
...@@ -269,14 +254,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) { ...@@ -269,14 +254,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) {
if ([ChromeEarlGrey isRegularXRegularSizeClass]) { if ([ChromeEarlGrey isRegularXRegularSizeClass]) {
EARL_GREY_TEST_DISABLED(@"Disabled for iPad due to device rotation bug."); EARL_GREY_TEST_DISABLED(@"Disabled for iPad due to device rotation bug.");
} }
// TODO(crbug.com/1046253): fix for iphone-device and reenable.
#if !TARGET_IPHONE_SIMULATOR
if (![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_DISABLED(@"Test disabled on iPhone devices.");
}
#endif
[[GREYUIThreadExecutor sharedInstance] drainUntilIdle]; [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
UIEdgeInsets safeArea = UIEdgeInsets safeArea =
[ContentSuggestionsAppInterface collectionView].safeAreaInsets; [ContentSuggestionsAppInterface collectionView].safeAreaInsets;
...@@ -324,13 +301,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) { ...@@ -324,13 +301,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) {
EARL_GREY_TEST_DISABLED(@"Disabled for iPad due to device rotation bug."); EARL_GREY_TEST_DISABLED(@"Disabled for iPad due to device rotation bug.");
} }
// TODO(crbug.com/1046253): fix for iphone-device and reenable.
#if !TARGET_IPHONE_SIMULATOR
if (![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_DISABLED(@"Test disabled on iPhone devices.");
}
#endif
[[EarlGrey selectElementWithMatcher:chrome_test_util:: [[EarlGrey selectElementWithMatcher:chrome_test_util::
ContentSuggestionCollectionView()] ContentSuggestionCollectionView()]
performAction:grey_swipeFastInDirection(kGREYDirectionUp)]; performAction:grey_swipeFastInDirection(kGREYDirectionUp)];
...@@ -505,13 +475,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) { ...@@ -505,13 +475,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) {
// toolbar. // toolbar.
return; return;
} }
// TODO(crbug.com/1046253): fix for iphone-device and reenable.
#if !TARGET_IPHONE_SIMULATOR
if (![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_DISABLED(@"Test disabled on iPhone devices.");
}
#endif
[ContentSuggestionsAppInterface swizzleSearchButtonLogging]; [ContentSuggestionsAppInterface swizzleSearchButtonLogging];
// Tap the search button. // Tap the search button.
...@@ -579,13 +542,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) { ...@@ -579,13 +542,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) {
// Tests that tapping the fake omnibox then unfocusing it moves the collection // Tests that tapping the fake omnibox then unfocusing it moves the collection
// back to where it was. // back to where it was.
- (void)testTapFakeOmniboxScrollScrolled { - (void)testTapFakeOmniboxScrollScrolled {
// TODO(crbug.com/1046253): fix for iphone-device and reenable.
#if !TARGET_IPHONE_SIMULATOR
if (![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_DISABLED(@"Test disabled on iPhone devices.");
}
#endif
// Get the collection and its layout. // Get the collection and its layout.
UICollectionView* collectionView = UICollectionView* collectionView =
[ContentSuggestionsAppInterface collectionView]; [ContentSuggestionsAppInterface collectionView];
...@@ -625,13 +581,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) { ...@@ -625,13 +581,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) {
return; return;
} }
// TODO(crbug.com/1046253): fix for iphone-device and reenable.
#if !TARGET_IPHONE_SIMULATOR
if (![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_DISABLED(@"Test disabled on iPhone devices.");
}
#endif
[[EarlGrey selectElementWithMatcher:chrome_test_util:: [[EarlGrey selectElementWithMatcher:chrome_test_util::
ContentSuggestionCollectionView()] ContentSuggestionCollectionView()]
performAction:grey_swipeFastInDirection(kGREYDirectionUp)]; performAction:grey_swipeFastInDirection(kGREYDirectionUp)];
...@@ -680,13 +629,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) { ...@@ -680,13 +629,6 @@ id<GREYMatcher> OmniboxWidthBetween(CGFloat width, CGFloat margin) {
} }
- (void)testFavicons { - (void)testFavicons {
// TODO(crbug.com/1046253): fix for iphone-device and reenable.
#if !TARGET_IPHONE_SIMULATOR
if (![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_DISABLED(@"Test disabled on iPhone devices.");
}
#endif
for (NSInteger index = 0; index < 8; index++) { for (NSInteger index = 0; index < 8; index++) {
[[EarlGrey selectElementWithMatcher: [[EarlGrey selectElementWithMatcher:
grey_accessibilityID([NSString grey_accessibilityID([NSString
......
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