Commit 2f553430 authored by dpapad's avatar dpapad Committed by Commit Bot

Convert CrElementsToolbarSearchFieldTest to interactive_ui_test.

Since it tests focus() and blur() functionality it should  be an
interactive ui test, which is known to work better for such WebUI
tests on Mac.

Note that the test currently manually fires 'blur' events
(via MockInteractions.blur), and bypasses the problem.

This is in preparation of relanding a CL that adds type-checking
for this file which was previously reverted at r775025.

Fixed: 1091201
Change-Id: I4d458eb6bef08cfdcb7741e1771747f6d39a5e94
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2296483
Commit-Queue: dpapad <dpapad@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788470}
parent ae216af9
...@@ -45,6 +45,7 @@ if (include_js_tests) { ...@@ -45,6 +45,7 @@ if (include_js_tests) {
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_profile_avatar_selector_tests.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_profile_avatar_selector_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_tabs_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_tabs_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toggle_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toggle_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toolbar_search_field_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_elements/iron_list_focus_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/iron_list_focus_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_focus_row_behavior_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_focus_row_behavior_test.m.js",
"$root_gen_dir/chrome/test/data/webui/mock_controller.m.js", "$root_gen_dir/chrome/test/data/webui/mock_controller.m.js",
...@@ -200,7 +201,6 @@ if (include_js_tests) { ...@@ -200,7 +201,6 @@ if (include_js_tests) {
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_slider_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_slider_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_manager_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_manager_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toolbar_search_field_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toolbar_tests.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toolbar_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_view_manager_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_view_manager_test.m.js",
"$root_gen_dir/chrome/test/data/webui/fake_chrome_event.m.js", "$root_gen_dir/chrome/test/data/webui/fake_chrome_event.m.js",
......
...@@ -81,30 +81,6 @@ TEST_F('CrElementsSearchFieldTest', 'All', function() { ...@@ -81,30 +81,6 @@ TEST_F('CrElementsSearchFieldTest', 'All', function() {
mocha.run(); mocha.run();
}); });
/**
* @constructor
* @extends {CrElementsBrowserTest}
*/
function CrElementsToolbarSearchFieldTest() {}
CrElementsToolbarSearchFieldTest.prototype = {
__proto__: CrElementsBrowserTest.prototype,
/** @override */
browsePreload:
'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.html',
/** @override */
extraLibraries: CrElementsBrowserTest.prototype.extraLibraries.concat([
'../test_util.js',
'cr_toolbar_search_field_tests.js',
]),
};
TEST_F('CrElementsToolbarSearchFieldTest', 'All', function() {
mocha.run();
});
/** /**
* @constructor * @constructor
* @extends {CrElementsBrowserTest} * @extends {CrElementsBrowserTest}
......
...@@ -52,6 +52,30 @@ TEST_F('CrElementsProfileAvatarSelectorTest', 'All', function() { ...@@ -52,6 +52,30 @@ TEST_F('CrElementsProfileAvatarSelectorTest', 'All', function() {
mocha.run(); mocha.run();
}); });
/**
* @constructor
* @extends {CrElementsFocusTest}
*/
function CrElementsToolbarSearchFieldTest() {}
CrElementsToolbarSearchFieldTest.prototype = {
__proto__: CrElementsFocusTest.prototype,
/** @override */
browsePreload:
'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.html',
/** @override */
extraLibraries: CrElementsFocusTest.prototype.extraLibraries.concat([
'../test_util.js',
'cr_toolbar_search_field_tests.js',
]),
};
TEST_F('CrElementsToolbarSearchFieldTest', 'All', function() {
mocha.run();
});
/** /**
* @constructor * @constructor
* @extends {CrElementsFocusTest} * @extends {CrElementsFocusTest}
......
...@@ -262,18 +262,6 @@ TEST_F('CrElementsToastV3Test', 'All', function() { ...@@ -262,18 +262,6 @@ TEST_F('CrElementsToastV3Test', 'All', function() {
mocha.run(); mocha.run();
}); });
// eslint-disable-next-line no-var
var CrElementsToolbarSearchFieldV3Test = class extends CrElementsV3BrowserTest {
/** @override */
get browsePreload() {
return 'chrome://test?module=cr_elements/cr_toolbar_search_field_tests.m.js';
}
};
TEST_F('CrElementsToolbarSearchFieldV3Test', 'All', function() {
mocha.run();
});
// eslint-disable-next-line no-var // eslint-disable-next-line no-var
var CrElementsToolbarV3Test = class extends CrElementsV3BrowserTest { var CrElementsToolbarV3Test = class extends CrElementsV3BrowserTest {
/** @override */ /** @override */
......
...@@ -133,6 +133,19 @@ TEST_F('CrElementsToggleV3Test', 'All', function() { ...@@ -133,6 +133,19 @@ TEST_F('CrElementsToggleV3Test', 'All', function() {
mocha.run(); mocha.run();
}); });
// eslint-disable-next-line no-var
var CrElementsToolbarSearchFieldV3Test = class extends CrElementsV3FocusTest {
/** @override */
get browsePreload() {
return 'chrome://test?module=cr_elements/cr_toolbar_search_field_tests.m.js';
}
};
TEST_F('CrElementsToolbarSearchFieldV3Test', 'All', function() {
mocha.run();
});
// eslint-disable-next-line no-var // eslint-disable-next-line no-var
var IronListFocusV3Test = class extends CrElementsV3FocusTest { var IronListFocusV3Test = class extends CrElementsV3FocusTest {
/** @override */ /** @override */
......
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