Skip to content

Commit 5b0bc02

Browse files
Resolve some TODOs
1 parent 646823b commit 5b0bc02

File tree

7 files changed

+8
-24
lines changed

7 files changed

+8
-24
lines changed

MangAdventure/templates/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<i class="mi mi-discord"></i><span>Discord</span>
2020
</a>
2121
{% endif %}
22-
{% if rss_url %}{# TODO: maybe clean this up? #}
22+
{% if rss_url %}
2323
<a {% if arg %}href="{% url rss_url arg %}"
2424
{% elif token %}href="{% url rss_url %}?token={{ token }}"
2525
{% else %}href="{% url rss_url %}"{% endif %} class="link"

MangAdventure/tests/test_views.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,26 +100,26 @@ class TestOpenSearch(MangadvViewTestBase):
100100

101101
def test_get(self):
102102
r = self.client.get(self.URL)
103-
# TODO: test contents
104103
assert r.status_code == 200
105104
assert r['Content-Type'] == 'application/opesearchdescription+xml'
105+
assert '<ShortName>MangAdventure' in str(r.content)
106106

107107

108108
class TestContribute(MangadvViewTestBase):
109109
URL = reverse('contribute')
110110

111111
def test_get(self):
112112
r = self.client.get(self.URL)
113-
# TODO: test contents
114113
assert r.status_code == 200
115114
assert r['Content-Type'] == 'application/json'
115+
assert r.json()['name'] == 'MangAdventure'
116116

117117

118118
class TestManifest(MangadvViewTestBase):
119119
URL = reverse('manifest')
120120

121121
def test_get(self):
122122
r = self.client.get(self.URL)
123-
# TODO: test contents
124123
assert r.status_code == 200
125124
assert r['Content-Type'] == 'application/manifest+json'
125+
assert r.json()['name'] == 'MangAdventure'

reader/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def has_delete_permission(self, request: HttpRequest, obj:
187187
return obj.series.manager_id == request.user.id
188188

189189

190-
# TODO: find a cleaner way to adapt the help_text
190+
# HACK: use a factory to adapt the help_text
191191
def alias_inline(model: str) -> Type[GenericStackedInline]:
192192
"""
193193
Get an inline admin model for :class:`~reader.models.Alias`.

reader/api.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,6 @@ class SeriesViewSet(CORSMixin, ModelViewSet):
154154
ordering = ('title',)
155155
lookup_field = 'slug'
156156

157-
def retrieve(self, request: Request, *args, **kwargs) -> Response:
158-
instance = self.get_object()
159-
if instance.licensed:
160-
raise _LegalException()
161-
serializer = self.get_serializer(instance)
162-
return Response(serializer.data)
163-
164157
def get_queryset(self) -> QuerySet:
165158
q = Q(chapters__published__lte=tz.now())
166159
return models.Series.objects.annotate(

reader/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ def names(self) -> List[str]:
6767
6868
:return: The values of the ``alias`` field.
6969
"""
70-
return list(self.get_queryset().values_list('name', flat=True))
70+
qs = self.get_queryset().order_by('name')
71+
return list(qs.values_list('name', flat=True))
7172

7273

7374
class Alias(models.Model):

reader/serializers.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,7 @@ def _get_aliases(self, obj: Series) -> List[str]:
260260
def _get_metadata(self, obj: Series) -> List[List[str]]:
261261
return [
262262
['Author', self._get_author(obj)],
263-
['Artist', self._get_artist(obj)],
264-
# TODO: Views & Last Updated
263+
['Artist', self._get_artist(obj)]
265264
]
266265

267266
def _get_chapters(self, obj: Series) -> Dict[str, Dict]:

reader/tests/test_admin.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
from os import getenv
2-
31
from django.contrib.admin import AdminSite
42
from django.contrib.auth.models import User
53
from django.http import HttpRequest
64

7-
from pytest import mark
8-
95
from MangAdventure.tests.utils import get_test_image
106

117
from reader.admin import (
@@ -57,7 +53,6 @@ def test_pages(self):
5753
page = self.chapter.pages.create(number=1, image=get_test_image())
5854
inline = self.admin.get_inline_instances(self.request, self.chapter)
5955
assert inline[0].preview(page).startswith('<img src="')
60-
# TODO: validate formset
6156

6257
def test_permissions(self):
6358
assert self.admin.has_change_permission(self.request)
@@ -130,10 +125,6 @@ def setup_method(self):
130125
self.artist.aliases.create(name='artist1')
131126
self.artist.aliases.create(name='artist2')
132127

133-
@mark.xfail(
134-
getenv('DB_TYPE') == 'postgresql',
135-
reason='PostgreSQL still hates us'
136-
) # TODO: appease PostgreSQL
137128
def test_aliases(self):
138129
assert self.author_admin.aliases(self.author) == 'author1, author2'
139130
assert self.artist_admin.aliases(self.artist) == 'artist1, artist2'

0 commit comments

Comments
 (0)