handle new rf behavior with catenate

Author: bollwyvl

anaconda-project.yml

@@ -54,8 +54,7 @@ commands:
     env_spec: rfjl37
 
   install:win:
-    windows: >
-      python -m pip install _artifacts\\sdist\\robotframework-jupyterlibrary-0.1.0.tar.gz --no-deps --ignore-installed -vv
+    windows: python -m pip install _artifacts\\sdist\\robotframework-jupyterlibrary-0.1.0.tar.gz --no-deps --ignore-installed -vv
     env_spec: win_rfjl37
 
 env_specs:
@@ -65,20 +64,19 @@ env_specs:
     - flake8
     - geckodriver
     - isort
-    - jupyterlab>=0.35
+    - jupyterlab >=0.35
     - nodejs
     - pillow
     - python-chromedriver-binary
-    - robotframework>=3.1
+    - robotframework >=3.1
     - robotframework-lint
-    - robotframework-seleniumlibrary>=3.2
+    - robotframework-seleniumlibrary >=3.2
     - six
     - pip:
       - nteract_on_jupyter
     channels:
     - conda-forge
     - defaults
-
   rfjl37:
     inherit_from:
     - robotframework-jupyterlibrary

environment.yml

@@ -9,7 +9,7 @@ dependencies:
   - flake8
   - geckodriver
   - isort
-  - jupyterlab >=0.45
+  - jupyterlab >=0.35
   - nodejs
   - pillow
   - python-chromedriver-binary

src/JupyterLibrary/resources/jupyterlab/Launcher.robot

@@ -6,7 +6,8 @@ Resource   JupyterLibrary/resources/jupyterlab/Selectors.robot
 Launch a new JupyterLab Document
     [Arguments]    ${kernel}=Python 3    ${category}=Notebook
     [Documentation]    Use the JupyterLab launcher to launch Notebook or Console
-    Click Element    xpath:${JLAB XP CARD}[@title='${kernel}'][@data-category='${category}']
+    ${sel} =  Catenate  SEPARATOR=${EMPTY}  ${JLAB XP CARD}  [@title='${kernel}'][@data-category='${category}']
+    Click Element    xpath:${sel}
     Wait Until Page Does Not Contain Element    css:${JLAB CSS SPINNER}
     Wait Until Page Contains Element    css:${JLAB CSS CELL}
     Sleep    0.1s

src/JupyterLibrary/resources/jupyterlab/Shell.robot

@@ -21,15 +21,20 @@ Wait for JupyterLab Splash Screen
 Click JupyterLab Menu
     [Arguments]    ${menu_label}
     [Documentation]    Click a top-level JupyterLab Menu bar, e.g. File, Help, etc.
-    ${xpath} =  Set Variable  ${JLAB XP TOP}${JLAB XP MENU LABEL}[text() = '${menu_label}']
+    ${xpath} =  Catenate  SEPARATOR=${EMPTY}
+    ...  ${JLAB XP TOP}
+    ...  ${JLAB XP MENU LABEL}
+    ...  [text() = '${menu_label}']
     Wait Until Page Contains Element    ${xpath}
     Mouse Over    ${xpath}
     Click Element    ${xpath}
 
 Click JupyterLab Menu Item
     [Arguments]    ${item_label}
     [Documentation]    Click a top-level JupyterLab Menu Item (not File, Help, etc.)
-    ${item} =    Set Variable    ${JLAB XP MENU ITEM LABEL}[text() = '${item_label}']
+    ${item} =    Catenate  SEPARATOR=${EMPTY}
+    ...    ${JLAB XP MENU ITEM LABEL}
+    ...   [text() = '${item_label}']
     Wait Until Page Contains Element    ${item}
     Mouse Over    ${item}
     Click Element    ${item}

src/JupyterLibrary/resources/jupyterlab/Sidebar.robot

@@ -13,4 +13,5 @@ Maybe Open JupyterLab Sidebar
     [Arguments]  ${data id}
     [Documentation]  Attempt to open a JupyterLab sidebar (if not already open)
     Maybe Close JupyterLab Sidebar
-    Click Element  css:${JLAB CSS SIDEBAR TAB}[data-id="${data id}"]
+    ${sel} =  Catenate   SEPARATOR=${EMPTY}   ${JLAB CSS SIDEBAR TAB}  [data-id="${data id}"]
+    Click Element  css:${sel}