Integration tests are excluded

Author: Akop Kesheshyan

README.md

@@ -56,6 +56,12 @@ except BitrixError as message:
 List methods return all available items at once. For large collections
 of data use limits.
 
+## Tests
+
+```
+python -m unittest discover
+```
+
 ## Author
 
 Akop Kesheshyan - <akop.kesheshyan@icloud.com>

bitrix24/bitrix24.py

@@ -28,12 +28,19 @@ class Bitrix24(object):
     """
 
     def __init__(self, domain, timeout=60):
+        """Create Bitrix24 API object
+        :param domain: str Bitrix24 webhook domain
+        :param timeout: int Timeout for API request in seconds
+        """
         self.domain = self._prepare_domain(domain)
         self.timeout = timeout
 
-    def _prepare_domain(self, string):
+    def _prepare_domain(self, domain):
         """Normalize user passed domain to a valid one."""
-        o = urlparse(string)
+        if domain == '' or not isinstance(domain, str):
+            raise Exception('Empty domain')
+
+        o = urlparse(domain)
         user_id, code = o.path.split('/')[2:4]
         return "{0}://{1}/rest/{2}/{3}".format(o.scheme, o.netloc, user_id, code)
 

tests/test_bitrix24.py

@@ -6,17 +6,11 @@
 class Bitrix24Test(unittest.TestCase):
 
     def setUp(self):
-        self.b24 = Bitrix24(os.environ.get('TEST_DOMAIN'))
+        self.b24 = Bitrix24('https://example.bitrix24.com/rest/1/123456789')
 
-    def test_call_post_method(self):
-        r = self.b24.callMethod('crm.deal.add', fields={
-                                'TITLE': 'Hello World'})
-        self.assertIs(type(r), int)
-
-    def test_call_get_method(self):
-        r = self.b24.callMethod('crm.deal.list', filter={
-                                'TITLE': 'Hello World'})
-        self.assertIs(type(r), list)
+    def test_init_with_empty_domain(self):
+        with self.assertRaises(Exception):
+            Bitrix24('')
 
     def test_call_with_empty_method(self):
         with self.assertRaises(BitrixError):
@@ -26,54 +20,61 @@ def test_call_non_exists_method(self):
         with self.assertRaises(BitrixError):
             self.b24.callMethod('hello.world')
 
+    def test_call_wrong_method(self):
+        with self.assertRaises(BitrixError):
+            self.b24.callMethod('helloworld')
 
 class ParamsPreparationTest(unittest.TestCase):
 
     def setUp(self):
-        self.b24 = Bitrix24('http://example.bitrix24.com/rest/1/123456789')
+        self.b24 = Bitrix24('https://example.bitrix24.com/rest/1/123456789')
 
     def test_one_level(self):
         params = {"fruit": "apple"}
-        param_string = self.b24._prepare_params(params)        
+        param_string = self.b24._prepare_params(params)
         self.assertEqual(param_string, "fruit=apple&")
 
     def test_one_level_several_items(self):
-        params = {"fruit": "apple", "vegetable":"broccoli"}
-        param_string = self.b24._prepare_params(params)        
+        params = {"fruit": "apple", "vegetable": "broccoli"}
+        param_string = self.b24._prepare_params(params)
         self.assertEqual(param_string, "fruit=apple&vegetable=broccoli&")
 
     def test_multi_level(self):
-        params = {"fruit": {"citrus":"lemon"}}
-        param_string = self.b24._prepare_params(params)        
+        params = {"fruit": {"citrus": "lemon"}}
+        param_string = self.b24._prepare_params(params)
         self.assertEqual(param_string, "fruit[citrus]=lemon&")
-    
+
     def test_multi_level_deep(self):
-        params = {"root": {"level 1":{"level 2":{"level 3":"value"}}}}
-        param_string = self.b24._prepare_params(params)        
-        self.assertEqual(param_string, "root[level 1][level 2][level 3]=value&")
-    
+        params = {"root": {"level 1": {"level 2": {"level 3": "value"}}}}
+        param_string = self.b24._prepare_params(params)
+        self.assertEqual(
+            param_string, "root[level 1][level 2][level 3]=value&")
+
     def test_list_dict_mixed(self):
-        params = {"root":{"level 1":[{"list_dict 1": "value 1"}, {"list_dict 2": "value 2"}]}}
-        param_string = self.b24._prepare_params(params)        
-        self.assertEqual(param_string, "root[level 1][0][list_dict 1]=value 1&root[level 1][1][list_dict 2]=value 2&")
-    
+        params = {"root": {"level 1": [
+            {"list_dict 1": "value 1"}, {"list_dict 2": "value 2"}]}}
+        param_string = self.b24._prepare_params(params)
+        self.assertEqual(
+            param_string, "root[level 1][0][list_dict 1]=value 1&root[level 1][1][list_dict 2]=value 2&")
+
     def test_multi_level_several_items(self):
-        params = {"fruit": {"citrus":"lemon", "sweet": "apple"}}
-        param_string = self.b24._prepare_params(params)        
-        self.assertEqual(param_string, "fruit[citrus]=lemon&fruit[sweet]=apple&")
+        params = {"fruit": {"citrus": "lemon", "sweet": "apple"}}
+        param_string = self.b24._prepare_params(params)
+        self.assertEqual(
+            param_string, "fruit[citrus]=lemon&fruit[sweet]=apple&")
 
     def test_list(self):
         params = {"fruit": ["lemon", "apple"]}
-        param_string = self.b24._prepare_params(params)        
+        param_string = self.b24._prepare_params(params)
         self.assertEqual(param_string, "fruit[0]=lemon&fruit[1]=apple&")
 
     def test_tuple(self):
         params = {"fruit": ("lemon", "apple")}
-        param_string = self.b24._prepare_params(params)        
+        param_string = self.b24._prepare_params(params)
         self.assertEqual(param_string, "fruit[0]=lemon&fruit[1]=apple&")
-    
+
     def test_string(self):
-        param_string = self.b24._prepare_params('')        
+        param_string = self.b24._prepare_params('')
         self.assertEqual(param_string, "")