Details

Reviewers

vlorentz
swh-public-ci

Group Reviewers

Reviewers

Commits

rDWAPPS8421487367a4: cypress: Add end to end tests for content rendering
rDWAPPS12427620b5ad: common/highlightjs: Improve code highlighting of numerous source files

Summary

That diff aims to test HTML rendering of the contents stored inside the archive.
The purpose is to ensure no regressions will appear when some JavaScript dependencies
or our custom frontend code evolve.

A first batch of tests will check that almost all the programming languages supported by the
highlightjs library are correctly highlighted.

The other tests will check that some special contents (images, pdf files, ...) will be
correctly rendered.

In order to provide relevant input data to these new tests, some new endpoints are added
to swh-web for that purpose (only available when running the end to end tests).

Related T1845

Diff Detail

Repository

rDWAPPS Web applications

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

anlambert created this revision.Jul 1 2019, 6:01 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptJul 1 2019, 6:01 PM

Build is green
See https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/567/ for more details.

Harbormaster completed remote builds in B6615: Diff 5607.Jul 1 2019, 6:09 PM

Please add comments on the code added to swh/web/tests/data.py, I have no idea what it does.

And you are bundling lots of non-trivial code, some with no authoring attribution or license. I don't think we need all these tests. Testing a few languages and formats (and trusting highlightjs to do its job on the rest) should be enough.

swh/web/common/highlightjs.py
46	Where is that list coming from?

This revision now requires changes to proceed.Jul 1 2019, 6:14 PM

Please add comments on the code added to swh/web/tests/data.py, I have no idea what it does.

So the WIP tag ...

And you are bundling lots of non-trivial code, some with no authoring attribution or license. I don't think we need all these tests.

From my point of view, those tests need to be exhaustive as code highlighting is one of the most important feature of
swh-web/browse (and we are a source code archive right ? we should be able to highlight correctly a lot of contents)
I can try to find better source files with proper licenses in it but it will be complicated to find some for some format.

Testing a few languages and formats (and trusting highlightjs to do its job on the rest) should be enough.

I do not rely on the automatic language detection of highlightjs as it does not work so great and it implies
reading the source file content client-side (not really optimal in terms of performance). I use heuristics based
on file extensions, filenames or content mime types. This is not the perfect solution but it works pretty great.
Of course, this could be improved in the future.

swh/web/common/highlightjs.py
46	Generated from the highlightjs language aliases and completed by hand.

vlorentz added inline comments.Jul 1 2019, 6:49 PM

swh/web/common/highlightjs.py
46	Would it be possible to send highlightjs a PR to add the aliases; and bundle their data file directly?

anlambert planned changes to this revision.Jul 4 2019, 5:21 PM

Update:

rebase to master
add remaining programming languages to test highlighting
add test for Jupyter notebook rendering

anlambert retitled this revision from [WIP] Add end to end tests for content rendering to Add end to end tests for content rendering.Jul 8 2019, 5:38 PM

anlambert edited the summary of this revision. (Show Details)

Build is green
See https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/588/ for more details.

Harbormaster completed remote builds in B6728: Diff 5705.Jul 8 2019, 5:41 PM

For your information, I have also tested how reliable the automatic language detection feature of the highlight.js library is.
Below are the results (tests without timing have failed):

Code highlighting tests
    1) should highlight source files with extension R
    2) should highlight source files with extension abnf
    ✓ should highlight source files with extension adb (1478ms)
    ✓ should highlight source files with extension adoc (1171ms)
    ✓ should highlight source files with extension ads (1783ms)
    3) should highlight source files with extension ahk
    4) should highlight source files with extension aj
    ✓ should highlight source files with extension applescript (694ms)
    5) should highlight source files with extension as
    ✓ should highlight source files with extension au3 (1522ms)
    6) should highlight source files with extension awk
    7) should highlight source files with extension bas
    ✓ should highlight source files with extension bat (836ms)
    ✓ should highlight source files with extension bf (783ms)
    8) should highlight source files with extension bnf
    ✓ should highlight source files with extension bsl (1231ms)
    ✓ should highlight source files with extension cal (1096ms)
    ✓ should highlight source files with extension capnp (1431ms)
    ✓ should highlight source files with extension cc (1183ms)
    9) should highlight source files with extension ceylon
    ✓ should highlight source files with extension clj (773ms)
    ✓ should highlight source files with extension cls (840ms)
    ✓ should highlight source files with extension cmake (941ms)
    ✓ should highlight source files with extension coffee (946ms)
    10) should highlight source files with extension cpp
    11) should highlight source files with extension cr
    ✓ should highlight source files with extension cs (872ms)
    ✓ should highlight source files with extension css (878ms)
    ✓ should highlight source files with extension d (1132ms)
    12) should highlight source files with extension dart
    ✓ should highlight source files with extension dcl (1453ms)
    13) should highlight source files with extension dfm
    14) should highlight source files with extension diff
    ✓ should highlight source files with extension do (1090ms)
    ✓ should highlight source files with extension dts (928ms)
    ✓ should highlight source files with extension dust (1082ms)
    15) should highlight source files with extension ebnf
    16) should highlight source files with extension elm
    ✓ should highlight source files with extension ep (1130ms)
    ✓ should highlight source files with extension erb (604ms)
    ✓ should highlight source files with extension erl (959ms)
    ✓ should highlight source files with extension ex (1055ms)
    ✓ should highlight source files with extension exs (868ms)
    ✓ should highlight source files with extension f90 (1025ms)
    17) should highlight source files with extension feature
    18) should highlight source files with extension flix
    ✓ should highlight source files with extension fs (1528ms)
    ✓ should highlight source files with extension gcode (799ms)
    ✓ should highlight source files with extension glsl (872ms)
    ✓ should highlight source files with extension gml (2535ms)
    19) should highlight source files with extension gms
    ✓ should highlight source files with extension go (1012ms)
    20) should highlight source files with extension golo
    21) should highlight source files with extension gradle
    22) should highlight source files with extension groovy
    23) should highlight source files with extension gss
    24) should highlight source files with extension haml
    25) should highlight source files with extension hbs
    26) should highlight source files with extension hs
    ✓ should highlight source files with extension hsp (1111ms)
    27) should highlight source files with extension hx
    ✓ should highlight source files with extension hy (2825ms)
    ✓ should highlight source files with extension icl (1104ms)
    28) should highlight source files with extension ini
    29) should highlight source files with extension ino
    30) should highlight source files with extension java
    31) should highlight source files with extension jl
    32) should highlight source files with extension js
    ✓ should highlight source files with extension json (1033ms)
    33) should highlight source files with extension kt
    34) should highlight source files with extension lasso
    35) should highlight source files with extension lc
    ✓ should highlight source files with extension ldif (802ms)
    ✓ should highlight source files with extension leaf (1086ms)
    ✓ should highlight source files with extension less (1026ms)
    36) should highlight source files with extension lisp
    ✓ should highlight source files with extension ll (1041ms)
    ✓ should highlight source files with extension ls (938ms)
    ✓ should highlight source files with extension lsl (1132ms)
    ✓ should highlight source files with extension lua (1030ms)
    37) should highlight source files with extension m
    ✓ should highlight source files with extension md (1461ms)
    ✓ should highlight source files with extension mel (1027ms)
    38) should highlight source files with extension mk
    39) should highlight source files with extension ml
    40) should highlight source files with extension moon
    41) should highlight source files with extension nb
    42) should highlight source files with extension nim
    ✓ should highlight source files with extension nix (779ms)
    ✓ should highlight source files with extension nsi (1502ms)
    43) should highlight source files with extension p
    ✓ should highlight source files with extension pas (1044ms)
    44) should highlight source files with extension pbi
    ✓ should highlight source files with extension pde (1964ms)
    45) should highlight source files with extension php
    46) should highlight source files with extension pl
    47) should highlight source files with extension pm
    48) should highlight source files with extension pony
    49) should highlight source files with extension pp
    50) should highlight source files with extension properties
    ✓ should highlight source files with extension proto (1654ms)
    51) should highlight source files with extension ps1
    ✓ should highlight source files with extension py (1057ms)
    52) should highlight source files with extension q
    53) should highlight source files with extension qml
    ✓ should highlight source files with extension rb (1220ms)
    ✓ should highlight source files with extension re (1053ms)
    54) should highlight source files with extension rib
    55) should highlight source files with extension rs
    ✓ should highlight source files with extension rsc (1811ms)
    56) should highlight source files with extension s
    ✓ should highlight source files with extension sas (1004ms)
    57) should highlight source files with extension scad
    ✓ should highlight source files with extension scala (1621ms)
    58) should highlight source files with extension sci
    ✓ should highlight source files with extension scm (972ms)
    ✓ should highlight source files with extension scss (1143ms)
    ✓ should highlight source files with extension sh (1335ms)
    ✓ should highlight source files with extension sl (1318ms)
    ✓ should highlight source files with extension smali (1371ms)
    ✓ should highlight source files with extension sml (807ms)
    ✓ should highlight source files with extension sqf (1264ms)
    59) should highlight source files with extension st
    ✓ should highlight source files with extension stan (898ms)
    60) should highlight source files with extension styl
    ✓ should highlight source files with extension subunit (1019ms)
    ✓ should highlight source files with extension swift (977ms)
    ✓ should highlight source files with extension tap (1231ms)
    61) should highlight source files with extension tcl
    ✓ should highlight source files with extension tex (1145ms)
    ✓ should highlight source files with extension thrift (854ms)
    62) should highlight source files with extension ts
    ✓ should highlight source files with extension v (2515ms)
    63) should highlight source files with extension vala
    ✓ should highlight source files with extension vb (1599ms)
    64) should highlight source files with extension vbs
    ✓ should highlight source files with extension vhd (5093ms)
    65) should highlight source files with extension vim
    66) should highlight source files with extension wl
    67) should highlight source files with extension xml
    ✓ should highlight source files with extension xqy (2337ms)
    68) should highlight source files with extension yml
    ✓ should highlight source files with extension zep (1373ms)
    ✓ should highlight source files with filenames .htaccess (1220ms)
    69) should highlight source files with filenames CMakeLists.txt
    70) should highlight source files with filenames Dockerfile
    71) should highlight source files with filenames Makefile
    ✓ should highlight source files with filenames access.log (1211ms)
    ✓ should highlight source files with filenames httpd.conf (1338ms)
    72) should highlight source files with filenames nginx.conf
    ✓ should highlight source files with filenames nginx.log (940ms)
    ✓ should highlight source files with filenames pf.conf (993ms)
    73) should highlight source files with filenames resolv.conf

So 73/152 tests are failing when the heuristics I have implemented to associate a programming language given a filename are not used.
This comforts me in the fact that using heuristics was the most reasonable approach.

anlambert mentioned this in T1909: Enable to manually select the programming language to highlight.Jul 10 2019, 4:52 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/cypress-diff/1/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/cypress-diff/1/console

This revision now requires changes to proceed.Jul 11 2019, 1:40 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/cypress-diff/21/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/cypress-diff/21/console

Rebase

Harbormaster failed remote builds in B6804: Diff 5784!Jul 11 2019, 2:26 PM

Build is green
See https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/605/ for more details.

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/cypress-diff/22/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/cypress-diff/22/console

kalpitk added a subscriber: kalpitk.Jul 23 2019, 2:39 PM

kalpitk added inline comments.

cypress/integration/content-rendering.spec.js
8 ↗	(On Diff #5784)	Should we move this to cypress/support/index.js so that it can be accessed by D1756 also?

anlambert added inline comments.Jul 24 2019, 11:55 AM

cypress/integration/content-rendering.spec.js
8 ↗	(On Diff #5784)	I will rather move it in the `cypress/integration/utils/index.js` file. As this function is not needed in every tests, I think it is better to import it only when required. I will update that diff today with that change (and also rebase it on master).

Update:

rebase
fix failing cypress tests
move checkLanguageHighlighting function in the utils module

Next step: Write simple Hello World files or reuse code example from highlight.js demo for each language to test highlighting instead of using random source files downloaded from the web.

Build is green
See https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/627/ for more details.

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/cypress-diff/223/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/cypress-diff/223/console

Harbormaster failed remote builds in B7004: Diff 5964!Jul 24 2019, 2:06 PM

Update: