From f1e5f54048cfadec42990f3dfb212c7147bf5faa Mon Sep 17 00:00:00 2001
From: NavaL <ayoyo@thoughtworks.com>
Date: Thu, 23 Jun 2016 12:13:20 +0200
Subject: refactoring: renaming services factory methods to relate them to user
 services sessions

---
 service/test/unit/resources/test_login_resource.py   | 10 +++++-----
 service/test/unit/resources/test_logout_resources.py |  2 +-
 service/test/unit/test_application.py                |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'service/test')

diff --git a/service/test/unit/resources/test_login_resource.py b/service/test/unit/resources/test_login_resource.py
index 09bc79bf..2fba72fd 100644
--- a/service/test/unit/resources/test_login_resource.py
+++ b/service/test/unit/resources/test_login_resource.py
@@ -37,7 +37,7 @@ class TestLoginResource(unittest.TestCase):
     def test_there_are_no_grand_children_resources_when_logged_in(self, mock_is_logged_in):
         request = DummyRequest(['/login/grand_children'])
         mock_is_logged_in.return_value = True
-        when(self.services_factory).is_logged_in(ANY()).thenReturn(True)
+        when(self.services_factory).has_session(ANY()).thenReturn(True)
 
         d = self.web.get(request)
 
@@ -168,7 +168,7 @@ class TestLoginPOST(unittest.TestCase):
         self.user_auth = user_auth
 
     def mock_user_has_services_setup(self):
-        when(self.services_factory).is_logged_in('some_user_uuid').thenReturn(True)
+        when(self.services_factory).has_session('some_user_uuid').thenReturn(True)
 
     def test_login_responds_interstitial_and_add_corresponding_session_to_services_factory(self):
         irrelevant = None
@@ -191,13 +191,13 @@ class TestLoginPOST(unittest.TestCase):
     def test_login_does_not_reload_services_if_already_loaded(self):
         irrelevant = None
         when(self.portal).login(ANY(), None, IResource).thenReturn((irrelevant, self.leap_session, irrelevant))
-        when(self.services_factory).is_logged_in('some_user_uuid').thenReturn(True)
+        when(self.services_factory).has_session('some_user_uuid').thenReturn(True)
 
         d = self.web.get(self.request)
 
         def assert_login_setup_service_for_user(_):
             verify(self.portal).login(ANY(), None, IResource)
-            verify(self.services_factory).is_logged_in('some_user_uuid')
+            verify(self.services_factory).has_session('some_user_uuid')
             verifyNoMoreInteractions(self.services_factory)
             interstitial_js_in_template = '<script src="startup-assets/Interstitial.js"></script>'
             self.assertIn(interstitial_js_in_template, self.request.written[0])
@@ -242,7 +242,7 @@ class TestLoginPOST(unittest.TestCase):
     @patch('pixelated.resources.session.PixelatedSession.is_logged_in')
     def test_should_not_process_login_if_already_logged_in(self, mock_logged_in, mock_redirect):
         mock_logged_in.return_value = True
-        when(self.services_factory).is_logged_in(ANY()).thenReturn(True)
+        when(self.services_factory).has_session(ANY()).thenReturn(True)
         mock_redirect.return_value = "mocked redirection"
         when(self.portal).login(ANY(), None, IResource).thenRaise(Exception())
         d = self.web.get(self.request)
diff --git a/service/test/unit/resources/test_logout_resources.py b/service/test/unit/resources/test_logout_resources.py
index 49866057..845fcde9 100644
--- a/service/test/unit/resources/test_logout_resources.py
+++ b/service/test/unit/resources/test_logout_resources.py
@@ -32,7 +32,7 @@ class TestLogoutResource(unittest.TestCase):
 
         def expire_session_and_redirect(_):
             session = self.resource.get_session(request)
-            self.services_factory.log_out_user.assert_called_once_with(session.user_uuid)
+            self.services_factory.destroy_session.assert_called_once_with(session.user_uuid)
             session.expire.assert_called_once_with()
             mock_redirect.assert_called_once_with('/login', request)
 
diff --git a/service/test/unit/test_application.py b/service/test/unit/test_application.py
index 87cb6871..649fd62b 100644
--- a/service/test/unit/test_application.py
+++ b/service/test/unit/test_application.py
@@ -83,7 +83,7 @@ class ApplicationTest(unittest.TestCase):
         services_factory_mock = MagicMock()
 
         mock_service_log_user_out = MagicMock(return_value=None)
-        services_factory_mock.log_out_user = mock_service_log_user_out
+        services_factory_mock.destroy_session = mock_service_log_user_out
 
         leap_session = MagicMock()
         register_mock = events_mock.register
-- 
cgit v1.2.3