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

Develop to master - move features to ckanext-datarequests

.ahoy.yml

@@ -152,18 +152,13 @@ commands:
       sleep 5 &&
       if [ "$BEHAVE_TAG" = "" ]; then
         # no tag specified, probably running locally
-        # Run reporting tests last so numbers are consistent
         (ahoy cli "behave -k ${*:-test/features} --tags=smoke" \
-         && ahoy cli "behave -k ${*:-test/features} --tags=-smoke --tags=-reporting" \
-         && ahoy cli "behave -k ${*:-test/features} --tags=reporting" \
+         && ahoy cli "behave -k ${*:-test/features} --tags=-smoke" \
         ) || [ "${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=-reporting" \
+        ahoy cli "behave -k ${*:-test/features} --tags=-unauthenticated --tags=-smoke --tags=-OpenData" \
           || [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
-        # Run reporting tests last so numbers are consistent
-        ahoy cli "behave -k ${*:-test/features} --tags=reporting" || \
-          [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
       else
         # run tests with the specified tag
         ahoy cli "behave -k ${*:-test/features} --tags=$BEHAVE_TAG" \

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
       fail-fast: true
       matrix:
         ckan-version: ["2.10", 2.9, 2.9-py2]
-        behave-tag: [smoke, authenticated, unauthenticated]
+        behave-tag: [smoke, unauthenticated, OpenData, authenticated]
 
     name: Run ${{ matrix.behave-tag }} tests on CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest

bin/build.sh

@@ -20,7 +20,7 @@ CKAN_GIT_VERSION=$CKAN_VERSION
 CKAN_GIT_ORG=qld-gov-au
 
 if [ "$CKAN_VERSION" = "2.10" ]; then
-    CKAN_GIT_VERSION=ckan-2.10.1-qgov.4
+    CKAN_GIT_VERSION=ckan-2.10.1-qgov.7
     PYTHON_VERSION=py3
     PYTHON="${PYTHON}3"
 else