diff --git a/.gitignore b/.gitignore index 70ba6af..3a19fd1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,6 @@ src/* .cache *.egg .idea +env/ +venv/ diff --git a/dadata/client.py b/dadata/client.py index c0c401a..7c99451 100644 --- a/dadata/client.py +++ b/dadata/client.py @@ -145,37 +145,37 @@ def __init__(self, *args, **kwargs): Clean Entities """ class Address(ApiURL): - url_postfix = '/address' + url_postfix = '/address/' limit = ADDRESS_LIMIT class Phone(ApiURL): - url_postfix = '/phone' + url_postfix = '/phone/' limit = PHONE_LIMIT class Passport(ApiURL): - url_postfix = '/passport' + url_postfix = '/passport/' limit = PASSPORT_LIMIT class FIO(ApiURL): - url_postfix = '/name' + url_postfix = '/name/' limit = FIO_LIMIT class EMail(ApiURL): - url_postfix = '/email' + url_postfix = '/email/' limit = EMAIL_LIMIT class Date(ApiURL): - url_postfix = '/birthdate' + url_postfix = '/birthdate/' limit = DATE_LIMIT class Auto(ApiURL): - url_postfix = '/vehicle' + url_postfix = '/vehicle/' limit = AUTO_LIMIT @@ -200,27 +200,27 @@ def __init__(self, *args, **kwargs): Suggestion Entities """ class S_Address(SuggestionApiURL): - url_postfix = '/address' + url_postfix = '/address/' limit = ADDRESS_LIMIT class S_Party(SuggestionApiURL): - url_postfix = '/party' + url_postfix = '/party/' limit = SUGGESTIONS_LIMIT class S_Bank(SuggestionApiURL): - url_postfix = '/bank' + url_postfix = '/bank/' limit = SUGGESTIONS_LIMIT class S_FIO(SuggestionApiURL): - url_postfix = '/name' + url_postfix = '/name/' limit = FIO_LIMIT class S_EMail(SuggestionApiURL): - url_postfix = '/email' + url_postfix = '/email/' limit = EMAIL_LIMIT diff --git a/requirements.txt b/requirements.txt index f229360..1027114 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,4 @@ requests +requests_mock +pytest +mock diff --git a/tests/test_address.py b/tests/test_address.py index be93c4c..928d55b 100644 --- a/tests/test_address.py +++ b/tests/test_address.py @@ -99,7 +99,7 @@ def setUp(self): ) adapter = requests_mock.Adapter() adapter.register_uri('POST', - 'mock://api/v2/clean/address', + 'mock://api/v2/clean/address/', request_headers={'Authorization': 'Token key', 'X-Secret':'secret'}, text=ADDRESS_RESPONSE) self.client.session.mount('mock', adapter) diff --git a/tests/test_suggestions.py b/tests/test_suggestions.py index 6c40808..d15ceb8 100644 --- a/tests/test_suggestions.py +++ b/tests/test_suggestions.py @@ -6,7 +6,7 @@ class SuggestionsTest(CommonTestCase): def test_suggestion_url(self): client = self.client # self.assertEqual(client.suggestions.address.url, "https://suggestions.dadata.ru/suggestions/api/4_1/rs/suggest/address") - self.assertEqual(client.suggestions.address.url, "https://dadata.ru/api/v2/suggest/address") + self.assertEqual(client.suggestions.address.url, "https://dadata.ru/api/v2/suggest/address/") def test_that_suggestion_url_is_not_private(self): self.assertEqual(self.client.suggestions.address.private, False) diff --git a/tests/test_url_builder.py b/tests/test_url_builder.py index a6d3394..a9bcae3 100644 --- a/tests/test_url_builder.py +++ b/tests/test_url_builder.py @@ -9,7 +9,7 @@ class UrlBuildTest(CommonTestCase): """ def test_address_url(self): url = self.client.address.url - correct_url = self.client.url + '/clean/address' + correct_url = self.client.url + '/clean/address/' self.assertEqual(url, correct_url) def test_request_no_key(self):