diff options
| author | kelvinp <kelvinp@chromium.org> | 2015-05-26 14:32:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-26 21:33:31 +0000 |
| commit | 1a8d5b2da013f3149fe601331125ef8d9205289e (patch) | |
| tree | 9efbe8e8cb685373324c8441a132b6c3fe7f2c28 /remoting/webapp/files.gni | |
| parent | 663a3a2fee3f20a58791219f10ec528c55c08928 (diff) | |
| download | chromium_src-1a8d5b2da013f3149fe601331125ef8d9205289e.zip chromium_src-1a8d5b2da013f3149fe601331125ef8d9205289e.tar.gz chromium_src-1a8d5b2da013f3149fe601331125ef8d9205289e.tar.bz2 | |
[Chromoting] Separates chrome mocks from chrome protos in unittests.
The current unittest reuses the chrome_proto.js as stubs in the unittest.
chrome_proto.js is subjected to changes as JSCompile augments the existing
set of functions through externs.
Summary of changes:
1. Auto activate/restore chrome mocks in each unittest.
2. Separates chrome mocks from chrome protos.
Review URL: https://codereview.chromium.org/1143033004
Cr-Commit-Position: refs/heads/master@{#331441}
Diffstat (limited to 'remoting/webapp/files.gni')
| -rw-r--r-- | remoting/webapp/files.gni | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/remoting/webapp/files.gni b/remoting/webapp/files.gni index 10b9976..dde5fa6 100644 --- a/remoting/webapp/files.gni +++ b/remoting/webapp/files.gni @@ -104,11 +104,8 @@ remoting_webapp_unittests_js_files = [ "crd/js/mock_xhr_unittest.js", ] remoting_webapp_unittests_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. "crd/js/mock_host_daemon_facade.js", "crd/js/mock_signal_strategy.js", - "js_proto/chrome_proto.js", "js_proto/chrome_mocks.js", "unittests/sinon_helpers.js", "crd/js/mock_xhr.js", @@ -117,6 +114,7 @@ remoting_webapp_unittests_js_mock_files = [ # Prototypes for objects that are not mocked. remoting_webapp_unittests_js_proto_files = [ "js_proto/chrome_cast_proto.js", + "js_proto/chrome_proto.js", "js_proto/dom_proto.js", "js_proto/remoting_proto.js", "js_proto/qunit_proto.js", @@ -125,6 +123,7 @@ remoting_webapp_unittests_js_proto_files = [ remoting_webapp_unittests_all_js_files = [ "<@(remoting_webapp_unittests_js_files)", "<@(remoting_webapp_unittests_js_mock_files)", + "unittests/qunit_callbacks.js", ] # All the files needed to run the unittests. |