Commit b998181a authored by Yi Gu's avatar Yi Gu Committed by Commit Bot

Revert "[iOS][Password Check] Rewriting Passwords test with new details screen"

This reverts commit 7b693e30.

Reason for revert: caused test flakiness on several bots. e.g. https://ci.chromium.org/p/chromium/builders/ci/ios-simulator-noncq/12320

Original change's description:
> [iOS][Password Check] Rewriting Passwords test with new details screen
>
> This change rewrites Passwords tests with new Password Details screen.
> Obsolete tests are deleted. Fixed flakiness for
> testSearchAndDeleteAllPasswords.
>
> Bug: 1075494, 1129441
> Change-Id: Id6d44a2f77c20edb1788f1d3dcaa04e9e645cdb5
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2418853
> Commit-Queue: Viktor Semeniuk <vsemeniuk@google.com>
> Reviewed-by: Gauthier Ambard <gambard@chromium.org>
> Reviewed-by: Eugene But <eugenebut@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#811668}

TBR=eugenebut@chromium.org,gambard@chromium.org,vsemeniuk@google.com

Change-Id: I9bd75ad7f3173c30e9174e0728575f77d8abdd10
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1075494
Bug: 1129441
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2438430Reviewed-by: default avatarYi Gu <yigu@chromium.org>
Commit-Queue: Yi Gu <yigu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811702}
parent c2f9162c
......@@ -268,9 +268,6 @@ BOOL WaitForJavaScriptCondition(NSString* java_script_condition) {
// Verify keyboard is shown without the password controller.
GREYAssertTrue([ChromeEarlGrey isKeyboardShownWithError:nil],
@"Keyboard Should be Shown");
[[EarlGrey
selectElementWithMatcher:chrome_test_util::NavigationBarCancelButton()]
performAction:grey_tap()];
[[EarlGrey selectElementWithMatcher:ManualFallbackPasswordTableViewMatcher()]
assertWithMatcher:grey_notVisible()];
}
......
......@@ -233,7 +233,6 @@ source_set("eg2_tests") {
":password_constants",
"//base:base",
"//base/test:test_support",
"//components/password_manager/core/common",
"//components/strings:components_strings_grit",
"//ios/chrome/app/strings:ios_strings_grit",
"//ios/chrome/browser/ui/settings:settings_root_constants",
......
......@@ -9,4 +9,4 @@
#endif
NSString* const kPasswordDetailsViewControllerId =
@"PasswordDetailsTableViewId";
@"kPasswordDetailsViewControllerId";
......@@ -210,8 +210,6 @@ typedef NS_ENUM(NSInteger, ReauthenticationReason) {
item.identifyingIcon = [[UIImage imageNamed:image]
imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
item.identifyingIconEnabled = YES;
item.identifyingIconAccessibilityLabel =
l10n_util::GetNSString(IDS_IOS_SETTINGS_PASSWORD_SHOW_BUTTON);
}
return item;
}
......
......@@ -43,7 +43,6 @@ source_set("test_support") {
"//components/keyed_service/core",
"//components/metrics",
"//components/metrics:demographics_test_support",
"//components/password_manager/core/common",
"//components/prefs",
"//components/signin/public/base",
"//components/sync:test_support_nigori",
......@@ -71,7 +70,6 @@ source_set("test_support") {
"//ios/chrome/browser/signin",
"//ios/chrome/browser/sync",
"//ios/chrome/browser/tabs",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/authentication/cells",
"//ios/chrome/browser/ui/browser_view",
"//ios/chrome/browser/ui/commands",
......@@ -83,7 +81,6 @@ source_set("test_support") {
"//ios/chrome/browser/ui/settings/password",
"//ios/chrome/browser/ui/settings/password:password_ui",
"//ios/chrome/browser/ui/settings/password:test_support",
"//ios/chrome/browser/ui/settings/password/password_details:password_details_ui",
"//ios/chrome/browser/ui/tab_grid",
"//ios/chrome/browser/ui/tabs",
"//ios/chrome/browser/ui/util",
......
......@@ -6,10 +6,8 @@
#include "base/mac/foundation_util.h"
#import "ios/chrome/browser/ui/settings/password/legacy_password_details_table_view_controller+testing.h"
#import "ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.h"
#import "ios/chrome/browser/ui/settings/password/passwords_table_view_controller.h"
#import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
#include "ios/chrome/browser/ui/ui_feature_flags.h"
#import "ios/chrome/browser/ui/util/top_view_controller.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
......@@ -55,11 +53,12 @@ MockReauthenticationModule* SetUpAndReturnMockReauthenticationModule() {
SettingsNavigationController* settings_navigation_controller =
base::mac::ObjCCastStrict<SettingsNavigationController>(
top_view_controller::TopPresentedViewController());
PasswordDetailsTableViewController* password_details_table_view_controller =
base::mac::ObjCCastStrict<PasswordDetailsTableViewController>(
settings_navigation_controller.topViewController);
password_details_table_view_controller.reauthModule =
mock_reauthentication_module;
LegacyPasswordDetailsTableViewController*
password_details_table_view_controller =
base::mac::ObjCCastStrict<LegacyPasswordDetailsTableViewController>(
settings_navigation_controller.topViewController);
[password_details_table_view_controller
setReauthenticationModule:mock_reauthentication_module];
return mock_reauthentication_module;
}
......
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