From 637e059ae88337eef6c80f9081bb0170a2fd6c9f Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Fri, 16 Oct 2020 08:44:37 +0200
Subject: [PATCH] Correctly accept doctestfilters kwarg in Documenter.doctest,
 fixes #1364.

---
 CHANGELOG.md                |  4 ++++
 src/Documenter.jl           |  4 ++++
 test/doctests/doctestapi.jl | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00a6655d33..5cc718bb3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 * ![Enhancement][badge-enhancement] The URL to the MathJax JS module can now be customized by passing the `url` keyword argument to the constructors (`MathJax2`, `MathJax3`). ([#1428][github-1428], [#1430][github-1430])
 
+* ![Bugfix][badge-bugfix] `Documenter.doctest` now correctly accepts the `doctestfilters` keyword, similar to `Documenter.makedocs`. ([#1364][github-1364], [#1435][github-1435])
+
 ## Version `v0.25.2`
 
 * ![Deprecation][badge-deprecation] The `Documenter.MathJax` type, used to specify the mathematics rendering engine in the HTML output, is now deprecated in favor of `Documenter.MathJax2`. ([#1362][github-1362], [#1367][github-1367])
@@ -656,6 +658,8 @@
 [github-1400]: https://github.com/JuliaDocs/Documenter.jl/pull/1400
 [github-1428]: https://github.com/JuliaDocs/Documenter.jl/issues/1428
 [github-1430]: https://github.com/JuliaDocs/Documenter.jl/pull/1430
+[github-1364]: https://github.com/JuliaDocs/Documenter.jl/issues/1364
+[github-1435]: https://github.com/JuliaDocs/Documenter.jl/pull/1435
 
 [documenterlatex]: https://github.com/JuliaDocs/DocumenterLaTeX.jl
 [documentermarkdown]: https://github.com/JuliaDocs/DocumenterMarkdown.jl
diff --git a/src/Documenter.jl b/src/Documenter.jl
index 55f655f33d..8520f8a2f1 100644
--- a/src/Documenter.jl
+++ b/src/Documenter.jl
@@ -775,6 +775,8 @@ manual pages can be disabled if `source` is set to `nothing`.
 
 **`testset`** specifies the name of test testset (default `Doctests`).
 
+**`doctestfilters`** vector of regex to filter tests (see the manual on [Filtering Doctests](@ref))
+
 **`fix`**, if set to `true`, updates all the doctests that fail with the correct output
 (default `false`).
 
@@ -790,6 +792,7 @@ function doctest(
         modules::AbstractVector{Module};
         fix = false,
         testset = "Doctests",
+        doctestfilters = Regex[],
     )
     function all_doctests()
         dir = mktempdir()
@@ -805,6 +808,7 @@ function doctest(
                 sitename = "",
                 doctest = fix ? :fix : :only,
                 modules = modules,
+                doctestfilters = doctestfilters,
             )
             true
         catch err
diff --git a/test/doctests/doctestapi.jl b/test/doctests/doctestapi.jl
index 641f8a513b..e524242006 100644
--- a/test/doctests/doctestapi.jl
+++ b/test/doctests/doctestapi.jl
@@ -106,6 +106,19 @@ module DocTest5
     end
 end
 
+"""
+```jldoctest
+julia> println("global filter")
+global FILTER
+```
+
+```jldoctest; filter = r"local (filter|FILTER)"
+julia> println("local filter")
+local FILTER
+```
+"""
+module DoctestFilters end
+
 """
 ```jldoctest
 julia> map(tuple, 1/(i+j) for i=1:2, j=1:2, [1:4;])
@@ -210,6 +223,12 @@ end
         @test result isa Test.DefaultTestSet
     end
 
+    # DoctestFilters
+    df = [r"global (filter|FILTER)"]
+    run_doctest(nothing, [DoctestFilters], doctestfilters=df) do result, success, backtrace, output
+        @test success
+    end
+
     # Parse errors in doctests (https://github.com/JuliaDocs/Documenter.jl/issues/1046)
     run_doctest(nothing, [ParseErrorSuccess]) do result, success, backtrace, output
         @test success