Commit 9d060301 authored by edchin's avatar edchin Committed by Commit Bot

Reland "[ios] Add eg2 tests for managed bookmarks"

This reverts commit c977b051.

Reason for revert:
EG swipe is not working properly on iOS 12.
Disabled swipe test for iOS 12.

Original change's description:
> Revert "[ios] Add eg2 tests for managed bookmarks"
>
> This reverts commit db19268d.
>
> Reason for revert: test failure, see crbug.com/1070676
>
> Original change's description:
> > [ios] Add eg2 tests for managed bookmarks
> >
> > This CL adds eg2 tests for changes in crrev.com/c/2140953.
> >
> > The test fixture in this CL must enable certain command-line flags
> > to be able to run the managed bookmarks enterprise policy.
> >
> > The eg2 tests for managed bookmarks include testing:
> > - disabling long-press for managed items (URLs and folders)
> > - disabling swipe-to-delete for managed items (URLs and folders)
> > - disabling new folder context menu button when inside a managed folder
> > - disabling edit context menu button when inside a managed folder
> >
> > Bug: 1065187
> > Change-Id: Ide92b87f03585d186b133f192d1e39a4fbbaa1cd
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2145260
> > Reviewed-by: Sergio Collazos <sczs@chromium.org>
> > Commit-Queue: edchin <edchin@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#758848}
>
> TBR=edchin@chromium.org,sczs@chromium.org
>
> Change-Id: Ie6b374a26d85cd99d52417ee52aabee8ff2d2683
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1065187, 1070676
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2149287
> Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
> Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#758903}

TBR=xhwang@chromium.org,sczs@chromium.org

Change-Id: Idbdbab707e239b9abdae0c19a10979af9abfef06
Bug: 1065187, 1070676
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2149507Reviewed-by: default avataredchin <edchin@chromium.org>
Commit-Queue: edchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759107}
parent 21939bfd
...@@ -99,13 +99,12 @@ source_set("eg2_tests") { ...@@ -99,13 +99,12 @@ source_set("eg2_tests") {
testonly = true testonly = true
sources = [ sources = [
"policy_app_interface.h",
"policy_app_interface_stub.mm",
"policy_egtest.mm", "policy_egtest.mm",
"policy_platform_provider_egtest.mm", "policy_platform_provider_egtest.mm",
] ]
deps = [ deps = [
":eg_test_support+eg2",
"//base", "//base",
"//components/password_manager/core/common", "//components/password_manager/core/common",
"//components/policy:generated", "//components/policy:generated",
...@@ -141,3 +140,20 @@ source_set("eg_app_support+eg2") { ...@@ -141,3 +140,20 @@ source_set("eg_app_support+eg2") {
] ]
libs = [ "Foundation.framework" ] libs = [ "Foundation.framework" ]
} }
source_set("eg_test_support+eg2") {
defines = [ "CHROME_EARL_GREY_2" ]
configs += [
"//build/config/compiler:enable_arc",
"//build/config/ios:xctest_config",
]
testonly = true
sources = [
"policy_app_interface.h",
"policy_app_interface_stub.mm",
]
deps = [
"//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib",
]
}
...@@ -246,13 +246,17 @@ source_set("eg2_tests") { ...@@ -246,13 +246,17 @@ source_set("eg2_tests") {
"bookmarks_folders_egtest.mm", "bookmarks_folders_egtest.mm",
"bookmarks_promo_egtest.mm", "bookmarks_promo_egtest.mm",
"bookmarks_search_egtest.mm", "bookmarks_search_egtest.mm",
"managed_bookmarks_egtest.mm",
] ]
deps = [ deps = [
":bookmarks_ui", ":bookmarks_ui",
":eg_test_support+eg2", ":eg_test_support+eg2",
"//base/test:test_support", "//base/test:test_support",
"//components/policy:generated",
"//components/strings", "//components/strings",
"//ios/chrome/app/strings", "//ios/chrome/app/strings",
"//ios/chrome/browser:utils",
"//ios/chrome/browser/policy:eg_test_support+eg2",
"//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
"//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/popup_menu:constants",
"//ios/chrome/browser/ui/table_view:feature_flags", "//ios/chrome/browser/ui/table_view:feature_flags",
......
This diff is collapsed.
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