Commit be603adb authored by Jordy Greenblatt's avatar Jordy Greenblatt Committed by Commit Bot

[SettingsSplit] Basic infrastructure for OS settings tests.

This CL just creates an infrastructure based on
cr_settings_browsertest.js and runs the existing test of the
settings-smb-shares-page element on the newly migrated file
chrome/browser/resources/settings/chromeos/os_downloads_page/smb_shares_page.js.

Bug: 966595
Change-Id: I5af3a28877a74474e3b715559e4a513d07c9119a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1628014
Commit-Queue: Jordy Greenblatt <jordynass@chromium.org>
Reviewed-by: default avatarJordy Greenblatt <jordynass@chromium.org>
Reviewed-by: default avatarMay Lippert <maybelle@chromium.org>
Reviewed-by: default avatarDan Beam <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664022}
parent bdfe9ba0
...@@ -108,6 +108,7 @@ js2gtest("browser_tests_js_webui") { ...@@ -108,6 +108,7 @@ js2gtest("browser_tests_js_webui") {
"settings/a11y/multidevice_a11y_test.js", "settings/a11y/multidevice_a11y_test.js",
"settings/a11y/multidevice_features_a11y_test.js", "settings/a11y/multidevice_features_a11y_test.js",
"settings/a11y/tts_subpage_a11y_test.js", "settings/a11y/tts_subpage_a11y_test.js",
"settings/chromeos/os_settings_browsertest.js",
"sys_internals/sys_internals_browsertest.js", "sys_internals/sys_internals_browsertest.js",
] ]
} else { } else {
......
// 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.
/** @fileoverview Tests for Chrome OS settings page. */
/** @const {string} Path general Chrome browser settings. */
const BROWSER_SETTINGS_PATH = '../';
// Polymer BrowserTest fixture.
GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
GEN('#include "ash/public/cpp/ash_features.h"');
GEN('#include "chrome/common/chrome_features.h"');
GEN('#include "chromeos/constants/chromeos_features.h"');
/**
* Generic text fixture for CrOS Polymer Settings elements to be overridden by
* individual element tests.
* @constructor
* @extends {PolymerTest}
*/
const OSSettingsBrowserTest = class extends PolymerTest {
/** @override */
get browsePreload() {
return 'chrome://settings/chromeos/';
}
/** @override */
get featureList() {
return {enabled: ['chromeos::features::kSplitSettings']};
}
/** @override */
get extraLibraries() {
return super.extraLibraries.concat([
BROWSER_SETTINGS_PATH + 'ensure_lazy_loaded.js',
]);
}
/** @override */
setUp() {
super.setUp();
settings.ensureLazyLoaded();
}
};
/**
* Test fixture for the Smb Shares page.
* @constructor
* @extends {OSSettingsBrowserTest}
*/
OSSettingsSmbPageTest = class extends OSSettingsBrowserTest {
/** @override */
get browsePreload() {
return super.browsePreload + 'os_downloads_page/smb_shares_page.html';
}
/** @override */
get extraLibraries() {
return super.extraLibraries.concat([
BROWSER_SETTINGS_PATH + 'test_util.js',
BROWSER_SETTINGS_PATH + '../test_browser_proxy.js',
'smb_shares_page_tests.js',
]);
}
};
TEST_F('OSSettingsSmbPageTest', 'All', function() {
mocha.run();
});
...@@ -192,5 +192,4 @@ suite('AddSmbShareDialogTests', function() { ...@@ -192,5 +192,4 @@ suite('AddSmbShareDialogTests', function() {
expectEquals(expectedSmbUrl, addDialog.mountUrl_); expectEquals(expectedSmbUrl, addDialog.mountUrl_);
expectEquals(expectedSmbUrl, addDialog.mountUrl_); expectEquals(expectedSmbUrl, addDialog.mountUrl_);
}); });
}); });
...@@ -2139,7 +2139,7 @@ CrSettingsSmbPageTest.prototype = { ...@@ -2139,7 +2139,7 @@ CrSettingsSmbPageTest.prototype = {
extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
'test_util.js', 'test_util.js',
'../test_browser_proxy.js', '../test_browser_proxy.js',
'smb_shares_page_tests.js', 'chromeos/smb_shares_page_tests.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