From 2a0191317676a7df759f4d47abf0e5745abee76b Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Thu, 1 Sep 2022 15:56:36 +1000 Subject: [PATCH 1/3] [QOL-9055] update Reporting and Archiver extensions to fix bugs - Ensure Flask views are returned - Improve Python 3 compatibility - Copy changes from upstream to add CKAN 2.10 compatibility --- vars/shared-CKANTest.var.yml | 4 ++-- vars/shared-OpenData.var.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/shared-CKANTest.var.yml b/vars/shared-CKANTest.var.yml index 86fc9f30..b4171d9c 100644 --- a/vars/shared-CKANTest.var.yml +++ b/vars/shared-CKANTest.var.yml @@ -119,7 +119,7 @@ extensions: description: "CKAN Extension for Reporting" type: "git" url: "https://github.com/qld-gov-au/ckanext-report.git" - version: "0.3.1-qgov.1" + version: "0.3.1-qgov.2" CKANExtArchiver: &CKANExtArchiver name: "ckanext-archiver-{{ Environment }}" @@ -127,7 +127,7 @@ extensions: description: "CKAN Extension for Archiving needed for ckanext-qa" type: "git" url: "https://github.com/qld-gov-au/ckanext-archiver.git" - version: "2.1.1-qgov.11" + version: "2.1.1-qgov.12" CKANExtQa: &CKANExtQa name: "ckanext-qa-{{ Environment }}" diff --git a/vars/shared-OpenData.var.yml b/vars/shared-OpenData.var.yml index 17ca06e7..cee4e6cc 100644 --- a/vars/shared-OpenData.var.yml +++ b/vars/shared-OpenData.var.yml @@ -119,7 +119,7 @@ extensions: description: "CKAN Extension for Reporting" type: "git" url: "https://github.com/qld-gov-au/ckanext-report.git" - version: "0.3.1-qgov.1" + version: "0.3.1-qgov.2" CKANExtArchiver: &CKANExtArchiver name: "ckanext-archiver-{{ Environment }}" @@ -127,7 +127,7 @@ extensions: description: "CKAN Extension for Archiving needed for ckanext-qa" type: "git" url: "https://github.com/qld-gov-au/ckanext-archiver.git" - version: "2.1.1-qgov.11" + version: "2.1.1-qgov.12" CKANExtQa: &CKANExtQa name: "ckanext-qa-{{ Environment }}" From e53cc5ef111733022cd9317ed3d5a6fa80d76607 Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Fri, 2 Sep 2022 06:59:07 +1000 Subject: [PATCH 2/3] [QOL-9055] add scenario test for public reporting --- test/features/reporting.feature | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 test/features/reporting.feature diff --git a/test/features/reporting.feature b/test/features/reporting.feature new file mode 100644 index 00000000..993bac00 --- /dev/null +++ b/test/features/reporting.feature @@ -0,0 +1,23 @@ +@OpenData +@reporting +Feature: Reporting + + @unauthenticated + Scenario: I can view a 'Broken Links' report anonymously + Given "Unauthenticated" as the persona + When I visit "/report" + And I click the link with text that contains "Broken links" + Then I should see an element with xpath "//select[@name='organization']" + And I should see an element with xpath "//table[@id='report-table']//th[contains(string(), 'Broken datasets')]" + And I should see an element with xpath "//table[@id='report-table']//th[contains(string(), 'Broken links')]" + And I should see an element with xpath "//table[@id='report-table']//td[position()=1]/a[contains(@href, 'report/broken-links') and contains(string(), 'Test Organisation')]" + + @unauthenticated + Scenario: I can view a 'Data Usability Rating' report anonymously + Given "Unauthenticated" as the persona + When I visit "/report" + And I click the link with text that contains "Data usability rating" + Then I should see an element with xpath "//select[@name='organization']" + And I should see an element with xpath "//table[@id='report-table']//th[contains(string(), 'Score TBC')]" + And I should see an element with xpath "//table[@id='report-table']//th[contains(string(), 'Average score')]" + And I should see an element with xpath "//table[@id='report-table']//td[position()=1]/a[contains(@href, 'report/openness') and contains(string(), 'Test Organisation')]" From 97815e1dac95319ab61b24c71fe1ec320bf4a3a1 Mon Sep 17 00:00:00 2001 From: antuarc Date: Fri, 2 Sep 2022 12:03:45 +1000 Subject: [PATCH 3/3] [QOL-9055] update Data Qld extension to fix public reports --- vars/shared-CKANTest.var.yml | 2 +- vars/shared-OpenData.var.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/shared-CKANTest.var.yml b/vars/shared-CKANTest.var.yml index b4171d9c..502acf4e 100644 --- a/vars/shared-CKANTest.var.yml +++ b/vars/shared-CKANTest.var.yml @@ -71,7 +71,7 @@ extensions: description: "CKAN Extension for Queensland Government Open Data" type: "git" url: "https://github.com/qld-gov-au/ckanext-data-qld.git" - version: "6.3.5" + version: "6.3.6" CKANExtODICertificates: &CKANExtODICertificates name: "ckanext-odi-certificates-{{ Environment }}" diff --git a/vars/shared-OpenData.var.yml b/vars/shared-OpenData.var.yml index cee4e6cc..2a7e91b3 100644 --- a/vars/shared-OpenData.var.yml +++ b/vars/shared-OpenData.var.yml @@ -71,7 +71,7 @@ extensions: description: "CKAN Extension for Queensland Government Open Data" type: "git" url: "https://github.com/qld-gov-au/ckanext-data-qld.git" - version: "6.3.5" + version: "6.3.6" CKANExtODICertificates: &CKANExtODICertificates name: "ckanext-odi-certificates-{{ Environment }}"