PR: Add test for file directory change in the Project Explorer.

spyder/widgets/explorer.py

@@ -694,14 +694,18 @@ def rename(self, fnames=None):
             self.rename_file(fname)
 
     @Slot()
-    def move(self, fnames=None):
+    def move(self, fnames=None, directory=None):
         """Move files/directories"""
         if fnames is None:
             fnames = self.get_selected_filenames()
         orig = fixpath(osp.dirname(fnames[0]))
         while True:
             self.parent_widget.redirect_stdio.emit(False)
-            folder = getexistingdirectory(self, _("Select directory"), orig)
+            if directory is None:
+                folder = getexistingdirectory(self, _("Select directory"),
+                                              orig)
+            else:
+                folder = directory
             self.parent_widget.redirect_stdio.emit(True)
             if folder:
                 folder = fixpath(folder)

spyder/widgets/projects/explorer.py

@@ -169,6 +169,7 @@ def delete(self, fnames=None):
 
 class ProjectExplorerWidget(QWidget):
     """Project Explorer"""
+    redirect_stdio = Signal(bool)
     sig_option_changed = Signal(str, object)
     sig_open_file = Signal(str)
 
@@ -261,13 +262,16 @@ def delete_project(self):
 # Tests
 #==============================================================================
 class ProjectExplorerTest(QWidget):
-    def __init__(self):
+    def __init__(self, directory=None):
         QWidget.__init__(self)
         vlayout = QVBoxLayout()
         self.setLayout(vlayout)
 
-        self.explorer = ProjectExplorerWidget(None, show_all=True)
-        self.explorer.setup_project(osp.dirname(osp.abspath(__file__)))
+        self.explorer = ProjectExplorerWidget(parent=self, show_all=True)
+        if directory:
+            self.explorer.setup_project(directory)
+        else:
+            self.explorer.setup_project(osp.dirname(osp.abspath(__file__)))
         vlayout.addWidget(self.explorer)
 
         hlayout1 = QHBoxLayout()

spyder/widgets/projects/tests/test_project_explorer.py

@@ -7,26 +7,59 @@
 """
 Tests for explorer.py
 """
+# Standard imports
+import os
+import os.path as osp
 
 # Test library imports
 import pytest
 
 # Local imports
 from spyder.widgets.projects.explorer import ProjectExplorerTest
 
+
 @pytest.fixture
-def setup_projects_explorer(qtbot):
-    """Set up ProjectExplorerWidgetTest."""
-    project_explorer = ProjectExplorerTest()
+def project_explorer(qtbot, request, tmpdir):
+    """Setup Project Explorer widget."""
+    directory = request.node.get_marker('change_directory')
+    if directory:
+        project_dir = str(tmpdir.mkdir('project'))
+    else:
+        project_dir = None
+    project_explorer = ProjectExplorerTest(directory=project_dir)
     qtbot.addWidget(project_explorer)
-    return project_explorer
+    return (project_explorer, project_dir)
+
+
+@pytest.mark.change_directory
+def test_change_directory_in_project_explorer(project_explorer, qtbot):
+    """Test changing a file from directory in the Project explorer."""
+    # Create project
+    project, project_dir = project_explorer
+
+    # Create a temp project directory and file
+    project_dir_tmp = osp.join(project_dir, 'tmpá')
+    project_file = osp.join(project_dir, 'script.py')
+
+    # Create an empty file in the project dir
+    os.mkdir(project_dir_tmp)
+    open(project_file, 'w').close()
+
+    # Move Python file
+    project.explorer.treewidget.move(
+                            fnames=[osp.join(project_dir, 'script.py')],
+                            directory=project_dir_tmp)
+
+    # Assert content was moved
+    assert osp.isfile(osp.join(project_dir_tmp, 'script.py'))
+
 
-def test_project_explorer(qtbot):
+def test_project_explorer(project_explorer, qtbot):
     """Run project explorer."""
-    project_explorer = setup_projects_explorer(qtbot)
-    project_explorer.resize(250, 480)
-    project_explorer.show()
-    assert project_explorer
+    project_explorer_dlg, project_dir = project_explorer
+    project_explorer_dlg.resize(250, 480)
+    project_explorer_dlg.show()
+    assert project_explorer_dlg
 
 
 if __name__ == "__main__":