Fix test setup for client model swapping

Author: stefanfoulis

…er/migrations/0027_auto_20181207_1311.py …igrations/0027_swappable_client_model.pyoidc_provider/migrations/0027_auto_20181207_1311.py renamed to oidc_provider/migrations/0027_swappable_client_model.py oidc_provider/migrations/0027_auto_20181207_1311.py renamed to oidc_provider/migrations/0027_swappable_client_model.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-12-07 13:11
+# Generated by Django 1.11.4 on 2018-12-07 14:12
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -19,4 +19,9 @@ class Migration(migrations.Migration):
             name='owner',
             field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='oidc_provider_client_set', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
         ),
+        migrations.AlterField(
+            model_name='client',
+            name='response_types',
+            field=models.ManyToManyField(related_name='oidc_provider_client_set', to='oidc_provider.ResponseType'),
+        ),
     ]

oidc_provider/models.py

@@ -73,7 +73,8 @@ class AbstractClient(models.Model):
                     u' of their credentials. <b>Public</b> clients are incapable.'))
     client_id = models.CharField(max_length=255, unique=True, verbose_name=_(u'Client ID'))
     client_secret = models.CharField(max_length=255, blank=True, verbose_name=_(u'Client SECRET'))
-    response_types = models.ManyToManyField(ResponseType)
+    response_types = models.ManyToManyField(
+        ResponseType, related_name='%(app_label)s_%(class)s_set')
     jwt_alg = models.CharField(
         max_length=10,
         choices=JWT_ALGS,

oidc_provider/tests/test_models.py oidc_provider/tests/cases/test_models.pyoidc_provider/tests/test_models.py renamed to oidc_provider/tests/cases/test_models.py

@@ -1,10 +1,8 @@
-from unittest import skip
-import django
 from django.test import TestCase, override_settings
 from django.contrib.auth import get_user_model
 
 from oidc_provider.models import get_client_model, Client
-from oidc_provider.tests.models import CustomClient
+from oidc_provider.tests.models import Client as CustomClient
 
 UserModel = get_user_model()
 
@@ -15,16 +13,15 @@ def test_retrieve_default_client_model(self):
         client = get_client_model()
         self.assertEqual(Client, client)
 
-    @override_settings(OIDC_CLIENT_MODEL='tests.CustomClient')
+    @override_settings(OIDC_CLIENT_MODEL='tests.Client')
     def test_retrireve_custom_client_model(self):
         client = get_client_model()
         self.assertEqual(CustomClient, client)
 
 
-@override_settings(OIDC_CLIENT_MODEL='tests.CustomClient')
+@override_settings(OIDC_CLIENT_MODEL='tests.Client')
 class TestCustomClientModel(TestCase):
 
-    @skip(django.VERSION <= (1, 7))
     def test_custom_client_model(self):
         """
         If a custom client model is installed, it should be present in
@@ -34,12 +31,12 @@ def test_custom_client_model(self):
             f.name for f in UserModel._meta.get_fields()
             if (f.one_to_many or f.one_to_one) and f.auto_created and not f.concrete
         ]
-        self.assertIn("tests_customclient_set", related_object_names)
+        self.assertIn("tests_client_set", related_object_names)
 
     @override_settings(OIDC_CLIENT_MODEL='IncorrectModelFormat')
-    def test_custom_application_model_incorrect_format(self):
+    def test_custom_application_model_incorrect_format_1(self):
         self.assertRaises(ValueError, get_client_model)
 
     @override_settings(OIDC_CLIENT_MODEL='tests.ClientNotInstalled')
-    def test_custom_application_model_incorrect_format(self):
+    def test_custom_application_model_incorrect_format_2(self):
         self.assertRaises(LookupError, get_client_model)

oidc_provider/tests/models.py

@@ -3,5 +3,5 @@
 from oidc_provider.models import AbstractClient
 
 
-class CustomClient(AbstractClient):
+class Client(AbstractClient):
     custom_field = models.CharField(max_length=255)

oidc_provider/tests/settings.py

@@ -47,6 +47,7 @@
     'django.contrib.messages',
     'django.contrib.admin',
     'oidc_provider',
+    'oidc_provider.tests',
 ]
 
 ROOT_URLCONF = 'oidc_provider.tests.app.urls'