From 907395c7cd5f9c70c3880b644ed19303f6926b08 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Sat, 26 Aug 2023 11:39:45 -0500
Subject: [PATCH] Testing: Expand test that checks Switcher/Projects
 integration

This includes new cases for binary and nonexistent files, and missing
fzf.
---
 spyder/app/tests/test_mainwindow.py | 58 +++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/spyder/app/tests/test_mainwindow.py b/spyder/app/tests/test_mainwindow.py
index d845cb46670..1acd51ea1b5 100644
--- a/spyder/app/tests/test_mainwindow.py
+++ b/spyder/app/tests/test_mainwindow.py
@@ -14,6 +14,7 @@
 import gc
 import os
 import os.path as osp
+from pathlib import Path
 import random
 import re
 import shutil
@@ -2535,8 +2536,9 @@ def example_def_2():
 
 
 @flaky(max_runs=3)
-def test_switcher_project_files(main_window, pytestconfig, qtbot, tmp_path):
-    """Test the number of items in the switcher when a project is active."""
+def test_switcher_projects_integration(main_window, pytestconfig, qtbot,
+                                       tmp_path):
+    """Test integration between the Switcher and Projects plugins."""
     # Disable pytest stdin capture to make calls to fzf work. Idea taken from:
     # https://github.com/pytest-dev/pytest/issues/2189#issuecomment-449512764
     capmanager = pytestconfig.pluginmanager.getplugin('capturemanager')
@@ -2558,16 +2560,22 @@ def test_switcher_project_files(main_window, pytestconfig, qtbot, tmp_path):
     project_dir = tmp_path / 'test-projects-switcher'
     project_dir.mkdir()
 
-    # Create project
-    with qtbot.waitSignal(projects.sig_project_loaded):
-        projects.create_project(str(project_dir))
-
     # Create some empty files in the project dir
     n_files_project = 3
     for i in range(n_files_project):
         fpath = project_dir / f"test_file{i}.py"
         fpath.touch()
 
+    # Copy binary file from our source tree to the project to check it's not
+    # displayed in the switcher.
+    binary_file = Path(LOCATION).parents[1] / 'images' / 'windows_app_icon.ico'
+    binary_file_copy = project_dir / 'windows.ico'
+    shutil.copyfile(binary_file, binary_file_copy)
+
+    # Create project
+    with qtbot.waitSignal(projects.sig_project_loaded):
+        projects.create_project(str(project_dir))
+
     # Check that the switcher has been populated in Projects
     qtbot.waitUntil(
         lambda: projects.get_widget()._default_switcher_paths != [],
@@ -2599,21 +2607,34 @@ def test_switcher_project_files(main_window, pytestconfig, qtbot, tmp_path):
     assert switcher.count() == 1
     switcher.on_close()
 
+    # Assert searching for a non-existent file leaves the switcher empty
+    switcher.open_switcher()
+    switcher.set_search_text('foo')
+    qtbot.wait(500)
+    assert switcher.count() == 0
+    switcher.on_close()
+
+    # Assert searching for a binary file leaves the switcher empty
+    switcher.open_switcher()
+    switcher.set_search_text('windows')
+    qtbot.wait(500)
+    assert switcher.count() == 0
+    switcher.on_close()
+
     # Remove project file and check the switcher is updated
     n_files_project -= 1
-    os.remove(osp.join(str(project_dir), 'test_file1.py'))
-    switcher.open_switcher()
+    os.remove(str(project_dir / 'test_file1.py'))
     qtbot.wait(500)
+    switcher.open_switcher()
     assert switcher.count() == n_files_open + n_files_project
     switcher.on_close()
 
-    # Select file in the project explorer
+    # Check that a project file opened in the editor is not shown twice in the
+    # switcher
     idx = projects.get_widget().treewidget.get_index(
-        osp.join(str(project_dir), 'test_file0.py')
+        str(project_dir / 'test_file0.py')
     )
     projects.get_widget().treewidget.setCurrentIndex(idx)
-
-    # Press Enter there
     qtbot.keyClick(projects.get_widget().treewidget, Qt.Key_Enter)
 
     switcher.open_switcher()
@@ -2621,6 +2642,19 @@ def test_switcher_project_files(main_window, pytestconfig, qtbot, tmp_path):
     assert switcher.count() == n_files_open + n_files_project - 1
     switcher.on_close()
 
+    # Check the switcher works without fzf
+    fzf = projects.get_widget()._fzf
+    projects.get_widget()._fzf = None
+    projects.get_widget()._default_switcher_paths = []
+
+    switcher.open_switcher()
+    switcher.set_search_text('0')
+    qtbot.wait(500)
+    assert switcher.count() == 1
+    switcher.on_close()
+
+    projects.get_widget()._fzf = fzf
+
     # Resume capturing
     capmanager.resume_global_capture()