From 44d114a050e12175e5f6fdf9c92c9207c7cae133 Mon Sep 17 00:00:00 2001 From: Chris de Graaf Date: Wed, 19 Dec 2018 13:48:07 -0600 Subject: [PATCH] Fix Documenter tests Tests now only work on v1.0.3+, lower versions will get an error saying that there are multiple versions of Documenter available. This doesn't break usage on older Julia versions, though. --- Manifest.toml | 4 ++-- test/plugins/travisci.jl | 8 ++++---- test/tests.jl | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index a037a79..21f4d42 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -37,9 +37,9 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[Mustache]] deps = ["Tables", "Test"] -git-tree-sha1 = "536782063c50421b05d1369bbd09fced13624361" +git-tree-sha1 = "be8d12b4a84ed7b592a6540b71c664440a4dd7f1" uuid = "ffc61752-8dc7-55ee-8c37-f3e9cdd09e70" -version = "0.5.7" +version = "0.5.8" [[Pkg]] deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] diff --git a/test/plugins/travisci.jl b/test/plugins/travisci.jl index 070f653..20d1fbb 100644 --- a/test/plugins/travisci.jl +++ b/test/plugins/travisci.jl @@ -37,7 +37,7 @@ pkg_dir = joinpath(t.dir, test_pkg) @test !occursin("after_success", travis) @test !occursin("Codecov.submit", travis) @test !occursin("Coveralls.submit", travis) - @test !occursin("Pkg.add(\"Documenter\")", travis) + @test !occursin("stage: Documentation", travis) rm(joinpath(pkg_dir, ".travis.yml")) # Generating the plugin with Codecov in the template should create a post-test step. @@ -48,7 +48,7 @@ pkg_dir = joinpath(t.dir, test_pkg) @test occursin("after_success", travis) @test occursin("Codecov.submit", travis) @test !occursin("Coveralls.submit", travis) - @test !occursin("Pkg.add(\"Documenter\")", travis) + @test !occursin("stage: Documentation", travis) rm(joinpath(pkg_dir, ".travis.yml")) # Coveralls should do the same. @@ -59,7 +59,7 @@ pkg_dir = joinpath(t.dir, test_pkg) @test occursin("after_success", travis) @test occursin("Coveralls.submit", travis) @test !occursin("Codecov.submit", travis) - @test !occursin("Pkg.add(\"Documenter\")", travis) + @test !occursin("stage: Documentation", travis) rm(joinpath(pkg_dir, ".travis.yml")) # With a Documenter plugin, there should be a docs deployment step. @@ -68,7 +68,7 @@ pkg_dir = joinpath(t.dir, test_pkg) delete!(t.plugins, GitHubPages) travis = read(joinpath(pkg_dir, ".travis.yml"), String) @test occursin("after_success", travis) - @test occursin("Pkg.add(\"Documenter\")", travis) + @test occursin("stage: Documentation", travis) @test !occursin("Codecov.submit", travis) @test !occursin("Coveralls.submit", travis) rm(joinpath(pkg_dir, ".travis.yml")) diff --git a/test/tests.jl b/test/tests.jl index aa95582..3c1690c 100644 --- a/test/tests.jl +++ b/test/tests.jl @@ -463,7 +463,7 @@ end @test occursin("\n checkdocs=:none,\n", make) @test !occursin("format=:markdown", make) - @test occursin("format=:html", make) + @test occursin("format=Documenter.HTML()", make) rm(pkg_dir; recursive=true) end # Test with string kwargs