Commit eac88a52 authored by Justin Cohen's avatar Justin Cohen Committed by Commit Bot

Disable bookmarks on iOS12.

Bug: 863476
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I864b2c054563e3b49f7ef87c4d2e85423c04e338
Reviewed-on: https://chromium-review.googlesource.com/1136669
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Reviewed-by: default avatarRohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574978}
parent cdca93f4
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#import <XCTest/XCTest.h> #import <XCTest/XCTest.h>
#include <vector> #include <vector>
#include "base/ios/ios_util.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#import "base/test/ios/wait_util.h" #import "base/test/ios/wait_util.h"
#include "base/test/scoped_feature_list.h" #include "base/test/scoped_feature_list.h"
...@@ -176,6 +177,13 @@ id<GREYMatcher> TappableBookmarkNodeWithLabel(NSString* label) { ...@@ -176,6 +177,13 @@ id<GREYMatcher> TappableBookmarkNodeWithLabel(NSString* label) {
@implementation BookmarksTestCase @implementation BookmarksTestCase
// TODO(crbug.com/863476): Temporarily disable bookmarks on iOS12.
+ (NSArray*)testInvocations {
if (base::ios::IsRunningOnIOS12OrLater())
return @[];
return [super testInvocations];
}
- (void)setUp { - (void)setUp {
[super setUp]; [super setUp];
...@@ -1755,6 +1763,13 @@ id<GREYMatcher> TappableBookmarkNodeWithLabel(NSString* label) { ...@@ -1755,6 +1763,13 @@ id<GREYMatcher> TappableBookmarkNodeWithLabel(NSString* label) {
@implementation BookmarksTestCaseEntries @implementation BookmarksTestCaseEntries
// TODO(crbug.com/863476): Temporarily disable bookmarks on iOS12.
+ (NSArray*)testInvocations {
if (base::ios::IsRunningOnIOS12OrLater())
return @[];
return [super testInvocations];
}
- (void)setUp { - (void)setUp {
[super setUp]; [super setUp];
...@@ -2765,6 +2780,13 @@ id<GREYMatcher> TappableBookmarkNodeWithLabel(NSString* label) { ...@@ -2765,6 +2780,13 @@ id<GREYMatcher> TappableBookmarkNodeWithLabel(NSString* label) {
@implementation BookmarksTestCasePromo @implementation BookmarksTestCasePromo
// TODO(crbug.com/863476): Temporarily disable bookmarks on iOS12.
+ (NSArray*)testInvocations {
if (base::ios::IsRunningOnIOS12OrLater())
return @[];
return [super testInvocations];
}
- (void)setUp { - (void)setUp {
[super setUp]; [super setUp];
...@@ -2979,6 +3001,13 @@ id<GREYMatcher> TappableBookmarkNodeWithLabel(NSString* label) { ...@@ -2979,6 +3001,13 @@ id<GREYMatcher> TappableBookmarkNodeWithLabel(NSString* label) {
@implementation BookmarksTestCaseAccessibility @implementation BookmarksTestCaseAccessibility
// TODO(crbug.com/863476): Temporarily disable bookmarks on iOS12.
+ (NSArray*)testInvocations {
if (base::ios::IsRunningOnIOS12OrLater())
return @[];
return [super testInvocations];
}
- (void)setUp { - (void)setUp {
[super setUp]; [super setUp];
...@@ -3155,6 +3184,13 @@ id<GREYMatcher> TappableBookmarkNodeWithLabel(NSString* label) { ...@@ -3155,6 +3184,13 @@ id<GREYMatcher> TappableBookmarkNodeWithLabel(NSString* label) {
@implementation BookmarksTestCaseFolders @implementation BookmarksTestCaseFolders
// TODO(crbug.com/863476): Temporarily disable bookmarks on iOS12.
+ (NSArray*)testInvocations {
if (base::ios::IsRunningOnIOS12OrLater())
return @[];
return [super testInvocations];
}
- (void)setUp { - (void)setUp {
[super setUp]; [super setUp];
......
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