Extend search tests

Author: Tschuppi81

tests/onegov/agency/test_views.py

@@ -725,9 +725,21 @@ def test_excel_export_not_logged_in(client):
 @mark.flaky(reruns=3)
 def test_basic_search(client_with_es):
     client = client_with_es
-
     client.login_admin()
+    anom = client.spawn()
+
+    # basic test
+    assert 'Resultate' in client.get('/search?q=test')
+    assert client.get('/search/suggest?q=test').json == []
+    assert 'Resultate' in anom.get('/search?q=test')
+    assert anom.get('/search/suggest?q=test').json == []
 
+    assert 'Resultate' in client.get('/search-postgres?q=test')
+    assert client.get('/search-postgres/suggest?q=test').json == []
+    assert 'Resultate' in anom.get('/search-postgres?q=test')
+    assert anom.get('/search-postgres/suggest?q=test').json == []
+
+    # Add data
     page = client.get('/settings').click("Organisationen", index=1)
     page.form['agency_phone_internal_digits'] = 4
     page.form.submit()
@@ -750,41 +762,40 @@ def test_basic_search(client_with_es):
     manage.form.submit()
 
     client.app.es_client.indices.refresh(index='_all')
-    client = client.spawn()
 
     # Test search results elasticsearch
-    assert 'Rivera' in client.get('/search?q=Nick')
-    assert 'Nick' in client.get('/search?q=Rivera')
-    assert 'Nick' in client.get('/search?q=Doctor')
-    assert 'Nick' in client.get('/search?q=+12345678901')
-    assert 'Nick' in client.get('/search?q=0345678901')
-    assert 'Nick' in client.get('/search?q=8911')
-    assert 'Hospital Springfield' in client.get('/search?q=Hospital')
-    assert 'Nick' in client.get('/search?q=Anesthetist')
+    assert 'Rivera' in anom.get('/search?q=Nick')
+    assert 'Nick' in anom.get('/search?q=Rivera')
+    assert 'Nick' in anom.get('/search?q=Doctor')
+    assert 'Nick' in anom.get('/search?q=+12345678901')
+    assert 'Nick' in anom.get('/search?q=0345678901')
+    assert 'Nick' in anom.get('/search?q=8911')
+    assert 'Hospital Springfield' in anom.get('/search?q=Hospital')
+    assert 'Nick' in anom.get('/search?q=Anesthetist')
 
     # Test suggestions
-    assert 'Nick Rivera (Doctor)' in client.get('/search/suggest?q=Nic').json
-    assert 'Rivera Nick (Doctor)' in client.get('/search/suggest?q=Riv').json
-    assert '8911 Rivera Nick (Doctor)' in client.get(
+    assert 'Nick Rivera (Doctor)' in anom.get('/search/suggest?q=Nic').json
+    assert 'Rivera Nick (Doctor)' in anom.get('/search/suggest?q=Riv').json
+    assert '8911 Rivera Nick (Doctor)' in anom.get(
         '/search/suggest?q=89').json
 
     # postgres
-    assert 'Rivera' in client.get('/search-postgres?q=Nick')
-    assert 'Nick' in client.get('/search-postgres?q=Rivera')
-    assert 'Nick' in client.get('/search-postgres?q=Doctor')
-    assert 'Nick' in client.get('/search-postgres?q=345678901')
-    assert 'Nick' in client.get('/search-postgres?q=345678911')
-    assert 'Nick' in client.get('/search-postgres?q=8911')
-    assert 'Hospital Springfield' in client.get('/search-postgres?q=Hospital')
-    assert 'Nick' in client.get('/search-postgres?q=Anesthetist')
+    assert 'Rivera' in anom.get('/search-postgres?q=Nick')
+    assert 'Nick' in anom.get('/search-postgres?q=Rivera')
+    assert 'Nick' in anom.get('/search-postgres?q=Doctor')
+    assert 'Nick' in anom.get('/search-postgres?q=345678901')
+    assert 'Nick' in anom.get('/search-postgres?q=345678911')
+    assert 'Nick' in anom.get('/search-postgres?q=8911')
+    assert 'Hospital Springfield' in anom.get('/search-postgres?q=Hospital')
+    assert 'Nick' in anom.get('/search-postgres?q=Anesthetist')
 
     # Test suggestions (no autocomplete)
     expected = ['Nick', 'Rivera', '(Doctor)']  # word order in json is changing
-    assert all(v in client.get('/search-postgres/suggest?q=Nick').json[0]
+    assert all(v in anom.get('/search-postgres/suggest?q=Nick').json[0]
                for v in expected)
-    assert all(v in client.get('/search-postgres/suggest?q=Rivera').json[0]
+    assert all(v in anom.get('/search-postgres/suggest?q=Rivera').json[0]
                for v in expected)
-    assert all(v in client.get('/search-postgres/suggest?q=8911').json[0]
+    assert all(v in anom.get('/search-postgres/suggest?q=8911').json[0]
                for v in expected)
 
 

tests/onegov/feriennet/test_views.py

@@ -264,6 +264,22 @@ def test_activity_communication(broadcast, authenticate, connect, client,
     assert "Using a Raspberry Pi we will learn Python" in message
 
 
+def test_basic_search(client_with_es):
+    client = client_with_es
+    anom = client.spawn()
+
+    # basic test
+    assert 'Resultate' in client.get('/search?q=test')
+    assert client.get('/search/suggest?q=test').json == []
+    assert 'Resultate' in anom.get('/search?q=test')
+    assert anom.get('/search/suggest?q=test').json == []
+
+    assert 'Resultate' in client.get('/search-postgres?q=test')
+    assert client.get('/search-postgres/suggest?q=test').json == []
+    assert 'Resultate' in anom.get('/search-postgres?q=test')
+    assert anom.get('/search-postgres/suggest?q=test').json == []
+
+
 def test_activity_search(client_with_es, scenario):
     client = client_with_es
 

tests/onegov/fsi/test_views_search.py

@@ -6,4 +6,11 @@ def test_basic_search(client_with_es):
     anom = client.spawn()
 
     assert 'Resultate' in client.get('/search?q=test')
+    assert client.get('/search/suggest?q=test').json == []
     anom.get('/search?q=test', status=403)  # forbidden
+    assert anom.get('/search/suggest?q=test', status=403)  # forbidden
+
+    assert 'Resultate' in client.get('/search-postgres?q=test')
+    assert client.get('/search/suggest?q=test').json == []
+    anom.get('/search-postgres?q=test', status=403)  # forbidden
+    assert anom.get('/search/suggest?q=test', status=403)  # forbidden

tests/onegov/org/test_views_search.py

@@ -22,6 +22,7 @@
 def test_basic_search(client_with_es):
     client = client_with_es
     client.login_admin()
+    anom = client.spawn()
 
     add_news = client.get('/news').click('Nachricht')
     add_news.form['title'] = "Now supporting fulltext search"
@@ -47,9 +48,9 @@ def test_basic_search(client_with_es):
 
     # make sure anonymous doesn't see hidden things in the search results
     # elasticsearch
-    assert "fulltext" in client.spawn().get('/search?q=fulltext')
+    assert "fulltext" in anom.get('/search?q=fulltext')
     # postgres
-    assert "fulltext" in client.spawn().get('/search-postgres?q=fulltext')
+    assert "fulltext" in anom.get('/search-postgres?q=fulltext')
 
     edit_news = news.click("Bearbeiten")
     edit_news.form['access'] = 'private'
@@ -58,14 +59,17 @@ def test_basic_search(client_with_es):
     client.app.es_client.indices.refresh(index='_all')
 
     # elasticsearch
-    assert ("Now supporting" not in
-            client.spawn().get('/search?q=fulltext'))
+    assert "Now supporting" not in anom.get('/search?q=fulltext')
+    assert anom.get('/search/suggest?q=fulltext').json == []
     assert "Now supporting" in client.get('/search?q=fulltext')
+    assert client.get('/search/suggest?q=fulltext').json == []
 
     # postgres
-    assert ("Now supporting" not in
-            client.spawn().get('/search-postgres?q=fulltext'))
+    assert "Now supporting" not in anom.get('/search-postgres?q=fulltext')
+    assert anom.get('/search-postgres/suggest?q=fulltext').json == []
     assert "Now supporting" in client.get('/search-postgres?q=fulltext')
+    assert (client.get('/search-postgres/suggest?q=fulltext').json == [
+        'Now supporting fulltext search'])
 
 
 @pytest.mark.flaky(reruns=3)