Skip to content
GitLab
Commit 8f19a9c8 authored by Chris Shantz's avatar Chris Shantz
Browse files

Merge branch '3.0.x' into prod/3.0.x

parents 27928060 ab8dc593
Hide whitespace changes
Inline Side-by-side
README.md
View file @ 8f19a9c8
......@@ -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
......
composer.json
View file @ 8f19a9c8
......@@ -23,6 +23,7 @@
"drupal/captcha": "1.2",
"drupal/ckeditorheight": "1.5",
"drupal/components": "2.4",
"drupal/composer_deploy": "1.6",
"drupal/conditional_fields": "4.0.0-alpha1",
"drupal/config_update": "1.7",
"drupal/config_views": "dev-2.0.0-beta1-uw_wcms1",
......@@ -33,7 +34,7 @@
"drupal/diff": "1.0",
"drupal/entity_browser": "2.6",
"drupal/entity_browser_block": "1.1",
"drupal/entity_browser_block_layout": "dev-8.x-1.x",
"drupal/entity_browser_block_layout": "1.0.0-beta1",
"drupal/entity_class_formatter": "1.2",
"drupal/entity_reference_revisions": "1.9",
"drupal/eu_cookie_compliance": "1.14",
......@@ -95,11 +96,10 @@
"drupal/schema_metatag": "1.8",
"drupal/sendgrid_integration": "2.0-beta2",
"drupal/simplesamlphp_auth": "dev-3.2-uw_wcms1",
"drupal/simplesamlphp_custom_attributes": "dev-8.x-1.1+5-dev",
"drupal/simplesamlphp_custom_attributes": "2.0.0",
"drupal/simplify_menu": "2.1",
"drupal/smart_date": "3.4.2",
"drupal/sophron": "1.1",
"drupal/structure_sync": "2.0.1",
"drupal/subpathauto": "dev-1.1-uw_wcms1",
"drupal/term_reference_tree": "1.0",
"drupal/token": "1.9",
......@@ -114,7 +114,7 @@
"drupal/views_contextual_filters_or": "1.2",
"drupal/views_exposed_filter_blocks": "1.1",
"drupal/views_taxonomy_term_name_into_id": "dev-1.0-alpha3-uw_wcms1",
"drupal/webform": "5.28",
"drupal/webform": "6.1.0-beta2",
"drupal/workbench_access": "1.0-beta4",
"fastglass/sendgrid": ">=2.0.0",
"fileeye/mimemap": "^1.1",
......@@ -123,40 +123,36 @@
"libraries/ckeditor-lineutils": "4.16.2",
"libraries/ckeditor-mathjax": "4.16.2",
"libraries/ckeditor-widget": "4.16.2",
"libraries/drupal-composer-info-rewrite": "1.0.0",
"libraries/jquery-ui-touch-punch": "dev-master",
"onelogin/php-saml": "3.2.1",
"oomphinc/composer-installers-extender": "v1.1.2",
"phayes/geophp": "1.2",
"simplesamlphp/simplesamlphp": "^1.18",
"simshaun/recurr": "^4.0",
"symfony/browser-kit": ">=2.8.13 <3.0",
"symfony/css-selector": "~3.0",
"symfony/finder": "^4.0",
"symfony/var-dumper": "^4.0",
"wcms/layout_builder_expand_collapse": "1.0.2",
"wcms/uw_auth_wcms_admins": "1.0.0",
"wcms/uw_cfg_common": "1.0.10",
"wcms/uw_ckeditor_plugins": "1.0.2",
"wcms/uw_ct_blog": "1.0.7",
"wcms/uw_ct_catalog": "1.0.6",
"wcms/uw_ct_contact": "1.0.6",
"wcms/uw_ct_event": "1.0.7",
"wcms/uw_ct_news_item": "1.0.6",
"wcms/uw_ct_profile": "1.0.6",
"wcms/uw_ct_sidebar": "1.0.3",
"wcms/uw_ct_site_footer": "1.0.3",
"wcms/uw_ct_web_page": "1.0.3",
"wcms/uw_custom_blocks": "1.0.5",
"wcms/uw_dashboard": "1.0.2",
"wcms/uw_fdsu_theme_resp": "1.0.6",
"wcms/uw_media": "1.0.1",
"wcms/uw_migrate": "1.0.7",
"wcms/uw_sites_all": "1.0.8",
"wcms/uw_theme_admin": "1.0.2",
"wcms/uw_wcms_gesso": "3.0.7",
"wcms/uw_ws_ofis": "2.0.0",
"wcms/layout_builder_expand_collapse": "dev-1.0.x",
"wcms/uw_auth_wcms_admins": "dev-1.0.x",
"wcms/uw_cfg_common": "dev-1.0.x",
"wcms/uw_ckeditor_plugins": "dev-1.0.x",
"wcms/uw_ct_blog": "dev-1.0.x",
"wcms/uw_ct_catalog": "dev-1.0.x",
"wcms/uw_ct_contact": "dev-1.0.x",
"wcms/uw_ct_event": "dev-1.0.x",
"wcms/uw_ct_news_item": "dev-1.0.x",
"wcms/uw_ct_profile": "dev-1.0.x",
"wcms/uw_ct_sidebar": "dev-1.0.x",
"wcms/uw_ct_site_footer": "dev-1.0.x",
"wcms/uw_ct_web_page": "dev-1.0.x",
"wcms/uw_custom_blocks": "dev-1.0.x",
"wcms/uw_dashboard": "dev-1.0.x",
"wcms/uw_fdsu_theme_resp": "dev-1.0.x",
"wcms/uw_media": "dev-1.0.x",
"wcms/uw_migrate": "dev-1.0.x",
"wcms/uw_sites_all": "dev-1.0.x",
"wcms/uw_theme_admin": "dev-1.0.x",
"wcms/uw_wcms_gesso": "dev-3.0.x",
"wcms/uw_ws_ofis": "dev-2.0.x",
"wikimedia/composer-merge-plugin": "^1.4"
}
}
composer.webform.libraries.json
View file @ 8f19a9c8
......@@ -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"
}
}
}
}
}
tests/src/Functional/UwWcmsBasicTest.php
View file @ 8f19a9c8
......@@ -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.');
}
}
}
......@@ -507,13 +510,14 @@ class UwWcmsBasicTest extends BrowserTestBase {
// permission again for late use.
user_role_grant_permissions('uw_role_content_author', ['create terms in uw_vocab_catalogs']);
}
}
// Test field_uw_event_map exists.
$this->drupalGet('node/add/uw_ct_event');
$this->assertSession()->statusCodeEquals(200);
$this->assertFieldByXPath('//input[@type="url" and @id="edit-field-uw-event-map-0-uri"]', NULL, 'Map link field exists.');
$this->assertSession()->pageTextContains('Optional: provide a link to a map with the event location (e.g. https://uwaterloo.ca/map/)');
if ($key === 'event') {
$this->assertFieldByXPath('//select[@id="edit-location-presets-select"]', NULL, 'Location lookup menu exists.');
// Test field_uw_event_map exists.
$this->assertFieldByXPath('//input[@type="url" and @id="edit-field-uw-event-map-0-uri"]', NULL, 'Map link field exists.');
$this->assertSession()->pageTextContains('Optional: provide a link to a map with the event location (e.g. https://uwaterloo.ca/map/)');
}
}
// Create a catalog term in order to create a catalog item.
$edit = [
......@@ -2602,7 +2606,7 @@ class UwWcmsBasicTest extends BrowserTestBase {
$this->assertSession()->statusCodeEquals(200);
// Validate settings form fields for administrator.
$this->assertSession()->pageTextContains('Clear OFIS caches');
$this->assertSession()->buttonExists('Clear OFIS caches');
$this->assertSession()->fieldExists('API endpoint');
$this->assertSession()->fieldExists('Enable OFIS profiles');
......
Supports Markdown
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