Skip to content

Commit

Permalink
rename context.url for context.pattern
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlmadurga
jlmadurga committed Apr 8, 2016
1 parent 6b962e2 commit 878c85c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions microbot/models/handler.py
View file
Expand Up @@ -145,12 +145,12 @@ def __str__(self):
def urlpattern(self):
return url(self.pattern, self.process)

def process(self, bot, update, state_context, **url_context):
def process(self, bot, update, state_context, **pattern_context):
env = {}
for env_var in bot.env_vars.all():
env.update(env_var.as_json())
context = {'state_context': state_context,
'url': url_context,
'pattern': pattern_context,
'env': env,
'update': update.to_dict()}

Expand Down
28 changes: 14 additions & 14 deletions tests/functional/test_handler.py
View file
Expand Up @@ -216,7 +216,7 @@ def test_get_request(self):

def test_get_pattern_command(self):
Author.objects.create(name="author1")
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{url.id}}/',
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{pattern.id}}/',
method=Request.GET)
self.response = factories.ResponseFactory(text_template='<b>{{response.data.name}}</b>',
keyboard_template='')
Expand Down Expand Up @@ -255,7 +255,7 @@ def test_post_request(self):

def test_put_request(self):
author = Author.objects.create(name="author1")
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{url.id}}/',
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{pattern.id}}/',
method=Request.PUT,
data='{"name": "author2"}')
self.response = factories.ResponseFactory(text_template='<b>{{response.data.name}}</b> updated',
Expand All @@ -271,9 +271,9 @@ def test_put_request(self):

def test_delete_request(self):
Author.objects.create(name="author1")
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{url.id}}/',
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{pattern.id}}/',
method=Request.DELETE)
self.response = factories.ResponseFactory(text_template='Author {{ url.id }} deleted',
self.response = factories.ResponseFactory(text_template='Author {{ pattern.id }} deleted',
keyboard_template='')
self.handler = factories.HandlerFactory(bot=self.bot,
pattern='/authors_delete@(?P<id>\d+)',
Expand Down Expand Up @@ -304,7 +304,7 @@ def test_url_parameters(self):
method=Request.GET)
self.url_param = factories.UrlParamFactory(request=self.request,
key='name',
value_template='{{url.name}}')
value_template='{{pattern.name}}')
self.response = factories.ResponseFactory(text_template='{% for author in response.data %}<b>{{author.name}}</b>{% endfor %}',
keyboard_template='')
self.handler = factories.HandlerFactory(bot=self.bot,
Expand Down Expand Up @@ -376,7 +376,7 @@ def test_header_not_authenticated(self):
def test_post_data_template(self):
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/',
method=Request.POST,
data='{"name":"{{url.name}}"}')
data='{"name":"{{pattern.name}}"}')
self.response = factories.ResponseFactory(text_template='<b>{{response.data.name}}</b> created',
keyboard_template='')
self.handler = factories.HandlerFactory(bot=self.bot,
Expand All @@ -388,9 +388,9 @@ def test_post_data_template(self):

def test_put_data_template(self):
Author.objects.create(name="author1")
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{url.id}}/',
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{pattern.id}}/',
method=Request.PUT,
data='{"name":"{{url.name}}"}')
data='{"name":"{{pattern.name}}"}')
self.response = factories.ResponseFactory(text_template='<b>{{response.data.name}}</b> updated',
keyboard_template='')
self.handler = factories.HandlerFactory(bot=self.bot,
Expand All @@ -402,9 +402,9 @@ def test_put_data_template(self):

def test_patch_data_template(self):
Author.objects.create(name="author1")
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{url.id}}/',
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{pattern.id}}/',
method=Request.PATCH,
data='{"name":"{{url.name}}"}')
data='{"name":"{{pattern.name}}"}')
self.response = factories.ResponseFactory(text_template='<b>{{response.data.name}}</b> updated',
keyboard_template='')
self.handler = factories.HandlerFactory(bot=self.bot,
Expand All @@ -416,7 +416,7 @@ def test_patch_data_template(self):

def test_update_as_part_of_context(self):
Author.objects.create(name="author1")
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{url.id}}/',
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{pattern.id}}/',
method=Request.PUT,
data='{"name": "author2"}')
self.response = factories.ResponseFactory(text_template='<b>{{response.data.name}}</b> updated by {{update.message.from_user.first_name}}',
Expand Down Expand Up @@ -459,13 +459,13 @@ def test_handler_with_state(self):
self._test_message(self.author_get)
self.assertEqual(ChatState.objects.get(chat=self.chat).state, self.state_target)
state_context = ChatState.objects.get(chat=self.chat).ctx
self.assertEqual(state_context['url'], {})
self.assertEqual(state_context['pattern'], {})
self.assertEqual(state_context['response']['data'][0], {'name': 'author1'})
self.assertEqual(None, state_context.get('state_context', None))

def test_handler_with_state_no_to_target_beacuse_no_success(self):
Author.objects.create(name="author1")
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{url.id}}/',
self.request = factories.RequestFactory(url_template=self.live_server_url + '/api/authors/{{pattern.id}}/',
method=Request.GET)
self.response = factories.ResponseFactory(text_template='{% if response.status == 404 %}Not found{% else %}<b>{{response.data.name}}</b>{% endif %}',
keyboard_template='')
Expand Down Expand Up @@ -518,7 +518,7 @@ def test_handler_with_state_still_no_chatstate(self):
self._test_message(self.author_get)
self.assertEqual(ChatState.objects.get(chat=self.chat).state, self.state_target)
state_context = ChatState.objects.get(chat=self.chat).ctx
self.assertEqual(state_context['url'], {})
self.assertEqual(state_context['pattern'], {})
self.assertEqual(state_context['response']['data'][0], {'name': 'author1'})
self.assertEqual(None, state_context.get('state_context', None))

Expand Down

0 comments on commit 878c85c

Please sign in to comment.