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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/remoting_webapp_files.gypi

Issue 927373005: [Chromoting] Enable jscompile for browser tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update all_browsertest var in gyp comment Created 5 years, 10 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
« no previous file with comments | « remoting/remoting_webapp.gypi ('k') | remoting/webapp/browser_test/browser_test.js » ('j') | remoting/webapp/browser_test/browser_test.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_webapp_files.gypi
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi
index 297241ddd9fffb9c1282a93a1f8043f6d123ad11..ab5ec7d51f783de0c3f5082d2b2f5fd55b1c4285 100644
--- a/remoting/remoting_webapp_files.gypi
+++ b/remoting/remoting_webapp_files.gypi
@@ -16,8 +16,81 @@
'webapp/js_proto/chrome_proto.js',
'webapp/js_proto/dom_proto.js',
'webapp/js_proto/remoting_proto.js',
+ 'webapp/js_proto/test_proto.js',
],
+ #
+ # Webapp browsertest and unittest JavaScript files.
+ #
+
+ # Mocks used by browsertests and unittests.
+ 'remoting_webapp_test_js_mock_files': [
+ 'webapp/js_proto/chrome_proto.js',
+ 'webapp/unittests/chrome_mocks.js',
+ 'webapp/unittests/mock_signal_strategy.js',
+ ],
+ # Browser test files.
+ 'remoting_webapp_browsertest_js_files': [
+ 'webapp/browser_test/browser_test.js',
+ 'webapp/browser_test/bump_scroll_browser_test.js',
+ 'webapp/browser_test/cancel_pin_browser_test.js',
+ 'webapp/browser_test/invalid_pin_browser_test.js',
+ 'webapp/browser_test/it2me_browser_test.js',
+ 'webapp/browser_test/mock_client_plugin.js',
+ 'webapp/browser_test/mock_host_list_api.js',
+ 'webapp/browser_test/mock_identity.js',
+ 'webapp/browser_test/mock_oauth2_api.js',
+ 'webapp/browser_test/mock_session_connector.js',
+ 'webapp/browser_test/scrollbar_browser_test.js',
+ 'webapp/browser_test/timeout_waiter.js',
+ 'webapp/browser_test/unauthenticated_browser_test.js',
+ 'webapp/browser_test/update_pin_browser_test.js',
+ ],
+ 'remoting_webapp_browsertest_js_all_files': [
+ '<@(remoting_webapp_browsertest_js_files)',
+ '<@(remoting_webapp_js_proto_files)',
+ '<@(remoting_webapp_test_js_mock_files)',
+ ],
+
+ # These product files are excluded from our JavaScript unittest
+ 'remoting_webapp_unittest_js_exclude_files': [
+ # background.js is where the onLoad handler is defined, which
+ # makes it the entry point of the background page.
+ 'webapp/crd/js/background.js',
+ ],
+ # The unit test cases for the webapp
+ 'remoting_webapp_unittest_js_files': [
+ 'webapp/unittests/apps_v2_migration_unittest.js',
+ 'webapp/unittests/base_unittest.js',
+ 'webapp/unittests/dns_blackhole_checker_unittest.js',
+ 'webapp/unittests/event_hook_unittest.js',
+ 'webapp/unittests/fallback_signal_strategy_unittest.js',
+ 'webapp/unittests/ipc_unittest.js',
+ 'webapp/unittests/it2me_helpee_channel_unittest.js',
+ 'webapp/unittests/it2me_helper_channel_unittest.js',
+ 'webapp/unittests/it2me_service_unittest.js',
+ 'webapp/unittests/l10n_unittest.js',
+ 'webapp/unittests/menu_button_unittest.js',
+ 'webapp/unittests/xmpp_connection_unittest.js',
+ 'webapp/unittests/xmpp_login_handler_unittest.js',
+ 'webapp/unittests/xmpp_stream_parser_unittest.js',
+ ],
+ 'remoting_webapp_unittest_js_all_files': [
+ '<@(remoting_webapp_js_proto_files)',
+ '<@(remoting_webapp_test_js_mock_files)',
+ '<@(remoting_webapp_unittest_js_files)',
+ ],
+ 'remoting_webapp_unittest_all_files': [
garykac 2015/02/18 00:20:36 Ditto
+ 'webapp/crd/html/menu_button.css',
+ '<@(remoting_webapp_unittest_js_all_files)',
+ ],
+ 'remoting_webapp_unittest_template_main':
+ 'webapp/crd/html/template_unittest.html',
+
+ #
+ # Webapp JavaScript file groups.
+ #
+
# Auth (apps v1) JavaScript files.
# These files aren't included directly from main.html. They are
# referenced from the manifest.json file (appsv1 only).
@@ -39,6 +112,10 @@
'webapp/crd/js/oauth2_api.js',
'webapp/crd/js/oauth2_api_impl.js',
],
+ # Cast extension handler JavaScript files.
+ 'remoting_webapp_js_cast_extension_files': [
+ 'webapp/crd/js/cast_extension_handler.js',
+ ],
# Client JavaScript files.
'remoting_webapp_js_client_files': [
'webapp/crd/js/client_plugin.js',
@@ -67,11 +144,14 @@
'webapp/crd/js/error.js',
'webapp/crd/js/event_handlers.js',
'webapp/crd/js/plugin_settings.js',
- # TODO(garykac) Split out UI client stuff from remoting.js.
'webapp/crd/js/remoting.js',
'webapp/crd/js/typecheck.js',
'webapp/crd/js/xhr.js',
],
+ # Gnubby authentication JavaScript files.
+ 'remoting_webapp_js_gnubby_auth_files': [
+ 'webapp/crd/js/gnubby_auth_handler.js',
+ ],
# Host JavaScript files.
'remoting_webapp_js_host_files': [
'webapp/crd/js/host.js',
@@ -104,6 +184,17 @@
'webapp/crd/js/server_log_entry.js',
'webapp/crd/js/stats_accumulator.js',
],
+ # Remoting signaling files.
+ 'remoting_webapp_js_signaling_files': [
+ 'webapp/crd/js/dns_blackhole_checker.js',
+ 'webapp/crd/js/fallback_signal_strategy.js',
+ 'webapp/crd/js/signal_strategy.js',
+ 'webapp/crd/js/wcs_adapter.js',
+ 'webapp/crd/js/wcs_sandbox_container.js',
+ 'webapp/crd/js/xmpp_connection.js',
+ 'webapp/crd/js/xmpp_login_handler.js',
+ 'webapp/crd/js/xmpp_stream_parser.js',
+ ],
# UI JavaScript files.
'remoting_webapp_js_ui_files': [
'webapp/base/js/window_shape.js',
@@ -120,17 +211,6 @@
'webapp/crd/js/toolbar.js',
'webapp/crd/js/window_frame.js',
],
- # Remoting signaling files.
- 'remoting_webapp_js_signaling_files': [
garykac 2015/02/18 00:20:36 Moved to fix alpha-order in this file.
- 'webapp/crd/js/dns_blackhole_checker.js',
- 'webapp/crd/js/fallback_signal_strategy.js',
- 'webapp/crd/js/signal_strategy.js',
- 'webapp/crd/js/wcs_adapter.js',
- 'webapp/crd/js/wcs_sandbox_container.js',
- 'webapp/crd/js/xmpp_connection.js',
- 'webapp/crd/js/xmpp_login_handler.js',
- 'webapp/crd/js/xmpp_stream_parser.js',
- ],
# Remoting WCS sandbox JavaScript files.
'remoting_webapp_js_wcs_sandbox_files': [
'webapp/crd/js/wcs.js',
@@ -138,65 +218,6 @@
'webapp/crd/js/wcs_sandbox_content.js',
'webapp/crd/js/xhr_proxy.js',
],
- # gnubby authentication JavaScript files.
- 'remoting_webapp_js_gnubby_auth_files': [
- 'webapp/crd/js/gnubby_auth_handler.js',
- ],
- # cast extension handler JavaScript files.
- 'remoting_webapp_js_cast_extension_files': [
- 'webapp/crd/js/cast_extension_handler.js',
- ],
- # Shared files for tests.
- 'remoting_webapp_js_test_common_files': [
- 'webapp/unittests/mock_signal_strategy.js',
- ],
- # browser test JavaScript files.
- 'remoting_webapp_js_browser_test_files': [
- 'webapp/browser_test/browser_test.js',
- 'webapp/browser_test/bump_scroll_browser_test.js',
- 'webapp/browser_test/cancel_pin_browser_test.js',
- 'webapp/browser_test/invalid_pin_browser_test.js',
- 'webapp/browser_test/it2me_browser_test.js',
- 'webapp/browser_test/mock_client_plugin.js',
- 'webapp/browser_test/mock_host_list_api.js',
- 'webapp/browser_test/mock_identity.js',
- 'webapp/browser_test/mock_oauth2_api.js',
- 'webapp/browser_test/mock_session_connector.js',
- 'webapp/browser_test/scrollbar_browser_test.js',
- 'webapp/browser_test/timeout_waiter.js',
- 'webapp/browser_test/unauthenticated_browser_test.js',
- 'webapp/browser_test/update_pin_browser_test.js',
- ],
- # These product files are excluded from our JavaScript unittest
- 'remoting_webapp_unittest_exclude_files': [
- # background.js is where the onLoad handler is defined, which
- # makes it the entry point of the background page.
- 'webapp/crd/js/background.js',
- ],
- # The unit test cases for the webapp
- 'remoting_webapp_unittest_js_files': [
- 'webapp/unittests/chrome_mocks.js',
- 'webapp/js_proto/chrome_proto.js',
- 'webapp/unittests/apps_v2_migration_unittest.js',
- 'webapp/unittests/base_unittest.js',
- 'webapp/unittests/dns_blackhole_checker_unittest.js',
- 'webapp/unittests/event_hook_unittest.js',
- 'webapp/unittests/fallback_signal_strategy_unittest.js',
- 'webapp/unittests/ipc_unittest.js',
- 'webapp/unittests/it2me_helpee_channel_unittest.js',
- 'webapp/unittests/it2me_helper_channel_unittest.js',
- 'webapp/unittests/it2me_service_unittest.js',
- 'webapp/unittests/l10n_unittest.js',
- 'webapp/unittests/menu_button_unittest.js',
- 'webapp/unittests/xmpp_connection_unittest.js',
- 'webapp/unittests/xmpp_login_handler_unittest.js',
- 'webapp/unittests/xmpp_stream_parser_unittest.js',
- ],
- 'remoting_webapp_unittest_additional_files': [
- 'webapp/crd/html/menu_button.css',
- ],
- 'remoting_webapp_unittest_template_main':
- 'webapp/crd/html/template_unittest.html',
# The shared JavaScript files required by main.html.
'remoting_webapp_shared_main_html_js_files': [
@@ -214,10 +235,9 @@
'<@(remoting_webapp_js_logging_files)',
'<@(remoting_webapp_js_ui_files)',
'<@(remoting_webapp_js_signaling_files)',
- # Uncomment these lines to include browser test files in the web app
+ # Uncomment this line to include browser test files in the web app
# to expedite debugging or local development.
- # '<@(remoting_webapp_js_browser_test_files)',
- # '<@(remoting_webapp_js_test_common_files)'
+ #'<@(remoting_webapp_browsertest_js_all_files)',
],
# The CRD-specific JavaScript files required by main.html.
« no previous file with comments | « remoting/remoting_webapp.gypi ('k') | remoting/webapp/browser_test/browser_test.js » ('j') | remoting/webapp/browser_test/browser_test.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698