refactor code/tests: keyword support for search index #2516

4 files changed, 11 insertions, 18 deletions

diff --git a/tests/roots/test-search-de/conf.py b/tests/roots/test-search-de/conf.py
deleted file mode 100644
index 3c902c292..000000000
--- a/tests/roots/test-search-de/conf.py
+++ /dev/null
@@ -1,3 +0,0 @@
-master_doc = 'index'
-exclude_patterns = ['_build']
-html_search_language = 'de'
diff --git a/tests/roots/test-search-de/index.rst b/tests/roots/test-search-de/index.rst
deleted file mode 100644
index 57a9216bb..000000000
--- a/tests/roots/test-search-de/index.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-meta keywords
-=============
-
-.. meta::
-   :keywords lang=de: findthiskey, thistoo
-   :keywords: thisonetoo
-   :keywords lang=en: findnotthiskey
-   :description: thisnoteither
diff --git a/tests/roots/test-search/index.rst b/tests/roots/test-search/index.rst
index 930789c79..f2536ce9a 100644
--- a/tests/roots/test-search/index.rst
+++ b/tests/roots/test-search/index.rst
@@ -2,7 +2,7 @@ meta keywords
 =============
 
 .. meta::
-   :keywords lang=en: findthiskey, thistoo
+   :keywords lang=en: findthiskey, thistoo, notgerman
    :keywords: thisonetoo
-   :keywords lang=de: findnotthiskey
-   :description: thisnoteither
+   :keywords lang=de: onlygerman, onlytoogerman
+   :description: thisnoteither
\ No newline at end of file
diff --git a/tests/test_search.py b/tests/test_search.py
index 033e7ccb4..160dd1827 100644
--- a/tests/test_search.py
+++ b/tests/test_search.py
@@ -8,6 +8,7 @@
     :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+import os
 
 from docutils import frontend, utils
 from docutils.parsers import rst
@@ -54,21 +55,24 @@ def test_objects_are_escaped(app, status, warning):
     assert 'n::Array&lt;T, d&gt;' in index.get('objects').get('')  # n::Array<T,d> is escaped
 
 def assert_lang_agnostic_key_words(searchindex):
-    assert 'findnotthiskey' not in searchindex
     assert 'thisnoteith' not in searchindex
-    assert 'thistoo' in searchindex
     assert 'thisonetoo' in searchindex
 
 @with_app(testroot='search')
 def test_meta_keys_are_handled_for_language_en(app, status, warning):
+    os.remove(app.outdir / 'searchindex.js')
     app.builder.build_all()
     searchindex = (app.outdir / 'searchindex.js').text()
     assert_lang_agnostic_key_words(searchindex)
     assert 'findthiskei' in searchindex
+    assert 'onlygerman' not in searchindex
+    assert 'thistoo' in searchindex
 
-@with_app(testroot='search-de')
+@with_app(testroot='search', confoverrides={'html_search_language': 'de'})
 def test_meta_keys_are_handled_for_language_de(app, status, warning):
     app.builder.build_all()
     searchindex = (app.outdir / 'searchindex.js').text()
     assert_lang_agnostic_key_words(searchindex)
-    assert 'findthiskey' in searchindex
\ No newline at end of file
+    assert 'onlygerman' in searchindex
+    assert 'notgerman' not in searchindex
+    assert 'onlytoogerman' in searchindex
\ No newline at end of file