Commit 0ffa5fda authored by James Hawkins's avatar James Hawkins Committed by Commit Bot

cr_components/network: Migrate NetworkIpConfig to Polymer 3.

R=khorimoto@chromium.org

Bug: 1045266
Test: NetworkComponentsNetworkIpConfigTest*
Change-Id: Ie94e86efab513c315fff2edf1da9b29b27de19e3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368468
Auto-Submit: James Hawkins <jhawkins@chromium.org>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800744}
parent 213740d4
......@@ -248,6 +248,7 @@ if (include_js_tests) {
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_behavior_mojo_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_indicator_mojo_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_element_behavior_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_ip_config_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_list_item_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_list_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_password_input_test.m.js",
......
......@@ -32,6 +32,7 @@ GEN('#include "content/public/test/browser_test.h"');
]
],
['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.js', []],
['NetworkIpConfig', 'network/network_ip_config_test.js', []],
['NetworkList', 'network/network_list_test.js', []],
['NetworkListItem', 'network/network_list_item_test.js', []],
['NetworkPasswordInput', 'network/network_password_input_test.js', []],
......
......@@ -13,6 +13,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
[['CrPolicyNetworkBehaviorMojo', 'network/cr_policy_network_behavior_mojo_tests.m.js'],
['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.m.js'],
['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.m.js'],
['NetworkIpConfig', 'network/network_ip_config_test.m.js'],
['NetworkList', 'network/network_list_test.m.js'],
['NetworkListItem', 'network/network_list_item_test.m.js'],
['NetworkPasswordInput', 'network/network_password_input_test.m.js'],
......
......@@ -9,6 +9,7 @@ js_modulizer("modulize") {
"cr_policy_network_behavior_mojo_tests.js",
"cr_policy_network_indicator_mojo_tests.js",
"network_config_element_behavior_test.js",
"network_ip_config_test.js",
"network_list_item_test.js",
"network_list_test.js",
"network_password_input_test.js",
......
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// clang-format off
// #import 'chrome://os-settings/strings.m.js';
// #import 'chrome://resources/cr_components/chromeos/network/network_ip_config.m.js';
// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// clang-format on
suite('NetworkIpConfigTest', function() {
/** @type {!NetworkIpConfig|undefined} */
let ipConfig;
setup(function() {
ipConfig = document.createElement('network-ip-config');
document.body.appendChild(ipConfig);
Polymer.dom.flush();
});
test('Auto-config toggle policy enforcement', function() {
const mojom = chromeos.networkConfig.mojom;
assertTrue(!!ipConfig.$.autoConfigIpToggle);
// ipAddressConfigType is not set; auto-config is toggleable.
ipConfig.managedProperties = {
ipAddressConfigType: null,
};
Polymer.dom.flush();
assertFalse(ipConfig.$.autoConfigIpToggle.disabled);
// ipAddressConfigType policy is not enforced (kNone).
ipConfig.managedProperties = {
ipAddressConfigType: {
activeValue: "Static",
policySource: mojom.PolicySource.kNone,
},
};
Polymer.dom.flush();
assertFalse(ipConfig.$.autoConfigIpToggle.disabled);
// ipAddressConfigType policy is enforced.
ipConfig.managedProperties = {
ipAddressConfigType: {
activeValue: "Static",
policySource: mojom.PolicySource.kUserPolicyEnforced,
},
};
Polymer.dom.flush();
assertTrue(ipConfig.$.autoConfigIpToggle.disabled);
});
});
......@@ -263,7 +263,7 @@ js_type_check("closure_compile_module") {
# ":network_config_toggle.m",
":network_icon.m",
# ":network_ip_config.m",
":network_ip_config.m",
":network_list.m",
":network_list_item.m",
":network_list_types.m",
......@@ -379,7 +379,13 @@ js_library("network_icon.m") {
js_library("network_ip_config.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_ip_config.m.js" ]
deps = [
# TODO: Fill those in.
":cr_policy_network_behavior_mojo.m",
":network_property_list_mojo.m",
":network_shared_css.m",
":onc_mojo.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
"//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
]
extra_deps = [ ":network_ip_config_module" ]
}
......@@ -600,6 +606,7 @@ polymer_modulizer("network_ip_config") {
js_file = "network_ip_config.js"
html_file = "network_ip_config.html"
html_type = "dom-module"
auto_imports = cr_components_chromeos_auto_imports
}
polymer_modulizer("network_list") {
......
......@@ -6,6 +6,7 @@
<link rel="import" href="cr_policy_network_behavior_mojo.html">
<link rel="import" href="network_property_list_mojo.html">
<link rel="import" href="network_shared_css.html">
<link rel="import" href="onc_mojo.html">
<dom-module id="network-ip-config">
<template>
......
......@@ -6,8 +6,6 @@
* @fileoverview Polymer element for displaying the IP Config properties for
* a network state.
*/
(function() {
'use strict';
/**
* Returns the routing prefix as a string for a given prefix length. If
......@@ -359,4 +357,3 @@ Polymer({
});
},
});
})();
......@@ -38,6 +38,10 @@
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_listener_behavior.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_NETWORK_IP_CONFIG_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_ip_config.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_NETWORK_LIST_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_list.m.js"
use_base_dir="false"
......
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