diff --git a/tests/behat/features/ckan.feature b/tests/behat/features/ckan.feature index c162672..e33f62b 100644 --- a/tests/behat/features/ckan.feature +++ b/tests/behat/features/ckan.feature @@ -24,8 +24,8 @@ Feature: Use CKAN When I click the "Data" CMS tab When I fill in "DataResource-uri" with "https://catalogue.data.govt.nz/dataset/directory-of-educational-institutions" And I wait for 5 seconds - And I should see "Early Childhood Services (ECE) Directory" - When I select "New Zealand Schools" from the ".ckan-resource-locator__resource-select select" field + And I should see "Early Childhood Services (ECEs) Directory" + When I select "Schools Directory" from the ".ckan-resource-locator__resource-select select" field And I wait for 5 seconds And I press the "Save" button Then I should see a "Saved" success toast @@ -36,10 +36,10 @@ Feature: Use CKAN And I check "Form_DataColumns_GridFieldEditableColumns_4_ShowInResultsView" And I press the "Save" button And I go to "/my-ckan-registry-page?stage=Stage" - Then I should see "School id" + Then I should see "Ece id" And I should see "Org name" And I should see "Telephone" And I should see "Search" When I click on the ".griddle-table-heading-cell:nth-of-type(2)" element And I wait for 2 seconds - Then I should see "Albury School" + Then I should see "ABC Educare" diff --git a/tests/php/Forms/GridField/GridFieldDetailForm/ResourceFieldItemRequestTest.php b/tests/php/Forms/GridField/GridFieldDetailForm/ResourceFieldItemRequestTest.php index 151c366..18d3501 100644 --- a/tests/php/Forms/GridField/GridFieldDetailForm/ResourceFieldItemRequestTest.php +++ b/tests/php/Forms/GridField/GridFieldDetailForm/ResourceFieldItemRequestTest.php @@ -11,6 +11,7 @@ use SilverStripe\CKANRegistry\Service\ResourcePopulatorInterface; use SilverStripe\Control\Controller; use SilverStripe\Control\HTTPRequest; +use SilverStripe\Control\HTTPResponse; use SilverStripe\Core\Injector\Injector; use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\Form; @@ -123,6 +124,7 @@ protected function moveFieldFixture($fixture, $newPosition) $controllerMock = $this->createMock(Controller::class); $controllerMock->method('Link')->willReturn('test'); $controllerMock->method('getRequest')->willReturn($request); + $controllerMock->method('getResponse')->willReturn(new HTTPResponse('test')); // Create an item request $itemRequest = new ResourceFieldItemRequest( diff --git a/yarn.lock b/yarn.lock index f7a23c4..32b69f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2240,7 +2240,7 @@ asap@^2.0.0, asap@~2.0.3: ast-types-flow@^0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" - integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag== + integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0= asynckit@^0.4.0: version "0.4.0" @@ -8167,9 +8167,9 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= ua-parser-js@^0.7.30: - version "0.7.31" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6" - integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ== + version "0.7.35" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.35.tgz#8bda4827be4f0b1dda91699a29499575a1f1d307" + integrity sha512-veRf7dawaj9xaWEu9HoTVn5Pggtc/qj+kqTOFvNiN1l0YdxwC1kvel57UCjThjGa3BHBihE8/UJAHI+uQHmd/g== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" @@ -8532,11 +8532,16 @@ wildcard@^2.0.0: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== -word-wrap@^1.2.3, word-wrap@~1.2.3: +word-wrap@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +word-wrap@~1.2.3: + version "1.2.5" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== + wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"