rename test app that uses enum-properties

bckohan · bckohan · commit d3b948508cf9 · 2022-07-25T12:11:59.000-07:00
diff --git a/django_enum/tests/enum_prop/__init__.py b/django_enum/tests/enum_prop/__init__.py
diff --git a/django_enum/tests/enum_prop/apps.py b/django_enum/tests/enum_prop/apps.py
@@ -2,7 +2,7 @@
 
 
 class App1Config(AppConfig):
-    name = 'django_enum.tests.app1'
+    name = 'django_enum.tests.enum_prop'
     label = name.replace('.', '_')
 
     def ready(self):
diff --git a/django_enum/tests/enum_prop/basic_enums.py b/django_enum/tests/enum_prop/basic_enums.py
diff --git a/django_enum/tests/enum_prop/enums.py b/django_enum/tests/enum_prop/enums.py
diff --git a/django_enum/tests/enum_prop/forms.py b/django_enum/tests/enum_prop/forms.py
@@ -1,6 +1,6 @@
 from django.forms import ModelForm
 from django_enum import EnumChoiceField
-from django_enum.tests.app1.enums import (
+from django_enum.tests.enum_prop.enums import (
     SmallPosIntEnum,
     SmallIntEnum,
     PosIntEnum,
@@ -12,7 +12,7 @@
     DJIntEnum,
     DJTextEnum
 )
-from django_enum.tests.app1.models import EnumTester
+from django_enum.tests.enum_prop.models import EnumTester
 
 
 class EnumTesterForm(ModelForm):
diff --git a/django_enum/tests/enum_prop/migrations/0001_initial.py b/django_enum/tests/enum_prop/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.14 on 2022-07-23 12:19
+# Generated by Django 3.2.14 on 2022-07-25 14:11
 
 from django.db import migrations, models
 import django_enum.fields
diff --git a/django_enum/tests/enum_prop/migrations/__init__.py b/django_enum/tests/enum_prop/migrations/__init__.py
diff --git a/django_enum/tests/enum_prop/models.py b/django_enum/tests/enum_prop/models.py
@@ -3,7 +3,7 @@
 from django.db import models
 from django.urls import reverse
 from django_enum import EnumField, IntegerChoices, TextChoices
-from django_enum.tests.app1.enums import (
+from django_enum.tests.enum_prop.enums import (
     BigIntEnum,
     BigPosIntEnum,
     Constants,
@@ -82,7 +82,7 @@ class EnumTester(models.Model):
     )
 
     def get_absolute_url(self):
-        return reverse('django_enum_tests_app1:enum-detail', kwargs={'pk': self.pk})
+        return reverse('django_enum_tests_enum_prop:enum-detail', kwargs={'pk': self.pk})
 
     class Meta:
         ordering = ('id',)
diff --git a/django_enum/tests/enum_prop/templates/django_enum_tests_enum_prop/base.html b/django_enum/tests/enum_prop/templates/django_enum_tests_enum_prop/base.html
diff --git a/django_enum/tests/enum_prop/templates/django_enum_tests_enum_prop/enumtester_confirm_delete.html b/django_enum/tests/enum_prop/templates/django_enum_tests_enum_prop/enumtester_confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends "django_enum_tests_app1/base.html" %}
+{% extends "django_enum_tests_enum_prop/base.html" %}
 
 {% block content %}
 <form method="post">{% csrf_token %}
diff --git a/django_enum/tests/enum_prop/templates/django_enum_tests_enum_prop/enumtester_detail.html b/django_enum/tests/enum_prop/templates/django_enum_tests_enum_prop/enumtester_detail.html
@@ -1,4 +1,4 @@
-{% extends "django_enum_tests_app1/base.html" %}
+{% extends "django_enum_tests_enum_prop/base.html" %}
 
 {% block content %}
     <div id="{{object.pk}}" class="enum">
@@ -16,8 +16,8 @@ <h1>{{ object.pk }}</h1>
     <p class="non_strict_int">non_strict_int: <b><span class="value">{{ object.non_strict_int.value}}</span></b> <b><span class="label">{{ object.non_strict_int.label }}</span></b></p>
 
     <p>
-    <a href="{% url 'django_enum_tests_app1:enum-update' pk=object.pk %}">Edit</a>
-    <a href="{% url 'django_enum_tests_app1:enum-delete' pk=object.pk %}">Delete</a>
+    <a href="{% url 'django_enum_tests_enum_prop:enum-update' pk=object.pk %}">Edit</a>
+    <a href="{% url 'django_enum_tests_enum_prop:enum-delete' pk=object.pk %}">Delete</a>
     </p>
     </div>
 {% endblock %}
diff --git a/django_enum/tests/enum_prop/templates/django_enum_tests_enum_prop/enumtester_form.html b/django_enum/tests/enum_prop/templates/django_enum_tests_enum_prop/enumtester_form.html
@@ -1,4 +1,4 @@
-{% extends "django_enum_tests_app1/base.html" %}
+{% extends "django_enum_tests_enum_prop/base.html" %}
 
 {% block content %}
     <form action = "" method = "post">
diff --git a/django_enum/tests/enum_prop/templates/django_enum_tests_enum_prop/enumtester_list.html b/django_enum/tests/enum_prop/templates/django_enum_tests_enum_prop/enumtester_list.html
@@ -1,4 +1,4 @@
-{% extends "django_enum_tests_app1/base.html" %}
+{% extends "django_enum_tests_enum_prop/base.html" %}
 
 {% block content %}
 <h1>EnumTester Objects</h1>
@@ -18,8 +18,8 @@ <h2>{{ object.pk }}</h2>
         <p class="non_strict_int">non_strict_int: <b><span class="value">{{ object.non_strict_int.value}}</span></b> <b><span class="label">{{ object.non_strict_int.label }}</span></b></p>
 
         <p>
-        <a href="{% url 'django_enum_tests_app1:enum-update' pk=object.pk %}">Edit</a>
-        <a href="{% url 'django_enum_tests_app1:enum-delete' pk=object.pk %}">Delete</a>
+        <a href="{% url 'django_enum_tests_enum_prop:enum-update' pk=object.pk %}">Edit</a>
+        <a href="{% url 'django_enum_tests_enum_prop:enum-delete' pk=object.pk %}">Delete</a>
         </p>
     </div>
 {% endfor %}
diff --git a/django_enum/tests/enum_prop/urls.py b/django_enum/tests/enum_prop/urls.py
@@ -1,6 +1,6 @@
 from django.urls import path
-from django_enum.tests.app1.models import EnumTester
-from django_enum.tests.app1.views import (
+from django_enum.tests.enum_prop.models import EnumTester
+from django_enum.tests.enum_prop.views import (
     EnumTesterCreateView,
     EnumTesterDeleteView,
     EnumTesterDetailView,
@@ -12,7 +12,7 @@
 )
 from django_filters.views import FilterView
 
-app_name = 'django_enum_tests_app1'
+app_name = 'django_enum_tests_enum_prop'
 
 urlpatterns = [
     path('enum/<int:pk>', EnumTesterDetailView.as_view(), name='enum-detail'),
@@ -22,7 +22,7 @@
         FilterView.as_view(
             model=EnumTester,
             filterset_fields='__all__',
-            template_name='django_enum_tests_app1/enumtester_list.html'
+            template_name='django_enum_tests_enum_prop/enumtester_list.html'
         ),
         name='enum-filter'
     ),
diff --git a/django_enum/tests/enum_prop/views.py b/django_enum/tests/enum_prop/views.py
@@ -4,7 +4,7 @@
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 from django_enum import EnumChoiceField
 from django_enum.filters import FilterSet as EnumFilterSet
-from django_enum.tests.app1.enums import (
+from django_enum.tests.enum_prop.enums import (
     BigIntEnum,
     BigPosIntEnum,
     Constants,
@@ -16,8 +16,8 @@
     SmallPosIntEnum,
     TextEnum,
 )
-from django_enum.tests.app1.forms import EnumTesterForm
-from django_enum.tests.app1.models import EnumTester
+from django_enum.tests.enum_prop.forms import EnumTesterForm
+from django_enum.tests.enum_prop.models import EnumTester
 from django_filters.views import FilterView
 
 
@@ -54,7 +54,7 @@ class EnumTesterFormCreateView(CreateView):
 class EnumTesterDeleteView(DeleteView):
     model = EnumTester
     success_url = reverse_lazy(
-        'django_enum_tests_app1:enum-list'
+        'django_enum_tests_enum_prop:enum-list'
     )
 
 
@@ -68,5 +68,5 @@ class Meta:
     filterset_class = EnumTesterFilter
     model = EnumTester
     template_name = (
-        'django_enum_tests_app1/enumtester_list.html'
+        'django_enum_tests_enum_prop/enumtester_list.html'
     )
diff --git a/django_enum/tests/settings.py b/django_enum/tests/settings.py
@@ -43,7 +43,7 @@
 
 INSTALLED_APPS = (
     'django_enum.tests.edit_tests',
-    'django_enum.tests.app1',
+    'django_enum.tests.enum_prop',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
diff --git a/django_enum/tests/tests.py b/django_enum/tests/tests.py
@@ -9,7 +9,7 @@
 from django.test import Client, TestCase
 from django.urls import reverse
 from django_enum import TextChoices
-from django_enum.tests.app1.enums import (
+from django_enum.tests.enum_prop.enums import (
     BigIntEnum,
     BigPosIntEnum,
     Constants,
@@ -22,7 +22,7 @@
     SmallPosIntEnum,
     TextEnum,
 )
-from django_enum.tests.app1.models import (
+from django_enum.tests.enum_prop.models import (
     EnumTester,
     MyModel,
     PerfCompare,
@@ -52,7 +52,7 @@ def set_models(version):
         reload(models)
 
 
-APP1_DIR = Path(__file__).parent / 'app1'
+APP1_DIR = Path(__file__).parent / 'enum_prop'
 
 
 class TestChoices(TestCase):
@@ -821,7 +821,7 @@ def test_post(self):
         # test normal choice field and our EnumChoiceField
         for form_url in ['enum-add', 'enum-form-add']:
             response = c.post(
-                reverse(f'django_enum_tests_app1:{form_url}'),
+                reverse(f'django_enum_tests_enum_prop:{form_url}'),
                 {
                     'small_pos_int': SmallPosIntEnum.VAL2,
                     'small_int': SmallIntEnum.VAL0,
@@ -890,7 +890,7 @@ def test_add_form(self):
         c = Client()
         # test normal choice field and our EnumChoiceField
         for form_url in ['enum-add', 'enum-form-add']:
-            response = c.get(reverse(f'django_enum_tests_app1:{form_url}'))
+            response = c.get(reverse(f'django_enum_tests_enum_prop:{form_url}'))
             soup = Soup(response.content, features='html.parser')
 
             for field in [
@@ -932,7 +932,7 @@ def test_update_form(self):
         # test normal choice field and our EnumChoiceField
         for form_url in ['enum-update', 'enum-form-update']:
             for obj in self.objects:
-                response = c.get(reverse(f'django_enum_tests_app1:{form_url}', kwargs={'pk': obj.pk}))
+                response = c.get(reverse(f'django_enum_tests_enum_prop:{form_url}', kwargs={'pk': obj.pk}))
                 soup = Soup(response.content, features='html.parser')
 
                 for field in [
diff --git a/django_enum/tests/urls.py b/django_enum/tests/urls.py
@@ -3,5 +3,5 @@
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('app1/', include('django_enum.tests.app1.urls'))
+    path('enum_prop/', include('django_enum.tests.enum_prop.urls'))
 ]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Generated by Django 3.2.14 on 2022-07-23 12:19`
	`1`	`+# Generated by Django 3.2.14 on 2022-07-25 14:11`
`2`	`2`
`3`	`3`	`from django.db import migrations, models`
`4`	`4`	`import django_enum.fields`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends "django_enum_tests_app1/base.html" %}`
	`1`	`+{% extends "django_enum_tests_enum_prop/base.html" %}`
`2`	`2`
`3`	`3`	`{% block content %}`
`4`	`4`	`<form method="post">{% csrf_token %}`