Merge pull request #105 from qld-gov-au/develop

Develop to master - fix position of mobile navigation menu
qld-gov-au · Dec 9, 2024 · 9b0023f · 9b0023f
2 parents f882f82 + 7a3c785
commit 9b0023f
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,8 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - name: Install requirements
@@ -26,16 +26,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ckan-version: ["2.10", 2.9, 2.9-py2]
+        ckan-version: ["2.10", 2.9]
 
     name: Test on CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest
-    container: drevops/ci-builder:23.7.0
+    container: drevops/ci-runner:23.12.0
     env:
       CKAN_VERSION: ${{ matrix.ckan-version }}
 
     steps:
-      - uses: actions/checkout@v3
+      # Patch https://github.com/actions/runner/issues/863
+      - name: Preserve $HOME set in the container
+        run: echo HOME=/root >> "$GITHUB_ENV"
+
+      - uses: actions/checkout@v4
         timeout-minutes: 2
 
       - name: Build
@@ -57,7 +61,7 @@ jobs:
       - name: Retrieve logs
         if: always()
         run: bin/get-logs.sh
-        timeout-minutes: 5
+        timeout-minutes: 1
 
       - name: Retrieve screenshots
         if: failure()
@@ -66,7 +70,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: CKAN ${{ matrix.ckan-version }} screenshots
           path: /tmp/artifacts/behave/screenshots

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Compatibility with core CKAN versions:
 | 2.6 and earlier | no              |
 | 2.7             | no              |
 | 2.8             | no              |
-| 2.9.5+ py2      | yes             |
+| 2.9.5+ py2      | no              |
 | 2.9.5+ py3      | yes             |
 
 

diff --git a/ckanext/publications_qld_theme/templates/page.html b/ckanext/publications_qld_theme/templates/page.html
@@ -16,7 +16,7 @@
 {% endblock %}
 
 {% block maintag %}
-    <div role="main" class={{ h.set_background_image_class() }}>
+    <div role="main" class="main {{ h.set_background_image_class() }}">
 {% endblock %}
 
 {% block flash %}
@@ -80,4 +80,4 @@ <h1>My page content</h1>
         </article>
         {% endblock %}
     </div>
-{% endblock %}
+{% endblock %}
diff --git a/dev-requirements-2.9-py2.txt b/dev-requirements-2.9-py2.txt
@@ -7,8 +7,11 @@ factory-boy
 flake8==3.8.3
 mock
 pytest-ckan
+requests>=2.32.0 # not directly required, pinned by Snyk to avoid a vulnerability
 six>=1.13.0
 splinter>=0.13.0,<0.17
+urllib3>=1.26.19,<2 # not directly required, pinned by Snyk to avoid a vulnerability
+zipp>=1.2
 
 -e git+https://github.com/qld-gov-au/ckanext-csrf-filter.git@1.1.8#egg=ckanext-csrf-filter
 -e git+https://github.com/qld-gov-au/ckanext-qgov.git@6.0.1#egg=ckanext-qgov

diff --git a/dev-requirements-2.9.txt b/dev-requirements-2.9.txt
@@ -7,8 +7,11 @@ factory-boy
 flake8==3.8.3
 mock
 pytest-ckan
+requests>=2.32.0 # not directly required, pinned by Snyk to avoid a vulnerability
 six>=1.13.0
 splinter>=0.13.0,<0.17
+urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability
+zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability
 
 -e git+https://github.com/qld-gov-au/ckanext-csrf-filter.git@1.1.8#egg=ckanext-csrf-filter
 -e git+https://github.com/qld-gov-au/ckanext-qgov.git@6.0.1#egg=ckanext-qgov

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -7,8 +7,10 @@ factory-boy
 flake8==6.0.0
 mock
 pytest-ckan
+requests>=2.32.0 # not directly required, pinned by Snyk to avoid a vulnerability
 selenium<4.10
 six>=1.13.0
+zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability
 
 -e git+https://github.com/qld-gov-au/ckanext-csrf-filter.git@1.1.8#egg=ckanext-csrf-filter
 -e git+https://github.com/qld-gov-au/ckanext-qgov.git@6.0.2#egg=ckanext-qgov

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
@@ -269,7 +269,7 @@ def fill_in_default_link_resource_fields(context):
 @when(u'I upload "{file_name}" of type "{file_format}" to resource')
 def upload_file_to_resource(context, file_name, file_format):
     context.execute_steps(u"""
-        When I execute the script "$('#resource-upload-button').trigger(click);"
+        When I execute the script "$('#resource-upload-button').trigger('click');"
         And I attach the file "{file_name}" to "upload"
         # Don't quote the injected string since it can have trailing spaces
         And I execute the script "document.getElementById('field-format').value='{file_format}'"