From 39b1204f0d32826d6c973cb95094a9249631fac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Krassowski?=
 <5832902+krassowski@users.noreply.github.com>
Date: Sun, 23 Oct 2022 02:46:59 +0100
Subject: [PATCH 01/10] Add notebook direct dependency

---
 .github/workflows/job.test.yml  | 3 +++
 requirements/github-actions.yml | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml
index bab4c95a2..0c7386467 100644
--- a/.github/workflows/job.test.yml
+++ b/.github/workflows/job.test.yml
@@ -454,6 +454,9 @@ jobs:
       - name: Install JupyterLab
         shell: bash -l {0}
         run: python -m pip install 'jupyterlab${{ matrix.lab }}'
+      - name: Install Notebook (to test serverextension)
+        shell: bash -l {0}
+        run: python -m pip install 'notebook'
       - name: Install the server package
         run: cd dist && python -m pip install -vv jupyter_lsp*.whl
       - name: install the source extension
diff --git a/requirements/github-actions.yml b/requirements/github-actions.yml
index 1118f5ba9..fe4bb2b5a 100644
--- a/requirements/github-actions.yml
+++ b/requirements/github-actions.yml
@@ -6,6 +6,8 @@ channels:
 
 dependencies:
   - jupyterlab {lab}
+  # to test serverextension
+  - notebook
   # build dependencies
   - pip
   - nodejs {nodejs}

From cf6551d2911cebad26ec91a157fb285ed494df63 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 23 Oct 2022 19:18:19 +0100
Subject: [PATCH 02/10] Lint docs

---
 docs/Language Servers.ipynb | 40 ++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/docs/Language Servers.ipynb b/docs/Language Servers.ipynb
index c8f5762f4..4bf73bdb0 100644
--- a/docs/Language Servers.ipynb	
+++ b/docs/Language Servers.ipynb	
@@ -135,13 +135,14 @@
    "source": [
     "### Servers tested with Notebooks\n",
     "\n",
-    "While most servers should work with notebooks and standalone files, some\n",
-    "require additional adjustments. The following language servers are tested\n",
-    "against `jupyterlab-lsp` and any issues when using them in notebooks\n",
-    "will be prioritised.\n",
+    "While most servers should work with notebooks and standalone files, some require\n",
+    "additional adjustments. The following language servers are tested against\n",
+    "`jupyterlab-lsp` and any issues when using them in notebooks will be\n",
+    "prioritised.\n",
     "\n",
-    "If you choose to install multiple language servers for the same language, the one with the highest\n",
-    "`priority` (which can be set in the _Advanced Settings Editor_) will be used."
+    "If you choose to install multiple language servers for the same language, the\n",
+    "one with the highest `priority` (which can be set in the _Advanced Settings\n",
+    "Editor_) will be used."
    ]
   },
   {
@@ -341,24 +342,26 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Servers and extensions listed below are not included in the testing suite of `jupyterlab-lsp`; the support may be provided by community members or a third-party:"
+    "Servers and extensions listed below are not included in the testing suite of\n",
+    "`jupyterlab-lsp`; the support may be provided by community members or a\n",
+    "third-party:"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "| Languages                 | Implementation                            | Comment       |\n",
-    "|---------------------------|-------------------------------------------|---------------|\n",
-    "|   Spark SQL               | [CybercentreCanada/jupyterlab-sql-editor] |               |\n",
-    "|   GraphQL, SPARQL, Turtle | [jupyrdf/graph-lsp]                       |               |\n",
-    "|   JSON                    | [jupyter-lsp/json-lsp]                    | (1)           |\n",
-    "|   YAML                    | [jupyter-lsp/yaml-lsp]                    | (1)           |\n",
-    "|   Scala                   | [scalameta/metals]                        | (2)           |\n",
-    "\n",
+    "| Languages               | Implementation                            | Comment |\n",
+    "| ----------------------- | ----------------------------------------- | ------- |\n",
+    "| Spark SQL               | [CybercentreCanada/jupyterlab-sql-editor] |         |\n",
+    "| GraphQL, SPARQL, Turtle | [jupyrdf/graph-lsp]                       |         |\n",
+    "| JSON                    | [jupyter-lsp/json-lsp]                    | (1)     |\n",
+    "| YAML                    | [jupyter-lsp/yaml-lsp]                    | (1)     |\n",
+    "| Scala                   | [scalameta/metals]                        | (2)     |\n",
     "\n",
     "[jupyrdf/graph-lsp]: https://github.com/jupyrdf/graph-lsp\n",
-    "[CybercentreCanada/jupyterlab-sql-editor]: https://github.com/CybercentreCanada/jupyterlab-sql-editor\n",
+    "[CybercentreCanada/jupyterlab-sql-editor]:\n",
+    "  https://github.com/CybercentreCanada/jupyterlab-sql-editor\n",
     "[jupyter-lsp/json-lsp]: https://github.com/jupyter-lsp/json-lsp\n",
     "[jupyter-lsp/yaml-lsp]: https://github.com/jupyter-lsp/yaml-lsp\n",
     "[scalameta/metals]: https://github.com/scalameta/metals"
@@ -369,8 +372,9 @@
    "metadata": {},
    "source": [
     "- (1) convenience wrappers for installation with `pip`, require Node.js.\n",
-    "- (2) `metals` is not currently auto-detected, but can be configured as demonstrated in the\n",
-    "[configuration example](./Configuring.html#example-scala-language-server-metals-integration)."
+    "- (2) `metals` is not currently auto-detected, but can be configured as\n",
+    "  demonstrated in the\n",
+    "  [configuration example](./Configuring.html#example-scala-language-server-metals-integration)."
    ]
   },
   {

From f279c3bf24e62abdd354229633daa428e6e3775f Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 23 Oct 2022 19:21:19 +0100
Subject: [PATCH 03/10] Replace deprecated `Force Tags` with `Test Tags`

---
 atest/01_Editor.robot                       | 2 +-
 atest/04_Interface/DiagnosticsPanel.robot   | 2 +-
 atest/05_Features/Completion.robot          | 2 +-
 atest/05_Features/Diagnostics.robot         | 2 +-
 atest/05_Features/Highlights.robot          | 2 +-
 atest/05_Features/Hover.robot               | 2 +-
 atest/05_Features/Jump.robot                | 2 +-
 atest/05_Features/Signature.robot           | 2 +-
 atest/05_Features/Syntax_highlighting.robot | 2 +-
 atest/06_Style.robot                        | 2 +-
 atest/07_Configuration.robot                | 2 +-
 atest/__init__.robot                        | 2 +-
 atest/examples/example.robot                | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/atest/01_Editor.robot b/atest/01_Editor.robot
index 979e98244..6803af416 100644
--- a/atest/01_Editor.robot
+++ b/atest/01_Editor.robot
@@ -4,7 +4,7 @@ Resource        Variables.resource
 
 Suite Setup     Setup Suite For Screenshots    editor
 
-Force Tags      ui:editor    aspect:ls:features
+Test Tags       ui:editor    aspect:ls:features
 
 
 *** Test Cases ***
diff --git a/atest/04_Interface/DiagnosticsPanel.robot b/atest/04_Interface/DiagnosticsPanel.robot
index 3e256d0e3..b71078775 100644
--- a/atest/04_Interface/DiagnosticsPanel.robot
+++ b/atest/04_Interface/DiagnosticsPanel.robot
@@ -5,7 +5,7 @@ Suite Setup         Setup Suite For Screenshots    diagnostics_panel
 Test Setup          Set Up
 Test Teardown       Clean Up
 
-Force Tags          ui:notebook    aspect:ls:features
+Test Tags           ui:notebook    aspect:ls:features
 
 
 *** Variables ***
diff --git a/atest/05_Features/Completion.robot b/atest/05_Features/Completion.robot
index c229b1060..bd60f7cc8 100644
--- a/atest/05_Features/Completion.robot
+++ b/atest/05_Features/Completion.robot
@@ -5,7 +5,7 @@ Suite Setup         Setup Suite For Screenshots    completion
 Test Setup          Setup Completion Test
 Test Teardown       Clean Up After Working With File    Completion.ipynb
 
-Force Tags          feature:completion
+Test Tags           feature:completion
 
 
 *** Variables ***
diff --git a/atest/05_Features/Diagnostics.robot b/atest/05_Features/Diagnostics.robot
index 854ff991f..b61517b2d 100644
--- a/atest/05_Features/Diagnostics.robot
+++ b/atest/05_Features/Diagnostics.robot
@@ -5,7 +5,7 @@ Suite Setup         Setup Suite For Screenshots    diagnostics
 Test Setup          Setup Notebook    Python    Diagnostic.ipynb
 Test Teardown       Clean Up After Working With File    Diagnostic.ipynb
 
-Force Tags          feature:diagnostics
+Test Tags           feature:diagnostics
 # note: diagnostics are also tested in 01_Editor and 04_Interface/DiagnosticsPanel.robot
 
 
diff --git a/atest/05_Features/Highlights.robot b/atest/05_Features/Highlights.robot
index 4696a8611..b5b9e4435 100644
--- a/atest/05_Features/Highlights.robot
+++ b/atest/05_Features/Highlights.robot
@@ -5,7 +5,7 @@ Suite Setup         Setup Suite For Screenshots    highlights
 Test Setup          Setup Highlights Test
 Test Teardown       Clean Up After Working With File    Highlights.ipynb
 
-Force Tags          feature:highlights
+Test Tags           feature:highlights
 
 
 *** Test Cases ***
diff --git a/atest/05_Features/Hover.robot b/atest/05_Features/Hover.robot
index 45e0c57b3..420c258b6 100644
--- a/atest/05_Features/Hover.robot
+++ b/atest/05_Features/Hover.robot
@@ -6,7 +6,7 @@ Suite Setup         Setup Suite For Screenshots    hover
 Test Setup          Setup Hover Test
 Test Teardown       Clean Up After Working With File    Hover.ipynb
 
-Force Tags          feature:hover
+Test Tags           feature:hover
 
 
 *** Variables ***
diff --git a/atest/05_Features/Jump.robot b/atest/05_Features/Jump.robot
index de1d70545..6f8d3bfe7 100644
--- a/atest/05_Features/Jump.robot
+++ b/atest/05_Features/Jump.robot
@@ -3,7 +3,7 @@ Resource        ../Keywords.resource
 
 Suite Setup     Setup Suite For Screenshots    gh-403
 
-Force Tags      feature:jump-to-definition    gh:403
+Test Tags       feature:jump-to-definition    gh:403
 
 
 *** Variables ***
diff --git a/atest/05_Features/Signature.robot b/atest/05_Features/Signature.robot
index 4001d9c16..94d0b3a29 100644
--- a/atest/05_Features/Signature.robot
+++ b/atest/05_Features/Signature.robot
@@ -5,7 +5,7 @@ Suite Setup         Setup Suite For Screenshots    signature
 Test Setup          Setup Notebook    Python    Signature.ipynb
 Test Teardown       Clean Up After Working With File    Signature.ipynb
 
-Force Tags          feature:signature
+Test Tags           feature:signature
 
 
 *** Variables ***
diff --git a/atest/05_Features/Syntax_highlighting.robot b/atest/05_Features/Syntax_highlighting.robot
index bcb23e985..e1011cbe3 100644
--- a/atest/05_Features/Syntax_highlighting.robot
+++ b/atest/05_Features/Syntax_highlighting.robot
@@ -5,7 +5,7 @@ Suite Setup         Setup Suite For Screenshots    syntax_highlighting
 Test Setup          Setup Highlighting Test
 Test Teardown       Clean Up After Working With File    Syntax highlighting.ipynb
 
-Force Tags          feature:syntax_highlighting
+Test Tags           feature:syntax_highlighting
 
 
 *** Test Cases ***
diff --git a/atest/06_Style.robot b/atest/06_Style.robot
index ca96fe61b..22d8c181c 100644
--- a/atest/06_Style.robot
+++ b/atest/06_Style.robot
@@ -5,7 +5,7 @@ Library         Collections
 
 Suite Setup     Setup Suite For Screenshots    style
 
-Force Tags      ui:editor    aspect:style
+Test Tags       ui:editor    aspect:style
 
 
 *** Variables ***
diff --git a/atest/07_Configuration.robot b/atest/07_Configuration.robot
index 053ef852d..3f77ca5af 100644
--- a/atest/07_Configuration.robot
+++ b/atest/07_Configuration.robot
@@ -5,7 +5,7 @@ Resource            ./Keywords.resource
 
 Suite Setup         Setup Suite For Screenshots    config
 
-Force Tags          feature:config
+Test Tags           feature:config
 
 
 *** Test Cases ***
diff --git a/atest/__init__.robot b/atest/__init__.robot
index 86c3f01aa..24c242d39 100644
--- a/atest/__init__.robot
+++ b/atest/__init__.robot
@@ -6,4 +6,4 @@ Suite Teardown      Tear Down Everything
 Test Setup          Reset Application State
 Test Teardown       Lab Log Should Not Contain Known Error Messages
 
-Force Tags          os:${os.lower()}    py:${py}
+Test Tags           os:${os.lower()}    py:${py}
diff --git a/atest/examples/example.robot b/atest/examples/example.robot
index 11b65d220..90c6269c4 100644
--- a/atest/examples/example.robot
+++ b/atest/examples/example.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Library           SeleniumLibrary
-Force Tags        atest:example
+Test Tags         atest:example
 
 *** Variables ***
 ${ABC}            abc

From 2c3630973468e37923077e4150a6979e19100fdb Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 13 Nov 2022 19:08:51 +0000
Subject: [PATCH 04/10] Update action versions, clean shell

---
 .github/workflows/job.test.yml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml
index 0c7386467..16871bae7 100644
--- a/.github/workflows/job.test.yml
+++ b/.github/workflows/job.test.yml
@@ -47,7 +47,7 @@ jobs:
         lab: ['>=3.3.0,<4.0.0a0']
         r: ['>=4']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: cschleiden/replace-tokens@v1
         with:
@@ -158,7 +158,6 @@ jobs:
           miniforge-variant: Mambaforge
 
       - name: Install minimal build deps
-        shell: bash -l {0}
         run: mamba install -n test -c conda-forge setuptools wheel 'jupyterlab${{ matrix.lab }}' 'nodejs${{ matrix.nodejs }}'
 
       - name: Cache node_modules
@@ -210,7 +209,7 @@ jobs:
           sha256sum * | tee SHA256SUMS
 
       - name: Publish builds
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: jupyterlab-lsp dist ${{ github.run_number }}
           path: ./dist
@@ -239,7 +238,7 @@ jobs:
             lab: '>=3.4.0,<4'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set JupyterLab and Node versions
         uses: cschleiden/replace-tokens@v1
@@ -297,7 +296,7 @@ jobs:
           key: |
             ${{ env.CACHE_EPOCH }}-julia-test-${{ runner.os }}-${{ env.JULIA_LANGSERVER }}
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: jupyterlab-lsp dist ${{ github.run_number }}
           path: ./dist
@@ -395,11 +394,11 @@ jobs:
             py_cmd: python
     steps:
       - name: Install Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
           architecture: 'x64'
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: jupyterlab-lsp dist ${{ github.run_number }}
           path: ./dist
@@ -437,25 +436,23 @@ jobs:
             lab: '>=3.3,<4'
     steps:
       - name: Install Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
           architecture: 'x64'
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.nodejs }}
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: jupyterlab-lsp dist ${{ github.run_number }}
           path: ./dist
       - name: Install the prerequisites
         run: python -m pip install --upgrade pip wheel setuptools
       - name: Install JupyterLab
-        shell: bash -l {0}
         run: python -m pip install 'jupyterlab${{ matrix.lab }}'
       - name: Install Notebook (to test serverextension)
-        shell: bash -l {0}
         run: python -m pip install 'notebook'
       - name: Install the server package
         run: cd dist && python -m pip install -vv jupyter_lsp*.whl

From 6ee894913ef829a8607fcc9553e1ed8de270ee9d Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 13 Nov 2022 20:14:15 +0000
Subject: [PATCH 05/10] Try just `python`

---
 .github/workflows/job.test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml
index 16871bae7..c86404809 100644
--- a/.github/workflows/job.test.yml
+++ b/.github/workflows/job.test.yml
@@ -389,7 +389,7 @@ jobs:
           - os: 'windows'
             py_cmd: python
           - os: 'macos'
-            py_cmd: python3
+            py_cmd: python
           - os: 'ubuntu'
             py_cmd: python
     steps:

From b8a4b7bb278152c5f977504dae642fd44e250b84 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 13 Nov 2022 20:55:16 +0000
Subject: [PATCH 06/10] Point to `jupyter` which is not in path on Mac now

---
 .github/workflows/job.test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml
index c86404809..e87fb9ef4 100644
--- a/.github/workflows/job.test.yml
+++ b/.github/workflows/job.test.yml
@@ -389,7 +389,7 @@ jobs:
           - os: 'windows'
             py_cmd: python
           - os: 'macos'
-            py_cmd: python
+            py_cmd: python3
           - os: 'ubuntu'
             py_cmd: python
     steps:
@@ -414,10 +414,10 @@ jobs:
       - name: Validate the install
         run: |
           set -eux
-          jupyter labextension list
-          jupyter server extension list
-          jupyter labextension list 2>&1 | grep -ie "jupyterlab-lsp.*enabled.*ok" -
-          jupyter server extension list 2>&1 | grep -ie "jupyter_lsp.*enabled" -
+          ${{ matrix.py_cmd }} -m jupyter labextension list
+          ${{ matrix.py_cmd }} -m jupyter server extension list
+          ${{ matrix.py_cmd }} -m jupyter labextension list 2>&1 | grep -ie "jupyterlab-lsp.*enabled.*ok" -
+          ${{ matrix.py_cmd }} -m jupyter server extension list 2>&1 | grep -ie "jupyter_lsp.*enabled" -
 
   source:
     name: smoke source install ${{ matrix.os }} py${{ matrix.python }} lab${{ matrix.lab }}

From 64da84fb37d87d3ce8147ea513ba56d3f6a4490c Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 13 Nov 2022 23:12:18 +0000
Subject: [PATCH 07/10] Fix failing tests (jupyter-core 5.0, lab 3.5)

---
 atest/Keywords.resource | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/atest/Keywords.resource b/atest/Keywords.resource
index 6386f7c5b..a6efdef53 100644
--- a/atest/Keywords.resource
+++ b/atest/Keywords.resource
@@ -41,6 +41,9 @@ Create Notebok Server Config
     [Documentation]    Copies in notebook server config file and updates accordingly
     [Arguments]    ${server_extension_enabled}=${True}
     ${conf} =    Set Variable    ${NOTEBOOK DIR}${/}${JPSERVER CONF JSON}
+    Set Environment Variable
+    ...    name=JUPYTER_CONFIG_DIR
+    ...    value=${NOTEBOOK DIR}
     ${extra_node_roots} =    Create List    ${ROOT}
     ${port} =    Get Unused Port
     Set Global Variable    ${PORT}    ${port}
@@ -217,7 +220,7 @@ Ensure Sidebar Is Closed
     END
 
 Refresh File List
-    IF    '${LAB VERSION}'.startswith('3.4')
+    IF    [int(part) for part in "${LAB VERSION}".split(".")] >= [3, 4, 0]
         Click Element    ${JLAB CSS REFRESH FILES}
     ELSE
         Click Element    ${JLAB CSS REFRESH F_OLD}

From b406a82f7ac76e505eff6120ee7f2501badc9a57 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Mon, 14 Nov 2022 01:42:02 +0000
Subject: [PATCH 08/10] Do not disable global config when disabled

as an attempt to fix 'Handles Server Extension Failure'
test failures
---
 atest/Keywords.resource | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/atest/Keywords.resource b/atest/Keywords.resource
index a6efdef53..e692b805e 100644
--- a/atest/Keywords.resource
+++ b/atest/Keywords.resource
@@ -16,13 +16,12 @@ Setup Server and Browser
     Initialize Global Variables
     Create Notebok Server Config    ${server_extension_enabled}
     Initialize User Settings
-    ${disable_global_config} =    Set Variable If    ${server_extension_enabled} != ${True}    '1'    ${EMPTY}
     ${server} =    Start Process    jupyter-lab
     ...    cwd=${NOTEBOOK DIR}
     ...    stdout=${LAB LOG}
     ...    stderr=STDOUT
     ...    env:HOME=${HOME}
-    ...    env:JUPYTER_NO_CONFIG=${disable_global_config}
+    ...    env:JUPYTER_NO_CONFIG=${EMPTY}
     Set Global Variable    ${SERVER}    ${server}
     Open JupyterLab
     Read Page Config

From 77fe7be8dd0da6380a86d22a93e8bfce92e45c49 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Fri, 9 Dec 2022 21:12:05 +0000
Subject: [PATCH 09/10] Try to fix backend failure test by explicit
 disable/enable

---
 atest/04_Interface/BackendFailure.robot | 13 +++++++++++--
 atest/Keywords.resource                 | 21 +++++++++------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/atest/04_Interface/BackendFailure.robot b/atest/04_Interface/BackendFailure.robot
index 1530be907..f5d3af4ca 100644
--- a/atest/04_Interface/BackendFailure.robot
+++ b/atest/04_Interface/BackendFailure.robot
@@ -1,8 +1,8 @@
 *** Settings ***
 Resource            ../Keywords.resource
 
-Suite Setup         Setup Server and Browser    server_extension_enabled=${False}
-Suite Teardown      Setup Server and Browser    server_extension_enabled=${True}
+Suite Setup         Setup Missing Extension Test
+Suite Teardown      Teardown Missing Extension Test
 
 
 *** Variables ***
@@ -19,3 +19,12 @@ Handles Server Extension Failure
     Accept Default Dialog Option
     Page Should Not Contain Element    ${POPOVER}
     [Teardown]    Clean Up After Working With File    Python.ipynb
+
+
+*** Keywords ***
+Setup Missing Extension Test
+    Set Server Extension State    enabled=${False}
+    Setup Server and Browser
+
+Teardown Missing Extension Test
+    Set Server Extension State    enabled=${True}
diff --git a/atest/Keywords.resource b/atest/Keywords.resource
index e692b805e..62dd150b9 100644
--- a/atest/Keywords.resource
+++ b/atest/Keywords.resource
@@ -12,9 +12,8 @@ Library     ./config.py
 
 *** Keywords ***
 Setup Server and Browser
-    [Arguments]    ${server_extension_enabled}=${True}
     Initialize Global Variables
-    Create Notebok Server Config    ${server_extension_enabled}
+    Create Notebok Server Config
     Initialize User Settings
     ${server} =    Start Process    jupyter-lab
     ...    cwd=${NOTEBOOK DIR}
@@ -38,7 +37,6 @@ Initialize Global Variables
 
 Create Notebok Server Config
     [Documentation]    Copies in notebook server config file and updates accordingly
-    [Arguments]    ${server_extension_enabled}=${True}
     ${conf} =    Set Variable    ${NOTEBOOK DIR}${/}${JPSERVER CONF JSON}
     Set Environment Variable
     ...    name=JUPYTER_CONFIG_DIR
@@ -57,19 +55,18 @@ Create Notebok Server Config
     Update Jupyter Config    ${conf}    LabApp
     ...    user_settings_dir=${SETTINGS DIR}
     ...    workspaces_dir=${WORKSPACES DIR}
-    # should be automatically enabled, so do not enable manually:
-    IF    not ${server_extension_enabled}
-        Set Server Extension State    ${conf}    enabled=${server_extension_enabled}
-    END
     Update Jupyter Config    ${conf}    LanguageServerManager
     ...    extra_node_roots=@{extra_node_roots}
 
 Set Server Extension State
-    [Arguments]    ${conf}    ${enabled}=${True}
-    ${extension_state} =    Create Dictionary    enabled=${enabled}
-    ${extensions} =    Create Dictionary    jupyter_lsp=${extension_state}
-    Update Jupyter Config    ${conf}    LabApp
-    ...    jpserver_extensions=${extensions}
+    [Arguments]    ${enabled}=${True}
+    IF    ${enabled}
+        Run Process    jupyter server extension enable jupyter_lsp
+        ...    shell=yes
+    ELSE
+        Run Process    jupyter server extension disable jupyter_lsp
+        ...    shell=yes
+    END
 
 Read Page Config
     ${script} =    Get Element Attribute    id:jupyter-config-data    innerHTML

From 0f9be0755c6ce9089d3323796fd5bb585eefc5a5 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Fri, 9 Dec 2022 23:16:31 +0000
Subject: [PATCH 10/10] True with environment variable set a priori

---
 atest/Keywords.resource | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/atest/Keywords.resource b/atest/Keywords.resource
index 62dd150b9..e02ff475d 100644
--- a/atest/Keywords.resource
+++ b/atest/Keywords.resource
@@ -60,6 +60,9 @@ Create Notebok Server Config
 
 Set Server Extension State
     [Arguments]    ${enabled}=${True}
+    Set Environment Variable
+    ...    name=JUPYTER_CONFIG_DIR
+    ...    value=${NOTEBOOK DIR}
     IF    ${enabled}
         Run Process    jupyter server extension enable jupyter_lsp
         ...    shell=yes