Cleanup folder in jump suite teardown

Author: krassowski

atest/05_Features/Jump.robot

@@ -19,7 +19,7 @@ Python Jumps Between Files
     Jump To Definition    ${sel}
     Wait Until Page Contains    ANOTHER_CONSTANT
     Capture Page Screenshot    10-jumped.png
-    Clean Up After Working With File    jump_b.py
+    [Teardown]    Clean Up Folder With Spaces    jump_a.py    jump_b.py
 
 Jumps To References With Modifier Click
     [Setup]    Prepare File for Editing    Python    editor    jump_references.py
@@ -35,7 +35,7 @@ Jumps To References With Modifier Click
     Select From List By Index    css:.jp-Dialog select    2
     Click Element    css:.jp-Dialog-button.jp-mod-accept
     Wait Until Keyword Succeeds    10 x    1 s    Cursor Should Jump    ${original}
-    Clean Up After Working With File    jump_references.py
+    [Teardown]    Clean Up After Working With File    jump_references.py
 
 Jumps To References From Context Menu
     [Setup]    Prepare File for Editing    Python    editor    jump_references.py
@@ -51,7 +51,7 @@ Jumps To References From Context Menu
     Select From List By Index    css:.jp-Dialog select    2
     Click Element    css:.jp-Dialog-button.jp-mod-accept
     Wait Until Keyword Succeeds    10 x    1 s    Cursor Should Jump    ${original}
-    Clean Up After Working With File    jump_references.py
+    [Teardown]    Clean Up After Working With File    jump_references.py
 
 Ctrl Click And Jumping Back Works
     [Setup]    Prepare File for Editing    Python    editor    jump.py
@@ -82,6 +82,15 @@ Copy Files to Folder With Spaces
         Copy File    examples${/}${file}    ${NOTEBOOK DIR}${/}${FOLDER WITH SPACE}${/}${file}
     END
 
+Clean Up Folder With Spaces
+    [Arguments]    @{files}
+    Try to Close All Tabs
+    Navigate to Root Folder
+    FOR    ${file}    IN    @{files}
+        Remove File    ${NOTEBOOK DIR}${/}${FOLDER WITH SPACE}${/}${file}
+    END
+    Remove Directory     ${NOTEBOOK DIR}${/}${FOLDER WITH SPACE}    recursive=True
+
 Select Token Occurrence
     [Arguments]    ${token}    ${type}=variable    ${which}=last
     ${sel} =    Set Variable
@@ -92,7 +101,3 @@ Ctrl Click Element
     [Arguments]    ${element}
     ${key} =    Evaluate    'COMMAND' if platform.system() == 'Darwin' else 'CTRL'    platform
     Click Element    ${element}    modifier=${key}
-
-Should Have Expected Count
-    [Arguments]    ${expected_count}
-    ${count} =    Count Diagnostics In Panel

atest/Keywords.resource

@@ -257,6 +257,10 @@ Open Folder
         Double Click Element    ${sel}
     END
 
+Navigate to Root Folder
+    Ensure File Browser is Open
+    Click Element    ${ROOT FOLDER}
+
 Open ${file} in ${editor}
     ${paths} =    Set Variable    ${file.split("/")}
     IF    ${paths.__len__() > 1}    Open Folder    @{paths[:-1]}
@@ -267,12 +271,18 @@ Open ${file} in ${editor}
     Mouse Over    ${editor}
     Click Element    ${editor}
 
-Clean Up After Working With File
-    [Arguments]    ${file}
-    Remove File    ${NOTEBOOK DIR}${/}${file}
+Clean Up After Working With Files
+    [Arguments]    @{files}
+    FOR    ${file}    IN    @{files}
+        Remove File    ${NOTEBOOK DIR}${/}${file}
+    END
     Reset Application State
     Lab Log Should Not Contain Known Error Messages
 
+Clean Up After Working With File
+    [Arguments]    ${file}
+    Clean Up After Working With Files    ${file}
+
 Setup Notebook
     [Arguments]    ${Language}    ${file}    ${isolated}=${True}    ${wait}=${True}
     Set Tags    language:${Language.lower()}

atest/Variables.resource

@@ -41,6 +41,7 @@ ${DIALOG WINDOW}                css:.jp-Dialog
 ${DIALOG INPUT}                 css:.jp-Input-Dialog input
 ${DIALOG ACCEPT}                css:button.jp-Dialog-button.jp-mod-accept
 ${STATUSBAR}                    css:div.lsp-statusbar-item
+${ROOT FOLDER}                  css:.jp-BreadCrumbs-home
 ${MENU EDITOR}                  xpath://div[contains(@class, 'lm-Menu-itemLabel')][contains(., "Editor")]
 ${MENU JUMP}
 ...                             xpath://div[contains(@class, 'lm-Menu-itemLabel')][contains(text(), "Jump to definition")]