diff --git a/test/plugins/appveyor.jl b/test/plugins/appveyor.jl index 7f89fd8..155a30a 100644 --- a/test/plugins/appveyor.jl +++ b/test/plugins/appveyor.jl @@ -34,28 +34,28 @@ pkg_dir = joinpath(temp_dir, test_pkg) @test gen_plugin(p, t, temp_dir, test_pkg) == [".appveyor.yml"] @test isfile(joinpath(pkg_dir, ".appveyor.yml")) appveyor = read(joinpath(pkg_dir, ".appveyor.yml"), String) - @test !contains(appveyor, "coverage=true") - @test !contains(appveyor, "after_test") - @test !contains(appveyor, "Codecov.submit") - @test !contains(appveyor, "Coveralls.submit") + @test !occursin("coverage=true", appveyor) + @test !occursin("after_test", appveyor) + @test !occursin("Codecov.submit", appveyor) + @test !occursin("Coveralls.submit", appveyor) rm(joinpath(pkg_dir, ".appveyor.yml")) t.plugins[CodeCov] = CodeCov() gen_plugin(p, t, temp_dir, test_pkg) delete!(t.plugins, CodeCov) appveyor = read(joinpath(pkg_dir, ".appveyor.yml"), String) - @test contains(appveyor, "coverage=true") - @test contains(appveyor, "after_test") - @test contains(appveyor, "Codecov.submit") - @test !contains(appveyor, "Coveralls.submit") + @test occursin("coverage=true", appveyor) + @test occursin("after_test", appveyor) + @test occursin("Codecov.submit", appveyor) + @test !occursin("Coveralls.submit", appveyor) rm(joinpath(pkg_dir, ".appveyor.yml")) t.plugins[Coveralls] = Coveralls() gen_plugin(p, t, temp_dir, test_pkg) delete!(t.plugins, Coveralls) appveyor = read(joinpath(pkg_dir, ".appveyor.yml"), String) - @test contains(appveyor, "coverage=true") - @test contains(appveyor, "after_test") - @test contains(appveyor, "Coveralls.submit") - @test !contains(appveyor, "Codecov.submit") + @test occursin("coverage=true", appveyor) + @test occursin("after_test", appveyor) + @test occursin("Coveralls.submit", appveyor) + @test !occursin("Codecov.submit", appveyor) rm(joinpath(pkg_dir, ".appveyor.yml")) p = AppVeyor(; config_file=nothing) @test isempty(gen_plugin(p, t, temp_dir, test_pkg)) diff --git a/test/plugins/githubpages.jl b/test/plugins/githubpages.jl index 226ca2d..aff7fb7 100644 --- a/test/plugins/githubpages.jl +++ b/test/plugins/githubpages.jl @@ -27,8 +27,8 @@ pkg_dir = joinpath(temp_dir, test_pkg) @test isdir(joinpath(pkg_dir, "docs")) @test isfile(joinpath(pkg_dir, "docs", "make.jl")) make = readchomp(joinpath(pkg_dir, "docs", "make.jl")) - @test contains(make, "assets=[]") - @test !contains(make, "deploydocs") + @test occursin("assets=[]", make) + @test !occursin("deploydocs", make) @test isdir(joinpath(pkg_dir, "docs", "src")) @test isfile(joinpath(pkg_dir, "docs", "src", "index.md")) index = readchomp(joinpath(pkg_dir, "docs", "src", "index.md")) @@ -50,7 +50,7 @@ pkg_dir = joinpath(temp_dir, test_pkg) t.plugins[TravisCI] = TravisCI() @test gen_plugin(p, t, temp_dir, test_pkg) == ["docs/"] make = readchomp(joinpath(pkg_dir, "docs", "make.jl")) - @test contains(make, "deploydocs") + @test occursin("deploydocs", make) rm(joinpath(pkg_dir, "docs"); recursive=true) end end diff --git a/test/plugins/gitlabci.jl b/test/plugins/gitlabci.jl index 5daf221..f1c5217 100644 --- a/test/plugins/gitlabci.jl +++ b/test/plugins/gitlabci.jl @@ -51,13 +51,13 @@ pkg_dir = joinpath(temp_dir, test_pkg) @test gen_plugin(p, t, temp_dir, test_pkg) == [".gitlab-ci.yml"] @test isfile(joinpath(pkg_dir, ".gitlab-ci.yml")) gitlab = read(joinpath(pkg_dir, ".gitlab-ci.yml"), String) - @test contains(gitlab, "test_template") - @test contains(gitlab, "using Coverage") + @test occursin("test_template", gitlab) + @test occursin("using Coverage", gitlab) rm(joinpath(pkg_dir, ".gitlab-ci.yml")) p = GitLabCI(; coverage=false) gen_plugin(p, t, temp_dir, test_pkg) gitlab = read(joinpath(pkg_dir, ".gitlab-ci.yml"), String) - @test !contains(gitlab, "using Coverage") + @test !occursin("using Coverage", gitlab) rm(joinpath(pkg_dir, ".gitlab-ci.yml")) p = GitLabCI(; config_file=nothing) @test isempty(gen_plugin(p, t, temp_dir, test_pkg)) diff --git a/test/plugins/travisci.jl b/test/plugins/travisci.jl index 5bd1754..96242ae 100644 --- a/test/plugins/travisci.jl +++ b/test/plugins/travisci.jl @@ -34,37 +34,37 @@ pkg_dir = joinpath(temp_dir, test_pkg) @test gen_plugin(p, t, temp_dir, test_pkg) == [".travis.yml"] @test isfile(joinpath(pkg_dir, ".travis.yml")) travis = read(joinpath(pkg_dir, ".travis.yml"), String) - @test !contains(travis, "after_success") - @test !contains(travis, "Codecov.submit") - @test !contains(travis, "Coveralls.submit") - @test !contains(travis, "Pkg.add(\"Documenter\")") + @test !occursin("after_success", travis) + @test !occursin("Codecov.submit", travis) + @test !occursin("Coveralls.submit", travis) + @test !occursin("Pkg.add(\"Documenter\")", travis) rm(joinpath(pkg_dir, ".travis.yml")) t.plugins[CodeCov] = CodeCov() gen_plugin(p, t, temp_dir, test_pkg) delete!(t.plugins, CodeCov) travis = read(joinpath(pkg_dir, ".travis.yml"), String) - @test contains(travis, "after_success") - @test contains(travis, "Codecov.submit") - @test !contains(travis, "Coveralls.submit") - @test !contains(travis, "Pkg.add(\"Documenter\")") + @test occursin("after_success", travis) + @test occursin("Codecov.submit", travis) + @test !occursin("Coveralls.submit", travis) + @test !occursin("Pkg.add(\"Documenter\")", travis) rm(joinpath(pkg_dir, ".travis.yml")) t.plugins[Coveralls] = Coveralls() gen_plugin(p, t, temp_dir, test_pkg) delete!(t.plugins, Coveralls) travis = read(joinpath(pkg_dir, ".travis.yml"), String) - @test contains(travis, "after_success") - @test contains(travis, "Coveralls.submit") - @test !contains(travis, "Codecov.submit") - @test !contains(travis, "Pkg.add(\"Documenter\")") + @test occursin("after_success", travis) + @test occursin("Coveralls.submit", travis) + @test !occursin("Codecov.submit", travis) + @test !occursin("Pkg.add(\"Documenter\")", travis) rm(joinpath(pkg_dir, ".travis.yml")) t.plugins[GitHubPages] = GitHubPages() gen_plugin(p, t, temp_dir, test_pkg) delete!(t.plugins, GitHubPages) travis = read(joinpath(pkg_dir, ".travis.yml"), String) - @test contains(travis, "after_success") - @test contains(travis, "Pkg.add(\"Documenter\")") - @test !contains(travis, "Codecov.submit") - @test !contains(travis, "Coveralls.submit") + @test occursin("after_success", travis) + @test occursin("Pkg.add(\"Documenter\")", travis) + @test !occursin("Codecov.submit", travis) + @test !occursin("Coveralls.submit", travis) rm(joinpath(pkg_dir, ".travis.yml")) p = TravisCI(; config_file=nothing) @test isempty(gen_plugin(p, t, temp_dir, test_pkg)) diff --git a/test/tests.jl b/test/tests.jl index c851c1d..da07649 100644 --- a/test/tests.jl +++ b/test/tests.jl @@ -209,9 +209,9 @@ end @test isfile(joinpath(pkg_dir, "README.md")) readme = readchomp(joinpath(pkg_dir, "README.md")) rm(joinpath(pkg_dir, "README.md")) - @test contains(readme, "# $test_pkg") + @test occursin("# $test_pkg", readme) for p in values(t.plugins) - @test contains(readme, join(badges(p, t.user, test_pkg), "\n")) + @test occursin("\n"), readme, join(badges(p, t.user, test_pkg)) end # Check the order of the badges. @test search(readme, "github.io").start < @@ -230,10 +230,10 @@ end @test isfile(joinpath(pkg_dir, ".gitignore")) gitignore = read(joinpath(pkg_dir, ".gitignore"), String) rm(joinpath(pkg_dir, ".gitignore")) - @test contains(gitignore, ".DS_Store") + @test occursin(".DS_Store", gitignore) for p in values(t.plugins) for entry in p.gitignore - @test contains(gitignore, entry) + @test occursin(entry, gitignore) end end @@ -241,22 +241,22 @@ end @test isfile(joinpath(pkg_dir, "LICENSE")) license = readchomp(joinpath(pkg_dir, "LICENSE")) rm(joinpath(pkg_dir, "LICENSE")) - @test contains(license, t.authors) - @test contains(license, t.years) - @test contains(license, read_license(t.license)) + @test occursin(t.authors, license) + @test occursin(t.years, license) + @test occursin(read_license(t.license), license) @test gen_entrypoint(temp_dir, test_pkg, t) == ["src/"] @test isdir(joinpath(pkg_dir, "src")) @test isfile(joinpath(pkg_dir, "src", "$test_pkg.jl")) entrypoint = readchomp(joinpath(pkg_dir, "src", "$test_pkg.jl")) rm(joinpath(pkg_dir, "src"); recursive=true) - @test contains(entrypoint, "__precompile__()") - @test contains(entrypoint, "module $test_pkg") + @test occursin("__precompile__()", entrypoint) + @test occursin("module $test_pkg", entrypoint) t2 = Template(; user=me, precompile=false) gen_entrypoint(temp_dir, test_pkg, t2) entrypoint = readchomp(joinpath(pkg_dir, "src", "$test_pkg.jl")) - @test !contains(entrypoint, "__precompile__()") - @test contains(entrypoint, "module $test_pkg") + @test !occursin("__precompile__()", entrypoint) + @test occursin("module $test_pkg", entrypoint) rm(joinpath(pkg_dir, "src"); recursive=true) @test gen_require(temp_dir, test_pkg, t) == ["REQUIRE"] @@ -270,8 +270,8 @@ end @test isfile(joinpath(pkg_dir, "test", "runtests.jl")) runtests = readchomp(joinpath(pkg_dir, "test", "runtests.jl")) rm(joinpath(pkg_dir, "test"); recursive=true) - @test contains(runtests, "using $test_pkg") - @test contains(runtests, "using Base.Test") + @test occursin("using $test_pkg", runtests) + @test occursin("using Base.Test", runtests) rm(temp_dir; recursive=true) end @@ -378,49 +378,49 @@ end @testset "Mustache substitution" begin view = Dict{String, Any}() text = substitute(template_text, view) - @test !contains(text, "PKGNAME: $test_pkg") - @test !contains(text, "Documenter") - @test !contains(text, "CodeCov") - @test !contains(text, "Coveralls") - @test !contains(text, "After") - @test !contains(text, "Other") + @test !occursin("PKGNAME: $test_pkg", text) + @test !occursin("Documenter", text) + @test !occursin("CodeCov", text) + @test !occursin("Coveralls", text) + @test !occursin("After", text) + @test !occursin("Other", text) view["PKGNAME"] = test_pkg view["OTHER"] = true text = substitute(template_text, view) - @test contains(text, "PKGNAME: $test_pkg") - @test contains(text, "Other") + @test occursin("PKGNAME: $test_pkg", text) + @test occursin("Other", text) t = Template(; user=me) view["OTHER"] = false text = substitute(template_text, t; view=view) - @test contains(text, "PKGNAME: $test_pkg") - @test contains(text, "VERSION: $(t.julia_version.major).$(t.julia_version.minor)") - @test !contains(text, "Documenter") - @test !contains(text, "After") - @test !contains(text, "Other") + @test occursin("PKGNAME: $test_pkg", text) + @test occursin("VERSION: $(t.julia_version.major).$(t.julia_version.minor)", text) + @test !occursin("Documenter", text) + @test !occursin("After", text) + @test !occursin("Other", text) t.plugins[GitHubPages] = GitHubPages() text = substitute(template_text, t; view=view) - @test contains(text, "Documenter") - @test contains(text, "After") + @test occursin("Documenter", text) + @test occursin("After", text) empty!(t.plugins) t.plugins[CodeCov] = CodeCov() text = substitute(template_text, t; view=view) - @test contains(text, "CodeCov") - @test contains(text, "After") + @test occursin("CodeCov", text) + @test occursin("After", text) empty!(t.plugins) t.plugins[Coveralls] = Coveralls() text = substitute(template_text, t; view=view) - @test contains(text, "Coveralls") - @test contains(text, "After") + @test occursin("Coveralls", text) + @test occursin("After", text) empty!(t.plugins) view["OTHER"] = true text = substitute(template_text, t; view=view) - @test contains(text, "Other") + @test occursin("Other", text) end @testset "License display" begin @@ -435,7 +435,7 @@ end redirect_stdout(old_stdout) for (short, long) in LICENSES - @test contains(licenses, "$short: $long") + @test occursin("$short: $long", licenses) end @test strip(mit) == strip(read_license("MIT")) @test strip(read_license("MIT")) == strip(read(joinpath(LICENSE_DIR, "MIT"), String))