Commit 4d24a33c authored by Steven Bennetts's avatar Steven Bennetts Committed by Commit Bot

Extract Internet subpage tests and re-enable

This CL:
* Extracts internet_subpage_tests to a separate test suite.
* Eliminates click-to-navigate logic from tests to fix flakiness.
* Removes the tests from cr_settings_browsertest (they are redundant).
* Re-enables the tests in os_settings_browsertest.

Bug: 92116
Change-Id: Ibb005e607ada112f33d3b6df3695893c8b537aa8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1768909
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690131}
parent 7f2e1c8e
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html">
<link rel="import" href="../controls/controlled_button.html"> <link rel="import" href="../controls/controlled_button.html">
<link rel="import" href="../controls/settings_toggle_button.html"> <link rel="import" href="../controls/settings_toggle_button.html">
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../prefs/prefs.html">
<link rel="import" href="../route.html"> <link rel="import" href="../route.html">
<link rel="import" href="internet_page_browser_proxy.html"> <link rel="import" href="internet_page_browser_proxy.html">
......
...@@ -264,7 +264,6 @@ Polymer({ ...@@ -264,7 +264,6 @@ Polymer({
* @param {string} guid * @param {string} guid
* @param {!chrome.networkingPrivate.NetworkType} type * @param {!chrome.networkingPrivate.NetworkType} type
* @param {string} name * @param {string} name
* @private
*/ */
init: function(guid, type, name) { init: function(guid, type, name) {
this.guid = guid; this.guid = guid;
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../prefs/prefs.html">
<link rel="import" href="../route.html"> <link rel="import" href="../route.html">
<link rel="import" href="../settings_page/settings_animated_pages.html"> <link rel="import" href="../settings_page/settings_animated_pages.html">
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="internet_page_browser_proxy.html"> <link rel="import" href="internet_page_browser_proxy.html">
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../route.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
<dom-module id="settings-internet-subpage"> <dom-module id="settings-internet-subpage">
......
...@@ -169,6 +169,10 @@ Polymer({ ...@@ -169,6 +169,10 @@ Polymer({
this.stopScanning_(); this.stopScanning_();
return; return;
} }
this.init();
},
init: function() {
// Clear any stale data. // Clear any stale data.
this.networkStateList_ = []; this.networkStateList_ = [];
this.thirdPartyVpns_ = {}; this.thirdPartyVpns_ = {};
......
...@@ -85,7 +85,7 @@ class FakeNetworkConfig { ...@@ -85,7 +85,7 @@ class FakeNetworkConfig {
getDeviceStateList() { getDeviceStateList() {
return new Promise(resolve => { return new Promise(resolve => {
this.extensionApi_.getDeviceStates(devices => { this.extensionApi_.getDeviceStates(devices => {
let result = devices.map(device => this.deviceToMojo_(device)); let result = devices.map(device => this.deviceToMojo(device));
resolve({result: result}); resolve({result: result});
}); });
}); });
...@@ -123,12 +123,19 @@ class FakeNetworkConfig { ...@@ -123,12 +123,19 @@ class FakeNetworkConfig {
this.extensionApi_.requestNetworkScan(); this.extensionApi_.requestNetworkScan();
} }
/**
* @param {string} type
* @return {?chrome.networkingPrivate.DeviceStateProperties}
*/
getDeviceStateForTest(type) {
return this.deviceToMojo(this.extensionApi_.getDeviceStateForTest(type));
}
/** /**
* @param {!chrome.networkingPrivate.DeviceStateProperties} device * @param {!chrome.networkingPrivate.DeviceStateProperties} device
* @return {!chromeos.networkConfig.mojom.DeviceStateProperties} * @return {!chromeos.networkConfig.mojom.DeviceStateProperties}
* @private
*/ */
deviceToMojo_(device) { deviceToMojo(device) {
return { return {
deviceState: OncMojo.getDeviceStateTypeFromString(device.State), deviceState: OncMojo.getDeviceStateTypeFromString(device.State),
type: OncMojo.getNetworkTypeFromString(device.Type), type: OncMojo.getNetworkTypeFromString(device.Type),
......
...@@ -7,10 +7,10 @@ suite('InternetDetailPage', function() { ...@@ -7,10 +7,10 @@ suite('InternetDetailPage', function() {
let internetDetailPage = null; let internetDetailPage = null;
/** @type {NetworkingPrivate} */ /** @type {NetworkingPrivate} */
let api_; let api_ = null;
/** @type {?chromeos.networkConfig.mojom.CrosNetworkConfigRemote} */ /** @type {?chromeos.networkConfig.mojom.CrosNetworkConfigRemote} */
let mojoApi_; let mojoApi_ = null;
/** @type {Object} */ /** @type {Object} */
let prefs_ = { let prefs_ = {
...@@ -70,14 +70,14 @@ suite('InternetDetailPage', function() { ...@@ -70,14 +70,14 @@ suite('InternetDetailPage', function() {
function flushAsync() { function flushAsync() {
Polymer.dom.flush(); Polymer.dom.flush();
return new Promise(resolve => { // Use setTimeout to wait for the next macrotask.
internetDetailPage.async(resolve); return new Promise(resolve => setTimeout(resolve));
});
} }
function setNetworksForTest(networks) { function setNetworksForTest(networks) {
api_.resetForTest(); api_.resetForTest();
api_.addNetworksForTest(networks); api_.addNetworksForTest(networks);
api_.onNetworkListChanged.callListeners();
} }
function getAllowSharedProxy() { function getAllowSharedProxy() {
......
...@@ -10,10 +10,10 @@ suite('InternetPage', function() { ...@@ -10,10 +10,10 @@ suite('InternetPage', function() {
let networkSummary_ = null; let networkSummary_ = null;
/** @type {?NetworkingPrivate} */ /** @type {?NetworkingPrivate} */
let api_; let api_ = null;
/** @type {?chromeos.networkConfig.mojom.CrosNetworkConfigRemote} */ /** @type {?chromeos.networkConfig.mojom.CrosNetworkConfigRemote} */
let mojoApi_; let mojoApi_ = null;
suiteSetup(function() { suiteSetup(function() {
loadTimeData.overrideValues({ loadTimeData.overrideValues({
...@@ -62,6 +62,7 @@ suite('InternetPage', function() { ...@@ -62,6 +62,7 @@ suite('InternetPage', function() {
function setNetworksForTest(networks) { function setNetworksForTest(networks) {
api_.resetForTest(); api_.resetForTest();
api_.addNetworksForTest(networks); api_.addNetworksForTest(networks);
api_.onNetworkListChanged.callListeners();
} }
function setArcVpnProvidersForTest(arcVpnProviders) { function setArcVpnProvidersForTest(arcVpnProviders) {
...@@ -96,7 +97,6 @@ suite('InternetPage', function() { ...@@ -96,7 +97,6 @@ suite('InternetPage', function() {
} }
internetPage.remove(); internetPage.remove();
internetPage = null; internetPage = null;
// Navigating to the details page changes the Route state.
settings.resetRouteForTesting(); settings.resetRouteForTesting();
}); });
...@@ -147,156 +147,6 @@ suite('InternetPage', function() { ...@@ -147,156 +147,6 @@ suite('InternetPage', function() {
}); });
}); });
}); });
});
suite('SubPage', function() {
test('WiFi', function() {
setNetworksForTest([
{GUID: 'wifi1_guid', Name: 'wifi1', Type: 'WiFi'},
{GUID: 'wifi12_guid', Name: 'wifi2', Type: 'WiFi'},
]);
api_.enableNetworkType('WiFi');
return flushAsync().then(() => {
const wifi = networkSummary_.$$('#WiFi');
assertTrue(!!wifi);
wifi.$$('.subpage-arrow').click();
return flushAsync().then(() => {
const subpage = internetPage.$$('settings-internet-subpage');
assertTrue(!!subpage);
assertEquals(2, subpage.networkStateList_.length);
const toggle = wifi.$$('#deviceEnabledButton');
assertTrue(!!toggle);
assertFalse(toggle.disabled);
const networkList = subpage.$$('#networkList');
assertTrue(!!networkList);
assertEquals(2, networkList.networks.length);
});
});
});
test('Cellular', function() {
setNetworksForTest([
{GUID: 'cellular1_guid', Name: 'cellular1', Type: 'Cellular'},
]);
api_.enableNetworkType('Cellular');
return flushAsync().then(() => {
const mobile = networkSummary_.$$('#Cellular');
assertTrue(!!mobile);
mobile.$$('.subpage-arrow').click();
return flushAsync().then(() => {
const detailPage = internetPage.$$('settings-internet-detail-page');
assertTrue(!!detailPage);
});
});
});
test('Tether', function() {
setNetworksForTest([
{GUID: 'tether1_guid', Name: 'tether1', Type: 'Tether'},
{GUID: 'tether2_guid', Name: 'tether2', Type: 'Tether'},
]);
api_.enableNetworkType('Tether');
return flushAsync().then(() => {
const mobile = networkSummary_.$$('#Tether');
assertTrue(!!mobile);
mobile.$$('.subpage-arrow').click();
return flushAsync().then(() => {
const subpage = internetPage.$$('settings-internet-subpage');
assertTrue(!!subpage);
assertEquals(2, subpage.networkStateList_.length);
const toggle = mobile.$$('#deviceEnabledButton');
assertTrue(!!toggle);
assertFalse(toggle.disabled);
const networkList = subpage.$$('#networkList');
assertTrue(!!networkList);
assertEquals(2, networkList.networks.length);
const tetherToggle = mobile.$$('#tetherEnabledButton');
// No separate tether toggle when Celular is not available; the
// primary toggle enables or disables Tether in that case.
assertFalse(!!tetherToggle);
});
});
});
test('Tether plus Cellular', function() {
setNetworksForTest([
{GUID: 'cellular1_guid', Name: 'cellular1', Type: 'Cellular'},
{GUID: 'tether1_guid', Name: 'tether1', Type: 'Tether'},
{GUID: 'tether2_guid', Name: 'tether2', Type: 'Tether'},
]);
api_.enableNetworkType('Cellular');
api_.enableNetworkType('Tether');
return flushAsync().then(() => {
const mobile = networkSummary_.$$('#Cellular');
assertTrue(!!mobile);
assertTrue(!!mobile.$$('.subpage-arrow'));
mobile.$$('.subpage-arrow').click();
return flushAsync().then(() => {
const subpage = internetPage.$$('settings-internet-subpage');
assertTrue(!!subpage);
assertEquals(3, subpage.networkStateList_.length);
const toggle = mobile.$$('#deviceEnabledButton');
assertTrue(!!toggle);
assertFalse(toggle.disabled);
const networkList = subpage.$$('#networkList');
assertTrue(!!networkList);
assertEquals(3, networkList.networks.length);
const tetherToggle = subpage.$$('#tetherEnabledButton');
assertTrue(!!tetherToggle);
assertFalse(tetherToggle.disabled);
});
});
});
test('VPN', function() {
setNetworksForTest([
{GUID: 'vpn1_guid', Name: 'vpn1', Type: 'VPN'},
{GUID: 'vpn2_guid', Name: 'vpn1', Type: 'VPN'},
{
GUID: 'third_party1_vpn1_guid',
Name: 'vpn3',
Type: 'VPN',
VPN: {
Type: 'ThirdPartyVPN',
ThirdPartyVPN: {ExtensionID: 'id1', ProviderName: 'pname1'}
}
},
{
GUID: 'third_party1_vpn2_guid',
Name: 'vpn4',
Type: 'VPN',
VPN: {
Type: 'ThirdPartyVPN',
ThirdPartyVPN: {ExtensionID: 'id1', ProviderName: 'pname1'}
}
},
{
GUID: 'third_party2_vpn1_guid',
Name: 'vpn5',
Type: 'VPN',
VPN: {
Type: 'ThirdPartyVPN',
ThirdPartyVPN: {ExtensionID: 'id2', ProviderName: 'pname2'}
}
},
]);
api_.onNetworkListChanged.callListeners();
return flushAsync().then(() => {
const vpn = networkSummary_.$$('#VPN');
assertTrue(!!vpn);
vpn.$$('.subpage-arrow').click();
return flushAsync().then(() => {
const subpage = internetPage.$$('settings-internet-subpage');
assertTrue(!!subpage);
assertEquals(2, subpage.networkStateList_.length);
const networkList = subpage.$$('#networkList');
assertTrue(!!networkList);
assertEquals(2, networkList.networks.length);
// TODO(stevenjb): Implement fake management API and test third
// party provider sections.
});
});
});
test('ArcVPNProvider', function() { test('ArcVPNProvider', function() {
setArcVpnProvidersForTest([ setArcVpnProvidersForTest([
...@@ -323,51 +173,13 @@ suite('InternetPage', function() { ...@@ -323,51 +173,13 @@ suite('InternetPage', function() {
assertTrue(!!addArcVpn); assertTrue(!!addArcVpn);
addArcVpn.click(); addArcVpn.click();
return flushAsync().then(() => { return flushAsync().then(() => {
const subpage = internetPage.$$('settings-internet-subpage'); assertEquals(2, internetPage.arcVpnProviders_.length);
assertTrue(!!subpage);
assertEquals(2, subpage.arcVpnProviders.length);
});
});
});
});
test('WiFi Detail', function() {
setNetworksForTest([
{
GUID: 'wifi1_guid',
Name: 'wifi1',
Type: 'WiFi',
ConnectionState: 'Connected'
},
]);
api_.enableNetworkType('WiFi');
return flushAsync().then(() => {
const wifi = networkSummary_.$$('#WiFi');
assertTrue(!!wifi);
wifi.$$('.subpage-arrow').click();
return flushAsync().then(() => {
const subpage = internetPage.$$('settings-internet-subpage');
assertTrue(!!subpage);
const networkList = subpage.$$('#networkList');
assertTrue(!!networkList);
assertEquals(1, networkList.networks.length);
assertEquals(1, networkList.listItems_.length);
const ironList = networkList.$$('iron-list');
assertTrue(!!ironList);
assertEquals(1, ironList.items.length);
const networkListItem = networkList.$$('cr-network-list-item');
assertTrue(!!networkListItem);
networkListItem.click();
return flushAsync().then(() => {
const detailPage = internetPage.$$('settings-internet-detail-page');
assertTrue(!!detailPage);
assertEquals('wifi1_guid', detailPage.guid);
return Promise.all([
api_.whenCalled('getManagedProperties'),
]);
}); });
}); });
}); });
}); });
}); });
// TODO(stevenjb): Figure out a way to reliably test navigation. Currently
// such tests are flaky.
}); });
// Copyright 2019 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.
suite('InternetSubpage', function() {
/** @type {?SettingsInternetSubpageElement} */
let internetSubpage = null;
/** @type {?NetworkingPrivate} */
let api_ = null;
/** @type {?chromeos.networkConfig.mojom.CrosNetworkConfigRemote} */
let mojoApi_ = null;
suiteSetup(function() {
loadTimeData.overrideValues({
internetAddConnection: 'internetAddConnection',
internetAddConnectionExpandA11yLabel:
'internetAddConnectionExpandA11yLabel',
internetAddConnectionNotAllowed: 'internetAddConnectionNotAllowed',
internetAddThirdPartyVPN: 'internetAddThirdPartyVPN',
internetAddVPN: 'internetAddVPN',
internetAddArcVPN: 'internetAddArcVPN',
internetAddArcVPNProvider: 'internetAddArcVPNProvider',
internetAddWiFi: 'internetAddWiFi',
internetDetailPageTitle: 'internetDetailPageTitle',
internetKnownNetworksPageTitle: 'internetKnownNetworksPageTitle',
});
CrOncStrings = {
OncTypeCellular: 'OncTypeCellular',
OncTypeEthernet: 'OncTypeEthernet',
OncTypeMobile: 'OncTypeMobile',
OncTypeTether: 'OncTypeTether',
OncTypeVPN: 'OncTypeVPN',
OncTypeWiFi: 'OncTypeWiFi',
networkListItemConnected: 'networkListItemConnected',
networkListItemConnecting: 'networkListItemConnecting',
networkListItemConnectingTo: 'networkListItemConnectingTo',
networkListItemNotConnected: 'networkListItemNotConnected',
networkListItemNoNetwork: 'networkListItemNoNetwork',
vpnNameTemplate: 'vpnNameTemplate',
};
api_ = new chrome.FakeNetworkingPrivate();
mojoApi_ = new FakeNetworkConfig(api_);
network_config.MojoInterfaceProviderImpl.getInstance().remote_ = mojoApi_;
// Disable animations so sub-pages open within one event loop.
testing.Test.disableAnimationsAndTransitions();
});
function flushAsync() {
Polymer.dom.flush();
// Use setTimeout to wait for the next macrotask.
return new Promise(resolve => setTimeout(resolve));
}
function setNetworksForTest(type, networks) {
api_.resetForTest();
api_.enableNetworkType(type);
api_.addNetworksForTest(networks);
internetSubpage.defaultNetwork = networks[0];
internetSubpage.deviceState = mojoApi_.getDeviceStateForTest(type);
api_.onNetworkListChanged.callListeners();
}
function setArcVpnProvidersForTest(arcVpnProviders) {
cr.webUIListenerCallback('sendArcVpnProviders', arcVpnProviders);
}
setup(function() {
PolymerTest.clearBody();
internetSubpage = document.createElement('settings-internet-subpage');
assertTrue(!!internetSubpage);
api_.resetForTest();
internetSubpage.networkingPrivate = api_;
document.body.appendChild(internetSubpage);
internetSubpage.init();
return flushAsync();
});
teardown(function() {
internetSubpage.remove();
internetSubpage = null;
settings.resetRouteForTesting();
});
suite('SubPage', function() {
test('WiFi', function() {
setNetworksForTest('WiFi', [
{GUID: 'wifi1_guid', Name: 'wifi1', Type: 'WiFi'},
{GUID: 'wifi12_guid', Name: 'wifi2', Type: 'WiFi'},
]);
return flushAsync().then(() => {
assertEquals(2, internetSubpage.networkStateList_.length);
const toggle = internetSubpage.$$('#deviceEnabledButton');
assertTrue(!!toggle);
assertFalse(toggle.disabled);
const networkList = internetSubpage.$$('#networkList');
assertTrue(!!networkList);
assertEquals(2, networkList.networks.length);
});
});
test('Tether', function() {
setNetworksForTest('Tether', [
{GUID: 'tether1_guid', Name: 'tether1', Type: 'Tether'},
{GUID: 'tether2_guid', Name: 'tether2', Type: 'Tether'},
]);
return flushAsync().then(() => {
assertEquals(2, internetSubpage.networkStateList_.length);
const toggle = internetSubpage.$$('#deviceEnabledButton');
assertTrue(!!toggle);
assertFalse(toggle.disabled);
const networkList = internetSubpage.$$('#networkList');
assertTrue(!!networkList);
assertEquals(2, networkList.networks.length);
const tetherToggle = internetSubpage.$$('#tetherEnabledButton');
// No separate tether toggle when Celular is not available; the
// primary toggle enables or disables Tether in that case.
assertFalse(!!tetherToggle);
});
});
test('Tether plus Cellular', function() {
api_.enableNetworkType('Tether');
setNetworksForTest('Cellular', [
{GUID: 'cellular1_guid', Name: 'cellular1', Type: 'Cellular'},
{GUID: 'tether1_guid', Name: 'tether1', Type: 'Tether'},
{GUID: 'tether2_guid', Name: 'tether2', Type: 'Tether'},
]);
internetSubpage.tetherDeviceState =
mojoApi_.deviceToMojo({Type: 'Tether', State: 'Enabled'});
return flushAsync().then(() => {
assertEquals(3, internetSubpage.networkStateList_.length);
const toggle = internetSubpage.$$('#deviceEnabledButton');
assertTrue(!!toggle);
assertFalse(toggle.disabled);
const networkList = internetSubpage.$$('#networkList');
assertTrue(!!networkList);
assertEquals(3, networkList.networks.length);
const tetherToggle = internetSubpage.$$('#tetherEnabledButton');
assertTrue(!!tetherToggle);
assertFalse(tetherToggle.disabled);
});
});
test('VPN', function() {
setNetworksForTest('VPN', [
{GUID: 'vpn1_guid', Name: 'vpn1', Type: 'VPN'},
{GUID: 'vpn2_guid', Name: 'vpn1', Type: 'VPN'},
{
GUID: 'third_party1_vpn1_guid',
Name: 'vpn3',
Type: 'VPN',
VPN: {
Type: 'ThirdPartyVPN',
ThirdPartyVPN: {ExtensionID: 'id1', ProviderName: 'pname1'}
}
},
{
GUID: 'third_party1_vpn2_guid',
Name: 'vpn4',
Type: 'VPN',
VPN: {
Type: 'ThirdPartyVPN',
ThirdPartyVPN: {ExtensionID: 'id1', ProviderName: 'pname1'}
}
},
{
GUID: 'third_party2_vpn1_guid',
Name: 'vpn5',
Type: 'VPN',
VPN: {
Type: 'ThirdPartyVPN',
ThirdPartyVPN: {ExtensionID: 'id2', ProviderName: 'pname2'}
}
},
]);
return flushAsync().then(() => {
assertEquals(2, internetSubpage.networkStateList_.length);
const networkList = internetSubpage.$$('#networkList');
assertTrue(!!networkList);
assertEquals(2, networkList.networks.length);
// TODO(stevenjb): Implement fake management API and test third
// party provider sections.
});
});
});
});
...@@ -387,6 +387,7 @@ var OSSettingsInternetPageTest = class extends OSSettingsBrowserTest { ...@@ -387,6 +387,7 @@ var OSSettingsInternetPageTest = class extends OSSettingsBrowserTest {
return super.extraLibraries.concat([ return super.extraLibraries.concat([
'//ui/webui/resources/js/promise_resolver.js', '//ui/webui/resources/js/promise_resolver.js',
'//ui/webui/resources/js/assert.js', '//ui/webui/resources/js/assert.js',
'//ui/webui/resources/js/util.js',
BROWSER_SETTINGS_PATH + '../fake_chrome_event.js', BROWSER_SETTINGS_PATH + '../fake_chrome_event.js',
BROWSER_SETTINGS_PATH + '../chromeos/fake_network_config_mojom.js', BROWSER_SETTINGS_PATH + '../chromeos/fake_network_config_mojom.js',
BROWSER_SETTINGS_PATH + '../chromeos/fake_networking_private.js', BROWSER_SETTINGS_PATH + '../chromeos/fake_networking_private.js',
...@@ -396,8 +397,34 @@ var OSSettingsInternetPageTest = class extends OSSettingsBrowserTest { ...@@ -396,8 +397,34 @@ var OSSettingsInternetPageTest = class extends OSSettingsBrowserTest {
} }
}; };
// Flaky on linux-chromeos-rel builder. https://crbug.com/992116 TEST_F('OSSettingsInternetPageTest', 'InternetPage', () => {
TEST_F('OSSettingsInternetPageTest', 'DISABLED_InternetPage', () => { mocha.run();
});
// Test fixture for settings-internet-subpage.
// eslint-disable-next-line no-var
var OSSettingsInternetSubpageTest = class extends OSSettingsBrowserTest {
/** @override */
get browsePreload() {
return super.browsePreload + 'internet_page/internet_subpage.html';
}
/** @override */
get extraLibraries() {
return super.extraLibraries.concat([
'//ui/webui/resources/js/promise_resolver.js',
'//ui/webui/resources/js/assert.js',
'//ui/webui/resources/js/util.js',
BROWSER_SETTINGS_PATH + '../fake_chrome_event.js',
BROWSER_SETTINGS_PATH + '../chromeos/fake_network_config_mojom.js',
BROWSER_SETTINGS_PATH + '../chromeos/fake_networking_private.js',
BROWSER_SETTINGS_PATH + '../chromeos/cr_onc_strings.js',
'internet_subpage_tests.js',
]);
}
};
TEST_F('OSSettingsInternetSubpageTest', 'InternetSubpage', () => {
mocha.run(); mocha.run();
}); });
......
...@@ -1654,65 +1654,6 @@ TEST_F('CrSettingsBluetoothPageTest', 'All', function() { ...@@ -1654,65 +1654,6 @@ TEST_F('CrSettingsBluetoothPageTest', 'All', function() {
mocha.run(); mocha.run();
}); });
/**
* Test fixture for settings-internet-page.
* @constructor
* @extends {CrSettingsBrowserTestCrOS}
*/
function CrSettingsInternetPageTest() {}
CrSettingsInternetPageTest.prototype = {
__proto__: CrSettingsBrowserTestCrOS.prototype,
/** @override */
browsePreload: 'chrome://settings/internet_page/internet_page.html',
/** @override */
extraLibraries: CrSettingsBrowserTestCrOS.prototype.extraLibraries.concat([
'//ui/webui/resources/js/promise_resolver.js',
'//ui/webui/resources/js/assert.js',
'../fake_chrome_event.js',
'../chromeos/fake_network_config_mojom.js',
'../chromeos/fake_networking_private.js',
'../chromeos/cr_onc_strings.js',
'chromeos/internet_page_tests.js',
]),
};
TEST_F('CrSettingsInternetPageTest', 'InternetPage', function() {
mocha.run();
});
/**
* Test fixture for settings-internet-detail-page.
* @constructor
* @extends {CrSettingsBrowserTestCrOS}
*/
function CrSettingsInternetDetailPageTest() {}
CrSettingsInternetDetailPageTest.prototype = {
__proto__: CrSettingsBrowserTestCrOS.prototype,
/** @override */
browsePreload: 'chrome://settings/internet_page/internet_detail_page.html',
/** @override */
extraLibraries: CrSettingsBrowserTestCrOS.prototype.extraLibraries.concat([
'//ui/webui/resources/js/promise_resolver.js',
'//ui/webui/resources/js/assert.js',
'//ui/webui/resources/js/util.js',
'../fake_chrome_event.js',
'../chromeos/fake_network_config_mojom.js',
'../chromeos/fake_networking_private.js',
'../chromeos/cr_onc_strings.js',
'chromeos/internet_detail_page_tests.js',
]),
};
TEST_F('CrSettingsInternetDetailPageTest', 'InternetDetailPage', function() {
mocha.run();
});
GEN('#endif // defined(OS_CHROMEOS)'); GEN('#endif // defined(OS_CHROMEOS)');
/** /**
......
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