Merge branch 'useblocks:master' into master

.github/workflows/ci.yaml

@@ -5,7 +5,7 @@ jobs:
     name: "py${{ matrix.python-version }} sp${{ matrix.sphinx-version }} do${{ matrix.docutils-version }} ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: true  # Set on "false" to get the results of ALL builds
+      fail-fast: false  # Set on "false" to get the results of ALL builds
       matrix:
         os: ["ubuntu-latest"]
         # 3.9.8 seems to be broken with type_ast
@@ -56,3 +56,17 @@ jobs:
       with:
         python-version: '3.8'
     - uses: pre-commit/[email protected]
+
+  check:
+    # This job does nothing and is only used for the branch protection
+    # see https://github.com/marketplace/actions/alls-green#why
+    if: always()
+    needs:
+    - lint
+    - tests
+    runs-on: ubuntu-latest
+    steps:
+    - name: Decide whether the needed jobs succeeded or failed
+      uses: re-actors/alls-green@release/v1
+      with:
+        jobs: ${{ toJSON(needs) }}

.gitignore

@@ -30,7 +30,8 @@ docs/_images/need_bar_*.*
 .dockerignore
 
 .benchmarks/
-
+tests/cypress/
+cypress/
 
 need_bar_*.png
 need_pie_*.png

AUTHORS

@@ -37,3 +37,5 @@ Duodu Randy <[email protected]>
 Christian Wappler <[email protected]>
 
 Chris Sewell <[email protected]>
+
+Simon Leiner <[email protected]>

Makefile

@@ -10,11 +10,15 @@ lint:
 
 .PHONY: test
 test:
-	poetry run pytest -n auto --tb=long --ignore=tests/benchmarks tests/
+	poetry run pytest -n auto -m "not jstest" --tb=long --ignore=tests/benchmarks tests/
 
 .PHONY: test
 test-short:
-	poetry run pytest -n auto --tb=long --ignore-glob="*official*" --ignore=tests/benchmarks tests/
+	poetry run pytest -n auto -m "not jstest" --tb=long --ignore-glob="*official*" --ignore=tests/benchmarks tests/
+
+.PHONY: test
+test-js:
+	poetry run pytest -n 1 -m "jstest" --tb=long --ignore-glob="*official*" --ignore=tests/benchmarks tests/
 
 .PHONY: benchmark-time
 benchmark-time:

docs/contributing.rst

@@ -121,6 +121,103 @@ These snapshots can be updated by running:
 
       pip install -r docs/requirements.txt
 
+Running JS Testcases with PyTest
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**Setup Cypress Locally**
+
+* Install Node JS on your computer and ensure it can be accessed through the CMD.
+* Install Cypress using the npm package manager by running ``npm install cypress``. Visit this link for more information on `how to install Cypress <https://docs.cypress.io/guides/getting-started/installing-cypress#npm-install>`_.
+* Verify if Cypress is installed correctly and is executable by running: ``npx cypress verify``. Get out this page for more information about `Cypress commandline <https://docs.cypress.io/guides/guides/command-line>`_.
+* If everything is successful then we can use Cypress.
+
+**Enable Cypress Test in Python Test Files**
+
+Under the ``js_test`` folder, you can save your Cypress JS test files (files should end with: ``*.cy.js``). For each Cypress JS test file, you will need to write the Cypress JS test cases in the file. You can read more from the `Cypress Docs <https://docs.cypress.io/>`_. You can also check the ``tests/js_test/sn-collapse-button.cy.js`` file as reference.
+
+In your Python test files, you must mark every JS related test case with the marker - ``jstest`` and you must include the ``spec_pattern`` key-value pair as part of the ``test_app`` fixture parameter.
+Also, you need to pass the ``test_server`` fixture to your test function for it to use the automated HTTP test server. For example, your test case could look like this:
+
+.. code-block:: python
+
+    # tests/test_sn_collapse_button.py
+
+    import pytest
+
+
+    @pytest.mark.jstest
+    @pytest.mark.parametrize(
+        "test_app",
+        [
+            {
+                "buildername": "html",
+                "srcdir": "doc_test/variant_doc",
+                "tags": ["tag_a"],
+                "spec_pattern": "js_test/js-test-sn-collapse-button.cy.js"
+            }
+        ],
+        indirect=True,
+    )
+    def test_collapse_button_in_docs(test_app, test_server):
+        ...
+
+.. note::
+
+    The ``spec_pattern`` key is required to ensure Cypress locates your test files or folder. Visit this link for more info on how to set the `spec_pattern <https://docs.cypress.io/guides/guides/command-line#cypress-run-spec-lt-spec-gt>`_.
+
+After you set the ``spec_pattern`` key-value pair as part of the ``test_app`` fixture parameter, you can call ``app.test_js()`` in your Python test case to run a JS test for the ``spec_pattern`` you provided. For example, you can use ``app.test_js()`` like below:
+
+.. code-block:: python
+
+    # tests/test_sn_collapse_button.py
+
+    import pytest
+
+
+    @pytest.mark.jstest
+    @pytest.mark.parametrize(
+        "test_app",
+        [
+            {
+                "buildername": "html",
+                "srcdir": "doc_test/variant_doc",
+                "tags": ["tag_a"],
+                "spec_pattern": "js_test/js-test-sn-collapse-button.cy.js"
+            }
+        ],
+        indirect=True,
+    )
+    def test_collapse_button_in_docs(test_app, test_server):
+        """Check if the Sphinx-Needs collapse button works in the provided documentation source."""
+        app = test_app
+        app.build()
+
+        # Call `app.test_js()` to run the JS test for a particular specPattern
+        js_test_result = app.test_js()
+
+        # Check the return code and stdout
+        assert js_test_result["returncode"] == 0
+        assert "All specs passed!" in js_test_result["stdout"].decode("utf-8")
+
+.. note::
+
+    ``app.test_js()`` will return a dictionary object containing the ``returncode``, ``stdout``, and ``stderr``. Example:
+
+    .. code-block:: python
+
+        return {
+            "returncode": 0,
+            "stdout": "Test passed string",
+            "stderr": "Errors encountered,
+        }
+
+You can run the ``make test-js`` command to check all JS testcases.
+
+.. note::
+
+    The ``http_server`` process invoked by the ``make test-js`` command may not terminate properly in some instances.
+    Kindly check your system's monitoring app to end the process if not terminated automatically.
+
 Linting & Formatting
 --------------------
 

noxfile.py

@@ -14,6 +14,7 @@
 TEST_DEPENDENCIES = [
     "pytest",
     "pytest-xdist",
+    "pytest-xprocess",
     "syrupy",
     "responses",
     "lxml",