From f84d8038c1ebc74be72bb49958d39ce2029c68c4 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Tue, 16 May 2017 09:05:35 -0700
Subject: [PATCH] Remove i18n stub used in NetworkStatusView tests

FREEBIE
---
 test/views/network_status_view_test.js | 28 +++++++++-----------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/test/views/network_status_view_test.js b/test/views/network_status_view_test.js
index 59ee678d8..b806c1d4c 100644
--- a/test/views/network_status_view_test.js
+++ b/test/views/network_status_view_test.js
@@ -4,24 +4,16 @@ describe('NetworkStatusView', function() {
         var networkStatusView;
         var socketStatus = WebSocket.OPEN;
 
-        var oldI18n;
         var oldGetSocketStatus;
 
         /* BEGIN stubbing globals */
         before(function() {
             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; };
         });
 
         after(function() {
             window.getSocketStatus = oldGetSocketStatus;
-            window.i18n = oldI18n;
         });
         /* END stubbing globals */
 
@@ -48,11 +40,11 @@ describe('NetworkStatusView', function() {
                 networkStatusView.update();
                 var status = networkStatusView.getNetworkStatus();
                 assert(status.hasInterruption);
-                assert.equal(status.instructions, "checkNetworkConnection");
+                assert.equal(status.instructions, "Check your network connection.");
             });
             it('should display an offline message', function() {
                 networkStatusView.update();
-                assert.match(networkStatusView.$el.text(), /offline/);
+                assert.match(networkStatusView.$el.text(), /Offline/);
             });
             it('should override socket status', function() {
                 _([WebSocket.CONNECTING,
@@ -61,13 +53,13 @@ describe('NetworkStatusView', function() {
                    WebSocket.CLOSED]).map(function(socketStatusVal) {
                     socketStatus = socketStatusVal;
                     networkStatusView.update();
-                    assert.match(networkStatusView.$el.text(), /offline/);
+                    assert.match(networkStatusView.$el.text(), /Offline/);
                 });
             });
             it('should override registration status', function() {
                 Whisper.Registration.remove();
                 networkStatusView.update();
-                assert.match(networkStatusView.$el.text(), /offline/);
+                assert.match(networkStatusView.$el.text(), /Offline/);
             });
         });
         describe('network status when registration is not done', function() {
@@ -76,7 +68,7 @@ describe('NetworkStatusView', function() {
             });
             it('should display an unlinked message', function() {
                 networkStatusView.update();
-                assert.match(networkStatusView.$el.text(), /unlinked/);
+                assert.match(networkStatusView.$el.text(), /Relink/);
             });
             it('should override socket status', function() {
                 _([WebSocket.CONNECTING,
@@ -85,7 +77,7 @@ describe('NetworkStatusView', function() {
                    WebSocket.CLOSED]).map(function(socketStatusVal) {
                     socketStatus = socketStatusVal;
                     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() {
                 networkStatusView.update();
-                assert.notMatch(networkStatusView.$el.text(), /unlinked/);
+                assert.notMatch(networkStatusView.$el.text(), /Relink/);
             });
         });
         describe('network status when socket is connecting', function() {
@@ -110,13 +102,13 @@ describe('NetworkStatusView', function() {
                 networkStatusView.withinConnectingGracePeriod = false;
                 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() {
                 assert(networkStatusView.withinConnectingGracePeriod);
                 var status = networkStatusView.getNetworkStatus();
 
-                assert.match(networkStatusView.$el.text(), /connecting/);
+                assert.match(networkStatusView.$el.text(), /Connecting/);
                 assert(!status.hasInterruption);
             });
             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() {
                 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() {