Merge pull request #5 from JaviCerveraIngram/master

Fixes and small changes.

Author: vgrebenschikov

connect/config.py

@@ -61,7 +61,8 @@ def check_credentials(api_url, api_key, products):
                              'Not set value for `api_key` or `api_url`')
 
         if products and not isinstance(products, (str, list)):
-            raise TypeError('Products can be string or string list')
+            raise TypeError('Products can be string or string list. Found type '
+                            + type(products).__name__)
 
         return
 

connect/models/__init__.py

@@ -1,7 +1,7 @@
 from .activation_response import ActivationTemplateResponse, ActivationTileResponse
 from .base import BaseScheme
 from .fulfillment import FulfillmentScheme
-from .parameters import Param, ParamsScheme
+from .parameters import Param, ParamScheme
 from .server_error import ServerErrorScheme
 
 __all__ = [
@@ -11,5 +11,5 @@
     'FulfillmentScheme',
     'ServerErrorScheme',
     'Param',
-    'ParamsScheme',
+    'ParamScheme',
 ]

connect/models/asset.py

@@ -2,7 +2,7 @@
 
 from .base import BaseObject, BaseScheme
 from .connection import ConnectionScheme
-from .parameters import ParamsScheme
+from .parameters import ParamScheme
 from .product import ItemScheme, ProductScheme
 from .tiers import TiersSchemeMixin
 
@@ -20,7 +20,7 @@ class AssetScheme(BaseScheme):
         ConnectionScheme, only=('id', 'type', 'provider', 'vendor'),
     )
     items = fields.List(fields.Nested(ItemScheme))
-    params = fields.List(fields.Nested(ParamsScheme))
+    params = fields.List(fields.Nested(ParamScheme))
     tiers = fields.Nested(TiersSchemeMixin)
 
     @post_load

connect/models/parameters.py

@@ -20,7 +20,7 @@ class Param(BaseObject):
     pass
 
 
-class ParamsScheme(BaseScheme):
+class ParamScheme(BaseScheme):
     name = fields.Str()
     type = fields.Str()
     value = fields.Str()

example/example.py

@@ -26,8 +26,8 @@ def process_request(self, request):
                     raise FulfillmentInquire(params=[param])
 
             # approve by ActivationTile
-            return ActivationTileResponse(tile='\n  # Welcome to Fallball!\n\nYes, '
-                                               'you decided to have an account in our amazing service!')
+            return ActivationTileResponse(tile='\n  # Welcome to Fallball!\n\nYes, you decided '
+                                               'to have an account in our amazing service!')
             # or
             # return TemplateResource().render(pk='TEMPLATE_ID', request_id=request.id)
 

tests/config.json

@@ -0,0 +1,5 @@
+{
+    "apiEndpoint": "http://localhost:8080/api/public/v1/",
+    "apiKey": "ApiKey XXXX:YYYYY",
+    "products": "CN-631-322-000"
+}

tests/test_config.py

@@ -1,44 +1,60 @@
 # -*- coding: utf-8 -*-
 
-import json
-from connect.config import Config
 import os
 
+import pytest
+
+from connect.config import Config
+
+
 conf_dict = {
     'apiEndpoint': 'http://localhost:8080/api/public/v1/',
     'apiKey': 'ApiKey XXXX:YYYYY',
     'products': 'CN-631-322-000'
 }
-file_name = 'test_config.json'
 
 
-def _assert_config():
-    assert Config.api_key == conf_dict.get('apiKey')
-    assert Config.api_url == conf_dict.get('apiEndpoint')
-    assert Config.products == [conf_dict.get('products')]
+def setup_module(module):
+    module.prev_dir = os.getcwd()
+    os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 
-def _reset_config():
+def teardown_module(module):
+    os.chdir(module.prev_dir)
+
+
+def teardown_function():
     Config.api_url, Config.api_key, Config.products = None, None, None
 
 
-def test_init_config_from_json_file():
-    file_path = os.path.join(os.path.dirname(__file__), file_name)
-    with open(file_path, 'w') as output:
-        output.write(json.dumps(conf_dict))
+def test_init_config_with_non_existing_file():
+    with pytest.raises(IOError):
+        Config(file='non_existing_config.json')
 
-    Config(file=file_path)
-    os.remove(file_path)
 
-    _assert_config()
-    _reset_config()
+def test_init_config_with_file():
+    config = Config(file='config.json')
+    _assert_config(config)
 
 
 def test_set_config():
-    Config(
+    config = Config(
         api_key=conf_dict.get('apiKey'),
         api_url=conf_dict.get('apiEndpoint'),
         products=conf_dict.get('products'),
     )
-    _assert_config()
-    _reset_config()
+    _assert_config(config)
+
+
+def _assert_config(config=None):
+    assert Config.api_key == conf_dict.get('apiKey')
+    assert Config.api_url == conf_dict.get('apiEndpoint')
+    assert isinstance(Config.products, list)
+    assert len(Config.products) == 1
+    assert Config.products == [conf_dict.get('products')]
+    if config:
+        assert config.api_key == conf_dict.get('apiKey')
+        assert config.api_url == conf_dict.get('apiEndpoint')
+        assert isinstance(config.products, list)
+        assert len(config.products) == 1
+        assert config.products == [conf_dict.get('products')]