Took suggestions, added '..' back to tabbing, fixed tests

1 files changed, 20 insertions, 21 deletions

diff --git a/tests/unit/mainwindow/test_prompt.py b/tests/unit/mainwindow/test_prompt.py
index 09c8ef6f6..d5ef5a363 100644
--- a/tests/unit/mainwindow/test_prompt.py
+++ b/tests/unit/mainwindow/test_prompt.py
@@ -80,11 +80,12 @@ class TestFileCompletion:
         with qtbot.wait_signal(prompt._file_model.directoryLoaded):
             for _ in range(3):
                 qtbot.keyPress(prompt._lineedit, Qt.Key_Backspace)
+        prompt._set_fileview_root(prompt._lineedit.text())
 
-        # foo should get completed from f
-
+        # ...and foo should get completed from f
+        prompt.item_focus('next')
+        assert prompt._lineedit.text() == str(tmp_path)
         prompt.item_focus('next')
-
         assert prompt._lineedit.text() == str(testdir / 'foo')
 
         # Deleting /[foo]
@@ -97,9 +98,9 @@ class TestFileCompletion:
         assert prompt._lineedit.text() == str(testdir / 'bar')
 
     @pytest.mark.parametrize("keys,expected",
-                            [([], ['bar', 'foo', 'bat'].sort()),
-                            (['F'], ['foo'].sort()),
-                            (['Backspace', 'A'], ['bar', 'bat'].sort())])
+                            [([], ['bar', 'bat', 'foo']),
+                            ([Qt.Key_F], ['foo']),
+                            ([Qt.Key_A], ['bar', 'bat'])])
     def test_filtering_path(self, qtbot, tmp_path, get_prompt, keys, expected):
         testdir = tmp_path / 'test'
 
@@ -107,21 +108,19 @@ class TestFileCompletion:
             (testdir / directory).mkdir(parents=True)
 
         prompt = get_prompt(str(testdir) + os.sep)
-
-        for _ in range(len(keys)):
-            for key in keys:
-                eval("qtbot.keyPress(prompt._lineedit, Qt.Key_{})".format(key))
-
-            num_rows = prompt._file_model.rowCount(prompt._root_index)
-            visible = []
-            for row in range(num_rows):
-                parent = prompt._file_model.index(
-                    os.path.basename(prompt._lineedit.text()))
-                index = prompt._file_model.index(row, 0, parent)
-                if prompt._file_view.isRowHidden(index.row(), index.parent()):
-                    visible.append(index.data())
-
-            assert visible.sort() == expected
+        for key in keys:
+            qtbot.keyPress(prompt._lineedit, key)
+        prompt._set_fileview_root(prompt._lineedit.text())
+
+        num_rows = prompt._file_model.rowCount(prompt._file_view.rootIndex())
+        visible = []
+        for row in range(num_rows):
+            parent = prompt._file_model.index(
+                os.path.dirname(prompt._lineedit.text()))
+            index = prompt._file_model.index(row, 0, parent)
+            if not prompt._file_view.isRowHidden(index.row(), index.parent()) and index.data() != "..":
+                visible.append(index.data())
+        assert visible == expected
 
     @pytest.mark.linux
     def test_root_path(self, get_prompt):