Commit f9ee3c0b authored by James Hawkins's avatar James Hawkins Committed by Commit Bot

cr_components/network: Convert NetworkConfigInput to Polymer 3.

R=khorimoto@chromium.org

Bug: 1045266
Test: NetworkComponentsNetworkConfigInputTest*
Change-Id: I2cd588e70a0f7dbb92e4550ee7f0365368abbbb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2388988
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803938}
parent fc45a6e7
...@@ -256,6 +256,7 @@ if (include_js_tests) { ...@@ -256,6 +256,7 @@ if (include_js_tests) {
"$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/cr_policy_network_indicator_mojo_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_apnlist_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_apnlist_test.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_config_element_behavior_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_input_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_select_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_select_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_toggle_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_toggle_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_ip_config_test.m.js",
......
...@@ -33,6 +33,7 @@ GEN('#include "content/public/test/browser_test.h"'); ...@@ -33,6 +33,7 @@ GEN('#include "content/public/test/browser_test.h"');
] ]
], ],
['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.js', []], ['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.js', []],
['NetworkConfigInput', 'network/network_config_input_test.js', []],
['NetworkConfigSelect', 'network/network_config_select_test.js', []], ['NetworkConfigSelect', 'network/network_config_select_test.js', []],
['NetworkConfigToggle', 'network/network_config_toggle_test.js', []], ['NetworkConfigToggle', 'network/network_config_toggle_test.js', []],
['NetworkIpConfig', 'network/network_ip_config_test.js', []], ['NetworkIpConfig', 'network/network_ip_config_test.js', []],
......
...@@ -14,6 +14,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"'); ...@@ -14,6 +14,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.m.js'], ['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.m.js'],
['NetworkApnlist', 'network/network_apnlist_test.m.js'], ['NetworkApnlist', 'network/network_apnlist_test.m.js'],
['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.m.js'], ['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.m.js'],
['NetworkConfigInput', 'network/network_config_input_test.m.js'],
['NetworkConfigSelect', 'network/network_config_select_test.m.js'], ['NetworkConfigSelect', 'network/network_config_select_test.m.js'],
['NetworkConfigToggle', 'network/network_config_toggle_test.m.js'], ['NetworkConfigToggle', 'network/network_config_toggle_test.m.js'],
['NetworkIpConfig', 'network/network_ip_config_test.m.js'], ['NetworkIpConfig', 'network/network_ip_config_test.m.js'],
......
...@@ -10,6 +10,7 @@ js_modulizer("modulize") { ...@@ -10,6 +10,7 @@ js_modulizer("modulize") {
"cr_policy_network_indicator_mojo_tests.js", "cr_policy_network_indicator_mojo_tests.js",
"network_apnlist_test.js", "network_apnlist_test.js",
"network_config_element_behavior_test.js", "network_config_element_behavior_test.js",
"network_config_input_test.js",
"network_config_select_test.js", "network_config_select_test.js",
"network_config_toggle_test.js", "network_config_toggle_test.js",
"network_ip_config_test.js", "network_ip_config_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://resources/cr_components/chromeos/network/network_config_input.m.js';
// #import {keyEventOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// clang-format on
suite('NetworkConfigInputTest', function() {
/** @type {!NetworkConfigInput|undefined} */
let configInput;
setup(function() {
configInput = document.createElement('network-config-input');
document.body.appendChild(configInput);
Polymer.dom.flush();
});
test('Enter key propagates up enter event', function(done) {
// Set up a listener to assert the 'enter' event fired.
configInput.addEventListener('enter', function() {
done();
});
// Simulate pressing enter on the input element.
const inputEl = configInput.$$('cr-input');
MockInteractions.keyEventOn(
inputEl, 'keypress', /* keyCode */ 13, /* modifiers */ undefined,
'Enter');
});
});
...@@ -258,7 +258,7 @@ js_type_check("closure_compile_module") { ...@@ -258,7 +258,7 @@ js_type_check("closure_compile_module") {
# ":network_choose_mobile.m", # ":network_choose_mobile.m",
# ":network_config.m", # ":network_config.m",
":network_config_element_behavior.m", ":network_config_element_behavior.m",
# ":network_config_input.m", ":network_config_input.m",
":network_config_select.m", ":network_config_select.m",
":network_config_toggle.m", ":network_config_toggle.m",
":network_icon.m", ":network_icon.m",
...@@ -349,7 +349,12 @@ js_library("network_config_element_behavior.m") { ...@@ -349,7 +349,12 @@ js_library("network_config_element_behavior.m") {
js_library("network_config_input.m") { js_library("network_config_input.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_config_input.m.js" ] sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_config_input.m.js" ]
deps = [ deps = [
# TODO: Fill those in. ":cr_policy_network_behavior_mojo.m",
":cr_policy_network_indicator_mojo.m",
":network_config_element_behavior.m",
":network_shared_css.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_input:cr_input.m",
] ]
extra_deps = [ ":network_config_input_module" ] extra_deps = [ ":network_config_input_module" ]
} }
...@@ -600,6 +605,7 @@ polymer_modulizer("network_config_input") { ...@@ -600,6 +605,7 @@ polymer_modulizer("network_config_input") {
js_file = "network_config_input.js" js_file = "network_config_input.js"
html_file = "network_config_input.html" html_file = "network_config_input.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = cr_components_chromeos_auto_imports
} }
polymer_modulizer("network_config_select") { polymer_modulizer("network_config_select") {
......
...@@ -56,14 +56,18 @@ ...@@ -56,14 +56,18 @@
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.m.js" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.m.js"
use_base_dir="false" use_base_dir="false"
type="BINDATA" /> type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_TOGGLE_M_JS" <include name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_INPUT_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_toggle.m.js" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_input.m.js"
use_base_dir="false" use_base_dir="false"
type="BINDATA" /> type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_SELECT_M_JS" <include name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_SELECT_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_select.m.js" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_select.m.js"
use_base_dir="false" use_base_dir="false"
type="BINDATA" /> type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_TOGGLE_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_toggle.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_NETWORK_LISTENER_BEHAVIOR_M_JS" <include name="IDR_WEBUI_CHROMEOS_NETWORK_LISTENER_BEHAVIOR_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_listener_behavior.m.js" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_listener_behavior.m.js"
use_base_dir="false" 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