Chromium Code Reviews| Index: chrome/test/data/webui/media_router/media_router_elements_browsertest.js |
| diff --git a/chrome/test/data/webui/media_router/media_router_elements_browsertest.js b/chrome/test/data/webui/media_router/media_router_elements_browsertest.js |
| index 163063d8cadd2b7e013ad8b96440caf67b3170cc..4815977912ef92bfd9b494fd0f867282b772cded 100644 |
| --- a/chrome/test/data/webui/media_router/media_router_elements_browsertest.js |
| +++ b/chrome/test/data/webui/media_router/media_router_elements_browsertest.js |
| @@ -32,6 +32,7 @@ MediaRouterElementsBrowserTest.prototype = { |
| extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ |
| 'issue_banner_tests.js', |
| 'media_router_container_tests.js', |
| + 'media_router_container_filter_tests.js', |
| 'media_router_header_tests.js', |
| 'media_router_search_highlighter.js', |
| 'route_details_tests.js', |
| @@ -39,15 +40,56 @@ MediaRouterElementsBrowserTest.prototype = { |
| }; |
| // Runs all tests. |
|
apacible
2016/02/26 22:02:40
nit: Remove this comment since tests are separated
|
| -// TODO(crbug.com/590177, crbug.com/582649): This test is disabled, as it |
| -// consistently fails on Linux Tests, and is flaky on Win7 and other bots. |
| -TEST_F('MediaRouterElementsBrowserTest', 'DISABLED_MediaRouterElementsTest', |
| +TEST_F('MediaRouterElementsBrowserTest', 'MediaRouterElementsTestIssue', |
|
imcheng
2016/02/26 21:56:42
naming suggestion: IssueBanner. Similarly for belo
|
| function() { |
| - // Register mocha tests for each element. |
| + // Register mocha tests for the issue banner. |
| issue_banner.registerTests(); |
| + |
| + // Run all registered tests. |
| + mocha.run(); |
| +}); |
| + |
| +TEST_F('MediaRouterElementsBrowserTest', 'MediaRouterElementsTestContainer', |
| + function() { |
| + // Register mocha tests for the container. |
| media_router_container.registerTests(); |
| + |
| + // Run all registered tests. |
| + mocha.run(); |
| +}); |
| + |
| +TEST_F('MediaRouterElementsBrowserTest', |
| + 'MediaRouterElementsTestContainerFilter', |
| + function() { |
| + // Register mocha tests for the container filter. |
| + media_router_container_filter.registerTests(); |
| + |
| + // Run all registered tests. |
| + mocha.run(); |
| +}); |
| + |
| +TEST_F('MediaRouterElementsBrowserTest', 'MediaRouterElementsTestHeader', |
| + function() { |
| + // Register mocha tests for the header. |
| media_router_header.registerTests(); |
| + |
| + // Run all registered tests. |
| + mocha.run(); |
| +}); |
| + |
| +TEST_F('MediaRouterElementsBrowserTest', |
| + 'MediaRouterElementsTestSearchHighlighter', |
| + function() { |
| + // Register mocha tests for the search highlighter. |
| media_router_search_highlighter.registerTests(); |
| + |
| + // Run all registered tests. |
| + mocha.run(); |
| +}); |
| + |
| +TEST_F('MediaRouterElementsBrowserTest', 'MediaRouterElementsTestRouteDetails', |
| + function() { |
| + // Register mocha tests for the route details. |
| route_details.registerTests(); |
| // Run all registered tests. |