fix: Normalize endpoint and web _router_completed calls and tests

closes #549

autopush/endpoint.py

@@ -586,8 +586,11 @@ def _router_completed(self, response, uaid_data, warning=""):
         # TODO: Add some custom wake logic here
 
         # Were we told to update the router data?
-        if response.router_data:
-            uaid_data["router_data"] = response.router_data
+        if response.router_data is not None:
+            if not response.router_data:
+                del uaid_data["router_data"]
+            else:
+                uaid_data["router_data"] = response.router_data
             uaid_data["connected_at"] = ms_time()
             d = deferToThread(self.ap_settings.router.register_user,
                               uaid_data)

autopush/tests/test_endpoint.py

@@ -624,7 +624,10 @@ def test_put_router_needs_change(self):
         def handle_finish(result):
             self.assertTrue(result)
             self.endpoint.set_status.assert_called_with(500, None)
-            ok_(not self.router_mock.register_user.called)
+            ru = self.router_mock.register_user
+            ok_(ru.called)
+            eq_('simplepush', ru.call_args[0][0].get('router_type'))
+
         self.finish_deferred.addCallback(handle_finish)
 
         self.endpoint.put(None, dummy_uaid)
@@ -638,7 +641,7 @@ def test_put_router_needs_update(self):
         )
         self.sp_router_mock.route_notification.return_value = RouterResponse(
             status_code=503,
-            router_data=dict(token="new_connect"),
+            router_data=dict(token="new_connect", router_type="simplepush"),
         )
 
         def handle_finish(result):