Skip to content

GitLab

T
tangled
Commit 0318330c authored by Tina Wang's avatar Tina Wang Committed by Commit Bot
Browse files
Options

[SettingsUI] Adding test for enterprise info item in the three dot menu 

Test the conditions for showing the enterprise info in the menu.

Change-Id: I8c2dd7ec18c76c7f58c434a9cea88890225e2cc4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2297721
Commit-Queue: Tina Wang <tinazwang@chromium.org>
Reviewed-by: default avatarRohit Rao <rohitrao@chromium.org>
Reviewed-by: default avatarOwen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789172}
parent f26dd0a4
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 0 deletions
ios/chrome/browser/policy/enterprise_policy_test_helper.cc
View file @ 0318330c
......@@ -72,3 +72,8 @@ policy::MockConfigurationPolicyProvider*
EnterprisePolicyTestHelper::GetPolicyProvider() {
return &policy_provider_;
}
BrowserPolicyConnectorIOS*
EnterprisePolicyTestHelper::GetBrowserPolicyConnector() {
return browser_policy_connector_.get();
}
ios/chrome/browser/policy/enterprise_policy_test_helper.h
View file @ 0318330c
......@@ -29,6 +29,8 @@ class EnterprisePolicyTestHelper {
PrefService* GetLocalState();
// Returns the policy provider attached to |browser_state_|.
policy::MockConfigurationPolicyProvider* GetPolicyProvider();
// Returns the browser policy connector.
BrowserPolicyConnectorIOS* GetBrowserPolicyConnector();
private:
// The enterprise configuration policy provider.
......
ios/chrome/browser/ui/popup_menu/BUILD.gn
View file @ 0318330c
......@@ -130,7 +130,10 @@ source_set("unit_tests") {
"//ios/chrome/browser/overlays",
"//ios/chrome/browser/overlays/public/web_content_area",
"//ios/chrome/browser/overlays/test",
"//ios/chrome/browser/policy",
"//ios/chrome/browser/policy:feature_flags",
"//ios/chrome/browser/policy:test_support",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/popup_menu/cells",
"//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui",
"//ios/chrome/browser/ui/toolbar/test",
......
ios/chrome/browser/ui/popup_menu/popup_menu_mediator_unittest.mm
View file @ 0318330c
......@@ -13,6 +13,7 @@
#include "components/bookmarks/test/bookmark_test_helpers.h"
#include "components/feature_engagement/test/mock_tracker.h"
#include "components/language/ios/browser/ios_language_detection_tab_helper.h"
#include "components/policy/core/common/mock_configuration_policy_provider.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/testing_pref_service.h"
#include "components/reading_list/core/reading_list_model_impl.h"
......@@ -25,12 +26,15 @@
#import "ios/chrome/browser/overlays/public/overlay_request_queue.h"
#import "ios/chrome/browser/overlays/public/web_content_area/java_script_dialog_overlay.h"
#include "ios/chrome/browser/overlays/test/fake_overlay_presentation_context.h"
#include "ios/chrome/browser/policy/enterprise_policy_test_helper.h"
#include "ios/chrome/browser/policy/policy_features.h"
#import "ios/chrome/browser/ui/popup_menu/cells/popup_menu_text_item.h"
#import "ios/chrome/browser/ui/popup_menu/cells/popup_menu_tools_item.h"
#import "ios/chrome/browser/ui/popup_menu/popup_menu_constants.h"
#import "ios/chrome/browser/ui/popup_menu/public/popup_menu_table_view_controller.h"
#import "ios/chrome/browser/ui/toolbar/test/toolbar_test_navigation_manager.h"
#import "ios/chrome/browser/ui/toolbar/test/toolbar_test_web_state.h"
#include "ios/chrome/browser/ui/ui_feature_flags.h"
#include "ios/chrome/browser/web/chrome_web_client.h"
#import "ios/chrome/browser/web/chrome_web_test.h"
#include "ios/chrome/browser/web/features.h"
......@@ -128,6 +132,20 @@ class PopupMenuMediatorTest : public ChromeWebTest {
return mediator_;
}
PopupMenuMediator* CreateMediatorWithBrowserPolicyConnector(
PopupMenuType type,
BOOL is_incognito,
BOOL trigger_incognito_hint,
BrowserPolicyConnectorIOS* browser_policy_connector) {
mediator_ =
[[PopupMenuMediator alloc] initWithType:type
isIncognito:is_incognito
readingListModel:reading_list_model_.get()
triggerNewIncognitoTabTip:trigger_incognito_hint
browserPolicyConnector:browser_policy_connector];
return mediator_;
}
void CreatePrefs() {
prefs_ = std::make_unique<TestingPrefServiceSimple>();
prefs_->registry()->RegisterBooleanPref(
......@@ -219,6 +237,16 @@ class PopupMenuMediatorTest : public ChromeWebTest {
return NO;
}
bool HasEnterpriseInfoItem(FakePopupMenuConsumer* consumer) {
for (NSArray* innerArray in consumer.popupMenuItems) {
for (PopupMenuTextItem* item in innerArray) {
if (item.accessibilityIdentifier == kTextMenuEnterpriseInfo)
return YES;
}
}
return NO;
}
FakeOverlayPresentationContext presentation_context_;
std::unique_ptr<WebStateList> web_state_list_;
FakeWebStateListDelegate web_state_list_delegate_;
......@@ -429,6 +457,56 @@ TEST_F(PopupMenuMediatorTest, TestTextZoomDisabled) {
EXPECT_TRUE(HasItem(consumer, kToolsMenuTextZoom, /*enabled=*/NO));
}
// Tests that the "Managed by..." item is hidden when none of the policies is
// set.
TEST_F(PopupMenuMediatorTest, TestEnterpriseInfoHidden) {
// Enabled the feature flag.
base::test::ScopedFeatureList feature_list;
feature_list.InitAndEnableFeature(kEnableIOSManagedSettingsUI);
CreateMediator(PopupMenuTypeToolsMenu, /*is_incognito=*/NO,
/*trigger_incognito_hint=*/NO);
mediator_.webStateList = web_state_list_.get();
FakePopupMenuConsumer* consumer = [[FakePopupMenuConsumer alloc] init];
mediator_.popupMenu = consumer;
SetUpActiveWebState();
ASSERT_FALSE(HasEnterpriseInfoItem(consumer));
}
// Tests that the "Managed by..." item is shown.
TEST_F(PopupMenuMediatorTest, TestEnterpriseInfoShown) {
// Enabled the feature flag.
base::test::ScopedFeatureList feature_list;
feature_list.InitAndEnableFeature(kEnableIOSManagedSettingsUI);
// Set a policy.
base::ScopedTempDir state_directory;
ASSERT_TRUE(state_directory.CreateUniqueTempDir());
std::unique_ptr<EnterprisePolicyTestHelper> enterprise_policy_helper =
std::make_unique<EnterprisePolicyTestHelper>(state_directory.GetPath());
BrowserPolicyConnectorIOS* connector =
enterprise_policy_helper->GetBrowserPolicyConnector();
policy::PolicyMap map;
map.Set("test-policy", policy::POLICY_LEVEL_MANDATORY,
policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_PLATFORM,
std::make_unique<base::Value>("hello"), nullptr);
enterprise_policy_helper->GetPolicyProvider()->UpdateChromePolicy(map);
CreateMediatorWithBrowserPolicyConnector(
PopupMenuTypeToolsMenu, /*is_incognito=*/NO,
/*trigger_incognito_hint=*/NO, connector);
mediator_.webStateList = web_state_list_.get();
FakePopupMenuConsumer* consumer = [[FakePopupMenuConsumer alloc] init];
mediator_.popupMenu = consumer;
SetUpActiveWebState();
ASSERT_TRUE(HasEnterpriseInfoItem(consumer));
}
// Tests that this feature is disabled on iPad, no matter the state of the
// Feature flag. See crbug.com/1061119.
TEST_F(PopupMenuMediatorTest, TestTextZoomDisabledIPad) {
......
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