A few more deprecations still

This commit is contained in:
Chris de Graaf 2018-09-19 14:57:21 -05:00
parent 9fc6092aa5
commit ab261170ef
4 changed files with 13 additions and 11 deletions

View File

@ -268,7 +268,7 @@ function interactive(
if default_config_file == nothing
print("[None]: ")
else
print("[$(replace(default_config_file, homedir(), "~"))]: ")
print("[$(replace(default_config_file, homedir() => "~"))]: ")
end
config_file = readline()
config_file = if uppercase(config_file) == "NONE"

View File

@ -31,7 +31,6 @@ function gen_plugin(
assets_string *= """$(tab^2)"assets/$(basename(asset))",\n"""
end
assets_string *= "$tab]"
else
assets_string = "[]"
end
@ -71,7 +70,7 @@ function show(io::IO, p::Documenter)
if n == 0
println(io)
else
println(io, ": $(join(map(a -> replace(a, homedir(), "~"), p.assets), ", "))")
println(io, ": $(join(map(a -> replace(a, homedir() => "~"), p.assets), ", "))")
end
n = length(p.gitignore)

View File

@ -37,13 +37,13 @@ pkg_dir = joinpath(temp_dir, test_pkg)
p = GitHubPages(; assets=[test_file])
@test gen_plugin(p, t, temp_dir, test_pkg) == ["docs/"]
make = readchomp(joinpath(pkg_dir, "docs", "make.jl"))
@test contains(
make,
@test occursin(
strip("""
assets=[
"assets/$(basename(test_file))",
]
"""),
make,
)
@test isfile(joinpath(pkg_dir, "docs", "src", "assets", basename(test_file)))
rm(joinpath(pkg_dir, "docs"); recursive=true)

View File

@ -214,17 +214,20 @@ end
@test occursin(join(badges(p, t.user, test_pkg), "\n"), readme)
end
# Check the order of the badges.
@test search(readme, "github.io").start <
search(readme, "travis").start <
search(readme, "appveyor").start <
search(readme, "codecov").start <
search(readme, "coveralls").start
@test something(findfirst("github.io", readme)).start <
something(findfirst("travis", readme)).start <
something(findfirst("appveyor", readme)).start <
something(findfirst("codecov", readme)).start <
something(findfirst("coveralls", readme)).start
# Plugins with badges but not in BADGE_ORDER should appear at the far right side.
t.plugins[Foo] = Foo()
gen_readme(temp_dir, test_pkg, t)
readme = readchomp(joinpath(pkg_dir, "README.md"))
rm(joinpath(pkg_dir, "README.md"))
@test search(readme, "coveralls").start < search(readme, "baz").start
@test <(
something(findfirst("coveralls", readme)).start,
something(findfirst("baz", readme)).start,
)
@test gen_gitignore(temp_dir, test_pkg, t) == [".gitignore"]
@test isfile(joinpath(pkg_dir, ".gitignore"))