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

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

Bug: 1045266
Change-Id: I06c026e4788c8225d1acdfa1792d4f221806c2c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359018
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799165}
parent 64ec54dd
......@@ -243,6 +243,7 @@ if (include_js_tests) {
if (is_chromeos) {
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/final_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_indicator_mojo_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_element_behavior_test.m.js",
......
......@@ -7,5 +7,6 @@ import("//ui/webui/resources/tools/js_modulizer.gni")
js_modulizer("modulize") {
input_files = [
"base_page_test.js",
"final_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/final_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('CrComponentsFinalPageTest', function() {
let finalPage;
setup(function() {
finalPage = document.createElement('final-page');
document.body.appendChild(finalPage);
Polymer.dom.flush();
});
test('Base test', function() {
const basePage = finalPage.$$('base-page');
assertTrue(!!basePage);
});
});
......@@ -50,6 +50,9 @@ GEN('#endif');
['BasePage', 'cellular_setup/base_page_test.js',
[]
],
['FinalPage', 'cellular_setup/final_page_test.js',
[]
],
].forEach(test => registerTest('CellularSetup', 'cellular-setup', ...test));
// clang-format on
......
......@@ -16,7 +16,8 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
['NetworkPasswordInput', 'network/network_password_input_test.m.js'],
].forEach(test => registerTest('Network', ...test));
[['BasePage', 'cellular_setup/base_page_test.m.js']
[['BasePage', 'cellular_setup/base_page_test.m.js'],
['FinalPage', 'cellular_setup/final_page_test.m.js'],
].forEach(test => registerTest('CellularSetup', ...test));
// clang-format on
......
......@@ -21,6 +21,7 @@ group("closure_compile") {
# "network:closure_compile_module",
"quick_unlock:closure_compile_module",
"cellular_setup:closure_compile_module",
"bluetooth:closure_compile_module",
"network_health:closure_compile_module",
"smb_shares:closure_compile_module",
......
......@@ -91,7 +91,7 @@ js_type_check("closure_compile_module") {
":base_page.m",
# ":button_bar.m",
# ":cellular_setup.m",
# ":final_page.m",
":final_page.m",
# ":mojo_interface_provider.m",
# ":provisioning_page.m",
# ":psim_flow_ui.m",
......@@ -109,8 +109,20 @@ js_library("base_page.m") {
extra_deps = [ ":base_page_module" ]
}
js_library("final_page.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/cellular_setup/final_page.m.js" ]
deps = [
":base_page.m",
"//ui/webui/resources/js:i18n_behavior.m",
]
extra_deps = [ ":final_page_module" ]
}
group("polymer3_elements") {
public_deps = [ ":base_page_module" ]
public_deps = [
":base_page_module",
":final_page_module",
]
}
polymer_modulizer("base_page") {
......@@ -120,3 +132,11 @@ polymer_modulizer("base_page") {
namespace_rewrites = cr_components_chromeos_namespace_rewrites
auto_imports = cr_components_chromeos_auto_imports
}
polymer_modulizer("final_page") {
js_file = "final_page.js"
html_file = "final_page.html"
html_type = "dom-module"
namespace_rewrites = cr_components_chromeos_namespace_rewrites
auto_imports = cr_components_chromeos_auto_imports
}
......@@ -82,6 +82,10 @@
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/base_page.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_FINAL_PAGE_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/final_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