colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix electron test race condition with protobuf loading

Browse Source
This commit is contained in:
Scott Nonnenberg
2018-04-19 16:10:08 -07:00
parent 978ff0e2bb
commit 334fe32210
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/fixtures.js
View File

@@ -2684,5 +2684,5 @@ Whisper.Fixtures = (function() {
} }
return conversationCollection; return conversationCollection;
})(); });

2
test/fixtures_test.js
View File

@@ -5,7 +5,7 @@ describe("Fixtures", function() {
// NetworkStatusView checks this method every five seconds while showing // NetworkStatusView checks this method every five seconds while showing
window.getSocketStatus = function() { return WebSocket.OPEN; }; window.getSocketStatus = function() { return WebSocket.OPEN; };
Whisper.Fixtures.saveAll().then(function() { Whisper.Fixtures().saveAll().then(function() {
done(); done();
}); });
}); });

2
test/index.html
View File

@@ -609,7 +609,7 @@
<script type="text/javascript" src="../js/chromium.js" data-cover></script> <script type="text/javascript" src="../js/chromium.js" data-cover></script>
<script type='text/javascript' src='../js/views/backbone_wrapper_view.js'></script> <script type='text/javascript' src='../js/views/react_wrapper_view.js'></script>
<script type='text/javascript' src='../js/views/whisper_view.js' data-cover></script> <script type='text/javascript' src='../js/views/whisper_view.js' data-cover></script>
<script type='text/javascript' src='../js/views/debug_log_view.js' data-cover></script> <script type='text/javascript' src='../js/views/debug_log_view.js' data-cover></script>
<script type='text/javascript' src='../js/views/toast_view.js' data-cover></script> <script type='text/javascript' src='../js/views/toast_view.js' data-cover></script>