Merge remote-tracking branch 'upstream/master' into elide-filepaths

Author: krassowski

atest/04_Interface/BackendFailure.robot

@@ -28,3 +28,4 @@ Setup Missing Extension Test
 
 Teardown Missing Extension Test
     Set Server Extension State    enabled=${True}
+    Setup Server and Browser

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

@@ -81,6 +81,7 @@ Setup Suite For Screenshots
     [Arguments]    ${folder}
     Set Screenshot Directory    ${SCREENSHOTS DIR}${/}${folder}
     Set Tags    lab:${LAB VERSION}
+    Reset Application State
 
 Initialize User Settings
     Create File
@@ -142,8 +143,7 @@ Reset Application State
     Try to Close All Tabs
     Accept Default Dialog Option
     Ensure All Kernels Are Shut Down
-    Lab Command    Reset Application State
-    Wait Until Keyword Succeeds    3x    5s    Wait For Splash
+    Accept Default Dialog Option
 
 Accept Default Dialog Option
     [Documentation]    Accept a dialog, if it exists
@@ -153,11 +153,9 @@ Accept Default Dialog Option
 Ensure All Kernels Are Shut Down
     Enter Command Name    Shut Down All Kernels
     ${els} =    Get WebElements    ${CMD PALETTE ITEM ACTIVE}
-    IF    ${els.__len__()}    Click Element    ${CMD PALETTE ITEM ACTIVE}
-    ${accept} =    Set Variable    css:.jp-mod-accept.jp-mod-warn
     IF    ${els.__len__()}
-        Wait Until Page Contains Element    ${accept}
-        Click Element    ${accept}
+        Click Element    ${CMD PALETTE ITEM ACTIVE}
+        Accept Default Dialog Option
     END
 
 Open Command Palette
@@ -219,6 +217,7 @@ Ensure Sidebar Is Closed
     END
 
 Refresh File List
+    Ensure File Browser is Open
     IF    [int(part) for part in "${LAB VERSION}".split(".")] >= [3, 4, 0]
         Click Element    ${JLAB CSS REFRESH FILES}
     ELSE
@@ -227,7 +226,6 @@ Refresh File List
 
 Open Context Menu for File
     [Arguments]    ${file}
-    Ensure File Browser is Open
     Refresh File List
     ${selector} =    Set Variable    xpath://span[@class='jp-DirListing-itemText']/span\[text() = '${file}']
     Wait Until Page Contains Element    ${selector}    timeout=10s
@@ -259,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]}
@@ -269,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")]

atest/__init__.robot

@@ -3,7 +3,6 @@ Resource            Keywords.resource
 
 Suite Setup         Setup Server and Browser
 Suite Teardown      Tear Down Everything
-Test Setup          Reset Application State
 Test Teardown       Lab Log Should Not Contain Known Error Messages
 
 Test Tags           os:${os.lower()}    py:${py}