Chromium Code Reviews| Index: remoting/remoting_webapp_files.gypi |
| diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi |
| index 6a085ea339a04905f861792db9077369d8dcee19..c8cf49854c08c1c4e94461ded9a332802f4a3f87 100644 |
| --- a/remoting/remoting_webapp_files.gypi |
| +++ b/remoting/remoting_webapp_files.gypi |
| @@ -14,19 +14,16 @@ |
| # These provide type information for jscompile. |
| 'remoting_webapp_js_proto_files': [ |
| 'webapp/js_proto/chrome_proto.js', |
| + 'webapp/js_proto/chrome_cast_proto.js', |
| + 'webapp/js_proto/chrome_event_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. |
| + # Webapp browsertest JavaScript files. |
| # |
| - # Shared files for tests. |
| - 'remoting_webapp_test_js_common_files': [ |
| - 'webapp/unittests/mock_signal_strategy.js', |
| - ], |
| # Browser test files. |
| 'remoting_webapp_browsertest_js_files': [ |
| 'webapp/browser_test/browser_test.js', |
| @@ -34,21 +31,34 @@ |
| '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/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', |
| + ], |
| + # Browser test files. |
| + 'remoting_webapp_browsertest_js_mock_files': [ |
| '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', |
| + 'webapp/unittests/mock_signal_strategy.js', |
| + ], |
| + 'remoting_webapp_browsertest_js_proto_files': [ |
| + 'webapp/js_proto/sinon_proto.js', |
| + 'webapp/js_proto/test_proto.js', |
| + '<@(remoting_webapp_js_proto_files)', |
| ], |
| 'remoting_webapp_browsertest_all_js_files': [ |
| '<@(remoting_webapp_browsertest_js_files)', |
| - '<@(remoting_webapp_test_js_common_files)', |
| + '<@(remoting_webapp_browsertest_js_mock_files)', |
| ], |
| + # |
| + # Webapp unittest JavaScript files. |
| + # |
| + |
| # These product files are excluded from our JavaScript unittest |
| 'remoting_webapp_unittest_exclude_js_files': [ |
| # background.js is where the onLoad handler is defined, which |
| @@ -57,8 +67,6 @@ |
| ], |
| # 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/desktop_viewport_unittest.js', |
| @@ -75,10 +83,29 @@ |
| 'webapp/unittests/xmpp_login_handler_unittest.js', |
| 'webapp/unittests/xmpp_stream_parser_unittest.js', |
| ], |
| + 'remoting_webapp_unittest_js_mock_files': [ |
| + # Some proto files can be repurposed as simple mocks for the unittests. |
| + # Note that some defs in chrome_proto are overwritten by chrome_mocks. |
| + 'webapp/js_proto/chrome_proto.js', |
|
kelvinp
2015/02/26 00:31:30
I thought we are getting rid of chrome_proto.js
garykac
2015/02/28 02:33:33
I removed the parts that needed to be moved out, b
|
| + 'webapp/unittests/chrome_mocks.js', |
| + 'webapp/unittests/mock_signal_strategy.js', |
| + 'webapp/unittests/sinon_helpers.js', |
| + 'webapp/unittests/test_start.js', |
| + ], |
| + # Prototypes for objects that are not mocked. |
| + 'remoting_webapp_unittest_js_proto_files': [ |
| + 'webapp/js_proto/chrome_cast_proto.js', |
| + 'webapp/js_proto/dom_proto.js', |
| + 'webapp/js_proto/remoting_proto.js', |
| + 'webapp/js_proto/qunit_proto.js', |
| + 'webapp/js_proto/sinon_proto.js', |
| + 'webapp/js_proto/sinon_stub_proto.js', |
| + ], |
| 'remoting_webapp_unittest_all_js_files': [ |
| '<@(remoting_webapp_unittest_js_files)', |
| - '<@(remoting_webapp_test_js_common_files)', |
| + '<@(remoting_webapp_unittest_js_mock_files)', |
| ], |
| + # All the files needed to run the unittests. |
| 'remoting_webapp_unittest_all_files': [ |
| 'webapp/crd/html/menu_button.css', |
| '<@(remoting_webapp_unittest_all_js_files)', |