Commit ab8dc593 authored by Chris Shantz's avatar Chris Shantz
Browse files

Merge branch 'feature/ISTWCMS-4684-lkmorlan-webform-6-update' into '3.0.x'

ISTWCMS-4684: Update to Webform 6

See merge request !222
parents 80154d7f 5e569f57
......@@ -52,11 +52,6 @@ samlauth 8.x-3.0-alpha1-uw_wcms3
- Patch 4a4b894d: fixing event subscribers.
https://www.drupal.org/project/samlauth/issues/2925171#comment-12351528
webform 8.x-5.6-uw_wcms2
- Base: 8.x-5.6
- 5752fc4a: allow webform libraries to use our repos
- cc6728b1: fix version numbers
## Testing
To prepare a Drupal install for testing with PHPUnit, copy
DRUPAL_ROOT/core/phpunit.xml.dist to DRUPAL_ROOT/core/phpunit.xml and in that
......
......@@ -51,7 +51,14 @@
"jquery/toggles": "*",
"progress-tracker/progress-tracker": "*",
"signature_pad/signature_pad": "*",
"svg-pan-zoom/svg-pan-zoom": "*"
"svg-pan-zoom/svg-pan-zoom": "*",
"tabby/tabby": "*",
"tippyjs/5.x": "*",
"tippyjs/6.x": "*"
},
"suggest": {
"drupal/jquery_ui_checkboxradio": "Provides jQuery UI Checkboxradio library. Required by the Webform jQueryUI Buttons module. The Webform jQueryUI Buttons module is deprecated because jQueryUI is no longer maintained.",
"drupal/jquery_ui_datepicker": "Provides jQuery UI Datepicker library. Required to support datepickers. The Webform jQueryUI Datepicker module is deprecated because jQueryUI is no longer maintained."
},
"repositories": {
"algolia.places": {
......@@ -378,7 +385,7 @@
"type": "package",
"package": {
"name": "progress-tracker/progress-tracker",
"version": "1.4.0",
"version": "2.0.6",
"type": "drupal-library",
"extra": {
"installer-name": "progress-tracker"
......@@ -386,7 +393,7 @@
"source": {
"url": "https://git.uwaterloo.ca/libraries/progress-tracker.git",
"type": "git",
"reference": "v1.4.0"
"reference": "2.0.6"
}
}
},
......@@ -421,6 +428,54 @@
"reference": "3.6.1"
}
}
},
"tabby": {
"type": "package",
"package": {
"name": "tabby/tabby",
"version": "12.0.3",
"type": "drupal-library",
"extra": {
"installer-name": "tabby"
},
"source": {
"url": "https://git.uwaterloo.ca/libraries/tabby.git",
"type": "git",
"reference": "v12.0.3"
}
}
},
"tippyjs/5.x": {
"type": "package",
"package": {
"name": "tippyjs/5.x",
"version": "5.2.1",
"type": "drupal-library",
"extra": {
"installer-name": "tippyjs/5.x"
},
"source": {
"url": "https://git.uwaterloo.ca/libraries/tippyjs.git",
"type": "git",
"reference": "5.2.1"
}
}
},
"tippyjs/6.x": {
"type": "package",
"package": {
"name": "tippyjs/6.x",
"version": "6.2.6",
"type": "drupal-library",
"extra": {
"installer-name": "tippyjs/6.x"
},
"source": {
"url": "https://git.uwaterloo.ca/libraries/tippyjs.git",
"type": "git",
"reference": "6.2.6"
}
}
}
}
}
......@@ -295,10 +295,13 @@ class UwWcmsBasicTest extends BrowserTestBase {
'admin/structure/webform/config/exporters' => ['uw_role_form_editor'],
'admin/structure/webform/config/handlers' => ['uw_role_form_editor'],
'admin/structure/webform/config/libraries' => ['uw_role_form_editor'],
'admin/structure/webform/config/options/manage' => ['uw_role_form_editor'],
'admin/structure/webform/options/manage' => ['uw_role_form_editor'],
'admin/structure/webform/config/submissions' => ['uw_role_form_editor'],
'admin/structure/webform/config/variants' => ['uw_role_form_editor'],
'admin/structure/webform/help' => TRUE,
'admin/structure/webform/help' => [
'uw_role_form_editor',
'uw_role_form_results_access',
],
'admin/structure/webform/submissions/manage' => [
'uw_role_form_editor',
'uw_role_form_results_access',
......@@ -337,8 +340,8 @@ class UwWcmsBasicTest extends BrowserTestBase {
if ($path === 'form/test-form' && !$this->loggedInUser) {
// Test for Honeypot element.
$this->assertRaw('Leave this field blank');
// Test for hCaptcha element.
$this->assertFieldByXPath('//div[@class="captcha"]/input[@name="captcha_token"]', NULL, 'Page has hCaptcha element.');
// Test for CAPTCHA.
$this->assertTrue((bool) $this->xpath('//details[@id="captcha"]'), 'Page has CAPTCHA.');
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment