fix(django): Remove second user_info and fix tests

Author: ashwoods

raven/contrib/django/client.py

@@ -143,6 +143,7 @@ def install_sql_hook(self):
         install_sql_hook()
 
     def get_user_info(self, request):
+
         user_info = {
             'ip_address': get_client_ip(request.META),
         }
@@ -160,8 +161,6 @@ def get_user_info(self, request):
                 if not authenticated:
                     return user_info
 
-            user_info = {}
-
             user_info['id'] = user.pk
 
             if hasattr(user, 'email'):

tests/contrib/django/tests.py

@@ -231,7 +231,12 @@ def test_user_info(self):
 
             assert len(self.raven.events) == 1
             event = self.raven.events.pop(0)
-            assert 'user' not in event
+            assert 'user' in event
+
+            user_info = event['user']
+            assert user_info == {
+                {'ip_address': '127.0.0.1'}
+            }
 
             assert self.client.login(username='admin', password='password')
 
@@ -249,6 +254,7 @@ def test_user_info(self):
 
     @pytest.mark.skipif(not DJANGO_15, reason='< Django 1.5')
     def test_get_user_info_abstract_user(self):
+
         from django.db import models
         from django.http import HttpRequest
         from django.contrib.auth.models import AbstractBaseUser