mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Remove i18n stub used in NetworkStatusView tests

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-05-16 09:05:35 -07:00
parent f31125eccc
commit f84d8038c1
No known key found for this signature in database
GPG key ID: A4931C09644C654B
1 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
test/views/network_status_view_test.js
View file

@ -4,24 +4,16 @@ describe('NetworkStatusView', function() {
var networkStatusView; var networkStatusView;
var socketStatus = WebSocket.OPEN; var socketStatus = WebSocket.OPEN;
var oldI18n;
var oldGetSocketStatus; var oldGetSocketStatus;
/* BEGIN stubbing globals */ /* BEGIN stubbing globals */
before(function() { before(function() {
oldGetSocketStatus = window.getSocketStatus; oldGetSocketStatus = window.getSocketStatus;
oldI18n = window.i18n;
// translationMessageName-arg1-arg2
window.i18n = function(message, args) {
return _([message, args]).chain().flatten().compact().value().join('-');
};
window.getSocketStatus = function() { return socketStatus; }; window.getSocketStatus = function() { return socketStatus; };
}); });
after(function() { after(function() {
window.getSocketStatus = oldGetSocketStatus; window.getSocketStatus = oldGetSocketStatus;
window.i18n = oldI18n;
}); });
/* END stubbing globals */ /* END stubbing globals */
@ -48,11 +40,11 @@ describe('NetworkStatusView', function() {
networkStatusView.update(); networkStatusView.update();
var status = networkStatusView.getNetworkStatus(); var status = networkStatusView.getNetworkStatus();
assert(status.hasInterruption); assert(status.hasInterruption);
assert.equal(status.instructions, "checkNetworkConnection"); assert.equal(status.instructions, "Check your network connection.");
}); });
it('should display an offline message', function() { it('should display an offline message', function() {
networkStatusView.update(); networkStatusView.update();
assert.match(networkStatusView.$el.text(), /offline/); assert.match(networkStatusView.$el.text(), /Offline/);
}); });
it('should override socket status', function() { it('should override socket status', function() {
_([WebSocket.CONNECTING, _([WebSocket.CONNECTING,
@ -61,13 +53,13 @@ describe('NetworkStatusView', function() {
WebSocket.CLOSED]).map(function(socketStatusVal) { WebSocket.CLOSED]).map(function(socketStatusVal) {
socketStatus = socketStatusVal; socketStatus = socketStatusVal;
networkStatusView.update(); networkStatusView.update();
assert.match(networkStatusView.$el.text(), /offline/); assert.match(networkStatusView.$el.text(), /Offline/);
}); });
}); });
it('should override registration status', function() { it('should override registration status', function() {
Whisper.Registration.remove(); Whisper.Registration.remove();
networkStatusView.update(); networkStatusView.update();
assert.match(networkStatusView.$el.text(), /offline/); assert.match(networkStatusView.$el.text(), /Offline/);
}); });
}); });
describe('network status when registration is not done', function() { describe('network status when registration is not done', function() {
@ -76,7 +68,7 @@ describe('NetworkStatusView', function() {
}); });
it('should display an unlinked message', function() { it('should display an unlinked message', function() {
networkStatusView.update(); networkStatusView.update();
assert.match(networkStatusView.$el.text(), /unlinked/); assert.match(networkStatusView.$el.text(), /Relink/);
}); });
it('should override socket status', function() { it('should override socket status', function() {
_([WebSocket.CONNECTING, _([WebSocket.CONNECTING,
@ -85,7 +77,7 @@ describe('NetworkStatusView', function() {
WebSocket.CLOSED]).map(function(socketStatusVal) { WebSocket.CLOSED]).map(function(socketStatusVal) {
socketStatus = socketStatusVal; socketStatus = socketStatusVal;
networkStatusView.update(); networkStatusView.update();
assert.match(networkStatusView.$el.text(), /unlinked/); assert.match(networkStatusView.$el.text(), /Relink/);
}); });
}); });
}); });
@ -97,7 +89,7 @@ describe('NetworkStatusView', function() {
}); });
it('should not display an unlinked message', function() { it('should not display an unlinked message', function() {
networkStatusView.update(); networkStatusView.update();
assert.notMatch(networkStatusView.$el.text(), /unlinked/); assert.notMatch(networkStatusView.$el.text(), /Relink/);
}); });
}); });
describe('network status when socket is connecting', function() { describe('network status when socket is connecting', function() {
@ -110,13 +102,13 @@ describe('NetworkStatusView', function() {
networkStatusView.withinConnectingGracePeriod = false; networkStatusView.withinConnectingGracePeriod = false;
var status = networkStatusView.getNetworkStatus(); var status = networkStatusView.getNetworkStatus();
assert.match(networkStatusView.$el.text(), /connecting/); assert.match(networkStatusView.$el.text(), /Connecting/);
}); });
it('it should not be interrupted if in connecting grace period', function() { it('it should not be interrupted if in connecting grace period', function() {
assert(networkStatusView.withinConnectingGracePeriod); assert(networkStatusView.withinConnectingGracePeriod);
var status = networkStatusView.getNetworkStatus(); var status = networkStatusView.getNetworkStatus();
assert.match(networkStatusView.$el.text(), /connecting/); assert.match(networkStatusView.$el.text(), /Connecting/);
assert(!status.hasInterruption); assert(!status.hasInterruption);
}); });
it('it should be interrupted if connecting grace period is over', function() { it('it should be interrupted if connecting grace period is over', function() {
@ -155,7 +147,7 @@ describe('NetworkStatusView', function() {
}); });
it('should format the message based on the socketReconnectWaitDuration property', function() { it('should format the message based on the socketReconnectWaitDuration property', function() {
assert.equal(networkStatusView.socketReconnectWaitDuration.asSeconds(), 61); assert.equal(networkStatusView.socketReconnectWaitDuration.asSeconds(), 61);
assert.match(networkStatusView.$('.network-status-message:last').text(), /attemptingReconnection-61/); assert.match(networkStatusView.$('.network-status-message:last').text(), /Attempting reconnect/);
}); });
it('should be reset by changing the socketStatus to CONNECTING', function() { it('should be reset by changing the socketStatus to CONNECTING', function() {