Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove tested constraint for response objects in filter method #511

Merged
merged 1 commit into from
Dec 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chatterbot/storage/django_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def filter(self, **kwargs):
if responses:
kwargs['in_response__response__text__in'] = []
for response in responses:
kwargs['in_response__response__text__in'].append(response.response.text)
kwargs['in_response__response__text__in'].append(response)
else:
kwargs['in_response'] = None

Expand Down
2 changes: 1 addition & 1 deletion chatterbot/storage/mongodb.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def filter(self, **kwargs):
if 'in_response_to' in kwargs:
serialized_responses = []
for response in kwargs['in_response_to']:
serialized_responses.append({'text': response.text})
serialized_responses.append({'text': response})

query = query.statement_response_list_equals(serialized_responses)
del kwargs['in_response_to']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def test_filter_in_response_to_no_matches(self):
self.adapter.update(self.statement1)

results = self.adapter.filter(
in_response_to=[Response("Maybe")]
in_response_to="Maybe"
)
self.assertEqual(len(results), 0)

Expand Down
4 changes: 1 addition & 3 deletions tests/storage_adapter_tests/test_mongo_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,7 @@ def test_filter_text_no_matches(self):
def test_filter_in_response_to_no_matches(self):
self.adapter.update(self.statement1)

results = self.adapter.filter(
in_response_to=[Response("Maybe")]
)
results = self.adapter.filter(in_response_to="Maybe")
self.assertEqual(len(results), 0)

def test_filter_equal_results(self):
Expand Down
6 changes: 3 additions & 3 deletions tests/storage_adapter_tests/test_storage_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ def test_count(self):

def test_find(self):
with self.assertRaises(StorageAdapter.AdapterMethodNotImplementedError):
self.adapter.find("")
self.adapter.find('')

def test_filter(self):
with self.assertRaises(StorageAdapter.AdapterMethodNotImplementedError):
self.adapter.filter()

def test_remove(self):
with self.assertRaises(StorageAdapter.AdapterMethodNotImplementedError):
self.adapter.remove("")
self.adapter.remove('')

def test_update(self):
with self.assertRaises(StorageAdapter.AdapterMethodNotImplementedError):
self.adapter.update("")
self.adapter.update('')

def test_get_random(self):
with self.assertRaises(StorageAdapter.AdapterMethodNotImplementedError):
Expand Down
4 changes: 1 addition & 3 deletions tests_django/test_django_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,7 @@ def test_filter_text_no_matches(self):
def test_filter_in_response_to_no_matches(self):
self.adapter.update(self.statement1)

results = self.adapter.filter(
in_response_to__contains="Maybe"
)
results = self.adapter.filter(in_response_to="Maybe")
self.assertEqual(len(results), 0)

def test_filter_equal_results(self):
Expand Down