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

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

Bug: 1045266
Change-Id: If57ab1625e934ed165e9ec94951927dbaaf6be69
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359368
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799323}
parent ea678c6b
...@@ -244,6 +244,7 @@ if (include_js_tests) { ...@@ -244,6 +244,7 @@ if (include_js_tests) {
data += [ data += [
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/base_page_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/base_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/final_page_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/final_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/sim_detect_page_test.m.js",
"$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_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/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_config_element_behavior_test.m.js",
......
...@@ -8,5 +8,6 @@ js_modulizer("modulize") { ...@@ -8,5 +8,6 @@ js_modulizer("modulize") {
input_files = [ input_files = [
"base_page_test.js", "base_page_test.js",
"final_page_test.js", "final_page_test.js",
"sim_detect_page_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/sim_detect_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('CrComponentsSimDetectPageTest', function() {
let simDetectPage;
setup(function() {
simDetectPage = document.createElement('sim-detect-page');
document.body.appendChild(simDetectPage);
Polymer.dom.flush();
});
test('Base test', function() {
const basePage = simDetectPage.$$('base-page');
assertTrue(!!basePage);
});
});
...@@ -53,6 +53,9 @@ GEN('#endif'); ...@@ -53,6 +53,9 @@ GEN('#endif');
['FinalPage', 'cellular_setup/final_page_test.js', ['FinalPage', 'cellular_setup/final_page_test.js',
[] []
], ],
['SimDetectPage', 'cellular_setup/sim_detect_page_test.js',
[]
],
].forEach(test => registerTest('CellularSetup', 'cellular-setup', ...test)); ].forEach(test => registerTest('CellularSetup', 'cellular-setup', ...test));
// clang-format on // clang-format on
......
...@@ -18,6 +18,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"'); ...@@ -18,6 +18,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
[['BasePage', 'cellular_setup/base_page_test.m.js'], [['BasePage', 'cellular_setup/base_page_test.m.js'],
['FinalPage', 'cellular_setup/final_page_test.m.js'], ['FinalPage', 'cellular_setup/final_page_test.m.js'],
['SimDetectPage', 'cellular_setup/sim_detect_page_test.m.js'],
].forEach(test => registerTest('CellularSetup', ...test)); ].forEach(test => registerTest('CellularSetup', ...test));
// clang-format on // clang-format on
......
...@@ -97,7 +97,7 @@ js_type_check("closure_compile_module") { ...@@ -97,7 +97,7 @@ js_type_check("closure_compile_module") {
# ":provisioning_page.m", # ":provisioning_page.m",
# ":psim_flow_ui.m", # ":psim_flow_ui.m",
# ":sim_detect_page.m", ":sim_detect_page.m",
":webview_post_util.m", ":webview_post_util.m",
] ]
} }
...@@ -139,10 +139,19 @@ js_library("webview_post_util.m") { ...@@ -139,10 +139,19 @@ js_library("webview_post_util.m") {
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize" ]
} }
js_library("sim_detect_page.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/cellular_setup/sim_detect_page.m.js" ]
deps = [
":base_page.m",
]
extra_deps = [ ":sim_detect_page_module" ]
}
group("polymer3_elements") { group("polymer3_elements") {
public_deps = [ public_deps = [
":base_page_module", ":base_page_module",
":final_page_module", ":final_page_module",
":sim_detect_page_module",
":modulize", ":modulize",
] ]
} }
...@@ -163,6 +172,14 @@ polymer_modulizer("final_page") { ...@@ -163,6 +172,14 @@ polymer_modulizer("final_page") {
auto_imports = cr_components_chromeos_auto_imports auto_imports = cr_components_chromeos_auto_imports
} }
polymer_modulizer("sim_detect_page") {
js_file = "sim_detect_page.js"
html_file = "sim_detect_page.html"
html_type = "dom-module"
namespace_rewrites = cr_components_chromeos_namespace_rewrites
auto_imports = cr_components_chromeos_auto_imports
}
js_modulizer("modulize") { js_modulizer("modulize") {
input_files = [ input_files = [
"mojo_interface_provider.js", "mojo_interface_provider.js",
......
...@@ -94,6 +94,10 @@ ...@@ -94,6 +94,10 @@
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/webview_post_util.m.js" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/webview_post_util.m.js"
use_base_dir="false" use_base_dir="false"
type="BINDATA" /> type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_SIM_DETECT_PAGE_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/sim_detect_page.m.js"
use_base_dir="false"
type="BINDATA" />
</if> </if>
<if expr="use_nss_certs"> <if expr="use_nss_certs">
<include name="IDR_WEBUI_CA_TRUST_EDIT_DIALOG_JS" <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