diff --git a/microbot/serializers.py b/microbot/serializers.py index 9ff0451..c1ba8d1 100644 --- a/microbot/serializers.py +++ b/microbot/serializers.py @@ -146,7 +146,7 @@ def create(self, validated_data): enabled=validated_data['enabled'], request=request, target_state=state, - priority=validated_data.get('priority',0)) + priority=validated_data.get('priority', 0)) self._create_params(validated_data['request']['url_parameters'], UrlParam, request) self._create_params(validated_data['request']['header_parameters'], HeaderParam, request) diff --git a/tests/test_api.py b/tests/test_api.py index e199259..0d1f7f0 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -323,7 +323,8 @@ def _handler_header_param_list_url(self, bot_pk=None, handler_pk=None): handler_pk = self.handler.pk return '%s/bots/%s/handlers/%s/headerparams/' % (self.api, bot_pk, handler_pk) - def assertHandler(self, name, pattern, response_text_template, response_keyboard_template, enabled, priority, target_state_name, source_states_names, handler=None): + def assertHandler(self, name, pattern, response_text_template, response_keyboard_template, enabled, priority, target_state_name, + source_states_names, handler=None): if not handler: handler = self.handler self.assertEqual(handler.name, name) @@ -387,7 +388,7 @@ def test_post_handlers_with_target_state_ok(self): self.handler.target_state = self.state self.handler.save() data = {'name': self.handler.name, 'pattern': self.handler.pattern, - 'target_state': {'name': self.state.name}, 'priority' : self.handler.priority, + 'target_state': {'name': self.state.name}, 'priority': self.handler.priority, 'response': {'text_template': self.handler.response.text_template, 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'request': {'url_template': self.handler.request.url_template, 'method': self.handler.request.method, @@ -405,7 +406,7 @@ def test_post_handlers_with_target_state_ok(self): def test_post_handlers_with_target_state_new_state_ok(self): data = {'name': self.handler.name, 'pattern': self.handler.pattern, - 'target_state': {'name': 'new_state'}, 'priority' : self.handler.priority, + 'target_state': {'name': 'new_state'}, 'priority': self.handler.priority, 'response': {'text_template': self.handler.response.text_template, 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'request': {'url_template': self.handler.request.url_template, 'method': self.handler.request.method, @@ -422,7 +423,7 @@ def test_post_handlers_with_target_state_new_state_ok(self): def test_post_handlers_not_auth(self): data = {'name': self.handler.name, 'pattern': self.handler.pattern, 'response': {'text_template': self.handler.response.text_template, - 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority' : self.handler.priority, + 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority': self.handler.priority, 'request': self.handler.request} self._test_post_list_not_auth(self._handler_list_url(), data) @@ -452,7 +453,7 @@ def test_get_handler_not_found(self): def test_put_handler_ok(self): data = {'name': self.handler.name, 'pattern': self.handler.pattern, 'response': {'text_template': self.handler.response.text_template, - 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority' : self.handler.priority, + 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority': self.handler.priority, 'request': {'url_template': self.handler.request.url_template, 'method': self.handler.request.method, 'url_parameters': [{'key': self.handler.request.url_parameters.all()[0].key, 'value_template': 'new_url_param_value'}], @@ -467,7 +468,7 @@ def test_put_handler_ok(self): def test_put_handler_with_target_new_state_ok(self): data = {'name': self.handler.name, 'pattern': self.handler.pattern, 'response': {'text_template': self.handler.response.text_template, - 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority' : self.handler.priority, + 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority': self.handler.priority, 'request': {'url_template': self.handler.request.url_template, 'method': self.handler.request.method, 'url_parameters': [{'key': self.handler.request.url_parameters.all()[0].key, 'value_template': 'new_url_param_value'}], @@ -487,7 +488,7 @@ def test_put_handler_with_target_state_ok(self): self.handler.target_state = self.state self.handler.save() data = {'name': self.handler.name, 'pattern': self.handler.pattern, 'response': {'text_template': self.handler.response.text_template, - 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority' : 2, + 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority': 2, 'request': {'url_template': self.handler.request.url_template, 'method': self.handler.request.method, 'url_parameters': [{'key': self.handler.request.url_parameters.all()[0].key, 'value_template': 'new_url_param_value'}], @@ -505,7 +506,7 @@ def test_put_handler_with_target_state_ok(self): def test_put_handler_from_other_bot(self): data = {'name': self.handler.name, 'pattern': self.handler.pattern, 'response': {'text_template': self.handler.response.text_template, - 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority' : self.handler.priority, + 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority': self.handler.priority, 'request': {'url_template': self.handler.request.url_template, 'method': self.handler.request.method, 'data': self.handler.request.data} } @@ -513,7 +514,7 @@ def test_put_handler_from_other_bot(self): def test_put_handler_not_auth(self): data = {'name': self.handler.name, 'pattern': self.handler.pattern, 'response': {'text_template': self.handler.response.text_template, - 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority' : self.handler.priority, + 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority': self.handler.priority, 'request': {'url_template': self.handler.request.url_template, 'method': self.handler.request.method, 'data': self.handler.request.data} } @@ -521,7 +522,7 @@ def test_put_handler_not_auth(self): def test_put_handler_not_found(self): data = {'name': self.handler.name, 'pattern': self.handler.pattern, 'response': {'text_template': self.handler.response.text_template, - 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority' : self.handler.priority, + 'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority': self.handler.priority, 'request': {'url_template': self.handler.request.url_template, 'method': self.handler.request.method, 'data': self.handler.request.data} }