Commit 50cca479 authored by Nnamdi Theodore Johnson-Kanu's avatar Nnamdi Theodore Johnson-Kanu Committed by Commit Bot

[CrOS settings] Migrate cellular_setup/base_page.js to Polymer3

Bug: 1045266
Change-Id: Id4397dbe3fcead691471a9c3a911f79364181fb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2355394
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798418}
parent d2d16a10
......@@ -244,6 +244,7 @@ if (include_js_tests) {
]
if (is_chromeos) {
data += [
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/base_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_searchable_drop_down_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/ambient_mode_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/bluetooth_page_tests.m.js",
......
......@@ -6,6 +6,7 @@ import("//ui/webui/resources/tools/js_modulizer.gni")
js_modulizer("modulize") {
input_files = [
"base_page_test.js",
"cr_policy_network_behavior_mojo_tests.js",
"cr_policy_network_indicator_mojo_tests.js",
"network_config_element_behavior_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/cellular_setup/base_page.m.js';
// #import {flush, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// #import {assertFalse, assertTrue} from '../../chai_assert.js';
// clang-format on
suite('CrComponentsBasePageTest', function() {
let basePage;
setup(function() {
basePage = document.createElement('base-page');
document.body.appendChild(basePage);
Polymer.dom.flush();
});
test('Base test', function() {
const title = basePage.$$('#title');
assertTrue(!!title);
});
});
......@@ -42,6 +42,13 @@ GEN('#endif');
[]
],
].forEach(test => registerTest('Network', 'internet-config-dialog', ...test));
[
['BasePage', 'base_page_test.js',
[]
],
].forEach(test => registerTest('CellularSetup', 'cellular-setup', ...test));
// clang-format on
function registerTest(componentName, webuiHost, testName, module, deps) {
......
......@@ -9,7 +9,8 @@ GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
GEN('#include "content/public/test/browser_test.h"');
// clang-format off
[['CrPolicyNetworkBehaviorMojo', 'cr_policy_network_behavior_mojo_tests.m.js'],
[['BasePage', 'base_page_test.m.js'],
['CrPolicyNetworkBehaviorMojo', 'cr_policy_network_behavior_mojo_tests.m.js'],
['CrPolicyNetworkIndicatorMojo', 'cr_policy_network_indicator_mojo_tests.m.js'],
['NetworkConfigElementBehavior', 'network_config_element_behavior_test.m.js'],
].forEach(test => registerTest('Network', ...test));
......
......@@ -29,6 +29,7 @@ group("closure_compile") {
group("polymer3_elements") {
public_deps = [
"bluetooth:polymer3_elements",
"cellular_setup:polymer3_elements",
"network:polymer3_elements",
"network_health:polymer3_elements",
"quick_unlock:polymer3_elements",
......
......@@ -3,6 +3,9 @@
# found in the LICENSE file.
import("//third_party/closure_compiler/compile_js.gni")
import("//tools/polymer/polymer.gni")
import("//ui/webui/resources/tools/js_modulizer.gni")
import("../os_cr_components.gni")
assert(is_chromeos, "CellularSetup UI is Chrome OS only.")
......@@ -78,3 +81,42 @@ js_library("mojo_interface_provider") {
"//ui/webui/resources/js:cr",
]
}
# Polymer3 files
js_type_check("closure_compile_module") {
is_polymer3 = true
deps = [
# ":button_bar.m",
":base_page.m",
# ":button_bar.m",
# ":cellular_setup.m",
# ":final_page.m",
# ":mojo_interface_provider.m",
# ":provisioning_page.m",
# ":psim_flow_ui.m",
# ":sim_detect_page.m",
# ":webview_post_util.m",
]
}
js_library("base_page.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/cellular_setup/base_page.m.js" ]
deps = [
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/js:i18n_behavior.m",
]
extra_deps = [ ":base_page_module" ]
}
group("polymer3_elements") {
public_deps = [ ":base_page_module" ]
}
polymer_modulizer("base_page") {
js_file = "base_page.js"
html_file = "base_page.html"
html_type = "dom-module"
namespace_rewrites = cr_components_chromeos_namespace_rewrites
auto_imports = cr_components_chromeos_auto_imports
}
......@@ -70,6 +70,10 @@
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard_icon.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_BASE_PAGE_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/base_page.m.js"
use_base_dir="false"
type="BINDATA" />
</if>
<if expr="use_nss_certs">
<include name="IDR_WEBUI_CA_TRUST_EDIT_DIALOG_JS"
......
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