Merge branch 'master' into flake8fix

django_mock_queries/query.py

@@ -140,6 +140,12 @@ def order_by(*fields):
 
     mock_set.order_by = MagicMock(side_effect=order_by)
 
+    def distinct():
+        results = set(items)
+        return MockSet(*results, clone=mock_set)
+
+    mock_set.distinct = MagicMock(side_effect=distinct)
+
     def latest(field):
         results = sorted(items, key=attrgetter(field), reverse=True)
         if len(results) == 0:

setup.py

@@ -3,7 +3,7 @@
 setup(
     name='django_mock_queries',
     packages=['django_mock_queries'],
-    version='0.0.12',
+    version='0.0.13',
     description='A django library for mocking queryset functions in memory for testing',
     author='Phivos Stylianides',
     author_email='stphivos@gmail.com',

tests/test_query.py

@@ -267,6 +267,16 @@ def test_query_order_by_descending(self):
 
         assert results == [item_1, item_2, item_3], results
 
+    def test_query_distinct(self):
+        item_1 = MockModel(foo=1, mock_name='item_1')
+        item_2 = MockModel(foo=2, mock_name='item_2')
+        item_3 = MockModel(foo=3, mock_name='item_3')
+
+        self.mock_set.add(item_2, item_3, item_1, item_3)
+        results = list(self.mock_set.distinct().order_by('foo'))
+
+        assert results == [item_1, item_2, item_3], results
+
     def test_query_implements_iterator_on_items(self):
         items = [1, 2, 3]
         assert [x for x in MockSet(*items)] == items