Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: chrome/test/data/webui/cr_elements/cr_elements_browsertest.js

Issue 2068713003: Refactors profile avatar selector into a Polymer element to use in md-settings & md-user-manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/webui/cr_elements/cr_elements_browsertest.js
diff --git a/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js b/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js
index 6596427acf939a4f04582d39cf7fb0644b810ee0..4e13fcde85be77fdbe0856ac0f93a0dc92eabc8e 100644
--- a/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js
+++ b/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js
@@ -22,18 +22,12 @@ CrElementsBrowserTest.prototype = {
__proto__: PolymerTest.prototype,
/** @override */
- extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
- 'cr_slider_tests.js',
- 'cr_toolbar_search_field_tests.js',
- ]),
+ extraLibraries: PolymerTest.getLibraries(ROOT_PATH),
- /**
- * Hack: load a page underneath chrome://resources so script errors come
- * from the same "domain" and can be viewed. HTML imports aren't deduped with
- * the current page, but it should be safe to load assert.html twice.
- * @override
- */
- browsePreload: 'chrome://resources/html/assert.html',
+ /** @override */
+ get browsePreload() {
+ throw 'this is abstract and should be overriden by subclasses';
+ },
/** @override */
setUp: function() {
@@ -43,12 +37,62 @@ CrElementsBrowserTest.prototype = {
},
};
-TEST_F('CrElementsBrowserTest', 'CrToolbarSearchFieldTest', function() {
+function CrElementsProfileAvatarSelectorTest() {}
+
+CrElementsProfileAvatarSelectorTest.prototype = {
+ __proto__: CrElementsBrowserTest.prototype,
+
+ /** @override */
+ browsePreload:
+ 'chrome://resources/cr_elements/cr_profile_avatar_selector/' +
+ 'cr_profile_avatar_selector.html',
+
+ /** @override */
+ extraLibraries: CrElementsBrowserTest.prototype.extraLibraries.concat([
+ 'cr_profile_avatar_selector_tests.js',
+ ]),
+};
+
+TEST_F('CrElementsProfileAvatarSelectorTest', 'All', function() {
+ cr_profile_avatar_selector.registerTests();
+ mocha.run();
+});
+
+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([
+ 'cr_toolbar_search_field_tests.js',
+ ]),
+};
+
+TEST_F('CrElementsToolbarSearchFieldTest', 'All', function() {
cr_toolbar_search_field.registerTests();
mocha.run();
});
-TEST_F('CrElementsBrowserTest', 'CrSliderTest', function() {
+function CrElementsSliderTest() {}
+
+CrElementsSliderTest.prototype = {
+ __proto__: CrElementsBrowserTest.prototype,
+
+ /** @override */
+ browsePreload: 'chrome://resources/cr_elements/cr_slider/cr_slider.html',
+
+ /** @override */
+ extraLibraries: CrElementsBrowserTest.prototype.extraLibraries.concat([
+ 'cr_slider_tests.js',
+ ]),
+};
+
+TEST_F('CrElementsSliderTest', 'All', function() {
cr_slider.registerTests();
mocha.run();
});

Powered by Google App Engine
This is Rietveld 408576698