Add tests for the recents feature

Author: marmarta

.gitlab-ci.yml

@@ -10,7 +10,7 @@ checks:pylint:
   stage: checks
   before_script:
     - sudo dnf install -y python3-gobject gtk3 xorg-x11-server-Xvfb 
-      python3-pip python3-mypy python3-pyxdg gtk-layer-shell
+      python3-pip python3-mypy python3-pyxdg gtk-layer-shell cairo-devel
     - pip3 install --quiet -r ci/requirements.txt
     - git clone https://github.com/QubesOS/qubes-core-admin-client ~/core-admin-client
   script:

qubes_menu/search_page.py

@@ -486,7 +486,7 @@ def enable_recent(self, state: bool):
                 "disable recent applications."
             )
             search_label.set_text(
-                "No recent searches. \nUse Menu Settings to disable recent applications."
+                "No recent searches. \nUse Menu Settings to disable recent searches."
             )
         else:
             app_label.set_text(

qubes_menu/tests/test_appmenu.py

@@ -29,6 +29,7 @@ def test_app_menu_conffeatures():
     qapp._qubes['dom0'].features['menu-initial-page'] = 'favorites_page'
     qapp._qubes['dom0'].features['menu-sort-running'] = '1'
     qapp._qubes['dom0'].features['menu-position'] = ''
+    qapp._qubes['dom0'].features['menu-disable-recent'] = '1'
     qapp.update_vm_calls()
 
     dispatcher = MockDispatcher(qapp)
@@ -40,6 +41,7 @@ def test_app_menu_conffeatures():
     assert app_menu.initial_page == "favorites_page"
     assert app_menu.sort_running
     assert app_menu.appmenu_position == "mouse"
+    assert app_menu.disable_recent == True
 
 
 def test_app_menu_conffeatures_default():
@@ -51,7 +53,9 @@ def test_app_menu_conffeatures_default():
         features={'menu-favorites': '',
                   'menu-initial-page': 'fake',
                   'menu-sort-running': 'fake',
-                  'menu-position': 'fake'})
+                  'menu-position': 'fake',
+                  'menu-disable-recent': ''
+                  })
     qapp.update_vm_calls()
 
     dispatcher = MockDispatcher(qapp)
@@ -63,6 +67,7 @@ def test_app_menu_conffeatures_default():
     assert app_menu.initial_page == "app_page"
     assert not app_menu.sort_running
     assert app_menu.appmenu_position == "mouse"
+    assert not app_menu.disable_recent
 
 
 def test_appmenu_options():
@@ -73,6 +78,7 @@ def test_appmenu_options():
     qapp._qubes['dom0'].features['menu-initial-page'] = 'app_page'
     qapp._qubes['dom0'].features['menu-sort-running'] = '1'
     qapp._qubes['dom0'].features['menu-position'] = 'top-left'
+    qapp._qubes['dom0'].features['menu-disable-recent'] = ''
     qapp.update_vm_calls()
 
     dispatcher = MockDispatcher(qapp)
@@ -101,6 +107,7 @@ def test_appmenu_positioning():
     qapp._qubes['dom0'].features['menu-initial-page'] = 'app_page'
     qapp._qubes['dom0'].features['menu-sort-running'] = '1'
     qapp._qubes['dom0'].features['menu-position'] = ''
+    qapp._qubes['dom0'].features['menu-disable-recent'] = ''
     qapp.update_vm_calls()
 
     dispatcher = MockDispatcher(qapp)

qubes_menu/tests/test_search.py

@@ -24,7 +24,6 @@
 from qubesadmin.tests.mock_app import MockDispatcher
 from ..search_page import SearchPage
 
-
 def test_search(test_desktop_file_path, test_qapp, test_builder):
     dispatcher = MockDispatcher(test_qapp)
     vm_manager = VMManager(test_qapp, dispatcher)
@@ -90,3 +89,71 @@ def test_search(test_desktop_file_path, test_qapp, test_builder):
                 if search_page._is_app_fitting(row)]
     assert len(found_entries) == 1
     assert found_entries[0].app_info.app_name == 'Xfce Appearance Settings'
+
+@mock.patch('gi.repository.Gtk.Application')
+def test_recent_searches(mock_application, test_desktop_file_path, test_qapp,
+                         test_builder):
+    dispatcher = MockDispatcher(test_qapp)
+    vm_manager = VMManager(test_qapp, dispatcher)
+
+    with mock.patch.object(DesktopFileManager, 'desktop_dirs',
+                           [test_desktop_file_path]):
+        desktop_file_manager = DesktopFileManager(test_qapp)
+
+    search_page = SearchPage(vm_manager, test_builder, desktop_file_manager)
+
+    assert search_page.search_entry.get_sensitive()
+
+    search_page.search_entry.set_text('dragons')
+
+    # find a dom0 app
+    search_page.search_entry.set_text('dom0')
+
+    for row in search_page.app_list.get_children():
+        if search_page._is_app_fitting(row):
+            with mock.patch('subprocess.Popen') as mock_run, mock.patch.object(
+                    row.get_toplevel(), 'get_application', side_effect=mock_application):
+                row.activate()
+                assert mock_run.call_count == 1
+                assert mock.call().emit('app-started', 'test3.desktop') in mock_application.mock_calls
+
+    # we are faking signals here
+    search_page.recent_apps_manager.add_new_recent_app(None, 'test3.desktop')
+
+    texts = [row.search_text for row in search_page.recent_list.get_children()]
+    assert texts == ['dom0']
+    apps = [row.app_info.entry_name for row in
+            search_page.recent_app_list.get_children()]
+    assert apps == ['test3.desktop']
+
+    # do two more searches, but one should be the same as an existing search
+    search_page.search_entry.set_text('')
+    search_page.search_entry.set_text('xTeRm')
+
+    for row in search_page.app_list.get_children():
+        if search_page._is_app_fitting(row):
+            with mock.patch('subprocess.Popen') as mock_run, mock.patch.object(
+                    row.get_toplevel(), 'get_application', side_effect=mock_application):
+                row.activate()
+                assert mock_run.call_count == 1
+                assert mock.call().emit('app-started', 'test1.desktop') in mock_application.mock_calls
+
+    search_page.recent_apps_manager.add_new_recent_app(None, 'test1.desktop')
+    search_page.search_entry.set_text('')
+    search_page.search_entry.set_text('dom0')
+
+    for row in search_page.app_list.get_children():
+        if search_page._is_app_fitting(row):
+            with mock.patch('subprocess.Popen') as mock_run, mock.patch.object(
+                    row.get_toplevel(), 'get_application', side_effect=mock_application):
+                row.activate()
+                assert mock_run.call_count == 1
+                assert mock.call().emit('app-started', 'test3.desktop') in mock_application.mock_calls
+
+    search_page.recent_apps_manager.add_new_recent_app(None, 'test3.desktop')
+
+    texts = [row.search_text for row in search_page.recent_list.get_children()]
+    assert texts == ['dom0', 'xTeRm']
+    apps = [row.app_info.entry_name for row in
+            search_page.recent_app_list.get_children()]
+    assert apps == ['test3.desktop', 'test1.desktop']

qubes_menu_settings/test_menu_settings.py

@@ -28,6 +28,7 @@ def test_menu_settings_load():
     qapp._qubes["dom0"].features["menu-sort-running"] = "1"
     qapp._qubes["dom0"].features["menu-favorites"] = ""
     qapp._qubes["dom0"].features["menu-position"] = ""
+    qapp._qubes["dom0"].features["menu-disable-recent"] = "1"
 
     qapp.update_vm_calls()
 
@@ -38,6 +39,7 @@ def test_menu_settings_load():
     assert app.initial_page_model.get_selected() == "favorites_page"
     assert app.menu_position_model.get_selected() == "mouse"
     assert app.sort_running_check.get_active()
+    assert not app.show_recent_check.get_active()
 
 
 def test_menu_settings_change():
@@ -46,6 +48,7 @@ def test_menu_settings_change():
     qapp._qubes["dom0"].features["menu-sort-running"] = ""
     qapp._qubes["dom0"].features["menu-favorites"] = ""
     qapp._qubes["dom0"].features["menu-position"] = "mouse"
+    qapp._qubes["dom0"].features["menu-disable-recent"] = "1"
 
     qapp.update_vm_calls()
 
@@ -56,10 +59,12 @@ def test_menu_settings_change():
     assert app.initial_page_model.get_selected() == "app_page"
     assert app.menu_position_model.get_selected() == "mouse"
     assert not app.sort_running_check.get_active()
+    assert not app.show_recent_check.get_active()
 
     app.starting_page_combo.set_active_id("Search")  # the first option is search
     app.menu_position_combo.set_active_id("Top Left")  # the first option is Top Left
     app.sort_running_check.set_active(True)
+    app.show_recent_check.set_active(True)
 
     qapp.expected_calls[("dom0", "admin.vm.feature.Set", "menu-sort-running", b"1")] = (
         b"0\0"
@@ -70,6 +75,9 @@ def test_menu_settings_change():
     qapp.expected_calls[
         ("dom0", "admin.vm.feature.Set", "menu-position", b"top-left")
     ] = b"0\0"
+    qapp.expected_calls[
+        ("dom0", "admin.vm.feature.Remove", "menu-disable-recent", None)
+    ] = b"0\0"
 
     app._save()
 
@@ -80,6 +88,7 @@ def test_menu_settings_change2():
     qapp._qubes["dom0"].features["menu-sort-running"] = ""
     qapp._qubes["dom0"].features["menu-favorites"] = ""
     qapp._qubes["dom0"].features["menu-position"] = "mouse"
+    qapp._qubes["dom0"].features["menu-disable-recent"] = ""
 
     qapp.update_vm_calls()
 
@@ -89,11 +98,16 @@ def test_menu_settings_change2():
 
     assert app.initial_page_model.get_selected() == "app_page"
     assert not app.sort_running_check.get_active()
+    assert app.show_recent_check.get_active()
 
     app.starting_page_combo.set_active_id("Favorites")
+    app.show_recent_check.set_active(False)
 
     qapp.expected_calls[
         ("dom0", "admin.vm.feature.Set", "menu-initial-page", b"favorites_page")
     ] = b"0\0"
+    qapp.expected_calls[
+        ("dom0", "admin.vm.feature.Set", "menu-disable-recent", b"1")
+    ] = b"0\0"
 
     app._save()