IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.8'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2019-02-03 19:53:12 +09:00
commit c70dfcd390
5 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/roots/test-html_style/_static/default.css Normal file
View File

2
tests/roots/test-html_style/conf.py Normal file
View File

@ -0,0 +1,2 @@
html_style = 'default.css'
html_static_path = ['_static']

2
tests/roots/test-html_style/index.rst Normal file
View File

@ -0,0 +1,2 @@
html_style
==========

1
tests/roots/test-root/conf.py
View File

@ -37,7 +37,6 @@ rst_epilog = '.. |subst| replace:: global substitution'
html_sidebars = {'**': ['localtoc.html', 'relations.html', 'sourcelink.html', html_sidebars = {'**': ['localtoc.html', 'relations.html', 'sourcelink.html',
'customsb.html', 'searchbox.html'], 'customsb.html', 'searchbox.html'],
'index': ['contentssb.html', 'localtoc.html', 'globaltoc.html']} 'index': ['contentssb.html', 'localtoc.html', 'globaltoc.html']}
html_style = 'default.css'
html_last_updated_fmt = '%b %d, %Y' html_last_updated_fmt = '%b %d, %Y'
html_context = {'hckey': 'hcval', 'hckey_co': 'wrong_hcval_co'} html_context = {'hckey': 'hcval', 'hckey_co': 'wrong_hcval_co'}

9
tests/test_build_html.py
View File

@ -1252,6 +1252,15 @@ def test_alternate_stylesheets(app, cached_etree_parse, fname, expect):
check_xpath(cached_etree_parse(app.outdir / fname), fname, *expect) check_xpath(cached_etree_parse(app.outdir / fname), fname, *expect)
@pytest.mark.sphinx('html', testroot='html_style')
def test_html_style(app, status, warning):
app.build()
result = (app.outdir / 'index.html').text()
assert '<link rel="stylesheet" href="_static/default.css" type="text/css" />' in result
assert ('<link rel="stylesheet" href="_static/alabaster.css" type="text/css" />'
not in result)
@pytest.mark.sphinx('html', testroot='images') @pytest.mark.sphinx('html', testroot='images')
def test_html_remote_images(app, status, warning): def test_html_remote_images(app, status, warning):
app.builder.build_all() app.builder.build_all()