From 4f6b8f323cd731f95bb98cd6d382344fbf58cac4 Mon Sep 17 00:00:00 2001
From: Johnny <strikax@gmail.com>
Date: Wed, 24 Oct 2018 18:59:56 +0000
Subject: [PATCH] Adds account and puppet to context processor, modifies test.

---
 evennia/web/utils/general_context.py |  2 +-
 evennia/web/utils/tests.py           | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/evennia/web/utils/general_context.py b/evennia/web/utils/general_context.py
index 57b46bf59a..117036e772 100644
--- a/evennia/web/utils/general_context.py
+++ b/evennia/web/utils/general_context.py
@@ -69,7 +69,7 @@ def general_context(request):
     """
     account = None
     if request.user.is_authenticated(): account = request.user
-    
+
     puppet = None
     if request.session.get('puppet'): puppet = request.session['puppet']
     
diff --git a/evennia/web/utils/tests.py b/evennia/web/utils/tests.py
index e2b28c3510..093b858f4d 100644
--- a/evennia/web/utils/tests.py
+++ b/evennia/web/utils/tests.py
@@ -1,10 +1,8 @@
-from mock import Mock, patch
-
-from django.test import TestCase
-
+from django.contrib.auth.models import AnonymousUser
+from django.test import RequestFactory, TestCase
+from mock import MagicMock, patch
 from . import general_context
 
-
 class TestGeneralContext(TestCase):
     maxDiff = None
 
@@ -15,8 +13,18 @@ class TestGeneralContext(TestCase):
     @patch('evennia.web.utils.general_context.WEBSOCKET_PORT', "websocket_client_port_testvalue")
     @patch('evennia.web.utils.general_context.WEBSOCKET_URL', "websocket_client_url_testvalue")
     def test_general_context(self):
-        request = Mock()
-        self.assertEqual(general_context.general_context(request), {
+        request = RequestFactory().get('/')
+        request.user = AnonymousUser()
+        request.session = {
+            'account': None,
+            'puppet': None,
+        }
+        
+        response = general_context.general_context(request)
+        
+        self.assertEqual(response, {
+            'account': None,
+            'puppet': None,
             'game_name': "test_name",
             'game_slogan': "test_game_slogan",
             'evennia_userapps': ['Accounts'],