From 4b2b9b221b3545a0a98c75e71a8439ec34b9dd60 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Wed, 8 Nov 2023 14:07:08 -0400
Subject: [PATCH] Fix tests (#991)

---
 .github/workflows/build-2.x.yml               |  2 +-
 .../JsonldTypeAlterReactionTest.php           | 39 ++++++++++++++++---
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml
index 396b9a0b..8e4e19be 100644
--- a/.github/workflows/build-2.x.yml
+++ b/.github/workflows/build-2.x.yml
@@ -26,7 +26,7 @@ jobs:
         php-versions: ["8.1", "8.2"]
         # test-suite functional-javascript will appear to pass but will skip tests; missing chromedriver.
         test-suite: ["kernel", "functional", "functional-javascript"]
-        drupal-version: ["10.0.x", "10.1.x"] # Fails on 10.2 until https://github.com/Islandora/islandora/issues/989 is resolved.
+        drupal-version: ["10.0.x", "10.1.x", "10.2.x-dev"]
         mysql: ["8.0"]
         allowed_failure: [false]
 
diff --git a/tests/src/Functional/JsonldTypeAlterReactionTest.php b/tests/src/Functional/JsonldTypeAlterReactionTest.php
index 658244ae..75ae41dd 100644
--- a/tests/src/Functional/JsonldTypeAlterReactionTest.php
+++ b/tests/src/Functional/JsonldTypeAlterReactionTest.php
@@ -26,12 +26,39 @@ class JsonldTypeAlterReactionTest extends JsonldSelfReferenceReactionTest {
 
     // Add the typed predicate we will select in the reaction config.
     // Taken from FieldUiTestTrait->fieldUIAddNewField.
-    $this->submitForm([
-      'new_storage_type' => 'string',
-      'label' => 'Typed Predicate',
-      'field_name' => 'type_predicate',
-    ], 'Save and continue');
-    $this->submitForm([], $this->t('Save field settings'));
+    if (version_compare(\Drupal::VERSION, '10.2.x-dev', 'lt')) {
+      $this->submitForm([
+        'new_storage_type' => 'string',
+        'label' => 'Typed Predicate',
+        'field_name' => 'type_predicate',
+      ], 'Save and continue');
+      $this->submitForm([], $this->t('Save field settings'));
+    }
+    else {
+      $this->getSession()->getPage()->selectFieldOption('new_storage_type', 'plain_text');
+      // First need to submit the form with the elements displayed
+      // on initial page load. The form is using AJAX to send a second element
+      // after we selected the radio button above
+      // we can instead get the second element by submitting the form
+      // and having it throw an error since the required field is missing.
+      // @todo refactor this as a functional javascript test.
+      $this->submitForm([
+        'new_storage_type' => 'plain_text',
+        'label' => 'Typed Predicate',
+        'field_name' => 'type_predicate',
+      ], $this->t('Continue'));
+
+      // Now we can proceed, selecting the plain text (i.e. string)
+      // for the second element now that the element is displayed after
+      // the initial form submission.
+      $this->getSession()->getPage()->selectFieldOption('group_field_options_wrapper', 'string');
+      $this->submitForm([
+        'new_storage_type' => 'plain_text',
+        'label' => 'Typed Predicate',
+        'field_name' => 'type_predicate',
+        'group_field_options_wrapper' => 'string',
+      ], $this->t('Continue'));
+    }
     $this->submitForm([], $this->t('Save settings'));
     $this->assertSession()->responseContains('field_type_predicate');