From 6f272fcd543efba69165fdda35d20de377cb55e0 Mon Sep 17 00:00:00 2001 From: Deimos Date: Sun, 2 Aug 2020 14:20:37 -0600 Subject: [PATCH] Revert "Build HTML Tidy, validate homepage HTML in tests" This reverts commit cb7be838774b82d2e61b320436ed5e22433426b1. HTML Tidy seems to have various gaps in its validation that we've found already, including one that's pretty much a deal-breaker for Tildes's HTML: it doesn't think that is a valid parent for
  • . We're looking at alternative validators still. --- salt/salt/tidy/init.sls | 25 ----------------------- salt/salt/top.sls | 1 - tildes/requirements-dev.in | 1 - tildes/requirements-dev.txt | 1 - tildes/tests/webtests/test_valid_html5.py | 20 ------------------ tildes/tildes/templates/base.jinja2 | 2 +- 6 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 salt/salt/tidy/init.sls delete mode 100644 tildes/tests/webtests/test_valid_html5.py diff --git a/salt/salt/tidy/init.sls b/salt/salt/tidy/init.sls deleted file mode 100644 index b6ef6d3..0000000 --- a/salt/salt/tidy/init.sls +++ /dev/null @@ -1,25 +0,0 @@ -{% set tidy_version = '5.7.28' %} - -unpack-tidy: - archive.extracted: - - name: /tmp/tidy-{{ tidy_version }} - - source: - - https://github.com/htacg/tidy-html5/archive/{{ tidy_version }}.tar.gz - - source_hash: sha256=5caa2c769204f506e24ea4986a45abe23f71d14f0fe968314f20065f342ffdba - - unless: /usr/local/bin/tidy --version | grep 'version {{ tidy_version }}' - - options: --strip-components=1 - - enforce_toplevel: False - -install-tidy: - pkg.installed: - - pkgs: - - build-essential - cmd.run: - - cwd: /tmp/tidy-{{ tidy_version }}/build/cmake - - names: - - cmake ../.. -DCMAKE_BUILD_TYPE=Release - - make - - make install - - ldconfig - - onchanges: - - archive: unpack-tidy diff --git a/salt/salt/top.sls b/salt/salt/top.sls index 98e40b1..9f6cb0a 100644 --- a/salt/salt/top.sls +++ b/salt/salt/top.sls @@ -30,7 +30,6 @@ base: - development - prometheus - nodejs - - tidy 'prod': - nginx.shortener-config - nginx.static-sites-config diff --git a/tildes/requirements-dev.in b/tildes/requirements-dev.in index debb984..2a508df 100644 --- a/tildes/requirements-dev.in +++ b/tildes/requirements-dev.in @@ -6,6 +6,5 @@ prospector pyramid-debugtoolbar pytest pytest-mock -pytidylib testing.redis webtest diff --git a/tildes/requirements-dev.txt b/tildes/requirements-dev.txt index ceda03f..9c01b6f 100644 --- a/tildes/requirements-dev.txt +++ b/tildes/requirements-dev.txt @@ -81,7 +81,6 @@ pytest-mock==3.2.0 pytest==6.0.0 python-dateutil==2.8.1 python-editor==1.0.4 # via alembic -pytidylib==0.3.2 pyyaml==5.3.1 qrcode==6.1 redis==3.5.3 diff --git a/tildes/tests/webtests/test_valid_html5.py b/tildes/tests/webtests/test_valid_html5.py deleted file mode 100644 index 98b4bfc..0000000 --- a/tildes/tests/webtests/test_valid_html5.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2020 Tildes contributors -# SPDX-License-Identifier: AGPL-3.0-or-later - -from tidylib import tidy_document - - -def test_homepage_tidy_loggedout(webtest_loggedout): - """Validate HTML5 using Tidy on the Tildes homepage, logged out.""" - homepage = webtest_loggedout.get("/") - _document, errors = tidy_document(homepage.body) - - assert not errors - - -def test_homepage_tidy_loggedin(webtest): - """Validate HTML5 using Tidy on the Tildes homepage, logged in.""" - homepage = webtest.get("/") - _document, errors = tidy_document(homepage.body) - - assert not errors diff --git a/tildes/tildes/templates/base.jinja2 b/tildes/tildes/templates/base.jinja2 index 237e19f..be58838 100644 --- a/tildes/tildes/templates/base.jinja2 +++ b/tildes/tildes/templates/base.jinja2 @@ -130,7 +130,7 @@
  • Blog
  • Contact
  • Source code
    • -
  • Planned features / All issues
    • +
  • Planned features / All issues
  • Privacy policy
  • Terms of use