2 files changed, 31 insertions, 0 deletions
diff --git a/tests/generic_views/test_base.py b/tests/generic_views/test_base.py
index 0e84e17132..2eadee2b42 100644
--- a/tests/generic_views/test_base.py
+++ b/tests/generic_views/test_base.py
@@ -411,3 +411,23 @@ class GetContextDataTest(unittest.TestCase):
         # test that kwarg overrides values assigned higher up
         context = test_view.get_context_data(test_name='test_value')
         self.assertEqual(context['test_name'], 'test_value')
+
+
+class UseMultipleObjectMixinTest(unittest.TestCase):
+    rf = RequestFactory()
+
+    def test_use_queryset_from_view(self):
+        test_view = views.CustomMultipleObjectMixinView()
+        test_view.get(self.rf.get('/'))
+        # Don't pass queryset as argument
+        context = test_view.get_context_data()
+        self.assertEqual(context['object_list'], test_view.queryset)
+
+    def test_overwrite_queryset(self):
+        test_view = views.CustomMultipleObjectMixinView()
+        test_view.get(self.rf.get('/'))
+        queryset = [{'name': 'Lennon'}, {'name': 'Ono'}]
+        self.assertNotEqual(test_view.queryset, queryset)
+        # Overwrite the view's queryset with queryset from kwarg
+        context = test_view.get_context_data(object_list=queryset)
+        self.assertEqual(context['object_list'], queryset)
diff --git a/tests/generic_views/views.py b/tests/generic_views/views.py
index aa8777e8c6..4dda3fe0e0 100644
--- a/tests/generic_views/views.py
+++ b/tests/generic_views/views.py
@@ -201,6 +201,17 @@ class BookDetailGetObjectCustomQueryset(BookDetail):
         return super(BookDetailGetObjectCustomQueryset,self).get_object(
             queryset=Book.objects.filter(pk=2))
 
+
+class CustomMultipleObjectMixinView(generic.list.MultipleObjectMixin, generic.View):
+    queryset = [
+        {'name': 'John'},
+        {'name': 'Yoko'},
+    ]
+
+    def get(self, request):
+        self.object_list = self.get_queryset()
+
+
 class CustomContextView(generic.detail.SingleObjectMixin, generic.View):
     model = Book
     object = Book(name='dummy')