diff --git a/.ahoy.yml b/.ahoy.yml index 89ae43cd..1b5e5cf6 100644 --- 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 index fc1cb64b..88221ace 100644 --- 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/test/features/admin_reporting.feature b/test/features/admin_reporting.feature index 512c30a0..ad9d63e7 100644 --- 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 index f38f9881..fa8b7b4e 100644 --- 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 index a70e897f..f0ca0a97 100644 --- 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 index 8495d65a..5613f8fb 100644 --- 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 index c2b5d59a..67bb75c9 100644 --- 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 index 1315fcc4..60e4eaf3 100644 --- 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 index a02ab65a..4144125d 100644 --- 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 index 27af1505..d18a62d4 100644 --- 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 index 1c5a8a8e..bcd130be 100644 --- 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