From ac5629d953a0790cb60981ec4c921cb14dc3f307 Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Mon, 25 Oct 2021 10:09:32 +1000 Subject: [PATCH 1/3] [QOL-8117] update test dependencies for Salsa work --- requirements-dev.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index cb9e15be..1cb8c797 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,9 +11,9 @@ git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit -e git+https://github.com/frictionlessdata/ckanext-validation.git#egg=ckanext-validation -e git+https://github.com/qld-gov-au/ckan-ex-qgov.git@3.3.0#egg=ckanext-qgov -e git+https://github.com/qld-gov-au/ckanext-archiver.git@2.1.1-qgov.6#egg=ckanext-archiver --e git+https://github.com/qld-gov-au/ckanext-data-qld.git@develop#egg=ckanext-data-qld +-e git+https://github.com/qld-gov-au/ckanext-data-qld.git@4.0.0#egg=ckanext-data-qld -e git+https://github.com/qld-gov-au/ckanext-datarequests.git@2.1.3-qgov#egg=ckanext-datarequests -e git+https://github.com/qld-gov-au/ckanext-qa.git@2.0.3-qgov.3#egg=ckanext-qa -e git+https://github.com/qld-gov-au/ckanext-report.git@0.2#egg=ckanext-report --e git+https://github.com/qld-gov-au/ckanext-ytp-comments.git@2.3.0-qgov#egg=ckanext-ytp-comments +-e git+https://github.com/qld-gov-au/ckanext-ytp-comments.git@2.4.0-qgov#egg=ckanext-ytp-comments From eef74f6a72701165bc74a6c774b04195596d1a25 Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Mon, 25 Oct 2021 10:30:36 +1000 Subject: [PATCH 2/3] [QOL-8117] update comment test expectations for Salsa work --- test/features/comments.feature | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/features/comments.feature b/test/features/comments.feature index 1257eeba..4bd1b0e9 100644 --- a/test/features/comments.feature +++ b/test/features/comments.feature @@ -90,7 +90,7 @@ Feature: Comments Then I should see "This is a reply" within 10 seconds @comment-delete - Scenario: When an Org Admin visits a dataset belonging to their organisation, they can delete a comment and should not see text 'This comment was deleted.' + Scenario: When an Org Admin visits a dataset belonging to their organisation, they can delete a comment and should see deletion text for the user responsible. Given "TestOrgAdmin" as the persona When I log in Then I go to dataset "warandpeace" comments @@ -99,10 +99,10 @@ Feature: Comments Then I press the element with xpath "//button[contains(string(), 'Confirm')]" Then I take a screenshot Then I should not see "This comment was deleted." within 2 seconds - And I should see "Comment deleted by test_org_admin." within 2 seconds + And I should see "Comment deleted by Test Admin." within 2 seconds @comment-delete @datarequest - Scenario: When an Org Admin visits a data request belonging to their organisation, they can delete a comment and should not see text 'This comment was deleted.' + Scenario: When an Org Admin visits a data request belonging to their organisation, they can delete a comment and should see deletion text for the user responsible. Given "TestOrgAdmin" as the persona When I log in And I go to data request "Test Request" comments @@ -110,7 +110,7 @@ Feature: Comments Then I should see "Are you sure you want to delete this comment?" within 1 seconds Then I press the element with xpath "//button[contains(string(), 'Confirm')]" Then I should not see "This comment was deleted." within 2 seconds - And I should see "Comment deleted by test_org_admin." within 2 seconds + And I should see "Comment deleted by Test Admin." within 2 seconds @comment-tab Scenario: Non-logged in users should not see comment form in dataset tab From 478851f4089931da5a5d861d292220df26b94b56 Mon Sep 17 00:00:00 2001 From: Sai Sun Work Date: Thu, 28 Oct 2021 16:21:28 +1000 Subject: [PATCH 3/3] using different logo images based on the screen size --- ckanext/data_qld_theme/templates/header.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ckanext/data_qld_theme/templates/header.html b/ckanext/data_qld_theme/templates/header.html index 316b0c13..680cdfd6 100644 --- a/ckanext/data_qld_theme/templates/header.html +++ b/ckanext/data_qld_theme/templates/header.html @@ -73,14 +73,13 @@ Open/Close Mobile Menu
-
Open Data Portal