Commit bd7b15d0 authored by Viktor Semeniuk's avatar Viktor Semeniuk Committed by Commit Bot

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

This is a reland of 7b693e30

Fixed failing tests:
testStoredEntriesAlwaysShown
testCancelDeletionInDetailView
testSearchPasswords

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}

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