From 79c72ef53db147be011c0db8465aaad65f00251d Mon Sep 17 00:00:00 2001
From: Anthony Johnson <aj@ohess.org>
Date: Mon, 6 Mar 2017 14:45:58 -0800
Subject: [PATCH 1/3] Adds testing and hopefully a final fix for the empty
 toctree issue

This adds some more hacky fixes to our layout to avoid singlehtml builders.
Instead of trying to guess if this is working, I added testing!
---
 .gitignore                                 |  1 +
 .travis.yml                                | 11 +++
 sphinx_rtd_theme/layout.html               |  2 +-
 tests/__init__.py                          |  0
 tests/roots/test-basic/bar.rst             |  2 +
 tests/roots/test-basic/conf.py             |  4 +
 tests/roots/test-basic/foo.rst             |  6 ++
 tests/roots/test-basic/index.rst           | 12 +++
 tests/roots/test-empty/conf.py             |  4 +
 tests/roots/test-empty/index.rst           | 10 +++
 tests/roots/test-missing-toctree/conf.py   |  4 +
 tests/roots/test-missing-toctree/index.rst |  2 +
 tests/test_builders.py                     | 99 ++++++++++++++++++++++
 tests/util.py                              | 60 +++++++++++++
 tox.ini                                    | 21 +++++
 15 files changed, 237 insertions(+), 1 deletion(-)
 create mode 100644 .travis.yml
 create mode 100644 tests/__init__.py
 create mode 100644 tests/roots/test-basic/bar.rst
 create mode 100644 tests/roots/test-basic/conf.py
 create mode 100644 tests/roots/test-basic/foo.rst
 create mode 100644 tests/roots/test-basic/index.rst
 create mode 100644 tests/roots/test-empty/conf.py
 create mode 100644 tests/roots/test-empty/index.rst
 create mode 100644 tests/roots/test-missing-toctree/conf.py
 create mode 100644 tests/roots/test-missing-toctree/index.rst
 create mode 100644 tests/test_builders.py
 create mode 100644 tests/util.py
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
index 3076d7d..e612dcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 .coverage
 *.DS_Store
 *.sass-cache
+.ropeproject/
 .ruby-version
 dist/
 bower_components/
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..abdeb38
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+language: python
+python:
+  - 2.7
+  - 3.4
+  - 3.5
+  - 3.6
+sudo: false
+install:
+  - pip install tox-travis
+script:
+  - tox
diff --git a/sphinx_rtd_theme/layout.html b/sphinx_rtd_theme/layout.html
index 232a8f2..2221917 100644
--- a/sphinx_rtd_theme/layout.html
+++ b/sphinx_rtd_theme/layout.html
@@ -129,7 +129,7 @@
               The singlehtml builder doesn't handle this toctree call when the
               toctree is empty. Skip building this for now.
             #}
-            {% if builder != 'singlehtml' %}
+            {% if builder not in ['singlehtml', 'readthedocssinglehtml', 'readthedocssinglehtmllocalmedia'] %}
               {% set global_toc = toctree(maxdepth=theme_navigation_depth|int, collapse=theme_collapse_navigation, includehidden=True) %}
             {% endif %}
             {% if global_toc %}
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/roots/test-basic/bar.rst b/tests/roots/test-basic/bar.rst
new file mode 100644
index 0000000..1cccd3c
--- /dev/null
+++ b/tests/roots/test-basic/bar.rst
@@ -0,0 +1,2 @@
+bar
+===
diff --git a/tests/roots/test-basic/conf.py b/tests/roots/test-basic/conf.py
new file mode 100644
index 0000000..e10f5e5
--- /dev/null
+++ b/tests/roots/test-basic/conf.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+master_doc = 'index'
+exclude_patterns = ['_build']
diff --git a/tests/roots/test-basic/foo.rst b/tests/roots/test-basic/foo.rst
new file mode 100644
index 0000000..468a424
--- /dev/null
+++ b/tests/roots/test-basic/foo.rst
@@ -0,0 +1,6 @@
+foo
+===
+
+.. toctree::
+
+    bar
diff --git a/tests/roots/test-basic/index.rst b/tests/roots/test-basic/index.rst
new file mode 100644
index 0000000..0a4b347
--- /dev/null
+++ b/tests/roots/test-basic/index.rst
@@ -0,0 +1,12 @@
+test-basic
+==========
+
+.. toctree::
+
+    foo
+
+Heading
+-------
+
+Subheading
+~~~~~~~~~~
diff --git a/tests/roots/test-empty/conf.py b/tests/roots/test-empty/conf.py
new file mode 100644
index 0000000..e10f5e5
--- /dev/null
+++ b/tests/roots/test-empty/conf.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+master_doc = 'index'
+exclude_patterns = ['_build']
diff --git a/tests/roots/test-empty/index.rst b/tests/roots/test-empty/index.rst
new file mode 100644
index 0000000..a69c08d
--- /dev/null
+++ b/tests/roots/test-empty/index.rst
@@ -0,0 +1,10 @@
+test-empty
+==========
+
+.. toctree::
+
+Heading
+-------
+
+Subheading
+~~~~~~~~~~
diff --git a/tests/roots/test-missing-toctree/conf.py b/tests/roots/test-missing-toctree/conf.py
new file mode 100644
index 0000000..e10f5e5
--- /dev/null
+++ b/tests/roots/test-missing-toctree/conf.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+master_doc = 'index'
+exclude_patterns = ['_build']
diff --git a/tests/roots/test-missing-toctree/index.rst b/tests/roots/test-missing-toctree/index.rst
new file mode 100644
index 0000000..a085e7f
--- /dev/null
+++ b/tests/roots/test-missing-toctree/index.rst
@@ -0,0 +1,2 @@
+test-missing-toctree
+====================
diff --git a/tests/test_builders.py b/tests/test_builders.py
new file mode 100644
index 0000000..3602782
--- /dev/null
+++ b/tests/test_builders.py
@@ -0,0 +1,99 @@
+import os
+
+import pytest
+import sphinx
+from sphinx import addnodes
+from sphinx.builders.html import SingleFileHTMLBuilder, DirectoryHTMLBuilder
+
+from .util import build_all
+
+
+def test_basic():
+    for (app, status, warning) in build_all('test-basic'):
+        assert app.env.get_doctree('index').traverse(addnodes.toctree)
+        content = open(os.path.join(app.outdir, 'index.html')).read()
+
+        if isinstance(app.builder, DirectoryHTMLBuilder):
+            search = (
+                '<div class="toctree-wrapper compound">\n'
+                '<ul>\n'
+                '<li class="toctree-l1">'
+                '<a class="reference internal" href="foo/">foo</a>'
+                '<ul>\n'
+                '<li class="toctree-l2">'
+                '<a class="reference internal" href="bar/">bar</a></li>\n'
+                '</ul>\n'
+                '</li>\n'
+                '</ul>\n'
+                '</div>'
+            )
+            assert search in content
+        elif isinstance(app.builder, SingleFileHTMLBuilder):
+            search = (
+                '<div class="local-toc"><ul>\n'
+                '<li class="toctree-l1">'
+                '<a class="reference internal" href="index.html#document-foo">foo</a>'
+                '<ul>\n'
+                '<li class="toctree-l2">'
+                '<a class="reference internal" href="index.html#document-bar">bar</a>'
+                '</li>\n'
+                '</ul>'
+            )
+            assert search in content
+        else:
+            search = (
+                '<div class="toctree-wrapper compound">\n'
+                '<ul>\n'
+                '<li class="toctree-l1">'
+                '<a class="reference internal" href="foo.html">foo</a>'
+                '<ul>\n'
+                '<li class="toctree-l2">'
+                '<a class="reference internal" href="bar.html">bar</a></li>\n'
+                '</ul>\n'
+                '</li>\n'
+                '</ul>\n'
+                '</div>'
+            )
+            assert search in content, ('Missing search with builder {0}'
+                                       .format(app.builder.name))
+
+
+def test_empty():
+    """Local TOC is showing, as toctree was empty"""
+    for (app, status, warning) in build_all('test-empty'):
+        assert app.env.get_doctree('index').traverse(addnodes.toctree)
+        content = open(os.path.join(app.outdir, 'index.html')).read()
+        if sphinx.version_info < (1, 4):
+            if isinstance(app.builder, SingleFileHTMLBuilder):
+                assert '<div class="toctree-wrapper compound">\n</div>' in content
+                assert '<div class="local-toc">' in content
+            else:
+                global_toc = (
+                    '<div class="toctree-wrapper compound">\n'
+                    '<ul class="simple">\n</ul>\n'
+                    '</div>'
+                )
+                local_toc = (
+                    '<div class="local-toc"><ul class="simple">'
+                    '</ul>\n</div>'
+                )
+                assert global_toc in content
+                assert local_toc not in content
+        else:
+            global_toc = '<div class="toctree-wrapper compound">\n</div>'
+            local_toc = (
+                '<div class="local-toc"><ul>\n'
+                '<li><a class="reference internal" href="#">test-empty</a></li>'
+                '</ul>\n</div>'
+            )
+            assert global_toc in content
+            assert local_toc not in content
+
+
+def test_missing_toctree():
+    """Local TOC is showing, as toctree was missing"""
+    for (app, status, warning) in build_all('test-missing-toctree'):
+        assert app.env.get_doctree('index').traverse(addnodes.toctree) == []
+        content = open(os.path.join(app.outdir, 'index.html')).read()
+        assert '<div class="toctree' not in content
+        assert '<div class="local-toc">' in content
diff --git a/tests/util.py b/tests/util.py
new file mode 100644
index 0000000..cf81029
--- /dev/null
+++ b/tests/util.py
@@ -0,0 +1,60 @@
+from __future__ import print_function
+
+import os
+import tempfile
+import shutil
+from contextlib import contextmanager
+
+import pytest
+from sphinx.application import Sphinx
+
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
+
+
+@contextmanager
+def build(root, builder='html', **kwargs):
+    tmpdir = tempfile.mkdtemp()
+
+    srcdir = os.path.join(os.path.dirname(__file__), 'roots', root)
+    destdir = os.path.join(tmpdir, builder)
+    doctreedir = os.path.join(tmpdir, 'doctree/')
+
+    status = StringIO()
+    warning = StringIO()
+
+    kwargs.update({
+        'status': status,
+        'warning': warning,
+    })
+
+    confoverrides = kwargs.pop('confoverrides', {})
+    confoverrides['html_theme'] = 'sphinx_rtd_theme'
+    extensions = confoverrides.get('extensions', [])
+    extensions.append('readthedocs_ext.readthedocs')
+    confoverrides['extensions'] = extensions
+    kwargs['confoverrides'] = confoverrides
+
+    try:
+        app = Sphinx(srcdir, srcdir, destdir, doctreedir, builder, **kwargs)
+        app.builder.build_all()
+        yield (app, status.getvalue(), warning.getvalue())
+    except Exception as e:
+        print('# root:', root)
+        print('# builder:', builder)
+        print('# source:', srcdir)
+        print('# destination:', destdir)
+        print('# status:', '\n' + status.getvalue())
+        print('# warning:', '\n' + warning.getvalue())
+        raise
+    finally:
+        shutil.rmtree(tmpdir)
+
+
+def build_all(root, **kwargs):
+    for builder in ['html', 'singlehtml', 'readthedocs', 'readthedocsdirhtml',
+                    'readthedocssinglehtml', 'readthedocssinglehtmllocalmedia']:
+        with build(root, builder, **kwargs) as ret:
+            yield ret
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..6052fc0
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,21 @@
+[tox]
+envlist = py{27,34,35,36}-sphinx{13,14,15}
+
+[tox:travis]
+2.7 = py27-sphinx{13,14,15}
+3.4 = py34-sphinx{13,14,15}
+3.5 = py35-sphinx{13,14,15}
+3.6 = py36-sphinx{13,14,15}
+
+[testenv]
+setev =
+    LANG=C
+deps =
+    .
+    readthedocs-sphinx-ext
+    pytest
+    sphinx13: Sphinx < 1.4
+    sphinx14: Sphinx < 1.5
+    sphinx15: Sphinx < 1.6
+commands =
+    py.test {posargs}

From aa8477b7a74b28effa3cac324b7251ce41f236c4 Mon Sep 17 00:00:00 2001
From: Eric Holscher <eric@ericholscher.com>
Date: Mon, 6 Mar 2017 14:56:12 -0800
Subject: [PATCH 2/3] Small change in README to trigger tests

---
 README.rst | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 563519c..8744203 100644
--- a/README.rst
+++ b/README.rst
@@ -17,12 +17,11 @@ Read the Docs Sphinx Theme
 
 View a working demo_ over on readthedocs.org_.
 
-This is a mobile-friendly sphinx_ theme I made for readthedocs.org_. It's
-currently in development there and includes some rtd variable checks that can be ignored
-if you're just trying to use it on your project outside of that site.
+This is a mobile-friendly sphinx_ theme I made for readthedocs.org_.
 
-**This repo also exists as a submodule within the readthedocs itself**, so please make your edits to
-the SASS files here, rather than the .css files on RTD.
+If you'd like to update the theme,
+please make your edits to the SASS files here,
+rather than the .css files on checked into the repo.
 
 .. image:: screen_mobile.png
     :width: 100%

From 9d636a8850902e8f80da3a2615c9b647ef6f4843 Mon Sep 17 00:00:00 2001
From: Anthony Johnson <aj@ohess.org>
Date: Mon, 6 Mar 2017 15:12:42 -0800
Subject: [PATCH 3/3] Altern conditional check on builder name

---
 sphinx_rtd_theme/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_rtd_theme/layout.html b/sphinx_rtd_theme/layout.html
index 2221917..2fdaf8a 100644
--- a/sphinx_rtd_theme/layout.html
+++ b/sphinx_rtd_theme/layout.html
@@ -129,7 +129,7 @@
               The singlehtml builder doesn't handle this toctree call when the
               toctree is empty. Skip building this for now.
             #}
-            {% if builder not in ['singlehtml', 'readthedocssinglehtml', 'readthedocssinglehtmllocalmedia'] %}
+            {% if 'singlehtml' not in builder %}
               {% set global_toc = toctree(maxdepth=theme_navigation_depth|int, collapse=theme_collapse_navigation, includehidden=True) %}
             {% endif %}
             {% if global_toc %}