refactor(session-keywords): remove duplicated logic and add test

MarketSquare · Jun 6, 2023 · 37c49a3 · 37c49a3
1 parent 5699493
commit 37c49a3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/RequestsLibrary/SessionKeywords.py b/src/RequestsLibrary/SessionKeywords.py
@@ -92,7 +92,7 @@ def _create_session(
             s.verify = verify
 
         # cant pass these into the Session anymore
-        self.timeout = float(timeout) if timeout is not None else None
+        self.timeout = timeout
         self.cookies = cookies
 
         s.url = url
@@ -585,7 +585,6 @@ def _check_status(expected_status, resp, msg=None):
             msg = "{}Url: {} Expected status".format(msg, resp.url)
             assert_equal(resp.status_code, expected_status, msg)
 
-    # FIXME might be broken we need a test for this
     def _get_timeout(self, timeout):
         return float(timeout) if timeout is not None else self.timeout
 

diff --git a/src/RequestsLibrary/version.py b/src/RequestsLibrary/version.py
@@ -1 +1 @@
-VERSION = '1.0a4'
+VERSION = '1.0a5'
diff --git a/utests/test_RequestsOnSessionKeywords.py b/utests/test_RequestsOnSessionKeywords.py
@@ -7,9 +7,9 @@
 
 
 def build_mocked_session_common_request(alias='alias', url='http://mocking.rules',
-                                        verify=None, cookies={}):
+                                        verify=None, cookies={}, timeout=None):
     keywords = RequestsLibrary()
-    session = keywords.create_session(alias, url, verify=verify, cookies=cookies)
+    session = keywords.create_session(alias, url, verify=verify, cookies=cookies, timeout=timeout)
     # this prevents a real network call from being executed
     session.get = mock.MagicMock()
     return session, keywords._common_request
@@ -67,3 +67,13 @@ def test_common_request_with_cookies_default_only():
     session, m_common_request = build_mocked_session_common_request(cookies={'a': 1, 'b': 2})
     m_common_request('get', session, '/')
     session.get.assert_called_with('http://mocking.rules/', timeout=None, cookies={'a': 1, 'b': 2})
+
+def test_common_request_with_float_timeout():
+    session, m_common_request = build_mocked_session_common_request(timeout=123.4)
+    m_common_request('get', session, '/')
+    session.get.assert_called_with('http://mocking.rules/', timeout=123.4, cookies={})
+
+def test_common_request_with_float_timeout_override():
+    session, m_common_request = build_mocked_session_common_request(timeout=None)
+    m_common_request('get', session, '/', timeout=123.4)
+    session.get.assert_called_with('http://mocking.rules/', timeout=123.4, cookies={})