From a937402f0dd5c6426b08508e4bc7b5286c6524fd Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Wed, 30 Oct 2024 11:10:24 +1000 Subject: [PATCH 1/2] Update XLoader to add status badges and integration with Validation --- 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 ab1ea01e..98b956ad 100644 --- a/vars/shared-CKANTest.var.yml +++ b/vars/shared-CKANTest.var.yml @@ -14,7 +14,7 @@ extensions: description: "CKAN Express Loader Extension" type: "git" url: "https://github.com/qld-gov-au/ckanext-xloader.git" - version: "1.0.1-qgov.14" + version: "1.0.1-qgov.16" CKANExtQGOV: &CKANExtQGOV name: "ckanext-qgov-{{ Environment }}" diff --git a/vars/shared-OpenData.var.yml b/vars/shared-OpenData.var.yml index 943fbeb3..bab5442a 100644 --- a/vars/shared-OpenData.var.yml +++ b/vars/shared-OpenData.var.yml @@ -14,7 +14,7 @@ extensions: description: "CKAN Express Loader Extension" type: "git" url: "https://github.com/qld-gov-au/ckanext-xloader.git" - version: "1.0.1-qgov.14" + version: "1.0.1-qgov.16" CKANExtQGOV: &CKANExtQGOV name: "ckanext-qgov-{{ Environment }}" From a3718c32740896666507e4f82079abba7235d45c Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Wed, 30 Oct 2024 16:13:29 +1000 Subject: [PATCH 2/2] adjust scenario test to allow XLoader completion to be delayed - Don't just wait until the status page is available, wait for the completion message --- test/features/xloader.feature | 1 + 1 file changed, 1 insertion(+) diff --git a/test/features/xloader.feature b/test/features/xloader.feature index 1f5d924d..a39096c9 100644 --- a/test/features/xloader.feature +++ b/test/features/xloader.feature @@ -12,6 +12,7 @@ Feature: XLoader Then I should see "DataStore" When I press "DataStore" + And I reload page every 3 seconds until I see an element with xpath "//*[contains(string(), 'Express Load completed')]" but not more than 6 times Then I should see "Express Load completed" And I should see "Data Schema" And I should see "Data Dictionary"