From 585a9e827f564fb024f1e1f7bb2150efd7db931f Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Thu, 29 Sep 2016 22:44:56 +0200
Subject: [PATCH 01/14] Add a style note on module indentation

---
 docs/src/man/contributing.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/src/man/contributing.md b/docs/src/man/contributing.md
index 385aae926b..7731abafd7 100644
--- a/docs/src/man/contributing.md
+++ b/docs/src/man/contributing.md
@@ -21,6 +21,7 @@ Follow the style of the surrounding text when making changes. When adding new fe
 ### Julia
 
   * 4-space indentation;
+  * modules spanning entire files should not be indented, but modules that have surrounding code should;
   * no blank lines at the start or end of files;
   * do not manually align syntax such as `=` or `::` over adjacent lines;
   * use `local` to define new local variables so that they are easier to locate;

From 9b79f176865cbedb3a9d835fa748d189e3ec2451 Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Thu, 29 Sep 2016 22:25:26 +0200
Subject: [PATCH 02/14] Move test/examples build code

Move the code of setting up the modules and building the examples docs
under examples/ to test/examples/make.jl. This allows the examples/ to
be built without calling the whole runtests.jl file. The pages/* are
considered to be part of the examples/.

The Mod and AutoDocs modules are now indented to help with readability.

Also, the output from the examples/ builds will now be stored under
test/examples/builds/<format>, instead of test/examples/build-<format>.
---
 .gitignore                     |   2 +-
 test/examples/make.jl          | 108 +++++++++++++++++++++++++++
 test/{ => examples}/pages/a.jl |   0
 test/{ => examples}/pages/b.jl |   0
 test/{ => examples}/pages/c.jl |   0
 test/{ => examples}/pages/d.jl |   0
 test/{ => examples}/pages/e.jl |   0
 test/runtests.jl               | 131 +++------------------------------
 8 files changed, 120 insertions(+), 121 deletions(-)
 create mode 100644 test/examples/make.jl
 rename test/{ => examples}/pages/a.jl (100%)
 rename test/{ => examples}/pages/b.jl (100%)
 rename test/{ => examples}/pages/c.jl (100%)
 rename test/{ => examples}/pages/d.jl (100%)
 rename test/{ => examples}/pages/e.jl (100%)

diff --git a/.gitignore b/.gitignore
index 569b087440..cead08769e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 *.jl.*.cov
 *.jl.mem
 
-test/examples/build-*
+test/examples/builds/
 test/missingdocs/build/
 test/errors/build/
 docs/build/
diff --git a/test/examples/make.jl b/test/examples/make.jl
new file mode 100644
index 0000000000..04ddfed8bf
--- /dev/null
+++ b/test/examples/make.jl
@@ -0,0 +1,108 @@
+# Defines the modules referred to in the example docs (under src/) and then builds them.
+# It can be called separately to build the examples/, or as part of the test suite.
+#
+# It defines a set of variables (`examples_*`) that can be used in the tests.
+# The `examples_root` should be used to check whether this file has already been included
+# or not and should be kept unique.
+isdefined(:examples_root) && error("examples_root is already defined\n$(@__FILE__) included multiple times?")
+
+# Modules `Mod` and `AutoDocs`
+module Mod
+    """
+        func(x)
+
+    [`T`](@ref)
+    """
+    func(x) = x
+
+    """
+        T
+
+    [`func(x)`](@ref)
+    """
+    type T end
+end
+
+"`AutoDocs` module."
+module AutoDocs
+    module Pages
+        include("pages/a.jl")
+        include("pages/b.jl")
+        include("pages/c.jl")
+        include("pages/d.jl")
+        include("pages/e.jl")
+    end
+
+    "Function `f`."
+    f(x) = x
+
+    "Constant `K`."
+    const K = 1
+
+    "Type `T`."
+    type T end
+
+    "Macro `@m`."
+    macro m() end
+
+    "Module `A`."
+    module A
+        "Function `A.f`."
+        f(x) = x
+
+        "Constant `A.K`."
+        const K = 1
+
+        "Type `B.T`."
+        type T end
+
+        "Macro `B.@m`."
+        macro m() end
+    end
+
+    "Module `B`."
+    module B
+        "Function `B.f`."
+        f(x) = x
+
+        "Constant `B.K`."
+        const K = 1
+
+        "Type `B.T`."
+        type T end
+
+        "Macro `B.@m`."
+        macro m() end
+    end
+end
+
+# Build example docs
+using Documenter
+
+const examples_root = dirname(@__FILE__)
+
+info("Building mock package docs: MarkdownWriter")
+examples_markdown_doc = makedocs(
+    debug = true,
+    root  = examples_root,
+    build = "builds/markdown",
+)
+
+info("Building mock package docs: HTMLWriter")
+examples_html_doc = makedocs(
+    debug = true,
+    root  = examples_root,
+    build = "builds/html",
+    format   = Documenter.Formats.HTML,
+    sitename = "Documenter example",
+    pages    = Any[
+        "Home" => "index.md",
+        "Manual" => [
+            "man/tutorial.md",
+        ],
+        "Library" => [
+            "lib/functions.md",
+            "lib/autodocs.md",
+        ]
+    ]
+)
diff --git a/test/pages/a.jl b/test/examples/pages/a.jl
similarity index 100%
rename from test/pages/a.jl
rename to test/examples/pages/a.jl
diff --git a/test/pages/b.jl b/test/examples/pages/b.jl
similarity index 100%
rename from test/pages/b.jl
rename to test/examples/pages/b.jl
diff --git a/test/pages/c.jl b/test/examples/pages/c.jl
similarity index 100%
rename from test/pages/c.jl
rename to test/examples/pages/c.jl
diff --git a/test/pages/d.jl b/test/examples/pages/d.jl
similarity index 100%
rename from test/pages/d.jl
rename to test/examples/pages/d.jl
diff --git a/test/pages/e.jl b/test/examples/pages/e.jl
similarity index 100%
rename from test/pages/e.jl
rename to test/examples/pages/e.jl
diff --git a/test/runtests.jl b/test/runtests.jl
index 9a89cdd7b3..41ec49fbcf 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,90 +1,8 @@
 # Build the real docs first.
 include(joinpath(dirname(@__FILE__), "..", "docs", "make.jl"))
 
-# docs module
-# ===========
-
-module Mod
-
-"""
-    func(x)
-
-[`T`](@ref)
-"""
-func(x) = x
-
-"""
-    T
-
-[`func(x)`](@ref)
-"""
-type T end
-
-end
-
-# autodocs module
-# ===============
-
-"`AutoDocs` module."
-module AutoDocs
-
-module Pages
-
-include("pages/a.jl")
-include("pages/b.jl")
-include("pages/c.jl")
-include("pages/d.jl")
-include("pages/e.jl")
-
-end
-
-"Function `f`."
-f(x) = x
-
-"Constant `K`."
-const K = 1
-
-"Type `T`."
-type T end
-
-"Macro `@m`."
-macro m() end
-
-"Module `A`."
-module A
-
-"Function `A.f`."
-f(x) = x
-
-"Constant `A.K`."
-const K = 1
-
-"Type `B.T`."
-type T end
-
-"Macro `B.@m`."
-macro m() end
-
-end
-
-"Module `B`."
-module B
-
-"Function `B.f`."
-f(x) = x
-
-"Constant `B.K`."
-const K = 1
-
-"Type `B.T`."
-type T end
-
-"Macro `B.@m`."
-macro m() end
-
-end
-
-end
+# Build the example docs
+include(joinpath(dirname(@__FILE__), "examples", "make.jl"))
 
 module MissingDocs
 
@@ -380,25 +298,15 @@ for sym in [:none, :exports]
     )
 end
 
-# setup
-# =====
-
-const example_root = joinpath(dirname(@__FILE__), "examples")
-
-info("Building mock package docs: MarkdownWriter")
-doc = makedocs(
-    debug = true,
-    root  = example_root,
-    build = "build-markdown",
-)
-
 # tests
 # =====
 
+let examples_root = Main.examples_root, doc = Main.examples_markdown_doc
+
 @test isa(doc, Documenter.Documents.Document)
 
-let build_dir  = joinpath(example_root, "build-markdown"),
-    source_dir = joinpath(example_root, "src")
+let build_dir  = joinpath(examples_root, "builds", "markdown"),
+    source_dir = joinpath(examples_root, "src")
 
     @test isdir(build_dir)
     @test isdir(joinpath(build_dir, "assets"))
@@ -420,9 +328,9 @@ let build_dir  = joinpath(example_root, "build-markdown"),
     )
 end
 
-@test doc.user.root   == example_root
+@test doc.user.root   == examples_root
 @test doc.user.source == "src"
-@test doc.user.build  == "build-markdown"
+@test doc.user.build  == "builds/markdown"
 @test doc.user.clean  == true
 @test doc.user.format == Documenter.Formats.Markdown
 
@@ -441,8 +349,8 @@ let headers = doc.internal.headers
     @test Documenter.Anchors.exists(headers, "Function-Index")
     @test Documenter.Anchors.exists(headers, "Functions")
     @test Documenter.Anchors.isunique(headers, "Functions")
-    @test Documenter.Anchors.isunique(headers, "Functions", joinpath("build-markdown", "lib", "functions.md"))
-    let name = "Foo", path = joinpath("build-markdown", "lib", "functions.md")
+    @test Documenter.Anchors.isunique(headers, "Functions", joinpath("builds", "markdown", "lib", "functions.md"))
+    let name = "Foo", path = joinpath("builds", "markdown", "lib", "functions.md")
         @test Documenter.Anchors.exists(headers, name, path)
         @test !Documenter.Anchors.isunique(headers, name)
         @test !Documenter.Anchors.isunique(headers, name, path)
@@ -452,24 +360,7 @@ end
 
 @test length(doc.internal.objects) == 36
 
-info("Building mock package docs: HTMLWriter")
-doc = makedocs(
-    debug = true,
-    root  = example_root,
-    build = "build-html",
-    format   = Documenter.Formats.HTML,
-    sitename = "Documenter example",
-    pages    = Any[
-        "Home" => "index.md",
-        "Manual" => [
-            "man/tutorial.md",
-        ],
-        "Library" => [
-            "lib/functions.md",
-            "lib/autodocs.md",
-        ]
-    ]
-)
+end # for `let doc = examples_markdown_doc`
 
 # Documenter package docs:
 

From 172e1c71933cb7b398f0c93c38927fa77227a736 Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Thu, 29 Sep 2016 23:27:45 +0200
Subject: [PATCH 03/14] Move examples/ tests to a separate file

Moves the tests of the examples/ build to examples/tests.jl. The tests
can be run separately as well.
---
 test/examples/tests.jl | 66 ++++++++++++++++++++++++++++++++++++++++++
 test/runtests.jl       | 64 +---------------------------------------
 2 files changed, 67 insertions(+), 63 deletions(-)
 create mode 100644 test/examples/tests.jl

diff --git a/test/examples/tests.jl b/test/examples/tests.jl
new file mode 100644
index 0000000000..e3f92763ff
--- /dev/null
+++ b/test/examples/tests.jl
@@ -0,0 +1,66 @@
+using Base.Test
+
+# When the file is run separately we need to include make.jl which actually builds
+# the docs and defines a few modules that are referred in the docs.
+isdefined(:examples_root) || include(joinpath(dirname(@__FILE__), "make.jl"))
+
+let examples_root = Main.examples_root, doc = Main.examples_markdown_doc
+
+@test isa(doc, Documenter.Documents.Document)
+
+let build_dir  = joinpath(examples_root, "builds", "markdown"),
+    source_dir = joinpath(examples_root, "src")
+
+    @test isdir(build_dir)
+    @test isdir(joinpath(build_dir, "assets"))
+    @test isdir(joinpath(build_dir, "lib"))
+    @test isdir(joinpath(build_dir, "man"))
+
+    @test isfile(joinpath(build_dir, "index.md"))
+    @test isfile(joinpath(build_dir, "assets", "mathjaxhelper.js"))
+    @test isfile(joinpath(build_dir, "assets", "Documenter.css"))
+    @test isfile(joinpath(build_dir, "assets", "custom.css"))
+    @test isfile(joinpath(build_dir, "assets", "custom.js"))
+    @test isfile(joinpath(build_dir, "lib", "functions.md"))
+    @test isfile(joinpath(build_dir, "man", "tutorial.md"))
+    @test isfile(joinpath(build_dir, "man", "data.csv"))
+
+    @test (==)(
+        readstring(joinpath(source_dir, "man", "data.csv")),
+        readstring(joinpath(build_dir,  "man", "data.csv")),
+    )
+end
+
+@test doc.user.root   == examples_root
+@test doc.user.source == "src"
+@test doc.user.build  == "builds/markdown"
+@test doc.user.clean  == true
+@test doc.user.format == Documenter.Formats.Markdown
+
+@test doc.internal.assets == normpath(joinpath(dirname(@__FILE__), "..", "..", "assets"))
+
+@test length(doc.internal.pages) == 5
+
+let headers = doc.internal.headers
+    @test Documenter.Anchors.exists(headers, "Documentation")
+    @test Documenter.Anchors.exists(headers, "Documentation")
+    @test Documenter.Anchors.exists(headers, "Index-Page")
+    @test Documenter.Anchors.exists(headers, "Functions-Contents")
+    @test Documenter.Anchors.exists(headers, "Tutorial-Contents")
+    @test Documenter.Anchors.exists(headers, "Index")
+    @test Documenter.Anchors.exists(headers, "Tutorial")
+    @test Documenter.Anchors.exists(headers, "Function-Index")
+    @test Documenter.Anchors.exists(headers, "Functions")
+    @test Documenter.Anchors.isunique(headers, "Functions")
+    @test Documenter.Anchors.isunique(headers, "Functions", joinpath("builds", "markdown", "lib", "functions.md"))
+    let name = "Foo", path = joinpath("builds", "markdown", "lib", "functions.md")
+        @test Documenter.Anchors.exists(headers, name, path)
+        @test !Documenter.Anchors.isunique(headers, name)
+        @test !Documenter.Anchors.isunique(headers, name, path)
+        @test length(headers.map[name][path]) == 4
+    end
+end
+
+@test length(doc.internal.objects) == 36
+
+end # for `let doc = examples_markdown_doc`
diff --git a/test/runtests.jl b/test/runtests.jl
index 41ec49fbcf..ee4639fc17 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -298,69 +298,7 @@ for sym in [:none, :exports]
     )
 end
 
-# tests
-# =====
-
-let examples_root = Main.examples_root, doc = Main.examples_markdown_doc
-
-@test isa(doc, Documenter.Documents.Document)
-
-let build_dir  = joinpath(examples_root, "builds", "markdown"),
-    source_dir = joinpath(examples_root, "src")
-
-    @test isdir(build_dir)
-    @test isdir(joinpath(build_dir, "assets"))
-    @test isdir(joinpath(build_dir, "lib"))
-    @test isdir(joinpath(build_dir, "man"))
-
-    @test isfile(joinpath(build_dir, "index.md"))
-    @test isfile(joinpath(build_dir, "assets", "mathjaxhelper.js"))
-    @test isfile(joinpath(build_dir, "assets", "Documenter.css"))
-    @test isfile(joinpath(build_dir, "assets", "custom.css"))
-    @test isfile(joinpath(build_dir, "assets", "custom.js"))
-    @test isfile(joinpath(build_dir, "lib", "functions.md"))
-    @test isfile(joinpath(build_dir, "man", "tutorial.md"))
-    @test isfile(joinpath(build_dir, "man", "data.csv"))
-
-    @test (==)(
-        readstring(joinpath(source_dir, "man", "data.csv")),
-        readstring(joinpath(build_dir,  "man", "data.csv")),
-    )
-end
-
-@test doc.user.root   == examples_root
-@test doc.user.source == "src"
-@test doc.user.build  == "builds/markdown"
-@test doc.user.clean  == true
-@test doc.user.format == Documenter.Formats.Markdown
-
-@test doc.internal.assets == normpath(joinpath(dirname(@__FILE__), "..", "assets"))
-
-@test length(doc.internal.pages) == 5
-
-let headers = doc.internal.headers
-    @test Documenter.Anchors.exists(headers, "Documentation")
-    @test Documenter.Anchors.exists(headers, "Documentation")
-    @test Documenter.Anchors.exists(headers, "Index-Page")
-    @test Documenter.Anchors.exists(headers, "Functions-Contents")
-    @test Documenter.Anchors.exists(headers, "Tutorial-Contents")
-    @test Documenter.Anchors.exists(headers, "Index")
-    @test Documenter.Anchors.exists(headers, "Tutorial")
-    @test Documenter.Anchors.exists(headers, "Function-Index")
-    @test Documenter.Anchors.exists(headers, "Functions")
-    @test Documenter.Anchors.isunique(headers, "Functions")
-    @test Documenter.Anchors.isunique(headers, "Functions", joinpath("builds", "markdown", "lib", "functions.md"))
-    let name = "Foo", path = joinpath("builds", "markdown", "lib", "functions.md")
-        @test Documenter.Anchors.exists(headers, name, path)
-        @test !Documenter.Anchors.isunique(headers, name)
-        @test !Documenter.Anchors.isunique(headers, name, path)
-        @test length(headers.map[name][path]) == 4
-    end
-end
-
-@test length(doc.internal.objects) == 36
-
-end # for `let doc = examples_markdown_doc`
+include(joinpath(dirname(@__FILE__), "examples", "tests.jl"))
 
 # Documenter package docs:
 

From 051af35f98a21c4604f6b88f4c2ff11a0ec71455 Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Thu, 29 Sep 2016 23:43:37 +0200
Subject: [PATCH 04/14] Move missing docs tests to a separate file

---
 test/missingdocs/make.jl | 23 +++++++++++++++++++++++
 test/runtests.jl         | 26 ++------------------------
 2 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 test/missingdocs/make.jl

diff --git a/test/missingdocs/make.jl b/test/missingdocs/make.jl
new file mode 100644
index 0000000000..58cfc350cd
--- /dev/null
+++ b/test/missingdocs/make.jl
@@ -0,0 +1,23 @@
+module MissingDocs
+    export f
+
+    "exported"
+    f(x) = x
+
+    "unexported"
+    g(x) = x
+end
+
+using Documenter
+
+for sym in [:none, :exports]
+    makedocs(
+        root = dirname(@__FILE__),
+        source = joinpath("src", string(sym)),
+        build = joinpath("build", string(sym)),
+        modules = MissingDocs,
+        checkdocs = sym,
+        format = Documenter.Formats.HTML,
+        sitename = "MissingDocs Checks",
+    )
+end
diff --git a/test/runtests.jl b/test/runtests.jl
index ee4639fc17..87d989d159 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -4,16 +4,8 @@ include(joinpath(dirname(@__FILE__), "..", "docs", "make.jl"))
 # Build the example docs
 include(joinpath(dirname(@__FILE__), "examples", "make.jl"))
 
-module MissingDocs
-
-export f
-"exported"
-f(x) = x
-
-"unexported"
-g(x) = x
-
-end
+# Test missing docs
+include(joinpath(dirname(@__FILE__), "missingdocs", "make.jl"))
 
 # tests module
 # ============
@@ -284,20 +276,6 @@ println("="^50)
 
 # Mock package docs:
 
-## Missing Docs.
-
-for sym in [:none, :exports]
-    makedocs(
-        root = joinpath(dirname(@__FILE__), "missingdocs"),
-        source = joinpath("src", string(sym)),
-        build = joinpath("build", string(sym)),
-        modules = Main.MissingDocs,
-        checkdocs = sym,
-        format = Documenter.Formats.HTML,
-        sitename = "MissingDocs Checks",
-    )
-end
-
 include(joinpath(dirname(@__FILE__), "examples", "tests.jl"))
 
 # Documenter package docs:

From 9ed346d9a4a782b1bdf622b1dc7882120486914c Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Sun, 2 Oct 2016 19:23:13 +0200
Subject: [PATCH 05/14] Indent submodules of Tests in runtests.jl

---
 test/runtests.jl | 209 +++++++++++++++++++++++------------------------
 1 file changed, 101 insertions(+), 108 deletions(-)

diff --git a/test/runtests.jl b/test/runtests.jl
index 87d989d159..ad9ad965d2 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -20,24 +20,21 @@ using Compat
 # Unit tests for module internals.
 
 module UnitTests
+    module SubModule end
 
-module SubModule end
-
-# Does `submodules` collect *all* the submodules?
-module A
-module B
-module C
-module D
-end
-end
-end
-end
-
-type T end
+    # Does `submodules` collect *all* the submodules?
+    module A
+        module B
+            module C
+                module D end
+            end
+        end
+    end
 
-"Documenter unit tests."
-Base.length(::T) = 1
+    type T end
 
+    "Documenter unit tests."
+    Base.length(::T) = 1
 end
 
 let doc = @doc(length)
@@ -155,115 +152,111 @@ end
 ## DOM Tests.
 
 module DOMTests
+    using Base.Test
+    import Documenter.Utilities.DOM: DOM, @tags
 
-using Base.Test
-import Documenter.Utilities.DOM: DOM, @tags
-
-@tags div ul li p
+    @tags div ul li p
 
-for tag in (:div, :ul, :li, :p)
-    TAG = getfield(current_module(), tag)
-    @test isdefined(tag)
-    @test isa(TAG, DOM.Tag)
-    @test TAG.name === tag
-end
+    for tag in (:div, :ul, :li, :p)
+        TAG = getfield(current_module(), tag)
+        @test isdefined(tag)
+        @test isa(TAG, DOM.Tag)
+        @test TAG.name === tag
+    end
 
-@test div().name === :div
-@test div().text == ""
-@test isempty(div().nodes)
-@test isempty(div().attributes)
-
-@test div("...").name === :div
-@test div("...").text == ""
-@test length(div("...").nodes) === 1
-@test div("...").nodes[1].text == "..."
-@test div("...").nodes[1].name === Symbol("")
-@test isempty(div("...").attributes)
-
-@test div[".class"]("...").name === :div
-@test div[".class"]("...").text == ""
-@test length(div[".class"]("...").nodes) === 1
-@test div[".class"]("...").nodes[1].text == "..."
-@test div[".class"]("...").nodes[1].name === Symbol("")
-@test length(div[".class"]("...").attributes) === 1
-@test div[".class"]("...").attributes[1] == (:class => "class")
-@test div[:attribute].attributes[1] == (:attribute => "")
-@test div[:attribute => "value"].attributes[1] == (:attribute => "value")
-
-let d = div(ul(map(li, [string(n) for n = 1:10])))
-    @test d.name === :div
-    @test d.text == ""
-    @test isempty(d.attributes)
-    @test length(d.nodes) === 1
-    let u = d.nodes[1]
-        @test u.name === :ul
-        @test u.text == ""
-        @test isempty(u.attributes)
-        @test length(u.nodes) === 10
-        for n = 1:10
-            let v = u.nodes[n]
-                @test v.name === :li
-                @test v.text == ""
-                @test isempty(v.attributes)
-                @test length(v.nodes) === 1
-                @test v.nodes[1].name === Symbol("")
-                @test v.nodes[1].text == string(n)
-                @test !isdefined(v.nodes[1], :attributes)
-                @test !isdefined(v.nodes[1], :nodes)
+    @test div().name === :div
+    @test div().text == ""
+    @test isempty(div().nodes)
+    @test isempty(div().attributes)
+
+    @test div("...").name === :div
+    @test div("...").text == ""
+    @test length(div("...").nodes) === 1
+    @test div("...").nodes[1].text == "..."
+    @test div("...").nodes[1].name === Symbol("")
+    @test isempty(div("...").attributes)
+
+    @test div[".class"]("...").name === :div
+    @test div[".class"]("...").text == ""
+    @test length(div[".class"]("...").nodes) === 1
+    @test div[".class"]("...").nodes[1].text == "..."
+    @test div[".class"]("...").nodes[1].name === Symbol("")
+    @test length(div[".class"]("...").attributes) === 1
+    @test div[".class"]("...").attributes[1] == (:class => "class")
+    @test div[:attribute].attributes[1] == (:attribute => "")
+    @test div[:attribute => "value"].attributes[1] == (:attribute => "value")
+
+    let d = div(ul(map(li, [string(n) for n = 1:10])))
+        @test d.name === :div
+        @test d.text == ""
+        @test isempty(d.attributes)
+        @test length(d.nodes) === 1
+        let u = d.nodes[1]
+            @test u.name === :ul
+            @test u.text == ""
+            @test isempty(u.attributes)
+            @test length(u.nodes) === 10
+            for n = 1:10
+                let v = u.nodes[n]
+                    @test v.name === :li
+                    @test v.text == ""
+                    @test isempty(v.attributes)
+                    @test length(v.nodes) === 1
+                    @test v.nodes[1].name === Symbol("")
+                    @test v.nodes[1].text == string(n)
+                    @test !isdefined(v.nodes[1], :attributes)
+                    @test !isdefined(v.nodes[1], :nodes)
+                end
             end
         end
     end
-end
 
-@tags script style img
-
-@test string(div(p("one"), p("two"))) == "<div><p>one</p><p>two</p></div>"
-@test string(div[:key => "value"])    == "<div key=\"value\"></div>"
-@test string(p(" < > & ' \" "))       == "<p> &lt; &gt; &amp; &#39; &quot; </p>"
-@test string(img[:src => "source"])   == "<img src=\"source\"/>"
-@test string(img[:none])              == "<img none/>"
-@test string(script(" < > & ' \" "))  == "<script> < > & ' \" </script>"
-@test string(style(" < > & ' \" "))   == "<style> < > & ' \" </style>"
-@test string(script)                  == "<script>"
-
-function locally_defined()
-    @tags button
-    @test try
-        x = button
-        true
-    catch err
-        false
+    @tags script style img
+
+    @test string(div(p("one"), p("two"))) == "<div><p>one</p><p>two</p></div>"
+    @test string(div[:key => "value"])    == "<div key=\"value\"></div>"
+    @test string(p(" < > & ' \" "))       == "<p> &lt; &gt; &amp; &#39; &quot; </p>"
+    @test string(img[:src => "source"])   == "<img src=\"source\"/>"
+    @test string(img[:none])              == "<img none/>"
+    @test string(script(" < > & ' \" "))  == "<script> < > & ' \" </script>"
+    @test string(style(" < > & ' \" "))   == "<style> < > & ' \" </style>"
+    @test string(script)                  == "<script>"
+
+    function locally_defined()
+        @tags button
+        @test try
+            x = button
+            true
+        catch err
+            false
+        end
     end
-end
-@test !isdefined(current_module(), :button)
-locally_defined()
-@test !isdefined(current_module(), :button)
-
-# HTMLDocument
-import Documenter.Utilities.DOM: HTMLDocument
-@test string(HTMLDocument(div())) == "<!DOCTYPE html>\n<div></div>\n"
-@test string(HTMLDocument("custom doctype", div())) == "<!DOCTYPE custom doctype>\n<div></div>\n"
-
+    @test !isdefined(current_module(), :button)
+    locally_defined()
+    @test !isdefined(current_module(), :button)
+
+    # HTMLDocument
+    import Documenter.Utilities.DOM: HTMLDocument
+    @test string(HTMLDocument(div())) == "<!DOCTYPE html>\n<div></div>\n"
+    @test string(HTMLDocument("custom doctype", div())) == "<!DOCTYPE custom doctype>\n<div></div>\n"
 end
 
 # `Markdown.MD` to `DOM.Node` conversion tests.
 module MarkdownToNode
-
-import Documenter.DocSystem
-import Documenter.Writers.HTMLWriter: mdconvert
-
-# Exhaustive Conversion from Markdown to Nodes.
-for mod in Base.Docs.modules
-    for (binding, multidoc) in DocSystem.getmeta(mod)
-        for (typesig, docstr) in multidoc.docs
-            md = DocSystem.parsedoc(docstr)
-            string(mdconvert(md))
+    import Documenter.DocSystem
+    import Documenter.Writers.HTMLWriter: mdconvert
+
+    # Exhaustive Conversion from Markdown to Nodes.
+    for mod in Base.Docs.modules
+        for (binding, multidoc) in DocSystem.getmeta(mod)
+            for (typesig, docstr) in multidoc.docs
+                md = DocSystem.parsedoc(docstr)
+                string(mdconvert(md))
+            end
         end
     end
 end
 
-end
-
 # Integration tests for module api.
 
 # Error reporting.

From 6cbca407ba2b1b01136a7baed847064c7ed30799 Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Sun, 2 Oct 2016 22:49:56 +0200
Subject: [PATCH 06/14] Use testsets for examples/tests.jl

Also properly indent the test code and add some logic to check if
make.jl has been loaded properly.
---
 test/examples/make.jl  |   3 +
 test/examples/tests.jl | 145 ++++++++++++++++++++++++-----------------
 2 files changed, 88 insertions(+), 60 deletions(-)

diff --git a/test/examples/make.jl b/test/examples/make.jl
index 04ddfed8bf..e3ac75cf3b 100644
--- a/test/examples/make.jl
+++ b/test/examples/make.jl
@@ -6,6 +6,9 @@
 # or not and should be kept unique.
 isdefined(:examples_root) && error("examples_root is already defined\n$(@__FILE__) included multiple times?")
 
+# The `Mod` and `AutoDocs` modules are assumed to exists in the Main module.
+current_module() === Main || error("$(@__FILE__) must be included into Main.")
+
 # Modules `Mod` and `AutoDocs`
 module Mod
     """
diff --git a/test/examples/tests.jl b/test/examples/tests.jl
index e3f92763ff..c20223fcfa 100644
--- a/test/examples/tests.jl
+++ b/test/examples/tests.jl
@@ -1,66 +1,91 @@
-using Base.Test
-
 # When the file is run separately we need to include make.jl which actually builds
-# the docs and defines a few modules that are referred in the docs.
-isdefined(:examples_root) || include(joinpath(dirname(@__FILE__), "make.jl"))
-
-let examples_root = Main.examples_root, doc = Main.examples_markdown_doc
-
-@test isa(doc, Documenter.Documents.Document)
-
-let build_dir  = joinpath(examples_root, "builds", "markdown"),
-    source_dir = joinpath(examples_root, "src")
-
-    @test isdir(build_dir)
-    @test isdir(joinpath(build_dir, "assets"))
-    @test isdir(joinpath(build_dir, "lib"))
-    @test isdir(joinpath(build_dir, "man"))
-
-    @test isfile(joinpath(build_dir, "index.md"))
-    @test isfile(joinpath(build_dir, "assets", "mathjaxhelper.js"))
-    @test isfile(joinpath(build_dir, "assets", "Documenter.css"))
-    @test isfile(joinpath(build_dir, "assets", "custom.css"))
-    @test isfile(joinpath(build_dir, "assets", "custom.js"))
-    @test isfile(joinpath(build_dir, "lib", "functions.md"))
-    @test isfile(joinpath(build_dir, "man", "tutorial.md"))
-    @test isfile(joinpath(build_dir, "man", "data.csv"))
-
-    @test (==)(
-        readstring(joinpath(source_dir, "man", "data.csv")),
-        readstring(joinpath(build_dir,  "man", "data.csv")),
-    )
+# the docs and defines a few modules that are referred to in the docs. The make.jl
+# has to be expected in the context of the Main module.
+if current_module() === Main && !isdefined(:examples_root)
+    include(joinpath(dirname(@__FILE__), "make.jl"))
+elseif current_module() !== Main && isdefined(Main, :examples_root)
+    using Documenter
+    const examples_root = Main.examples_root
+elseif current_module() !== Main && !isdefined(Main, :examples_root)
+    error("examples/make.jl has not been loaded into Main.")
 end
 
-@test doc.user.root   == examples_root
-@test doc.user.source == "src"
-@test doc.user.build  == "builds/markdown"
-@test doc.user.clean  == true
-@test doc.user.format == Documenter.Formats.Markdown
-
-@test doc.internal.assets == normpath(joinpath(dirname(@__FILE__), "..", "..", "assets"))
-
-@test length(doc.internal.pages) == 5
-
-let headers = doc.internal.headers
-    @test Documenter.Anchors.exists(headers, "Documentation")
-    @test Documenter.Anchors.exists(headers, "Documentation")
-    @test Documenter.Anchors.exists(headers, "Index-Page")
-    @test Documenter.Anchors.exists(headers, "Functions-Contents")
-    @test Documenter.Anchors.exists(headers, "Tutorial-Contents")
-    @test Documenter.Anchors.exists(headers, "Index")
-    @test Documenter.Anchors.exists(headers, "Tutorial")
-    @test Documenter.Anchors.exists(headers, "Function-Index")
-    @test Documenter.Anchors.exists(headers, "Functions")
-    @test Documenter.Anchors.isunique(headers, "Functions")
-    @test Documenter.Anchors.isunique(headers, "Functions", joinpath("builds", "markdown", "lib", "functions.md"))
-    let name = "Foo", path = joinpath("builds", "markdown", "lib", "functions.md")
-        @test Documenter.Anchors.exists(headers, name, path)
-        @test !Documenter.Anchors.isunique(headers, name)
-        @test !Documenter.Anchors.isunique(headers, name, path)
-        @test length(headers.map[name][path]) == 4
-    end
+if VERSION >= v"0.5.0-dev+7720"
+    using Base.Test
+else
+    using BaseTestNext
+    const Test = BaseTestNext
 end
 
-@test length(doc.internal.objects) == 36
+using Compat
+
+@testset "Examples" begin
+    @testset "Markdown" begin
+        local doc = Main.examples_markdown_doc
+
+        @test isa(doc, Documenter.Documents.Document)
+
+        let build_dir  = joinpath(examples_root, "builds", "markdown"),
+            source_dir = joinpath(examples_root, "src")
+
+            @test isdir(build_dir)
+            @test isdir(joinpath(build_dir, "assets"))
+            @test isdir(joinpath(build_dir, "lib"))
+            @test isdir(joinpath(build_dir, "man"))
+
+            @test isfile(joinpath(build_dir, "index.md"))
+            @test isfile(joinpath(build_dir, "assets", "mathjaxhelper.js"))
+            @test isfile(joinpath(build_dir, "assets", "Documenter.css"))
+            @test isfile(joinpath(build_dir, "assets", "custom.css"))
+            @test isfile(joinpath(build_dir, "assets", "custom.js"))
+            @test isfile(joinpath(build_dir, "lib", "functions.md"))
+            @test isfile(joinpath(build_dir, "man", "tutorial.md"))
+            @test isfile(joinpath(build_dir, "man", "data.csv"))
+
+            @test (==)(
+                readstring(joinpath(source_dir, "man", "data.csv")),
+                readstring(joinpath(build_dir,  "man", "data.csv")),
+            )
+        end
+
+        @test doc.user.root   == examples_root
+        @test doc.user.source == "src"
+        @test doc.user.build  == "builds/markdown"
+        @test doc.user.clean  == true
+        @test doc.user.format == Documenter.Formats.Markdown
 
-end # for `let doc = examples_markdown_doc`
+        @test doc.internal.assets == normpath(joinpath(dirname(@__FILE__), "..", "..", "assets"))
+
+        @test length(doc.internal.pages) == 5
+
+        let headers = doc.internal.headers
+            @test Documenter.Anchors.exists(headers, "Documentation")
+            @test Documenter.Anchors.exists(headers, "Documentation")
+            @test Documenter.Anchors.exists(headers, "Index-Page")
+            @test Documenter.Anchors.exists(headers, "Functions-Contents")
+            @test Documenter.Anchors.exists(headers, "Tutorial-Contents")
+            @test Documenter.Anchors.exists(headers, "Index")
+            @test Documenter.Anchors.exists(headers, "Tutorial")
+            @test Documenter.Anchors.exists(headers, "Function-Index")
+            @test Documenter.Anchors.exists(headers, "Functions")
+            @test Documenter.Anchors.isunique(headers, "Functions")
+            @test Documenter.Anchors.isunique(headers, "Functions", joinpath("builds", "markdown", "lib", "functions.md"))
+            let name = "Foo", path = joinpath("builds", "markdown", "lib", "functions.md")
+                @test Documenter.Anchors.exists(headers, name, path)
+                @test !Documenter.Anchors.isunique(headers, name)
+                @test !Documenter.Anchors.isunique(headers, name, path)
+                @test length(headers.map[name][path]) == 4
+            end
+        end
+
+        @test length(doc.internal.objects) == 36
+    end
+
+    @testset "HTML" begin
+        local doc = Main.examples_html_doc
+
+        @test isa(doc, Documenter.Documents.Document)
+
+        # TODO: test the HTML build
+    end
+end

From eb524dd6cfcc65989e83282ff6049979a786bd76 Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Sun, 2 Oct 2016 22:53:13 +0200
Subject: [PATCH 07/14] Use testsets for navnode.jl

---
 test/navnode.jl | 83 +++++++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 37 deletions(-)

diff --git a/test/navnode.jl b/test/navnode.jl
index 2236ab2863..d6ce621b13 100644
--- a/test/navnode.jl
+++ b/test/navnode.jl
@@ -1,6 +1,12 @@
 module NavNodeTests
 
-using Base.Test
+if VERSION >= v"0.5.0-dev+7720"
+    using Base.Test
+else
+    using BaseTestNext
+    const Test = BaseTestNext
+end
+
 using Compat
 import Documenter: Documents, Builder
 import Documenter.Documents: NavNode
@@ -14,44 +20,47 @@ type FakeDocument
     internal :: FakeDocumentInternal
     FakeDocument() = new(FakeDocumentInternal())
 end
-@test fieldtype(FakeDocumentInternal, :navlist) == fieldtype(Documents.Internal, :navlist)
-
-pages = [
-    "page1.md",
-    "Page2" => "page2.md",
-    "Section" => [
-        "page3.md",
-        "Page4" => "page4.md",
-        "Subsection" => [
-            "page5.md",
+
+@testset "NavNode" begin
+    @test fieldtype(FakeDocumentInternal, :navlist) == fieldtype(Documents.Internal, :navlist)
+
+    pages = [
+        "page1.md",
+        "Page2" => "page2.md",
+        "Section" => [
+            "page3.md",
+            "Page4" => "page4.md",
+            "Subsection" => [
+                "page5.md",
+            ],
         ],
-    ],
-    "page6.md",
-]
-doc = FakeDocument()
-doc.internal.pages = Dict(map(i -> "page$i.md" => nothing, 1:8))
-navtree = Builder.walk_navpages(pages, nothing, doc)
-navlist = doc.internal.navlist
-
-@test length(navlist) == 6
-for (i,navnode) in enumerate(navlist)
-    @test get(navnode.page) == "page$i.md"
-end
+        "page6.md",
+    ]
+    doc = FakeDocument()
+    doc.internal.pages = Dict(map(i -> "page$i.md" => nothing, 1:8))
+    navtree = Builder.walk_navpages(pages, nothing, doc)
+    navlist = doc.internal.navlist
+
+    @test length(navlist) == 6
+    for (i,navnode) in enumerate(navlist)
+        @test get(navnode.page) == "page$i.md"
+    end
 
-@test isa(navtree, Vector{NavNode})
-@test length(navtree) == 4
-@test navtree[1] === navlist[1]
-@test navtree[2] === navlist[2]
-@test navtree[4] === navlist[6]
+    @test isa(navtree, Vector{NavNode})
+    @test length(navtree) == 4
+    @test navtree[1] === navlist[1]
+    @test navtree[2] === navlist[2]
+    @test navtree[4] === navlist[6]
 
-section = navtree[3]
-@test get(section.title_override) == "Section"
-@test isnull(section.page)
-@test length(section.children) == 3
+    section = navtree[3]
+    @test get(section.title_override) == "Section"
+    @test isnull(section.page)
+    @test length(section.children) == 3
 
-navpath = Documents.navpath(navlist[5])
-@test length(navpath) == 3
-@test navpath[1] === section
-@test navpath[3] === navlist[5]
+    navpath = Documents.navpath(navlist[5])
+    @test length(navpath) == 3
+    @test navpath[1] === section
+    @test navpath[3] === navlist[5]
+end
 
-end # module NavNodeTests
+end

From 988f4632801c5611748077538c3a5214ea399d6a Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Sun, 2 Oct 2016 23:13:07 +0200
Subject: [PATCH 08/14] Move DOM tests to separate file and use testsets

---
 test/dom.jl      | 98 ++++++++++++++++++++++++++++++++++++++++++++++++
 test/runtests.jl | 90 +-------------------------------------------
 2 files changed, 99 insertions(+), 89 deletions(-)
 create mode 100644 test/dom.jl

diff --git a/test/dom.jl b/test/dom.jl
new file mode 100644
index 0000000000..96db3841fd
--- /dev/null
+++ b/test/dom.jl
@@ -0,0 +1,98 @@
+module DOMTests
+
+if VERSION >= v"0.5.0-dev+7720"
+    using Base.Test
+else
+    using BaseTestNext
+    const Test = BaseTestNext
+end
+
+import Documenter.Utilities.DOM: DOM, @tags, HTMLDocument
+
+@tags div ul li p
+
+@testset "DOM" begin
+    for tag in (:div, :ul, :li, :p)
+        TAG = getfield(current_module(), tag)
+        @test isdefined(tag)
+        @test isa(TAG, DOM.Tag)
+        @test TAG.name === tag
+    end
+
+    @test div().name === :div
+    @test div().text == ""
+    @test isempty(div().nodes)
+    @test isempty(div().attributes)
+
+    @test div("...").name === :div
+    @test div("...").text == ""
+    @test length(div("...").nodes) === 1
+    @test div("...").nodes[1].text == "..."
+    @test div("...").nodes[1].name === Symbol("")
+    @test isempty(div("...").attributes)
+
+    @test div[".class"]("...").name === :div
+    @test div[".class"]("...").text == ""
+    @test length(div[".class"]("...").nodes) === 1
+    @test div[".class"]("...").nodes[1].text == "..."
+    @test div[".class"]("...").nodes[1].name === Symbol("")
+    @test length(div[".class"]("...").attributes) === 1
+    @test div[".class"]("...").attributes[1] == (:class => "class")
+    @test div[:attribute].attributes[1] == (:attribute => "")
+    @test div[:attribute => "value"].attributes[1] == (:attribute => "value")
+
+    let d = div(ul(map(li, [string(n) for n = 1:10])))
+        @test d.name === :div
+        @test d.text == ""
+        @test isempty(d.attributes)
+        @test length(d.nodes) === 1
+        let u = d.nodes[1]
+            @test u.name === :ul
+            @test u.text == ""
+            @test isempty(u.attributes)
+            @test length(u.nodes) === 10
+            for n = 1:10
+                let v = u.nodes[n]
+                    @test v.name === :li
+                    @test v.text == ""
+                    @test isempty(v.attributes)
+                    @test length(v.nodes) === 1
+                    @test v.nodes[1].name === Symbol("")
+                    @test v.nodes[1].text == string(n)
+                    @test !isdefined(v.nodes[1], :attributes)
+                    @test !isdefined(v.nodes[1], :nodes)
+                end
+            end
+        end
+    end
+
+    @tags script style img
+
+    @test string(div(p("one"), p("two"))) == "<div><p>one</p><p>two</p></div>"
+    @test string(div[:key => "value"])    == "<div key=\"value\"></div>"
+    @test string(p(" < > & ' \" "))       == "<p> &lt; &gt; &amp; &#39; &quot; </p>"
+    @test string(img[:src => "source"])   == "<img src=\"source\"/>"
+    @test string(img[:none])              == "<img none/>"
+    @test string(script(" < > & ' \" "))  == "<script> < > & ' \" </script>"
+    @test string(style(" < > & ' \" "))   == "<style> < > & ' \" </style>"
+    @test string(script)                  == "<script>"
+
+    function locally_defined()
+        @tags button
+        @test try
+            x = button
+            true
+        catch err
+            false
+        end
+    end
+    @test !isdefined(current_module(), :button)
+    locally_defined()
+    @test !isdefined(current_module(), :button)
+
+    # HTMLDocument
+    @test string(HTMLDocument(div())) == "<!DOCTYPE html>\n<div></div>\n"
+    @test string(HTMLDocument("custom doctype", div())) == "<!DOCTYPE custom doctype>\n<div></div>\n"
+end
+
+end
diff --git a/test/runtests.jl b/test/runtests.jl
index ad9ad965d2..8502db0bce 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -151,95 +151,7 @@ end
 
 ## DOM Tests.
 
-module DOMTests
-    using Base.Test
-    import Documenter.Utilities.DOM: DOM, @tags
-
-    @tags div ul li p
-
-    for tag in (:div, :ul, :li, :p)
-        TAG = getfield(current_module(), tag)
-        @test isdefined(tag)
-        @test isa(TAG, DOM.Tag)
-        @test TAG.name === tag
-    end
-
-    @test div().name === :div
-    @test div().text == ""
-    @test isempty(div().nodes)
-    @test isempty(div().attributes)
-
-    @test div("...").name === :div
-    @test div("...").text == ""
-    @test length(div("...").nodes) === 1
-    @test div("...").nodes[1].text == "..."
-    @test div("...").nodes[1].name === Symbol("")
-    @test isempty(div("...").attributes)
-
-    @test div[".class"]("...").name === :div
-    @test div[".class"]("...").text == ""
-    @test length(div[".class"]("...").nodes) === 1
-    @test div[".class"]("...").nodes[1].text == "..."
-    @test div[".class"]("...").nodes[1].name === Symbol("")
-    @test length(div[".class"]("...").attributes) === 1
-    @test div[".class"]("...").attributes[1] == (:class => "class")
-    @test div[:attribute].attributes[1] == (:attribute => "")
-    @test div[:attribute => "value"].attributes[1] == (:attribute => "value")
-
-    let d = div(ul(map(li, [string(n) for n = 1:10])))
-        @test d.name === :div
-        @test d.text == ""
-        @test isempty(d.attributes)
-        @test length(d.nodes) === 1
-        let u = d.nodes[1]
-            @test u.name === :ul
-            @test u.text == ""
-            @test isempty(u.attributes)
-            @test length(u.nodes) === 10
-            for n = 1:10
-                let v = u.nodes[n]
-                    @test v.name === :li
-                    @test v.text == ""
-                    @test isempty(v.attributes)
-                    @test length(v.nodes) === 1
-                    @test v.nodes[1].name === Symbol("")
-                    @test v.nodes[1].text == string(n)
-                    @test !isdefined(v.nodes[1], :attributes)
-                    @test !isdefined(v.nodes[1], :nodes)
-                end
-            end
-        end
-    end
-
-    @tags script style img
-
-    @test string(div(p("one"), p("two"))) == "<div><p>one</p><p>two</p></div>"
-    @test string(div[:key => "value"])    == "<div key=\"value\"></div>"
-    @test string(p(" < > & ' \" "))       == "<p> &lt; &gt; &amp; &#39; &quot; </p>"
-    @test string(img[:src => "source"])   == "<img src=\"source\"/>"
-    @test string(img[:none])              == "<img none/>"
-    @test string(script(" < > & ' \" "))  == "<script> < > & ' \" </script>"
-    @test string(style(" < > & ' \" "))   == "<style> < > & ' \" </style>"
-    @test string(script)                  == "<script>"
-
-    function locally_defined()
-        @tags button
-        @test try
-            x = button
-            true
-        catch err
-            false
-        end
-    end
-    @test !isdefined(current_module(), :button)
-    locally_defined()
-    @test !isdefined(current_module(), :button)
-
-    # HTMLDocument
-    import Documenter.Utilities.DOM: HTMLDocument
-    @test string(HTMLDocument(div())) == "<!DOCTYPE html>\n<div></div>\n"
-    @test string(HTMLDocument("custom doctype", div())) == "<!DOCTYPE custom doctype>\n<div></div>\n"
-end
+include("dom.jl")
 
 # `Markdown.MD` to `DOM.Node` conversion tests.
 module MarkdownToNode

From 5189bb739fbdce99207dea138548db965dc87f4e Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Sun, 2 Oct 2016 23:17:47 +0200
Subject: [PATCH 09/14] Move DocSystem tests to a sep. file, use testsets

---
 test/docsystem.jl | 85 +++++++++++++++++++++++++++++++++++++++++++++++
 test/runtests.jl  | 78 +------------------------------------------
 2 files changed, 86 insertions(+), 77 deletions(-)
 create mode 100644 test/docsystem.jl

diff --git a/test/docsystem.jl b/test/docsystem.jl
new file mode 100644
index 0000000000..3976ebc738
--- /dev/null
+++ b/test/docsystem.jl
@@ -0,0 +1,85 @@
+module DocSystemTests
+
+if VERSION >= v"0.5.0-dev+7720"
+    using Base.Test
+else
+    using BaseTestNext
+    const Test = BaseTestNext
+end
+
+import Documenter: Documenter, DocSystem
+
+const alias_of_getdocs = DocSystem.getdocs # NOTE: won't get docstrings if in a @testset
+
+@testset "DocSystem" begin
+    ## Bindings.
+    @test_throws ArgumentError DocSystem.binding(9000)
+    let b = Docs.Binding(current_module(), :DocSystem)
+        @test DocSystem.binding(b) == b
+    end
+    let b = DocSystem.binding(Documenter.Documents.Document)
+        @test b.mod === Documenter.Documents
+        @test b.var === :Document
+    end
+    let b = DocSystem.binding(Documenter)
+        @test b.mod === Main
+        @test b.var === :Documenter
+    end
+    let b = DocSystem.binding(:Main)
+        # @test b.mod === Main
+        @test b.var === :Main
+    end
+    let b = DocSystem.binding(DocSystem.binding)
+        @test b.mod === DocSystem
+        @test b.var === :binding
+    end
+    let b = DocSystem.binding(getfield(Core.Intrinsics, :ccall))
+        @test b.mod === Core.Intrinsics
+        @test b.var === :ccall
+    end
+    let b = DocSystem.binding(Documenter, :Documenter)
+        @test b.mod === Main
+        @test b.var === :Documenter
+    end
+
+    ## `MultiDoc` object.
+    @test isdefined(DocSystem, :MultiDoc)
+    @test fieldnames(DocSystem.MultiDoc) == [:order, :docs]
+
+    ## `DocStr` object.
+    @test isdefined(DocSystem, :DocStr)
+    @test fieldnames(DocSystem.DocStr) == [:text, :object, :data]
+
+    ## `getdocs`.
+    let b   = DocSystem.binding(DocSystem, :getdocs),
+        d_0 = DocSystem.getdocs(b, Tuple{}),
+        d_1 = DocSystem.getdocs(b),
+        d_2 = DocSystem.getdocs(b, Union{Tuple{ANY}, Tuple{ANY, Type}}; compare = (==)),
+        d_3 = DocSystem.getdocs(b; modules = Module[Main]),
+        d_4 = DocSystem.getdocs(DocSystem.binding(current_module(), :alias_of_getdocs)),
+        d_5 = DocSystem.getdocs(DocSystem.binding(current_module(), :alias_of_getdocs); aliases = false)
+
+        @test length(d_0) == 0
+        @test length(d_1) == 2
+        @test length(d_2) == 1
+        @test length(d_3) == 0
+        @test length(d_4) == 2
+        @test length(d_5) == 0
+
+        @test d_1[1].data[:binding] == b
+        @test d_1[2].data[:binding] == b
+        @test d_1[1].data[:typesig] == Union{Tuple{Docs.Binding}, Tuple{Docs.Binding, Type}}
+        @test d_1[2].data[:typesig] == Union{Tuple{ANY}, Tuple{ANY, Type}}
+        @test d_1[1].data[:module]  == DocSystem
+        @test d_1[2].data[:module]  == DocSystem
+
+        @test d_2[1].data[:binding] == b
+        @test d_2[1].data[:typesig] == Union{Tuple{ANY}, Tuple{ANY, Type}}
+        @test d_2[1].data[:module]  == DocSystem
+
+        @test d_1 == d_4
+        @test d_1 != d_5
+    end
+end
+
+end
diff --git a/test/runtests.jl b/test/runtests.jl
index 8502db0bce..a178fd2de2 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -71,83 +71,7 @@ include("navnode.jl")
 
 # DocSystem unit tests.
 
-import Documenter: DocSystem
-
-## Bindings.
-
-@test_throws ArgumentError DocSystem.binding(9000)
-let b = Docs.Binding(current_module(), :DocSystem)
-    @test DocSystem.binding(b) == b
-end
-let b = DocSystem.binding(Documenter.Documents.Document)
-    @test b.mod === Documenter.Documents
-    @test b.var === :Document
-end
-let b = DocSystem.binding(Documenter)
-    @test b.mod === Main
-    @test b.var === :Documenter
-end
-let b = DocSystem.binding(:Main)
-    # @test b.mod === Main
-    @test b.var === :Main
-end
-let b = DocSystem.binding(DocSystem.binding)
-    @test b.mod === DocSystem
-    @test b.var === :binding
-end
-let b = DocSystem.binding(getfield(Core.Intrinsics, :ccall))
-    @test b.mod === Core.Intrinsics
-    @test b.var === :ccall
-end
-let b = DocSystem.binding(Documenter, :Documenter)
-    @test b.mod === Main
-    @test b.var === :Documenter
-end
-
-## `MultiDoc` object.
-
-@test isdefined(DocSystem, :MultiDoc)
-@test fieldnames(DocSystem.MultiDoc) == [:order, :docs]
-
-## `DocStr` object.
-
-@test isdefined(DocSystem, :DocStr)
-@test fieldnames(DocSystem.DocStr) == [:text, :object, :data]
-
-## `getdocs`.
-
-const alias_of_getdocs = DocSystem.getdocs
-
-let b   = DocSystem.binding(DocSystem, :getdocs),
-    d_0 = DocSystem.getdocs(b, Tuple{}),
-    d_1 = DocSystem.getdocs(b),
-    d_2 = DocSystem.getdocs(b, Union{Tuple{ANY}, Tuple{ANY, Type}}; compare = (==)),
-    d_3 = DocSystem.getdocs(b; modules = Module[Main]),
-    d_4 = DocSystem.getdocs(DocSystem.binding(current_module(), :alias_of_getdocs)),
-    d_5 = DocSystem.getdocs(DocSystem.binding(current_module(), :alias_of_getdocs); aliases = false)
-
-    @test length(d_0) == 0
-    @test length(d_1) == 2
-    @test length(d_2) == 1
-    @test length(d_3) == 0
-    @test length(d_4) == 2
-    @test length(d_5) == 0
-
-    @test d_1[1].data[:binding] == b
-    @test d_1[2].data[:binding] == b
-    @test d_1[1].data[:typesig] == Union{Tuple{Docs.Binding}, Tuple{Docs.Binding, Type}}
-    @test d_1[2].data[:typesig] == Union{Tuple{ANY}, Tuple{ANY, Type}}
-    @test d_1[1].data[:module]  == DocSystem
-    @test d_1[2].data[:module]  == DocSystem
-
-    @test d_2[1].data[:binding] == b
-    @test d_2[1].data[:typesig] == Union{Tuple{ANY}, Tuple{ANY, Type}}
-    @test d_2[1].data[:module]  == DocSystem
-
-    @test d_1 == d_4
-    @test d_1 != d_5
-end
-
+include("docsystem.jl")
 
 ## DOM Tests.
 

From f1b03dfcbe062bdef1bece5b0c31bdcbb244d432 Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Sun, 2 Oct 2016 23:24:21 +0200
Subject: [PATCH 10/14] Move Utilities tests to a sep. file, use testsets

---
 test/runtests.jl  | 46 +-----------------------------------
 test/utilities.jl | 60 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 45 deletions(-)
 create mode 100644 test/utilities.jl

diff --git a/test/runtests.jl b/test/runtests.jl
index a178fd2de2..8ac966e19d 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -19,51 +19,7 @@ using Compat
 
 # Unit tests for module internals.
 
-module UnitTests
-    module SubModule end
-
-    # Does `submodules` collect *all* the submodules?
-    module A
-        module B
-            module C
-                module D end
-            end
-        end
-    end
-
-    type T end
-
-    "Documenter unit tests."
-    Base.length(::T) = 1
-end
-
-let doc = @doc(length)
-    a = Documenter.Utilities.filterdocs(doc, Set{Module}())
-    b = Documenter.Utilities.filterdocs(doc, Set{Module}([UnitTests]))
-    c = Documenter.Utilities.filterdocs(doc, Set{Module}([Base]))
-    d = Documenter.Utilities.filterdocs(doc, Set{Module}([Tests]))
-
-    @test !isnull(a)
-    @test get(a) === doc
-    @test !isnull(b)
-    @test contains(stringmime("text/plain", get(b)), "Documenter unit tests.")
-    @test !isnull(c)
-    @test !contains(stringmime("text/plain", get(c)), "Documenter unit tests.")
-    @test isnull(d)
-end
-
-# Documenter.Utilities.issubmodule
-@test Documenter.Utilities.issubmodule(Main, Main) === true
-@test Documenter.Utilities.issubmodule(UnitTests, UnitTests) === true
-@test Documenter.Utilities.issubmodule(UnitTests.SubModule, Main) === true
-@test Documenter.Utilities.issubmodule(UnitTests.SubModule, UnitTests) === true
-@test Documenter.Utilities.issubmodule(UnitTests.SubModule, Base) === false
-@test Documenter.Utilities.issubmodule(UnitTests, UnitTests.SubModule) === false
-
-@test UnitTests.A in Documenter.Utilities.submodules(UnitTests.A)
-@test UnitTests.A.B in Documenter.Utilities.submodules(UnitTests.A)
-@test UnitTests.A.B.C in Documenter.Utilities.submodules(UnitTests.A)
-@test UnitTests.A.B.C.D in Documenter.Utilities.submodules(UnitTests.A)
+include("utilities.jl")
 
 ## NavNode tests
 
diff --git a/test/utilities.jl b/test/utilities.jl
new file mode 100644
index 0000000000..95eecb5202
--- /dev/null
+++ b/test/utilities.jl
@@ -0,0 +1,60 @@
+module UtilitiesTests
+
+if VERSION >= v"0.5.0-dev+7720"
+    using Base.Test
+else
+    using BaseTestNext
+    const Test = BaseTestNext
+end
+
+import Documenter
+
+module UnitTests
+    module SubModule end
+
+    # Does `submodules` collect *all* the submodules?
+    module A
+        module B
+            module C
+                module D end
+            end
+        end
+    end
+
+    type T end
+
+    "Documenter unit tests."
+    Base.length(::T) = 1
+end
+
+@testset "Utilities" begin
+    let doc = @doc(length)
+        a = Documenter.Utilities.filterdocs(doc, Set{Module}())
+        b = Documenter.Utilities.filterdocs(doc, Set{Module}([UnitTests]))
+        c = Documenter.Utilities.filterdocs(doc, Set{Module}([Base]))
+        d = Documenter.Utilities.filterdocs(doc, Set{Module}([UtilitiesTests]))
+
+        @test !isnull(a)
+        @test get(a) === doc
+        @test !isnull(b)
+        @test contains(stringmime("text/plain", get(b)), "Documenter unit tests.")
+        @test !isnull(c)
+        @test !contains(stringmime("text/plain", get(c)), "Documenter unit tests.")
+        @test isnull(d)
+    end
+
+    # Documenter.Utilities.issubmodule
+    @test Documenter.Utilities.issubmodule(Main, Main) === true
+    @test Documenter.Utilities.issubmodule(UnitTests, UnitTests) === true
+    @test Documenter.Utilities.issubmodule(UnitTests.SubModule, Main) === true
+    @test Documenter.Utilities.issubmodule(UnitTests.SubModule, UnitTests) === true
+    @test Documenter.Utilities.issubmodule(UnitTests.SubModule, Base) === false
+    @test Documenter.Utilities.issubmodule(UnitTests, UnitTests.SubModule) === false
+
+    @test UnitTests.A in Documenter.Utilities.submodules(UnitTests.A)
+    @test UnitTests.A.B in Documenter.Utilities.submodules(UnitTests.A)
+    @test UnitTests.A.B.C in Documenter.Utilities.submodules(UnitTests.A)
+    @test UnitTests.A.B.C.D in Documenter.Utilities.submodules(UnitTests.A)
+end
+
+end

From 0f31e39f66d5c996fca2d09ea89872786ce27c1e Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Sun, 2 Oct 2016 23:37:46 +0200
Subject: [PATCH 11/14] Move output tests to separate files, use testsets

---
 test/formats/latex.jl    | 63 ++++++++++++++++++++++++++
 test/formats/markdown.jl | 61 ++++++++++++++++++++++++++
 test/runtests.jl         | 95 ++--------------------------------------
 3 files changed, 127 insertions(+), 92 deletions(-)
 create mode 100644 test/formats/latex.jl
 create mode 100644 test/formats/markdown.jl

diff --git a/test/formats/latex.jl b/test/formats/latex.jl
new file mode 100644
index 0000000000..a03bfc2a37
--- /dev/null
+++ b/test/formats/latex.jl
@@ -0,0 +1,63 @@
+module LaTeXFormatTests
+
+if VERSION >= v"0.5.0-dev+7720"
+    using Base.Test
+else
+    using BaseTestNext
+    const Test = BaseTestNext
+end
+
+using Documenter
+
+# Documenter package docs
+info("Building Documenter's docs with LaTeX.")
+const Documenter_root = normpath(joinpath(dirname(@__FILE__), "..", "..", "docs"))
+doc = makedocs(
+    debug = true,
+    root = Documenter_root,
+    modules = [Documenter],
+    clean = false,
+    format = Documenter.Formats.LaTeX,
+    sitename = "Documenter.jl",
+    authors = "Michael Hatherly, Morten Piibeleht, and contributors.",
+    pages = Any[ # Compat: `Any` for 0.4 compat
+        "Home" => "index.md",
+        "Manual" => Any[
+            "Guide" => "man/guide.md",
+            "man/examples.md",
+            "man/syntax.md",
+            "man/doctests.md",
+            "man/hosting.md",
+            "man/latex.md",
+            "man/internals.md",
+            "man/contributing.md",
+        ],
+        "Library" => Any[
+            "Public" => "lib/public.md",
+            "Internals" => Any[
+                "Internals" => "lib/internals.md",
+                "lib/internals/anchors.md",
+                "lib/internals/builder.md",
+                "lib/internals/cross-references.md",
+                "lib/internals/docchecks.md",
+                "lib/internals/docsystem.md",
+                "lib/internals/documents.md",
+                "lib/internals/dom.md",
+                "lib/internals/expanders.md",
+                "lib/internals/formats.md",
+                "lib/internals/generator.md",
+                "lib/internals/mdflatten.md",
+                "lib/internals/selectors.md",
+                "lib/internals/utilities.md",
+                "lib/internals/walkers.md",
+                "lib/internals/writers.md",
+            ]
+        ]
+    ]
+)
+
+@testset "LaTeX" begin
+    @test isa(doc, Documenter.Documents.Document)
+end
+
+end
diff --git a/test/formats/markdown.jl b/test/formats/markdown.jl
new file mode 100644
index 0000000000..1224ab92a5
--- /dev/null
+++ b/test/formats/markdown.jl
@@ -0,0 +1,61 @@
+module MarkdownFormatTests
+
+if VERSION >= v"0.5.0-dev+7720"
+    using Base.Test
+else
+    using BaseTestNext
+    const Test = BaseTestNext
+end
+
+using Documenter
+
+# Documenter package docs
+info("Building Documenter's docs with Markdown.")
+const Documenter_root = normpath(joinpath(dirname(@__FILE__), "..", "..", "docs"))
+doc = makedocs(
+    debug   = true,
+    root    = Documenter_root,
+    modules = Documenter,
+    clean   = false,
+)
+
+@testset "Markdown" begin
+    @test isa(doc, Documenter.Documents.Document)
+
+    let build_dir  = joinpath(Documenter_root, "build"),
+        source_dir = joinpath(Documenter_root, "src")
+
+        @test isdir(build_dir)
+        @test isdir(joinpath(build_dir, "assets"))
+        @test isdir(joinpath(build_dir, "lib"))
+        @test isdir(joinpath(build_dir, "man"))
+
+        @test isfile(joinpath(build_dir, "index.md"))
+        @test isfile(joinpath(build_dir, "assets", "mathjaxhelper.js"))
+        @test isfile(joinpath(build_dir, "assets", "Documenter.css"))
+    end
+
+    @test doc.user.root   == Documenter_root
+    @test doc.user.source == "src"
+    @test doc.user.build  == "build"
+    @test doc.user.clean  == false
+
+    rm(joinpath(Documenter_root, "build"); recursive = true)
+
+    mktempdir() do root
+        let path = joinpath(root, "docs")
+            Documenter.generate("DocumenterTestPackage", dir = path)
+            @test isdir(path)
+            @test isfile(joinpath(path, "mkdocs.yml"))
+            @test isfile(joinpath(path, ".gitignore"))
+            @test isfile(joinpath(path, "make.jl"))
+            @test isdir(joinpath(path, "src"))
+            @test isfile(joinpath(path, "src", "index.md"))
+        end
+    end
+
+    @test_throws ErrorException Documenter.generate("Documenter")
+    @test_throws ErrorException Documenter.generate(randstring())
+end
+
+end
diff --git a/test/runtests.jl b/test/runtests.jl
index 8ac966e19d..6821b31930 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -63,99 +63,10 @@ println("="^50)
 
 include(joinpath(dirname(@__FILE__), "examples", "tests.jl"))
 
-# Documenter package docs:
+# Documenter package docs with other formats
 
-const Documenter_root = normpath(joinpath(dirname(@__FILE__), "..", "docs"))
-
-info("Building Documenter package docs.")
-doc = makedocs(
-    debug   = true,
-    root    = Documenter_root,
-    modules = Documenter,
-    clean   = false,
-)
-
-@test isa(doc, Documenter.Documents.Document)
-
-let build_dir  = joinpath(Documenter_root, "build"),
-    source_dir = joinpath(Documenter_root, "src")
-
-    @test isdir(build_dir)
-    @test isdir(joinpath(build_dir, "assets"))
-    @test isdir(joinpath(build_dir, "lib"))
-    @test isdir(joinpath(build_dir, "man"))
-
-    @test isfile(joinpath(build_dir, "index.md"))
-    @test isfile(joinpath(build_dir, "assets", "mathjaxhelper.js"))
-    @test isfile(joinpath(build_dir, "assets", "Documenter.css"))
-end
-
-@test doc.user.root   == Documenter_root
-@test doc.user.source == "src"
-@test doc.user.build  == "build"
-@test doc.user.clean  == false
-
-rm(joinpath(Documenter_root, "build"); recursive = true)
-
-mktempdir() do root
-    let path = joinpath(root, "docs")
-        Documenter.generate("DocumenterTestPackage", dir = path)
-        @test isdir(path)
-        @test isfile(joinpath(path, "mkdocs.yml"))
-        @test isfile(joinpath(path, ".gitignore"))
-        @test isfile(joinpath(path, "make.jl"))
-        @test isdir(joinpath(path, "src"))
-        @test isfile(joinpath(path, "src", "index.md"))
-    end
-end
-
-@test_throws ErrorException Documenter.generate("Documenter")
-@test_throws ErrorException Documenter.generate(randstring())
-
-# Test PDF generation.
-
-makedocs(
-    root = Documenter_root,
-    modules = [Documenter],
-    clean = false,
-    format = Documenter.Formats.LaTeX,
-    sitename = "Documenter.jl",
-    authors = "Michael Hatherly, Morten Piibeleht, and contributors.",
-    pages = Any[ # Compat: `Any` for 0.4 compat
-        "Home" => "index.md",
-        "Manual" => Any[
-            "Guide" => "man/guide.md",
-            "man/examples.md",
-            "man/syntax.md",
-            "man/doctests.md",
-            "man/hosting.md",
-            "man/latex.md",
-            "man/internals.md",
-            "man/contributing.md",
-        ],
-        "Library" => Any[
-            "Public" => "lib/public.md",
-            "Internals" => Any[
-                "Internals" => "lib/internals.md",
-                "lib/internals/anchors.md",
-                "lib/internals/builder.md",
-                "lib/internals/cross-references.md",
-                "lib/internals/docchecks.md",
-                "lib/internals/docsystem.md",
-                "lib/internals/documents.md",
-                "lib/internals/dom.md",
-                "lib/internals/expanders.md",
-                "lib/internals/formats.md",
-                "lib/internals/generator.md",
-                "lib/internals/mdflatten.md",
-                "lib/internals/selectors.md",
-                "lib/internals/utilities.md",
-                "lib/internals/walkers.md",
-                "lib/internals/writers.md",
-            ]
-        ]
-    ]
-)
+include("formats/markdown.jl")
+include("formats/latex.jl")
 
 end
 

From 4da069bb00dba30adf0a8dd734177d5a1040786f Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Sun, 2 Oct 2016 23:51:52 +0200
Subject: [PATCH 12/14] Use testsets in runtests.jl

And otherwise reorganize the file a bit.

Fixes #154.
---
 test/runtests.jl | 72 +++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/test/runtests.jl b/test/runtests.jl
index 6821b31930..431290ded9 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -7,33 +7,49 @@ include(joinpath(dirname(@__FILE__), "examples", "make.jl"))
 # Test missing docs
 include(joinpath(dirname(@__FILE__), "missingdocs", "make.jl"))
 
-# tests module
-# ============
-
-module Tests
+# Error reporting.
+println("="^50)
+info("The following errors are expected output.")
+include(joinpath("errors", "make.jl"))
+info("END of expected error output.")
+println("="^50)
 
-using Documenter
-using Base.Test
-using Compat
+# Primary @testset
 
+if VERSION >= v"0.5.0-dev+7720"
+    using Base.Test
+else
+    using BaseTestNext
+    const Test = BaseTestNext
+end
 
-# Unit tests for module internals.
+@testset "Documenter" begin
+    # Unit tests for module internals.
+    include("utilities.jl")
 
-include("utilities.jl")
+    # NavNode tests.
+    include("navnode.jl")
 
-## NavNode tests
+    # DocSystem unit tests.
+    include("docsystem.jl")
 
-include("navnode.jl")
+    # DOM Tests.
+    include("dom.jl")
 
-# DocSystem unit tests.
+    # MDFlatten tests.
+    include("mdflatten.jl")
 
-include("docsystem.jl")
+    # Mock package docs.
+    include("examples/tests.jl")
 
-## DOM Tests.
+    # Documenter package docs with other formats.
+    include("formats/markdown.jl")
+    include("formats/latex.jl")
+end
 
-include("dom.jl")
+# Additional tests
 
-# `Markdown.MD` to `DOM.Node` conversion tests.
+## `Markdown.MD` to `DOM.Node` conversion tests.
 module MarkdownToNode
     import Documenter.DocSystem
     import Documenter.Writers.HTMLWriter: mdconvert
@@ -48,27 +64,3 @@ module MarkdownToNode
         end
     end
 end
-
-# Integration tests for module api.
-
-# Error reporting.
-
-println("="^50)
-info("The following errors are expected output.")
-include(joinpath("errors", "make.jl"))
-info("END of expected error output.")
-println("="^50)
-
-# Mock package docs:
-
-include(joinpath(dirname(@__FILE__), "examples", "tests.jl"))
-
-# Documenter package docs with other formats
-
-include("formats/markdown.jl")
-include("formats/latex.jl")
-
-end
-
-# more tests from files
-include("mdflatten.jl")

From ef5e3ec9ca9892754e6a9ea34d1fcc7e8801d65a Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Tue, 4 Oct 2016 20:22:43 +0200
Subject: [PATCH 13/14] Remove branch restrictions from appveyor.yml

---
 appveyor.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b9d81af640..466f951b92 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,11 +4,6 @@ environment:
   - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
   - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
 
-branches:
-  only:
-    - master
-    - /^release-.*/
-
 notifications:
   - provider: Email
     on_build_success: false

From cdc1e14d37d1189f7dd3bdf5c867c0e718663c2e Mon Sep 17 00:00:00 2001
From: Morten Piibeleht <morten.piibeleht@gmail.com>
Date: Wed, 5 Oct 2016 19:23:52 +0200
Subject: [PATCH 14/14] Don't use joinpath in test includes

Julia already handles cross-platform matters and always includes
files relative to the current file, so they're not necessary and
dropping them makes the code more readable.
---
 test/examples/tests.jl | 2 +-
 test/runtests.jl       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/examples/tests.jl b/test/examples/tests.jl
index c20223fcfa..df1f6a5ab0 100644
--- a/test/examples/tests.jl
+++ b/test/examples/tests.jl
@@ -2,7 +2,7 @@
 # the docs and defines a few modules that are referred to in the docs. The make.jl
 # has to be expected in the context of the Main module.
 if current_module() === Main && !isdefined(:examples_root)
-    include(joinpath(dirname(@__FILE__), "make.jl"))
+    include("make.jl")
 elseif current_module() !== Main && isdefined(Main, :examples_root)
     using Documenter
     const examples_root = Main.examples_root
diff --git a/test/runtests.jl b/test/runtests.jl
index 431290ded9..1a4f274680 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,11 +1,11 @@
 # Build the real docs first.
-include(joinpath(dirname(@__FILE__), "..", "docs", "make.jl"))
+include("../docs/make.jl")
 
 # Build the example docs
-include(joinpath(dirname(@__FILE__), "examples", "make.jl"))
+include("examples/make.jl")
 
 # Test missing docs
-include(joinpath(dirname(@__FILE__), "missingdocs", "make.jl"))
+include("missingdocs/make.jl")
 
 # Error reporting.
 println("="^50)