Merge branch 'snyk-fix-df3e1843278b946b44f03fa23bd02bce' of https://g…

…ithub.com/qld-gov-au/ckanext-data-qld into snyk-fix-0cbb4fac9a523cd415b6e6754acdae6b
qld-gov-au · Oct 4, 2024 · 48e6db2 · 48e6db2
2 parents cf02277 + 3cb8953
commit 48e6db2
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 7 deletions.
diff --git a/.ahoy.yml b/.ahoy.yml
@@ -159,9 +159,12 @@ commands:
         ) || [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
       elif [ "$BEHAVE_TAG" = "authenticated" ]; then
         # run any tests that don't have a specific tag
-        ahoy cli "behave -k ${*:-test/features} --tags=-unauthenticated --tags=-smoke --tags=-OpenData" \
+        ahoy cli "behave -k ${*:-test/features} --tags=-unauthenticated --tags=-smoke --tags=-OpenData --tags=-multi_plugin" \
           || [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
       else
+        if [ "$BEHAVE_TAG" != "multi_plugin" ]; then
+            BEHAVE_TAG="$BEHAVE_TAG --tags=-multi_plugin"
+        fi
         # run tests with the specified tag
         ahoy cli "behave -k ${*:-test/features} --tags=$BEHAVE_TAG" \
           || [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
       fail-fast: true
       matrix:
         ckan-version: ["2.10", 2.9]
-        behave-tag: [smoke, unauthenticated, OpenData, authenticated]
+        behave-tag: [smoke, unauthenticated, multi_plugin, OpenData, authenticated]
 
     name: Run ${{ matrix.behave-tag }} tests on CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest

diff --git a/dev-requirements-2.9.txt b/dev-requirements-2.9.txt
@@ -14,4 +14,5 @@ python-magic==0.4.18
 progressbar==2.5
 
 pika>=1.1.0,<1.3.0 # resolve harvester conflict
+requests>=2.32.0 # not directly required, pinned by Snyk to avoid a vulnerability
 zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,18 +1,21 @@
 behaving==3.1.5
 Appium-Python-Client==2.10.1
+certifi>=2024.7.4 # not directly required, pinned by Snyk to avoid a vulnerability
 ckanapi==4.3
 ckantoolkit>=0.0.4
 factory-boy
 Faker
 flake8==6.0.0
+idna>=3.7 # not directly required, pinned by Snyk to avoid a vulnerability
 mock
+pika>=1.1.0,<1.3.0 # resolve harvester conflict
+progressbar==2.5
 pytest-ckan
+python-magic==0.4.18
+requests>=2.31.0 # not directly required, pinned by Snyk to avoid a vulnerability
 selenium<4.10
 six>=1.13.0
-xlrd==1.2.0
-python-magic==0.4.18
-progressbar==2.5
-
 typer<0.11 # We still need Click 7 for now
-pika>=1.1.0,<1.3.0 # resolve harvester conflict
+urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability
+xlrd==1.2.0
 zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/test/features/admin_reporting.feature b/test/features/admin_reporting.feature
@@ -1,5 +1,6 @@
 @reporting
 @OpenData
+@multi_plugin
 Feature: AdminReporting
 
     Scenario: As an admin user of my organisation, I can view 'My Reports' tab in the dashboard and show the 'Admin Report' with filters and table columns

diff --git a/test/features/comments.feature b/test/features/comments.feature
@@ -1,5 +1,6 @@
 @comments
 @OpenData
+@multi_plugin
 Feature: Comments
 
     @unauthenticated

diff --git a/test/features/data_validation.feature b/test/features/data_validation.feature
@@ -1,5 +1,6 @@
 @config
 @OpenData
+@multi_plugin
 Feature: Data Validation
 
     Scenario Outline: As a sysadmin, admin and editor user of the dataset organisation I can see the 'JSON' button

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
@@ -1,5 +1,6 @@
 @datarequest
 @OpenData
+@multi_plugin
 Feature: Data Request
 
     @unauthenticated

diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
@@ -1,5 +1,6 @@
 @data-requests-circumstances
 @OpenData
+@multi_plugin
 Feature: Datarequest-circumstances
 
     Scenario: As a sysadmin user when I go to the admin config page I can view the data requests closing circumstances textarea

diff --git a/test/features/dataset_schema.feature b/test/features/dataset_schema.feature
@@ -1,5 +1,6 @@
 @dataset_schema
 @OpenData
+@multi_plugin
 Feature: Dataset Schema
 
     Scenario Outline: Add new dataset metadata fields for default data schema validation

diff --git a/test/features/engagement_reporting.feature b/test/features/engagement_reporting.feature
@@ -1,5 +1,6 @@
 @reporting
 @OpenData
+@multi_plugin
 Feature: Engagement Reporting
 
     Scenario Outline: As a user with admin or editor role capacity of an organisation, I can view 'My Reports' tab in the dashboard and show the engagement report with filters

diff --git a/test/features/reporting.feature b/test/features/reporting.feature
@@ -1,5 +1,6 @@
 @reporting
 @OpenData
+@multi_plugin
 Feature: Reporting
 
     @unauthenticated

diff --git a/test/features/schema_generation.feature b/test/features/schema_generation.feature
@@ -1,4 +1,5 @@
 @OpenData
+@multi_plugin
 Feature: Schema Generation
     Enable worker with `ckan jobs clear && ckan jobs worker`, since these tests rely on background tasks