mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-28 20:41:46 +00:00
Code Issues Projects Releases Wiki Activity

Adds html linting to test

Browse source
This commit is contained in:
Mouse Reeve 2021-09-28 10:21:12 -07:00
parent 9a06b7d493
commit 585c71e72a
5 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -8,4 +8,4 @@ WORKDIR /app
COPY requirements.txt /app/ COPY requirements.txt /app/
RUN pip install -r requirements.txt --no-cache-dir RUN pip install -r requirements.txt --no-cache-dir
RUN apt-get update && apt-get install -y gettext libgettextpo-dev && apt-get clean RUN apt-get update && apt-get install -y gettext libgettextpo-dev tidy && apt-get clean

3
bookwyrm/forms.py
View file

@ -29,8 +29,7 @@ class CustomForm(ModelForm):
input_type = visible.field.widget.input_type input_type = visible.field.widget.input_type
if isinstance(visible.field.widget, Textarea): if isinstance(visible.field.widget, Textarea):
input_type = "textarea" input_type = "textarea"
visible.field.widget.attrs["cols"] = None visible.field.widget.attrs["rows"] = 5
visible.field.widget.attrs["rows"] = None
visible.field.widget.attrs["class"] = css_classes[input_type] visible.field.widget.attrs["class"] = css_classes[input_type]

4
bookwyrm/templates/layout.html
View file

@ -117,7 +117,7 @@
</a> </a>
</li> </li>
{% if perms.bookwyrm.create_invites or perms.moderate_user %} {% if perms.bookwyrm.create_invites or perms.moderate_user %}
<li class="navbar-divider" role="presentation"></li> <li class="navbar-divider" role="presentation">&nbsp;</li>
{% endif %} {% endif %}
{% if perms.bookwyrm.create_invites and not site.allow_registration %} {% if perms.bookwyrm.create_invites and not site.allow_registration %}
<li> <li>
@ -133,7 +133,7 @@
</a> </a>
</li> </li>
{% endif %} {% endif %}
<li class="navbar-divider" role="presentation"></li> <li class="navbar-divider" role="presentation">&nbsp;</li>
<li> <li>
<a href="{% url 'logout' %}" class="navbar-item"> <a href="{% url 'logout' %}" class="navbar-item">
{% trans 'Log out' %} {% trans 'Log out' %}

7
bookwyrm/tests/views/test_edit_user.py
View file

@ -3,6 +3,7 @@ import json
import pathlib import pathlib
from unittest.mock import patch from unittest.mock import patch
from PIL import Image from PIL import Image
from tidylib import tidy_document
from django.contrib.auth.models import AnonymousUser from django.contrib.auth.models import AnonymousUser
from django.contrib.sessions.middleware import SessionMiddleware from django.contrib.sessions.middleware import SessionMiddleware
@ -59,7 +60,10 @@ class EditUserViews(TestCase):
request.user = self.local_user request.user = self.local_user
result = view(request) result = view(request)
self.assertIsInstance(result, TemplateResponse) self.assertIsInstance(result, TemplateResponse)
result.render() html = result.render()
_, errors = tidy_document(html.content)
if errors:
raise Exception(errors)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
def test_edit_user(self, _): def test_edit_user(self, _):
@ -93,6 +97,7 @@ class EditUserViews(TestCase):
image_file = pathlib.Path(__file__).parent.joinpath( image_file = pathlib.Path(__file__).parent.joinpath(
"../../static/images/no_cover.jpg" "../../static/images/no_cover.jpg"
) )
# pylint: disable=consider-using-with
form.data["avatar"] = SimpleUploadedFile( form.data["avatar"] = SimpleUploadedFile(
image_file, open(image_file, "rb").read(), content_type="image/jpeg" image_file, open(image_file, "rb").read(), content_type="image/jpeg"
) )

1
requirements.txt
View file

@ -26,3 +26,4 @@ pytest==6.1.2
pytest-cov==2.10.1 pytest-cov==2.10.1
pytest-env==0.6.2 pytest-env==0.6.2
pytest-xdist==2.3.0 pytest-xdist==2.3.0
pytidylib==0.3.2