Skip to content

Commit

Permalink
Reland "Reland "[ios] add credit card test for manual fallback""
Browse files Browse the repository at this point in the history
This is a reland of 965f2dd

Original change's description:
> Reland "[ios] add credit card test for manual fallback"
> 
> This is a reland of 30e1dd1
> 
> Adding feature flags to slimnav.
> Revert bug: https://bugs.chromium.org/p/chromium/issues/detail?id=908970
> 
> Original change's description:
> > [ios] add credit card test for manual fallback
> >
> > Also adds AutofillManualFallbackPhaseTwo to test bots.
> >
> > Bug: 845472
> > Change-Id: I6bd05781c09c24c0768e24acfe59efa7ce1da05d
> > Reviewed-on: https://chromium-review.googlesource.com/c/1337347
> > Reviewed-by: Rohit Rao <rohitrao@chromium.org>
> > Reviewed-by: Ben Pastene <bpastene@chromium.org>
> > Reviewed-by: Javier Ernesto Flores Robles <javierrobles@chromium.org>
> > Commit-Queue: David Jean <djean@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#611171}
> 
> TBR=rohitrao@chromium.org
> 
> Bug: 845472,908970
> Change-Id: I2cc0cddf0be8cea447f45f69457afbe19c840f29
> Reviewed-on: https://chromium-review.googlesource.com/c/1352328
> Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
> Reviewed-by: Javier Ernesto Flores Robles <javierrobles@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#611679}

Bug: 845472, 908970
Change-Id: Ia84d71d73733d5c326443c3441e3127b700e73ef
Reviewed-on: https://chromium-review.googlesource.com/c/1356718
Commit-Queue: David Jean <djean@chromium.org>
Reviewed-by: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#614677}
  • Loading branch information
cdavidjean authored and Commit Bot committed Dec 7, 2018
1 parent 49f80a4 commit 9e7f3e8
Show file tree
Hide file tree
Showing 6 changed files with 523 additions and 7 deletions.
8 changes: 4 additions & 4 deletions ios/build/bots/chromium.mac/ios-slimnav.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
{
"app": "ios_chrome_manual_fill_egtests",
"test args": [
"--enable-features=AutofillManualFallback,WebFrameMessaging,SlimNavigationManager"
"--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging,SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "11.4",
Expand Down Expand Up @@ -250,7 +250,7 @@
{
"app": "ios_chrome_manual_fill_egtests",
"test args": [
"--enable-features=AutofillManualFallback,WebFrameMessaging,SlimNavigationManager"
"--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging,SlimNavigationManager"
],
"xctest": true,
"device type": "iPad Air 2",
Expand Down Expand Up @@ -342,7 +342,7 @@
{
"app": "ios_chrome_manual_fill_egtests",
"test args": [
"--enable-features=AutofillManualFallback,WebFrameMessaging,SlimNavigationManager"
"--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging,SlimNavigationManager"
],
"xctest": true,
"device type": "iPhone X",
Expand Down Expand Up @@ -433,7 +433,7 @@
{
"app": "ios_chrome_manual_fill_egtests",
"test args": [
"--enable-features=AutofillManualFallback,WebFrameMessaging,SlimNavigationManager"
"--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging,SlimNavigationManager"
],
"device type": "iPhone X",
"os": "12.1",
Expand Down
2 changes: 1 addition & 1 deletion ios/build/bots/tests/eg_tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{
"app": "ios_chrome_manual_fill_egtests",
"test args": [
"--enable-features=AutofillManualFallback,WebFrameMessaging"
"--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging"
],
"xctest": true
},
Expand Down
4 changes: 4 additions & 0 deletions ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ source_set("eg_tests") {
configs += [ "//build/config/compiler:enable_arc" ]
testonly = true
sources = [
"card_view_controller_egtest.mm",
"keyboard_observer_egtest.mm",
"password_view_controller_egtest.mm",
]
Expand All @@ -193,10 +194,13 @@ source_set("eg_tests") {
":manual_fill_ui",
"//base",
"//base/test:test_support",
"//components/autofill/core/browser",
"//components/autofill/core/browser:test_support",
"//components/autofill/core/common",
"//components/autofill/ios/browser",
"//components/keyed_service/core",
"//components/password_manager/core/browser",
"//ios/chrome/browser/autofill",
"//ios/chrome/browser/passwords",
"//ios/chrome/browser/ui/util",
"//ios/chrome/test/app:test_support",
Expand Down
1 change: 0 additions & 1 deletion ios/chrome/browser/ui/autofill/manual_fill/card_mediator.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class CreditCard;

namespace manual_fill {
extern NSString* const ManageCardsAccessibilityIdentifier;
extern NSString* const OtherCardsAccessibilityIdentifier;
} // namespace manual_fill

// Object in charge of getting the cards relevant for the manual fill
Expand Down
Loading

0 comments on commit 9e7f3e8

Please sign in to comment.