Merge pull request #4 from bollwyvl/more-clients

Add more clients

Author: bollwyvl

README.md

@@ -55,6 +55,15 @@ See the [acceptance tests][] for examples.
 
       python -m scripts.atest
 
+# Free Software
+JupyterLibrary is Free Software under the BSD-3-Clause License. It contains code
+from a number of other projects:
+
+- [SeleniumLibrary][] ([APL-2.0][selibrary-license])
+  - backport of `Press Keys`
+- [Jyve][] ([BSD-3-Clause][jyve-license])
+  - Initial implementations of robot keywords
+
 [acceptance tests]: https://github.com/bollwyvl/robotframework-jupyterlab
 [Miniconda3]: https://conda.io/miniconda.html
 [binder-badge]: https://mybinder.org/badge_logo.svg
@@ -63,3 +72,9 @@ See the [acceptance tests][] for examples.
 [pipeline]: https://dev.azure.com/nickbollweg/nickbollweg/_build/latest?definitionId=2
 [docs-badge]: https://readthedocs.org/projects/robotframework-jupyterlibrary/badge/?version=latest
 [docs]: https://robotframework-jupyterlibrary.readthedocs.io
+
+[SeleniumLibrary]: https://github.com/robotframework/SeleniumLibrary
+[selibrary-license]: https://github.com/robotframework/SeleniumLibrary/blob/master/LICENSE.txt
+
+[Jyve]: https://github.com/deathbeds/jyve
+[jyve-license]: https://github.com/deathbeds/jyve/blob/master/LICENSE

anaconda-project.yml

@@ -30,7 +30,24 @@ commands:
     env_spec: rfjl37
 
   atest:
-    unix: rm -rf _artifacts/test_output && python -m scripts.atest
+    unix: python -m scripts.atest
+    env_spec: rfjl37
+
+  atest:full:
+    unix: |-
+      set -eux &&
+      rm -rf _artifacts/test_output &&
+      python -m scripts.atest &&
+      BROWSER=headlesschrome python -m scripts.atest &&
+      python -m scripts.combine
+    env_spec: rfjl37
+
+  atest:clean:
+    unix: rm -rf _artifacts/test_output
+    env_spec: rfjl37
+
+  atest:combine:
+    unix: python -m scripts.combine
     env_spec: rfjl37
 
   atest:win:
@@ -45,6 +62,10 @@ commands:
     unix: python setup.py sdist --dist-dir=_artifacts/sdist
     env_spec: rfjl37
 
+  wheel:
+    unix: python setup.py bdist_wheel --dist-dir=_artifacts/wheel
+    env_spec: rfjl37
+
   sdist:win:
     windows: python setup.py sdist --dist-dir=_artifacts/sdist
     env_spec: win_rfjl37

atest/acceptance/01_server/00_basic.robot

@@ -1,12 +1,17 @@
 *** Settings ***
+Suite Setup       Create Directory    ${LOGS}
 Suite Teardown    Terminate All Jupyter Servers
+Force Tags        server
 Library           JupyterLibrary
 Library           Process
 Library           OperatingSystem
 
+*** Variables ***
+${LOGS}           ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}logs${/}
+
 *** Test Cases ***
 Start one server
-    ${nbserver} =    Start New Jupyter Server    stdout=${OUTPUT_DIR}${/}one_server.log    stderr=STDOUT
+    ${nbserver} =    Start New Jupyter Server    stdout=${LOGS}1.log    stderr=STDOUT
     ${ready} =    Wait for Jupyter Server to be Ready
     Should be equal as integers    ${ready}    1    msg=One server should be ready
     ${terminated} =    Terminate All Jupyter Servers
@@ -15,11 +20,12 @@ Start one server
     Should Contain    ${log}    The Jupyter Notebook is running    msg=Log should contain expected status message
 
 Start three servers
-    ${nb1} =    Start New Jupyter Server    stdout=${OUTPUT_DIR}${/}one_of_three_server.log    stderr=STDOUT
-    ${nb2} =    Start New Jupyter Server    stdout=${OUTPUT_DIR}${/}two_of_three_server.log    stderr=STDOUT
+    [Setup]    Create Directory    ${LOGS}3
+    ${nb1} =    Start New Jupyter Server    stdout=${LOGS}3${/}1.log    stderr=STDOUT
+    ${nb2} =    Start New Jupyter Server    stdout=${LOGS}3${/}2.log    stderr=STDOUT
     ${ready} =    Wait for Jupyter Server to be Ready    ${nb2}    ${nb1}
     Should be equal as integers    ${ready}    2    msg=Three servers should be ready
-    ${nb3} =    Start New Jupyter Server    stdout=${OUTPUT_DIR}${/}three_of_three_server.log    stderr=STDOUT
+    ${nb3} =    Start New Jupyter Server    stdout=${LOGS}3${/}3.log    stderr=STDOUT
     ${terminated} =    Terminate All Jupyter Servers
     Should be equal as integers    ${terminated}    3    msg=Three servers should have been terminated
     ${log1} =    Get Process Result    ${nb1}    stderr=${True}
@@ -31,7 +37,7 @@ Start three servers
 
 Server Files
     [Setup]    Create File    ${OUTPUT_DIR}${/}foo.txt    bar
-    ${nb1} =    Start New Jupyter Server    stdout=${OUTPUT_DIR}${/}files.log    stderr=STDOUT
+    ${nb1} =    Start New Jupyter Server    stdout=${LOGS}files.log    stderr=STDOUT
     Copy Files to Jupyter Directory    ${OUTPUT_DIR}${/}*.txt
     ${nbdir} =    Get Jupyter Directory    ${nb1}
     ${out} =    Get File    ${nbdir}${/}foo.txt

atest/acceptance/__init__.robot

@@ -1,6 +1,7 @@
 *** Settings ***
-Suite Setup       Set Screenshot Directory    ${OUTPUT_DIR}${/}screenshots
+Suite Setup       Set Screenshot Directory    ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}screenshots
 Suite Teardown    Clean Up Everything
+Force Tags        os:${OS}    browser:${BROWSER}
 Library           JupyterLibrary
 Library           Process
 

atest/acceptance/classic/10_notebook.robot

@@ -0,0 +1,14 @@
+*** Settings ***
+Test Teardown     Close All Browsers
+Default Tags      notebook
+Library           JupyterLibrary
+Library           Process
+
+*** Test Cases ***
+IPython Notebook on Classic
+    Open Notebook Classic
+    Launch a new Notebook Classic Notebook
+    Add and Run Notebook Classic Code Cell    print("hello world")
+    Wait Until Notebook Classic Kernel Is Idle
+    Current Notebook Classic Cell Output Should Contain    hello world
+    Capture Page Screenshot    classic${/}ipython.png

atest/acceptance/10_lab/__init__.robot renamed to atest/acceptance/classic/__init__.robot

@@ -1,4 +1,5 @@
 *** Settings ***
 Suite Setup       Wait for New Jupyter Server to be Ready
 Suite Teardown    Terminate All Jupyter Servers
+Force Tags        client:notebook
 Library           JupyterLibrary

atest/acceptance/10_lab/00_shell.robot renamed to atest/acceptance/lab/00_shell.robot

@@ -11,5 +11,5 @@ Open JupyterLab
 Get Help
     Open JupyterLab
     Open With JupyterLab Menu    Help    About JupyterLab
-    Capture Element Screenshot    css:.jp-Dialog-content    about.png
+    Capture Element Screenshot    css:.jp-Dialog-content    lab${/}about.png
     Click Element    css:${JLAB CSS ACCEPT}

atest/acceptance/10_lab/10_notebook.robot renamed to atest/acceptance/lab/10_notebook.robot

@@ -6,17 +6,18 @@ Library           JupyterLibrary
 Library           Process
 
 *** Test Cases ***
-IPython Notebook
+IPython Notebook on Lab
     Open JupyterLab
     Launch a new JupyterLab Document
     Add and Run JupyterLab Code Cell    print("hello world")
     Wait Until JupyterLab Kernel Is Idle
-    Capture Page Screenshot    ipython.png
+    Current JupyterLab Cell Output Should Contain    hello world
+    Capture Page Screenshot    lab${/}ipython.png
 
-IPython Notebook Outputs
+IPython Notebook Outputs on Lab
     Open JupyterLab
     Launch a new JupyterLab Document
     : FOR    ${i}    IN RANGE    ${10}
     \    Add and Run JupyterLab Code Cell    print("${i} hello world " * ${i ** 2})
     Wait Until JupyterLab Kernel Is Idle
-    Screenshot Each Output of Active JupyterLab Document    ipython_outputs${/}
+    Screenshot Each Output of Active JupyterLab Document    lab${/}ipython_outputs${/}

atest/acceptance/lab/__init__.robot

@@ -0,0 +1,5 @@
+*** Settings ***
+Suite Setup       Wait for New Jupyter Server to be Ready
+Suite Teardown    Terminate All Jupyter Servers
+Force Tags        client:jupyterlab
+Library           JupyterLibrary

atest/acceptance/nteract/10_notebook.robot

@@ -0,0 +1,14 @@
+*** Settings ***
+Test Teardown     Close All Browsers
+Default Tags      notebook
+Library           JupyterLibrary
+Library           Process
+
+*** Test Cases ***
+IPython Notebook on nteract
+    Open nteract
+    Launch a new nteract Notebook
+    Add and Run nteract Code Cell    print("hello world")
+    Wait Until nteract Kernel Is Idle
+    Current nteract Cell Output Should Contain    hello world
+    Capture Page Screenshot    nteract${/}ipython.png