Merge pull request #136 from qld-gov-au/QOLDEV-455-add-recaptcha

QOLDEV-455 fix recaptcha failure message on CKAN 2.10

.ahoy.yml

@@ -146,10 +146,16 @@ commands:
       ahoy title 'Run scenario tests'
       ahoy cli "rm -f test/screenshots/*"
       ahoy start-mailmock &
-      sleep 5 &&
-      ahoy cli "behave -k ${*:-test/features}" --tags=smoke $BEHAVE_TAGS && \
-      ahoy cli "behave -k ${*:-test/features} $BEHAVE_TAGS" || \
-      [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
+      sleep 5
+      if [ "$BEHAVE_TAG" = "" ]; then
+        (ahoy cli "behave -k ${*:-test/features} --tags=smoke" \
+         && ahoy cli "behave -k ${*:-test/features}"
+        ) || [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
+      else
+        # run tests with the specified tag
+        ahoy cli "behave -k ${*:-test/features} --tags=$BEHAVE_TAG" \
+          || [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
+      fi
       ahoy stop-mailmock
 
   start-mailmock:

.github/workflows/test.yml

@@ -43,8 +43,12 @@ jobs:
         run: bin/build.sh
         timeout-minutes: 15
 
+      - name: Lint
+        run: ahoy lint
+        timeout-minutes: 10
+
       - name: Unit test
-        run: bin/test.sh
+        run: ahoy test-unit
         timeout-minutes: 10
 
       - name: Scenario test

bin/create-test-data.sh

@@ -100,14 +100,6 @@ organisation_create=$( \
 )
 echo ${organisation_create}
 
-echo "Updating organisation_admin to have admin privileges in the department-of-health Organisation:"
-organisation_admin_update=$( \
-    curl -LsH "Authorization: ${API_KEY}" \
-    --data "id=department-of-health&username=organisation_admin&role=admin" \
-    ${CKAN_ACTION_URL}/organization_member_create
-)
-echo ${organisation_admin_update}
-
 echo "Creating non-organisation group:"
 group_create=$( \
     curl -LsH "Authorization: ${API_KEY}" \

ckanext/qgov/common/views/user.py

@@ -1,30 +1,14 @@
 # encoding: utf-8
 
-from six import text_type as str
-
 from flask import Blueprint
 
-import ckan.lib.helpers as h
-from ckan.plugins.toolkit import _, g, request, redirect_to, url_for
-from ckan.views.user import login, me, EditView
+from ckan.plugins.toolkit import g, redirect_to, url_for
+import ckan.views.user
+from ckan.views.user import _ as original_gettext, EditView
 
 blueprint = Blueprint(u'user_overrides', __name__)
 
 
-def logged_in_override():
-    """
-    Override default CKAN behaviour to only redirect user to `came_from` URL if they are logged in.
-    Ref.: ckan/views/user.py > def logged_in()
-    :return:
-    """
-    if g.user:
-        came_from = request.params.get(u'came_from', None)
-        return redirect_to(str(came_from)) if came_from and h.url_is_local(came_from) else me()
-    else:
-        h.flash_error(_(u'Login failed. Bad username or password or reCAPTCHA.'))
-        return login()
-
-
 def user_edit_override():
     """
     Override default CKAN behaviour of displaying "No user specified" message for /user/edit page and instead
@@ -39,8 +23,15 @@ def user_edit_override():
     return EditView().dispatch_request()
 
 
-blueprint.add_url_rule(u'/user/logged_in', u'logged_in', logged_in_override)
+def _gettext_wrapper(key):
+    translation = original_gettext(key)
+    if key == 'Login failed. Bad username or password.':
+        translation = translation.replace('or password.', 'or password or reCAPTCHA.')
+    return translation
+
+
 blueprint.add_url_rule(u'/user/edit', u'edit', user_edit_override)
+ckan.views.user._ = _gettext_wrapper
 
 
 def get_blueprints():

test/features/steps/steps.py

@@ -551,4 +551,5 @@ def lock_account(context):
     for x in range(11):
         context.execute_steps(u"""
             When I attempt to log in with password "incorrect password"
+            Then I should see "Bad username or password or reCAPTCHA."
         """)