File list and busy indicator lab 3.4 compat for tests

Author: krassowski

atest/05_Features/Completion.robot

@@ -11,7 +11,8 @@ Force Tags          feature:completion
 *** Variables ***
 ${COMPLETER_BOX}            css:.jp-Completer.jp-HoverBox
 ${DOCUMENTATION_PANEL}      css:.jp-Completer-docpanel
-${KERNEL_BUSY_INDICATOR}    css:.jp-NotebookPanel-toolbar div[title="Kernel Busy"]
+${KERNEL_BUSY_INDCA_OLD}    css:.jp-NotebookPanel-toolbar div[title="Kernel Busy"]
+${KERNEL_BUSY_INDICATOR}    css:.jp-Notebook-ExecutionIndicator div[data-status="busy"]
 
 
 *** Test Cases ***
@@ -451,12 +452,20 @@ Should Complete While Kernel Is Busy
     # Lab Command    Run Selected Cells And Don't Advance
     Press Keys    None    CTRL+ENTER
     # Confirm that the kernel is busy
-    Wait Until Page Contains Element    ${KERNEL_BUSY_INDICATOR}    timeout=5s
+    IF    '${LAB VERSION}'.startswith('3.4')
+        Wait Until Page Contains Element    ${KERNEL_BUSY_INDICATOR}    timeout=5s
+    ELSE
+        Wait Until Page Contains Element    ${KERNEL_BUSY_INDCA_OLD}    timeout=5s
+    END
     # Enter a cell with "t"
     Enter Cell Editor    18
     # Check if completion worked
     Enter Cell Editor    1    line=2
     Trigger Completer    timeout=10s
     Completer Should Suggest    test
     # Confirm that the kernel indicator was busy all along
-    Page Should Contain Element    ${KERNEL_BUSY_INDICATOR}
+    IF    '${LAB VERSION}'.startswith('3.4')
+        Page Should Contain Element    ${KERNEL_BUSY_INDICATOR}
+    ELSE
+        Page Should Contain Element    ${KERNEL_BUSY_INDCA_OLD}
+    END

atest/Keywords.resource

@@ -214,10 +214,17 @@ Ensure Sidebar Is Closed
         Click Element    css:.jp-mod-${side} .lm-TabBar-tab.lm-mod-current
     END
 
+Refresh File List
+    IF    '${LAB VERSION}'.startswith('3.4')
+        Click Element    ${JLAB CSS REFRESH FILES}
+    ELSE
+        Click Element    ${JLAB CSS REFRESH F_OLD}
+    END
+
 Open Context Menu for File
     [Arguments]    ${file}
     Ensure File Browser is Open
-    Click Element    ${JLAB CSS REFRESH FILES}
+    Refresh File List
     ${selector} =    Set Variable    xpath://span[@class='jp-DirListing-itemText']/span\[text() = '${file}']
     Wait Until Page Contains Element    ${selector}    timeout=10s
     Wait Until Keyword Succeeds    10 x    0.1 s    Open Context Menu    ${selector}
@@ -240,7 +247,7 @@ Input Into Dialog
 
 Open Folder
     [Arguments]    @{paths}
-    Click Element    ${JLAB CSS REFRESH FILES}
+    Refresh File List
     FOR    ${path}    IN    @{paths}
         ${sel} =    Set Variable    css:li.jp-DirListing-item\[title^='Name: ${path}']
         Wait Until Page Contains Element    ${sel}

atest/Variables.resource

@@ -23,7 +23,8 @@ ${JLAB XP MENU ITEM LABEL}      //div[contains(@class, 'lm-Menu-itemLabel')]
 ${JLAB XP MENU LABEL}           //div[contains(@class, 'lm-MenuBar-itemLabel')]
 ${JLAB XP DOCK TAB}             xpath://div[contains(@class, 'lm-DockPanel-tabBar')]//li[contains(@class, 'lm-TabBar-tab')]
 ${JLAB CSS VERSION}             css:.jp-About-version
-${JLAB CSS REFRESH FILES}       css:button[title="Refresh File List"]
+${JLAB CSS REFRESH F_OLD}       css:button[title="Refresh File List"]
+${JLAB CSS REFRESH FILES}       css:button[data-command="filebrowser:refresh"]
 ${CSS DIALOG OK}                css:.jp-Dialog .jp-mod-accept
 ${MENU OPEN WITH}               xpath://div[contains(@class, 'lm-Menu-itemLabel')][contains(text(), "Open With")]
 # R is missing on purpose (may need to use .)